apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

api_refactoring: for network api refactoring move interfaces so it works

Browse Source 
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 <bhaisaab@apache.org>
This commit is contained in:
Rohit Yadav 2012-12-05 14:53:16 -08:00
parent 0799052d70
commit ba8e61bfb5
15 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/src/org/apache/cloudstack/api/admin/network/command/AddNetworkDeviceCmd.java
View File

@ -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;

2
server/src/com/cloud/server/api/response/NetworkDeviceResponse.java → api/src/org/apache/cloudstack/api/admin/network/response/NetworkDeviceResponse.java
View File

@ -14,7 +14,7 @@
// 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;
package org.apache.cloudstack.api.admin.network.response;
import org.apache.cloudstack.api.ApiConstants;
import com.cloud.utils.IdentityProxy;

6
server/src/com/cloud/network/ExternalNetworkDeviceManager.java → api/src/org/apache/cloudstack/network/ExternalNetworkDeviceManager.java
View File

@ -14,15 +14,17 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
package com.cloud.network;
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 com.cloud.server.api.response.NetworkDeviceResponse;
import org.apache.cloudstack.api.admin.network.response.NetworkDeviceResponse;
import com.cloud.utils.component.Manager;
public interface ExternalNetworkDeviceManager extends Manager {

2
plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java
View File

@ -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;

2
plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.java
View File

@ -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;

2
plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java
View File

@ -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;

2
plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java
View File

@ -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;

2
server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java
View File

@ -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;

2
server/src/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java
View File

@ -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;

2
server/src/com/cloud/network/ExternalLoadBalancerDeviceVO.java
View File

@ -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;

3
server/src/com/cloud/network/ExternalNetworkDeviceManagerImpl.java
View File

@ -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;

1
server/src/com/cloud/server/api/response/ExternalFirewallResponse.java
View File

@ -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 {

1
server/src/com/cloud/server/api/response/ExternalLoadBalancerResponse.java
View File

@ -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 {

1
server/src/com/cloud/server/api/response/NwDeviceDhcpResponse.java
View File

@ -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")

1
server/src/com/cloud/server/api/response/NwDevicePxeServerResponse.java
View File

@ -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 {