api_refactoring: for network api refactoring move interfaces so it works Move ExternalNetworkDeviceManager to cloud-api, as server depends on cloud-api The api refactoring of one of the api required this interface
Signed-off-by: Rohit Yadav <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/ba8e61bf Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/ba8e61bf Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/ba8e61bf Branch: refs/heads/api_refactoring Commit: ba8e61bfb5a810dbf66a2dd8ccd35377457c85ef Parents: 0799052 Author: Rohit Yadav <[email protected]> Authored: Wed Dec 5 14:53:16 2012 -0800 Committer: Rohit Yadav <[email protected]> Committed: Wed Dec 5 14:53:16 2012 -0800 ---------------------------------------------------------------------- .../admin/network/command/AddNetworkDeviceCmd.java | 4 +- .../network/response/NetworkDeviceResponse.java | 37 +++++++ .../network/ExternalNetworkDeviceManager.java | 79 +++++++++++++++ .../element/F5ExternalLoadBalancerElement.java | 2 +- .../element/JuniperSRXExternalFirewallElement.java | 2 +- .../cloud/network/element/NetscalerElement.java | 2 +- .../cloud/network/element/NiciraNvpElement.java | 2 +- .../network/ExternalFirewallDeviceManagerImpl.java | 2 +- .../ExternalLoadBalancerDeviceManagerImpl.java | 2 +- .../network/ExternalLoadBalancerDeviceVO.java | 2 + .../network/ExternalNetworkDeviceManager.java | 77 -------------- .../network/ExternalNetworkDeviceManagerImpl.java | 3 +- .../api/response/ExternalFirewallResponse.java | 1 + .../api/response/ExternalLoadBalancerResponse.java | 1 + .../server/api/response/NetworkDeviceResponse.java | 37 ------- .../server/api/response/NwDeviceDhcpResponse.java | 1 + .../api/response/NwDevicePxeServerResponse.java | 1 + 17 files changed, 132 insertions(+), 123 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ba8e61bf/api/src/org/apache/cloudstack/api/admin/network/command/AddNetworkDeviceCmd.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/admin/network/command/AddNetworkDeviceCmd.java b/api/src/org/apache/cloudstack/api/admin/network/command/AddNetworkDeviceCmd.java index 8c597d5..8d63f0e 100644 --- a/api/src/org/apache/cloudstack/api/admin/network/command/AddNetworkDeviceCmd.java +++ b/api/src/org/apache/cloudstack/api/admin/network/command/AddNetworkDeviceCmd.java @@ -31,9 +31,9 @@ import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.ResourceAllocationException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.host.Host; -import com.cloud.network.ExternalNetworkDeviceManager; +import org.apache.cloudstack.network.ExternalNetworkDeviceManager; import com.cloud.server.ManagementService; -import com.cloud.server.api.response.NetworkDeviceResponse; +import org.apache.cloudstack.api.admin.network.response.NetworkDeviceResponse; import com.cloud.utils.component.ComponentLocator; import com.cloud.utils.exception.CloudRuntimeException; http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ba8e61bf/api/src/org/apache/cloudstack/api/admin/network/response/NetworkDeviceResponse.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/admin/network/response/NetworkDeviceResponse.java b/api/src/org/apache/cloudstack/api/admin/network/response/NetworkDeviceResponse.java new file mode 100644 index 0000000..f4435be --- /dev/null +++ b/api/src/org/apache/cloudstack/api/admin/network/response/NetworkDeviceResponse.java @@ -0,0 +1,37 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package org.apache.cloudstack.api.admin.network.response; + +import org.apache.cloudstack.api.ApiConstants; +import com.cloud.utils.IdentityProxy; +import com.cloud.api.response.BaseResponse; +import com.cloud.serializer.Param; +import com.google.gson.annotations.SerializedName; + +public class NetworkDeviceResponse extends BaseResponse { + @SerializedName(ApiConstants.ID) + @Param(description = "the ID of the network device") + private IdentityProxy id = new IdentityProxy("host"); + + public Long getId() { + return id.getValue(); + } + + public void setId(Long id) { + this.id.setValue(id); + } +} http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ba8e61bf/api/src/org/apache/cloudstack/network/ExternalNetworkDeviceManager.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/network/ExternalNetworkDeviceManager.java b/api/src/org/apache/cloudstack/network/ExternalNetworkDeviceManager.java new file mode 100644 index 0000000..35cab8e --- /dev/null +++ b/api/src/org/apache/cloudstack/network/ExternalNetworkDeviceManager.java @@ -0,0 +1,79 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package org.apache.cloudstack.network; + +import java.util.ArrayList; +import java.util.List; + +import com.cloud.network.Network; +import org.apache.cloudstack.api.admin.network.command.AddNetworkDeviceCmd; +import org.apache.cloudstack.api.admin.network.command.DeleteNetworkDeviceCmd; +import org.apache.cloudstack.api.admin.network.command.ListNetworkDeviceCmd; +import com.cloud.host.Host; +import org.apache.cloudstack.api.admin.network.response.NetworkDeviceResponse; +import com.cloud.utils.component.Manager; + +public interface ExternalNetworkDeviceManager extends Manager { + + public static class NetworkDevice { + private String _name; + private String _provider; + private static List<NetworkDevice> supportedNetworkDevices = new ArrayList<NetworkDevice>(); + + public static final NetworkDevice ExternalDhcp = new NetworkDevice("ExternalDhcp", null); + public static final NetworkDevice PxeServer = new NetworkDevice("PxeServer", null); + public static final NetworkDevice NetscalerMPXLoadBalancer = new NetworkDevice("NetscalerMPXLoadBalancer", Network.Provider.Netscaler.getName()); + public static final NetworkDevice NetscalerVPXLoadBalancer = new NetworkDevice("NetscalerVPXLoadBalancer", Network.Provider.Netscaler.getName()); + public static final NetworkDevice NetscalerSDXLoadBalancer = new NetworkDevice("NetscalerSDXLoadBalancer", Network.Provider.Netscaler.getName()); + public static final NetworkDevice F5BigIpLoadBalancer = new NetworkDevice("F5BigIpLoadBalancer", Network.Provider.F5BigIp.getName()); + public static final NetworkDevice JuniperSRXFirewall = new NetworkDevice("JuniperSRXFirewall", Network.Provider.JuniperSRX.getName()); + public static final NetworkDevice NiciraNvp = new NetworkDevice("NiciraNvp", Network.Provider.NiciraNvp.getName()); + public static final NetworkDevice MidokuraMidonet = new NetworkDevice("MidokuraMidonet", Network.Provider.MidokuraMidonet.getName()); + + public NetworkDevice(String deviceName, String ntwkServiceprovider) { + _name = deviceName; + _provider = ntwkServiceprovider; + supportedNetworkDevices.add(this); + } + + public String getName() { + return _name; + } + + public String getNetworkServiceProvder() { + return _provider; + } + + public static NetworkDevice getNetworkDevice(String devicerName) { + for (NetworkDevice device : supportedNetworkDevices) { + if (device.getName().equalsIgnoreCase(devicerName)) { + return device; + } + } + return null; + } + } + + public Host addNetworkDevice(AddNetworkDeviceCmd cmd); + + public NetworkDeviceResponse getApiResponse(Host device); + + public List<Host> listNetworkDevice(ListNetworkDeviceCmd cmd); + + public boolean deleteNetworkDevice(DeleteNetworkDeviceCmd cmd); + +} http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ba8e61bf/plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java ---------------------------------------------------------------------- diff --git a/plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java b/plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java index 00114f2..5710e60 100644 --- a/plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java +++ b/plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java @@ -55,7 +55,7 @@ import com.cloud.network.ExternalLoadBalancerDeviceManager; import com.cloud.network.ExternalLoadBalancerDeviceManagerImpl; import com.cloud.network.ExternalLoadBalancerDeviceVO; import com.cloud.network.ExternalLoadBalancerDeviceVO.LBDeviceState; -import com.cloud.network.ExternalNetworkDeviceManager.NetworkDevice; +import org.apache.cloudstack.network.ExternalNetworkDeviceManager.NetworkDevice; import com.cloud.network.Network; import com.cloud.network.Network.Capability; import com.cloud.network.Network.Provider; http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ba8e61bf/plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.java ---------------------------------------------------------------------- diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.java b/plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.java index 6e81547..d3353af 100644 --- a/plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.java +++ b/plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.java @@ -55,7 +55,7 @@ import com.cloud.host.dao.HostDetailsDao; import com.cloud.network.ExternalFirewallDeviceManagerImpl; import com.cloud.network.ExternalFirewallDeviceVO; import com.cloud.network.ExternalFirewallDeviceVO.FirewallDeviceState; -import com.cloud.network.ExternalNetworkDeviceManager.NetworkDevice; +import org.apache.cloudstack.network.ExternalNetworkDeviceManager.NetworkDevice; import com.cloud.network.Network; import com.cloud.network.Network.Capability; import com.cloud.network.Network.Provider; http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ba8e61bf/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java ---------------------------------------------------------------------- diff --git a/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java b/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java index 455dcbd..3725a24 100644 --- a/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java +++ b/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java @@ -65,7 +65,7 @@ import com.cloud.network.ExternalLoadBalancerDeviceManager; import com.cloud.network.ExternalLoadBalancerDeviceManagerImpl; import com.cloud.network.ExternalLoadBalancerDeviceVO; import com.cloud.network.ExternalLoadBalancerDeviceVO.LBDeviceState; -import com.cloud.network.ExternalNetworkDeviceManager.NetworkDevice; +import org.apache.cloudstack.network.ExternalNetworkDeviceManager.NetworkDevice; import com.cloud.network.IpAddress; import com.cloud.network.NetScalerPodVO; import com.cloud.network.Network; http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ba8e61bf/plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java ---------------------------------------------------------------------- diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java b/plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java index 4616736..d38abcc 100644 --- a/plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java +++ b/plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java @@ -70,7 +70,7 @@ import com.cloud.host.HostVO; import com.cloud.host.dao.HostDao; import com.cloud.host.dao.HostDetailsDao; import com.cloud.network.Network; -import com.cloud.network.ExternalNetworkDeviceManager.NetworkDevice; +import org.apache.cloudstack.network.ExternalNetworkDeviceManager.NetworkDevice; import com.cloud.network.Network.Capability; import com.cloud.network.Network.Provider; import com.cloud.network.Network.Service; http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ba8e61bf/server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java b/server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java index c7d1312..292255b 100644 --- a/server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java +++ b/server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java @@ -58,7 +58,7 @@ import com.cloud.host.Host; import com.cloud.host.HostVO; import com.cloud.host.dao.HostDao; import com.cloud.host.dao.HostDetailsDao; -import com.cloud.network.ExternalNetworkDeviceManager.NetworkDevice; +import org.apache.cloudstack.network.ExternalNetworkDeviceManager.NetworkDevice; import com.cloud.network.Networks.TrafficType; import com.cloud.network.dao.ExternalFirewallDeviceDao; import com.cloud.network.dao.IPAddressDao; http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ba8e61bf/server/src/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java b/server/src/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java index 448474f..dc4e42a 100644 --- a/server/src/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java +++ b/server/src/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java @@ -63,7 +63,7 @@ import com.cloud.host.dao.HostDao; import com.cloud.host.dao.HostDetailsDao; import com.cloud.network.ExternalLoadBalancerDeviceVO.LBDeviceAllocationState; import com.cloud.network.ExternalLoadBalancerDeviceVO.LBDeviceState; -import com.cloud.network.ExternalNetworkDeviceManager.NetworkDevice; +import org.apache.cloudstack.network.ExternalNetworkDeviceManager.NetworkDevice; import com.cloud.network.Network.Service; import com.cloud.network.Networks.TrafficType; import com.cloud.network.addr.PublicIp; http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ba8e61bf/server/src/com/cloud/network/ExternalLoadBalancerDeviceVO.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/ExternalLoadBalancerDeviceVO.java b/server/src/com/cloud/network/ExternalLoadBalancerDeviceVO.java index 190067b..8457632 100644 --- a/server/src/com/cloud/network/ExternalLoadBalancerDeviceVO.java +++ b/server/src/com/cloud/network/ExternalLoadBalancerDeviceVO.java @@ -16,6 +16,8 @@ // under the License. package com.cloud.network; +import org.apache.cloudstack.network.ExternalNetworkDeviceManager; + import java.util.UUID; import javax.persistence.Column; http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ba8e61bf/server/src/com/cloud/network/ExternalNetworkDeviceManager.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/ExternalNetworkDeviceManager.java b/server/src/com/cloud/network/ExternalNetworkDeviceManager.java deleted file mode 100644 index fc66f87..0000000 --- a/server/src/com/cloud/network/ExternalNetworkDeviceManager.java +++ /dev/null @@ -1,77 +0,0 @@ -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. -package com.cloud.network; - -import java.util.ArrayList; -import java.util.List; -import org.apache.cloudstack.api.admin.network.command.AddNetworkDeviceCmd; -import org.apache.cloudstack.api.admin.network.command.DeleteNetworkDeviceCmd; -import org.apache.cloudstack.api.admin.network.command.ListNetworkDeviceCmd; -import com.cloud.host.Host; -import com.cloud.server.api.response.NetworkDeviceResponse; -import com.cloud.utils.component.Manager; - -public interface ExternalNetworkDeviceManager extends Manager { - - public static class NetworkDevice { - private String _name; - private String _provider; - private static List<NetworkDevice> supportedNetworkDevices = new ArrayList<NetworkDevice>(); - - public static final NetworkDevice ExternalDhcp = new NetworkDevice("ExternalDhcp", null); - public static final NetworkDevice PxeServer = new NetworkDevice("PxeServer", null); - public static final NetworkDevice NetscalerMPXLoadBalancer = new NetworkDevice("NetscalerMPXLoadBalancer", Network.Provider.Netscaler.getName()); - public static final NetworkDevice NetscalerVPXLoadBalancer = new NetworkDevice("NetscalerVPXLoadBalancer", Network.Provider.Netscaler.getName()); - public static final NetworkDevice NetscalerSDXLoadBalancer = new NetworkDevice("NetscalerSDXLoadBalancer", Network.Provider.Netscaler.getName()); - public static final NetworkDevice F5BigIpLoadBalancer = new NetworkDevice("F5BigIpLoadBalancer", Network.Provider.F5BigIp.getName()); - public static final NetworkDevice JuniperSRXFirewall = new NetworkDevice("JuniperSRXFirewall", Network.Provider.JuniperSRX.getName()); - public static final NetworkDevice NiciraNvp = new NetworkDevice("NiciraNvp", Network.Provider.NiciraNvp.getName()); - public static final NetworkDevice MidokuraMidonet = new NetworkDevice("MidokuraMidonet", Network.Provider.MidokuraMidonet.getName()); - - public NetworkDevice(String deviceName, String ntwkServiceprovider) { - _name = deviceName; - _provider = ntwkServiceprovider; - supportedNetworkDevices.add(this); - } - - public String getName() { - return _name; - } - - public String getNetworkServiceProvder() { - return _provider; - } - - public static NetworkDevice getNetworkDevice(String devicerName) { - for (NetworkDevice device : supportedNetworkDevices) { - if (device.getName().equalsIgnoreCase(devicerName)) { - return device; - } - } - return null; - } - } - - public Host addNetworkDevice(AddNetworkDeviceCmd cmd); - - public NetworkDeviceResponse getApiResponse(Host device); - - public List<Host> listNetworkDevice(ListNetworkDeviceCmd cmd); - - public boolean deleteNetworkDevice(DeleteNetworkDeviceCmd cmd); - -} http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ba8e61bf/server/src/com/cloud/network/ExternalNetworkDeviceManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/ExternalNetworkDeviceManagerImpl.java b/server/src/com/cloud/network/ExternalNetworkDeviceManagerImpl.java index f73b0f9..8767f95 100755 --- a/server/src/com/cloud/network/ExternalNetworkDeviceManagerImpl.java +++ b/server/src/com/cloud/network/ExternalNetworkDeviceManagerImpl.java @@ -28,6 +28,7 @@ import javax.naming.ConfigurationException; import org.apache.cloudstack.api.admin.network.command.AddNetworkDeviceCmd; import org.apache.cloudstack.api.admin.network.command.ListNetworkDeviceCmd; +import org.apache.cloudstack.network.ExternalNetworkDeviceManager; import org.apache.log4j.Logger; import com.cloud.agent.AgentManager; @@ -58,7 +59,7 @@ import com.cloud.network.dao.VpnUserDao; import com.cloud.network.rules.dao.PortForwardingRulesDao; import com.cloud.offerings.dao.NetworkOfferingDao; import com.cloud.server.ManagementServer; -import com.cloud.server.api.response.NetworkDeviceResponse; +import org.apache.cloudstack.api.admin.network.response.NetworkDeviceResponse; import com.cloud.server.api.response.NwDeviceDhcpResponse; import com.cloud.server.api.response.PxePingResponse; import com.cloud.user.AccountManager; http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ba8e61bf/server/src/com/cloud/server/api/response/ExternalFirewallResponse.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/server/api/response/ExternalFirewallResponse.java b/server/src/com/cloud/server/api/response/ExternalFirewallResponse.java index c419f23..6023ab6 100644 --- a/server/src/com/cloud/server/api/response/ExternalFirewallResponse.java +++ b/server/src/com/cloud/server/api/response/ExternalFirewallResponse.java @@ -20,6 +20,7 @@ import org.apache.cloudstack.api.ApiConstants; import com.cloud.utils.IdentityProxy; import com.cloud.serializer.Param; import com.google.gson.annotations.SerializedName; +import org.apache.cloudstack.api.admin.network.response.NetworkDeviceResponse; public class ExternalFirewallResponse extends NetworkDeviceResponse { http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ba8e61bf/server/src/com/cloud/server/api/response/ExternalLoadBalancerResponse.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/server/api/response/ExternalLoadBalancerResponse.java b/server/src/com/cloud/server/api/response/ExternalLoadBalancerResponse.java index c1e8ca4..ed8d8be 100644 --- a/server/src/com/cloud/server/api/response/ExternalLoadBalancerResponse.java +++ b/server/src/com/cloud/server/api/response/ExternalLoadBalancerResponse.java @@ -20,6 +20,7 @@ import org.apache.cloudstack.api.ApiConstants; import com.cloud.utils.IdentityProxy; import com.cloud.serializer.Param; import com.google.gson.annotations.SerializedName; +import org.apache.cloudstack.api.admin.network.response.NetworkDeviceResponse; public class ExternalLoadBalancerResponse extends NetworkDeviceResponse { http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ba8e61bf/server/src/com/cloud/server/api/response/NetworkDeviceResponse.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/server/api/response/NetworkDeviceResponse.java b/server/src/com/cloud/server/api/response/NetworkDeviceResponse.java deleted file mode 100644 index 1c64a94..0000000 --- a/server/src/com/cloud/server/api/response/NetworkDeviceResponse.java +++ /dev/null @@ -1,37 +0,0 @@ -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. -package com.cloud.server.api.response; - -import org.apache.cloudstack.api.ApiConstants; -import com.cloud.utils.IdentityProxy; -import com.cloud.api.response.BaseResponse; -import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; - -public class NetworkDeviceResponse extends BaseResponse { - @SerializedName(ApiConstants.ID) - @Param(description = "the ID of the network device") - private IdentityProxy id = new IdentityProxy("host"); - - public Long getId() { - return id.getValue(); - } - - public void setId(Long id) { - this.id.setValue(id); - } -} http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ba8e61bf/server/src/com/cloud/server/api/response/NwDeviceDhcpResponse.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/server/api/response/NwDeviceDhcpResponse.java b/server/src/com/cloud/server/api/response/NwDeviceDhcpResponse.java index d53fe1c..d4c0046 100644 --- a/server/src/com/cloud/server/api/response/NwDeviceDhcpResponse.java +++ b/server/src/com/cloud/server/api/response/NwDeviceDhcpResponse.java @@ -19,6 +19,7 @@ package com.cloud.server.api.response; import org.apache.cloudstack.api.ApiConstants; import com.cloud.serializer.Param; import com.google.gson.annotations.SerializedName; +import org.apache.cloudstack.api.admin.network.response.NetworkDeviceResponse; public class NwDeviceDhcpResponse extends NetworkDeviceResponse { @SerializedName(ApiConstants.ZONE_ID) @Param(description="Zone where to add PXE server") http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ba8e61bf/server/src/com/cloud/server/api/response/NwDevicePxeServerResponse.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/server/api/response/NwDevicePxeServerResponse.java b/server/src/com/cloud/server/api/response/NwDevicePxeServerResponse.java index 61371ad..df1faec 100644 --- a/server/src/com/cloud/server/api/response/NwDevicePxeServerResponse.java +++ b/server/src/com/cloud/server/api/response/NwDevicePxeServerResponse.java @@ -20,6 +20,7 @@ import org.apache.cloudstack.api.ApiConstants; import com.cloud.utils.IdentityProxy; import com.cloud.serializer.Param; import com.google.gson.annotations.SerializedName; +import org.apache.cloudstack.api.admin.network.response.NetworkDeviceResponse; public class NwDevicePxeServerResponse extends NetworkDeviceResponse {
