From 4fbecf15ecbfa17cba514c310f78f6e455b3ba3e Mon Sep 17 00:00:00 2001 From: Edison Su Date: Mon, 21 Jan 2013 16:59:24 -0800 Subject: [PATCH] add unit test back, primary storage life cycle is tested --- core/src/com/cloud/storage/StoragePoolVO.java | 18 ++-- .../entity/api/db/dao/HostDetailsDaoImpl.java | 2 +- engine/storage/integration-test/pom.xml | 6 ++ .../storage/test/ChildTestConfiguration.java | 89 +++++++++++++++++ .../storage/test/volumeServiceTest.java | 71 +++++++++++--- .../test/resource/storageContext.xml | 97 +++++++++---------- .../integration-test/test/resource/testng.xml | 2 +- .../storage/HypervisorHostEndPoint.java | 17 +++- .../datastore/db/PrimaryDataStoreVO.java | 1 + .../DataStoreProviderManagerImpl.java | 12 ++- .../endpoint/DefaultEndPointSelector.java | 6 +- .../storage/image/db/ImageDataDaoImpl.java | 12 +-- .../datastore/PrimaryDataStoreHelper.java | 1 - .../datastore/DefaultPrimaryDataStore.java | 33 ++++--- .../DefaultPrimaryDataStoreLifeCycleImpl.java | 8 +- ...ltPrimaryDataStoreProviderManagerImpl.java | 8 +- .../storage/volume/VolumeManagerImpl.java | 2 +- .../com/cloud/hypervisor/guru/VMwareGuru.java | 2 +- .../resource/XenServerStorageResource.java | 12 ++- .../lb/ElasticLoadBalancerManagerImpl.java | 6 +- .../network/lb/dao/ElasticLbVmMapDao.java | 2 +- .../network/lb/dao/ElasticLbVmMapDaoImpl.java | 2 +- .../api/commands/AddF5LoadBalancerCmd.java | 2 +- .../commands/ConfigureF5LoadBalancerCmd.java | 2 +- .../api/commands/ListF5LoadBalancersCmd.java | 2 +- .../api/response/F5LoadBalancerResponse.java | 3 +- .../F5ExternalLoadBalancerElement.java | 10 +- .../F5ExternalLoadBalancerElementService.java | 3 +- .../cloud/api/commands/AddSrxFirewallCmd.java | 2 +- .../api/commands/ConfigureSrxFirewallCmd.java | 2 +- .../api/commands/ListSrxFirewallsCmd.java | 2 +- .../api/response/SrxFirewallResponse.java | 3 +- .../JuniperSRXExternalFirewallElement.java | 10 +- .../JuniperSRXFirewallElementService.java | 3 +- .../commands/AddNetscalerLoadBalancerCmd.java | 2 +- .../ConfigureNetscalerLoadBalancerCmd.java | 2 +- .../ListNetscalerLoadBalancersCmd.java | 2 +- .../NetscalerLoadBalancerResponse.java | 3 +- .../network/element/NetscalerElement.java | 10 +- .../NetscalerLoadBalancerElementService.java | 2 +- .../network/element/NiciraNvpElement.java | 4 +- .../guru/NiciraNvpGuestNetworkGuru.java | 4 +- .../guru/NiciraNvpGuestNetworkGuruTest.java | 4 +- .../network/guru/OvsGuestNetworkGuru.java | 2 +- server/src/com/cloud/api/ApiDBUtils.java | 16 +-- .../src/com/cloud/api/ApiResponseHelper.java | 6 +- .../baremetal/BareMetalVmManagerImpl.java | 2 +- .../ConfigurationManagerImpl.java | 6 +- .../consoleproxy/ConsoleProxyManagerImpl.java | 4 +- .../com/cloud/dc/dao/DataCenterDaoImpl.java | 2 +- .../dc/dao/DataCenterIpAddressDaoImpl.java | 2 +- .../DataCenterLinkLocalIpAddressDaoImpl.java | 2 +- .../cloud/dc/dao/DataCenterVnetDaoImpl.java | 2 +- .../com/cloud/dc/dao/DcDetailsDaoImpl.java | 2 +- server/src/com/cloud/dc/dao/HostPodDao.java | 2 - .../src/com/cloud/dc/dao/HostPodDaoImpl.java | 29 +----- .../src/com/cloud/dc/dao/PodVlanDaoImpl.java | 2 +- .../src/com/cloud/host/dao/HostDaoImpl.java | 2 +- .../cloud/host/dao/HostDetailsDaoImpl.java | 2 +- .../com/cloud/host/dao/HostTagsDaoImpl.java | 2 +- .../ExternalFirewallDeviceManager.java | 1 + .../ExternalFirewallDeviceManagerImpl.java | 5 + .../ExternalLoadBalancerDeviceManager.java | 1 + ...ExternalLoadBalancerDeviceManagerImpl.java | 9 +- .../ExternalLoadBalancerUsageManagerImpl.java | 5 + .../src/com/cloud/network/NetworkManager.java | 2 + .../com/cloud/network/NetworkManagerImpl.java | 5 + .../com/cloud/network/NetworkModelImpl.java | 5 + .../com/cloud/network/NetworkServiceImpl.java | 4 + .../cloud/network/NetworkUsageManager.java | 2 + .../network/NetworkUsageManagerImpl.java | 2 + .../cloud/network/PortProfileManagerImpl.java | 5 +- .../network/StorageNetworkManagerImpl.java | 1 + .../src/com/cloud/network/addr/PublicIp.java | 2 +- .../network/as/AutoScaleManagerImpl.java | 2 +- .../dao/ExternalFirewallDeviceDao.java | 5 +- .../dao/ExternalFirewallDeviceDaoImpl.java | 5 +- .../{ => dao}/ExternalFirewallDeviceVO.java | 2 +- .../dao/ExternalLoadBalancerDeviceDao.java | 6 +- .../ExternalLoadBalancerDeviceDaoImpl.java | 5 +- .../ExternalLoadBalancerDeviceVO.java | 2 +- .../network/dao/FirewallRulesCidrsDao.java | 1 - .../dao/FirewallRulesCidrsDaoImpl.java | 1 - .../{ => dao}/FirewallRulesCidrsVO.java | 2 +- .../network/dao/FirewallRulesDaoImpl.java | 1 - .../com/cloud/network/dao/IPAddressDao.java | 1 - .../cloud/network/dao/IPAddressDaoImpl.java | 1 - .../cloud/network/{ => dao}/IPAddressVO.java | 5 +- .../dao/InlineLoadBalancerNicMapDao.java | 1 - .../dao/InlineLoadBalancerNicMapDaoImpl.java | 1 - .../{ => dao}/InlineLoadBalancerNicMapVO.java | 2 +- .../network/dao/LBStickinessPolicyDao.java | 1 - .../dao/LBStickinessPolicyDaoImpl.java | 1 - .../{ => dao}/LBStickinessPolicyVO.java | 2 +- .../cloud/network/dao/LoadBalancerDao.java | 1 - .../network/dao/LoadBalancerDaoImpl.java | 1 - .../network/dao/LoadBalancerVMMapDao.java | 1 - .../network/dao/LoadBalancerVMMapDaoImpl.java | 1 - .../{ => dao}/LoadBalancerVMMapVO.java | 2 +- .../network/{ => dao}/LoadBalancerVO.java | 2 +- .../{ => dao}/NetworkAccountDaoImpl.java | 2 +- .../network/{ => dao}/NetworkAccountVO.java | 2 +- .../src/com/cloud/network/dao/NetworkDao.java | 2 - .../com/cloud/network/dao/NetworkDaoImpl.java | 5 - .../cloud/network/dao/NetworkDomainDao.java | 1 - .../network/dao/NetworkDomainDaoImpl.java | 1 - .../network/{ => dao}/NetworkDomainVO.java | 3 +- .../dao/NetworkExternalFirewallDao.java | 1 - .../dao/NetworkExternalFirewallDaoImpl.java | 1 - .../{ => dao}/NetworkExternalFirewallVO.java | 2 +- .../dao/NetworkExternalLoadBalancerDao.java | 1 - .../NetworkExternalLoadBalancerDaoImpl.java | 1 - .../NetworkExternalLoadBalancerVO.java | 2 +- .../network/dao/NetworkRuleConfigDao.java | 1 - .../network/dao/NetworkRuleConfigDaoImpl.java | 1 - .../{ => dao}/NetworkRuleConfigVO.java | 2 +- .../network/dao/NetworkServiceMapDao.java | 1 - .../network/dao/NetworkServiceMapDaoImpl.java | 1 - .../{ => dao}/NetworkServiceMapVO.java | 3 +- .../cloud/network/{ => dao}/NetworkVO.java | 7 +- .../cloud/network/dao/PhysicalNetworkDao.java | 1 - .../network/dao/PhysicalNetworkDaoImpl.java | 1 - .../network/{ => dao}/PhysicalNetworkVO.java | 5 +- .../com/cloud/network/dao/PortProfileDao.java | 1 - .../cloud/network/dao/PortProfileDaoImpl.java | 1 - .../network/{ => dao}/PortProfileVO.java | 2 +- .../cloud/network/dao/RemoteAccessVpnDao.java | 1 - .../network/dao/RemoteAccessVpnDaoImpl.java | 1 - .../network/{ => dao}/RemoteAccessVpnVO.java | 5 +- .../network/dao/RouterNetworkDaoImpl.java | 1 - .../network/{ => dao}/RouterNetworkVO.java | 3 +- .../dao/Site2SiteCustomerGatewayDao.java | 1 - .../dao/Site2SiteCustomerGatewayDaoImpl.java | 1 - .../{ => dao}/Site2SiteCustomerGatewayVO.java | 3 +- .../dao/Site2SiteVpnConnectionDao.java | 1 - .../dao/Site2SiteVpnConnectionDaoImpl.java | 2 - .../{ => dao}/Site2SiteVpnConnectionVO.java | 4 +- .../network/dao/Site2SiteVpnGatewayDao.java | 1 - .../dao/Site2SiteVpnGatewayDaoImpl.java | 1 - .../{ => dao}/Site2SiteVpnGatewayVO.java | 3 +- .../network/firewall/FirewallManagerImpl.java | 2 +- .../network/guru/ControlNetworkGuru.java | 2 +- .../cloud/network/guru/DirectNetworkGuru.java | 4 +- .../guru/DirectPodBasedNetworkGuru.java | 2 +- .../guru/ExternalGuestNetworkGuru.java | 2 +- .../cloud/network/guru/GuestNetworkGuru.java | 6 +- .../network/guru/PodBasedNetworkGuru.java | 2 +- .../network/guru/PrivateNetworkGuru.java | 2 +- .../cloud/network/guru/PublicNetworkGuru.java | 4 +- .../network/guru/StorageNetworkGuru.java | 2 +- .../lb/LoadBalancingRulesManagerImpl.java | 10 +- .../VirtualNetworkApplianceManagerImpl.java | 36 ++++++- ...VpcVirtualNetworkApplianceManagerImpl.java | 8 +- .../cloud/network/rules/FirewallManager.java | 2 +- .../cloud/network/rules/RulesManagerImpl.java | 2 +- .../dao/SecurityGroupVMMapDaoImpl.java | 2 +- .../com/cloud/network/vpc/VpcManagerImpl.java | 4 +- .../vpn/RemoteAccessVpnManagerImpl.java | 4 +- .../network/vpn/Site2SiteVpnManager.java | 2 +- .../network/vpn/Site2SiteVpnManagerImpl.java | 8 +- .../cloud/resource/ResourceManagerImpl.java | 2 +- .../cloud/server/ConfigurationServerImpl.java | 2 +- .../cloud/server/ManagementServerImpl.java | 6 +- .../SecondaryStorageManagerImpl.java | 4 +- .../com/cloud/user/AccountManagerImpl.java | 6 +- .../src/com/cloud/vm/UserVmManagerImpl.java | 6 +- .../src/com/cloud/vm/UserVmStateListener.java | 2 +- .../com/cloud/vm/VirtualMachineManager.java | 2 +- .../cloud/vm/VirtualMachineManagerImpl.java | 2 +- .../com/cloud/vm/dao/DomainRouterDaoImpl.java | 2 +- .../network/MockFirewallManagerImpl.java | 1 + .../cloud/network/MockNetworkManagerImpl.java | 2 + .../cloud/network/MockNetworkModelImpl.java | 2 + .../com/cloud/network/NetworkModelTest.java | 1 + .../vm/MockVirtualMachineManagerImpl.java | 2 +- .../com/cloud/vpc/MockNetworkManagerImpl.java | 4 +- .../vpc/MockSite2SiteVpnManagerImpl.java | 2 +- .../com/cloud/vpc/dao/MockNetworkDaoImpl.java | 4 +- .../vpc/dao/MockNetworkServiceMapDaoImpl.java | 2 +- setup/db/4.1-new-db-schema.sql | 5 +- .../utils/component/ComponentContext.java | 3 + 181 files changed, 558 insertions(+), 364 deletions(-) rename server/src/com/cloud/network/{ => dao}/ExternalFirewallDeviceVO.java (99%) rename server/src/com/cloud/network/{ => dao}/ExternalLoadBalancerDeviceVO.java (99%) rename server/src/com/cloud/network/{ => dao}/FirewallRulesCidrsVO.java (98%) rename server/src/com/cloud/network/{ => dao}/IPAddressVO.java (98%) rename server/src/com/cloud/network/{ => dao}/InlineLoadBalancerNicMapVO.java (98%) rename server/src/com/cloud/network/{ => dao}/LBStickinessPolicyVO.java (99%) rename server/src/com/cloud/network/{ => dao}/LoadBalancerVMMapVO.java (98%) rename server/src/com/cloud/network/{ => dao}/LoadBalancerVO.java (98%) rename server/src/com/cloud/network/{ => dao}/NetworkAccountDaoImpl.java (97%) rename server/src/com/cloud/network/{ => dao}/NetworkAccountVO.java (98%) rename server/src/com/cloud/network/{ => dao}/NetworkDomainVO.java (97%) rename server/src/com/cloud/network/{ => dao}/NetworkExternalFirewallVO.java (98%) rename server/src/com/cloud/network/{ => dao}/NetworkExternalLoadBalancerVO.java (98%) rename server/src/com/cloud/network/{ => dao}/NetworkRuleConfigVO.java (98%) rename server/src/com/cloud/network/{ => dao}/NetworkServiceMapVO.java (97%) rename server/src/com/cloud/network/{ => dao}/NetworkVO.java (98%) rename server/src/com/cloud/network/{ => dao}/PhysicalNetworkVO.java (97%) rename server/src/com/cloud/network/{ => dao}/PortProfileVO.java (99%) rename server/src/com/cloud/network/{ => dao}/RemoteAccessVpnVO.java (95%) rename server/src/com/cloud/network/{ => dao}/RouterNetworkVO.java (96%) rename server/src/com/cloud/network/{ => dao}/Site2SiteCustomerGatewayVO.java (98%) rename server/src/com/cloud/network/{ => dao}/Site2SiteVpnConnectionVO.java (96%) rename server/src/com/cloud/network/{ => dao}/Site2SiteVpnGatewayVO.java (97%) diff --git a/core/src/com/cloud/storage/StoragePoolVO.java b/core/src/com/cloud/storage/StoragePoolVO.java index 49abd50a5b1..af6e4e2905c 100644 --- a/core/src/com/cloud/storage/StoragePoolVO.java +++ b/core/src/com/cloud/storage/StoragePoolVO.java @@ -49,7 +49,7 @@ public class StoragePoolVO implements StoragePool { @Column(name="pool_type", updatable=false, nullable=false, length=32) @Enumerated(value=EnumType.STRING) - private StoragePoolType protocol; + private StoragePoolType poolType; @Column(name=GenericDao.CREATED_COLUMN) Date created; @@ -112,7 +112,7 @@ public class StoragePoolVO implements StoragePool { @Override public StoragePoolType getPoolType() { - return protocol; + return poolType; } @Override @@ -215,7 +215,7 @@ public class StoragePoolVO implements StoragePool { this.name = name; this.id = poolId; this.uuid = uuid; - this.protocol = type; + this.poolType = type; this.dataCenterId = dataCenterId; this.availableBytes = availableBytes; this.capacityBytes = capacityBytes; @@ -227,11 +227,11 @@ public class StoragePoolVO implements StoragePool { } public StoragePoolVO(StoragePoolVO that) { - this(that.id, that.name, that.uuid, that.protocol, that.dataCenterId, that.podId, that.availableBytes, that.capacityBytes, that.hostAddress, that.port, that.path); + this(that.id, that.name, that.uuid, that.poolType, that.dataCenterId, that.podId, that.availableBytes, that.capacityBytes, that.hostAddress, that.port, that.path); } public StoragePoolVO(StoragePoolType type, String hostAddress, int port, String path) { - this.protocol = type; + this.poolType = type; this.hostAddress = hostAddress; this.port = port; this.path = path; @@ -240,7 +240,7 @@ public class StoragePoolVO implements StoragePool { } public StoragePoolVO(StoragePoolType type, String hostAddress, int port, String path, String userInfo) { - this.protocol = type; + this.poolType = type; this.hostAddress = hostAddress; this.port = port; this.path = path; @@ -285,12 +285,12 @@ public class StoragePoolVO implements StoragePool { @Override public boolean isShared() { - return protocol.isShared(); + return poolType.isShared(); } @Override public boolean isLocal() { - return !protocol.isShared(); + return !poolType.isShared(); } @Transient @@ -341,6 +341,6 @@ public class StoragePoolVO implements StoragePool { @Override public String toString() { - return new StringBuilder("Pool[").append(id).append("|").append(protocol).append("]").toString(); + return new StringBuilder("Pool[").append(id).append("|").append(poolType).append("]").toString(); } } diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/HostDetailsDaoImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/HostDetailsDaoImpl.java index ee5c809d1b5..02f8c2c546c 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/HostDetailsDaoImpl.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/HostDetailsDaoImpl.java @@ -37,7 +37,7 @@ public class HostDetailsDaoImpl extends GenericDaoBase implement protected final SearchBuilder HostSearch; protected final SearchBuilder DetailSearch; - protected HostDetailsDaoImpl() { + public HostDetailsDaoImpl() { HostSearch = createSearchBuilder(); HostSearch.and("hostId", HostSearch.entity().getHostId(), SearchCriteria.Op.EQ); HostSearch.done(); diff --git a/engine/storage/integration-test/pom.xml b/engine/storage/integration-test/pom.xml index f004561099d..fae9e9c9071 100644 --- a/engine/storage/integration-test/pom.xml +++ b/engine/storage/integration-test/pom.xml @@ -32,6 +32,12 @@ ${project.version} test + + org.apache.cloudstack + cloud-engine-storage-snapshot + ${project.version} + test + org.apache.cloudstack cloud-engine-storage-image diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/ChildTestConfiguration.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/ChildTestConfiguration.java index 1b12b54e024..c965322828e 100644 --- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/ChildTestConfiguration.java +++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/ChildTestConfiguration.java @@ -16,12 +16,38 @@ // under the License. package org.apache.cloudstack.storage.test; +import org.apache.cloudstack.acl.APIChecker; +import org.apache.cloudstack.engine.service.api.OrchestrationService; import org.apache.cloudstack.storage.HostEndpointRpcServer; +import org.apache.cloudstack.storage.endpoint.DefaultEndPointSelector; +import org.apache.cloudstack.storage.endpoint.EndPointSelector; import org.mockito.Mockito; import org.springframework.context.annotation.Bean; import com.cloud.agent.AgentManager; +import com.cloud.cluster.ClusteredAgentRebalanceService; +import com.cloud.cluster.agentlb.dao.HostTransferMapDao; +import com.cloud.cluster.agentlb.dao.HostTransferMapDaoImpl; +import com.cloud.dc.dao.ClusterDao; +import com.cloud.dc.dao.ClusterDaoImpl; +import com.cloud.dc.dao.DataCenterDao; +import com.cloud.dc.dao.DataCenterDaoImpl; +import com.cloud.dc.dao.DataCenterIpAddressDaoImpl; +import com.cloud.dc.dao.DataCenterLinkLocalIpAddressDaoImpl; +import com.cloud.dc.dao.DataCenterVnetDaoImpl; +import com.cloud.dc.dao.DcDetailsDaoImpl; +import com.cloud.dc.dao.HostPodDao; +import com.cloud.dc.dao.HostPodDaoImpl; +import com.cloud.dc.dao.PodVlanDaoImpl; import com.cloud.host.dao.HostDao; +import com.cloud.host.dao.HostDetailsDao; +import com.cloud.host.dao.HostDetailsDaoImpl; +import com.cloud.host.dao.HostTagsDao; +import com.cloud.host.dao.HostTagsDaoImpl; +import com.cloud.server.auth.UserAuthenticator; +import com.cloud.storage.dao.StoragePoolHostDao; +import com.cloud.storage.dao.StoragePoolHostDaoImpl; +import com.cloud.utils.component.ComponentContext; public class ChildTestConfiguration extends TestConfiguration { @@ -33,6 +59,53 @@ public class ChildTestConfiguration extends TestConfiguration { return nDao; } + @Bean + public EndPointSelector selector() { + return Mockito.mock(EndPointSelector.class); + } + @Bean + public DataCenterDao dcDao() { + return new DataCenterDaoImpl(); + } + @Bean + public HostDetailsDao hostDetailsDao() { + return new HostDetailsDaoImpl(); + } + + @Bean + public HostTagsDao hostTagsDao() { + return new HostTagsDaoImpl(); + } + + @Bean ClusterDao clusterDao() { + return new ClusterDaoImpl(); + } + + @Bean HostTransferMapDao hostTransferDao() { + return new HostTransferMapDaoImpl(); + } + @Bean DataCenterIpAddressDaoImpl dataCenterIpAddressDaoImpl() { + return new DataCenterIpAddressDaoImpl(); + } + @Bean DataCenterLinkLocalIpAddressDaoImpl dataCenterLinkLocalIpAddressDaoImpl() { + return new DataCenterLinkLocalIpAddressDaoImpl(); + } + @Bean DataCenterVnetDaoImpl dataCenterVnetDaoImpl() { + return new DataCenterVnetDaoImpl(); + } + @Bean PodVlanDaoImpl podVlanDaoImpl() { + return new PodVlanDaoImpl(); + } + @Bean DcDetailsDaoImpl dcDetailsDaoImpl() { + return new DcDetailsDaoImpl(); + } + @Bean HostPodDao hostPodDao() { + return new HostPodDaoImpl(); + } + @Bean StoragePoolHostDao storagePoolHostDao() { + return new StoragePoolHostDaoImpl(); + } + @Bean public AgentManager agentMgr() { return new DirectAgentManagerSimpleImpl(); @@ -42,6 +115,22 @@ public class ChildTestConfiguration extends TestConfiguration { public HostEndpointRpcServer rpcServer() { return new MockHostEndpointRpcServerDirectCallResource(); } + @Bean + public ClusteredAgentRebalanceService _rebalanceService() { + return Mockito.mock(ClusteredAgentRebalanceService.class); + } + @Bean + public UserAuthenticator authenticator() { + return Mockito.mock(UserAuthenticator.class); + } + @Bean + public OrchestrationService orchSrvc() { + return Mockito.mock(OrchestrationService.class); + } + @Bean + public APIChecker apiChecker() { + return Mockito.mock(APIChecker.class); + } /* @Override @Bean public PrimaryDataStoreDao primaryDataStoreDao() { diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/volumeServiceTest.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/volumeServiceTest.java index 0a692477f6d..0d4a5402d8d 100644 --- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/volumeServiceTest.java +++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/volumeServiceTest.java @@ -18,6 +18,8 @@ */ package org.apache.cloudstack.storage.test; +import java.net.URI; +import java.net.URISyntaxException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -33,12 +35,15 @@ import org.apache.cloudstack.engine.subsystem.api.storage.ClusterScope; import org.apache.cloudstack.engine.subsystem.api.storage.DataStore; import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreLifeCycle; import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreRole; +import org.apache.cloudstack.engine.subsystem.api.storage.EndPoint; import org.apache.cloudstack.engine.subsystem.api.storage.PrimaryDataStoreInfo; import org.apache.cloudstack.engine.subsystem.api.storage.type.RootDisk; +import org.apache.cloudstack.storage.HypervisorHostEndPoint; import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao; import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreVO; import org.apache.cloudstack.storage.datastore.provider.DataStoreProvider; import org.apache.cloudstack.storage.datastore.provider.DataStoreProviderManager; +import org.apache.cloudstack.storage.endpoint.EndPointSelector; import org.apache.cloudstack.storage.image.ImageService; import org.apache.cloudstack.storage.image.db.ImageDataDao; import org.apache.cloudstack.storage.image.db.ImageDataVO; @@ -66,7 +71,7 @@ import com.cloud.org.Managed.ManagedState; import com.cloud.resource.ResourceState; import com.cloud.storage.Storage.TemplateType; -@ContextConfiguration(locations="classpath:/storageContext.xml") +@ContextConfiguration(locations={"classpath:/storageContext.xml"}) public class volumeServiceTest extends CloudStackTestNGBase { //@Inject //ImageDataStoreProviderManager imageProviderMgr; @@ -92,6 +97,8 @@ public class volumeServiceTest extends CloudStackTestNGBase { DataStoreProviderManager dataStoreProviderMgr; @Inject AgentManager agentMgr; + @Inject + EndPointSelector selector; Long dcId; Long clusterId; Long podId; @@ -101,7 +108,12 @@ public class volumeServiceTest extends CloudStackTestNGBase { @Test(priority = -1) public void setUp() { - + try { + dataStoreProviderMgr.configure(null, new HashMap()); + } catch (ConfigurationException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } host = hostDao.findByGuid(this.getHostGuid()); if (host != null) { dcId = host.getDataCenterId(); @@ -143,13 +155,8 @@ public class volumeServiceTest extends CloudStackTestNGBase { host.setClusterId(cluster.getId()); host = hostDao.persist(host); - try { - dataStoreProviderMgr.configure(null, new HashMap()); - } catch (ConfigurationException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - primaryStore = createPrimaryDataStore(); + + //primaryStore = createPrimaryDataStore(); //CreateVolumeAnswer createVolumeFromImageAnswer = new CreateVolumeAnswer(UUID.randomUUID().toString()); @@ -175,7 +182,12 @@ public class volumeServiceTest extends CloudStackTestNGBase { List results = new ArrayList(); results.add(host); Mockito.when(hostDao.listAll()).thenReturn(results); + Mockito.when(hostDao.findById(Mockito.anyLong())).thenReturn(host); Mockito.when(hostDao.findHypervisorHostInCluster(Mockito.anyLong())).thenReturn(results); + List eps = new ArrayList(); + eps.add(HypervisorHostEndPoint.getHypervisorHostEndPoint(host.getId(), + host.getPrivateIpAddress())); + Mockito.when(selector.selectAll(Mockito.any(DataStore.class))).thenReturn(eps); } private ImageDataVO createImageData() { @@ -220,16 +232,50 @@ public class volumeServiceTest extends CloudStackTestNGBase { public void createTemplateTest() { createTemplate(); } + + @Test + public void testCreatePrimaryStorage() { + DataStoreProvider provider = dataStoreProviderMgr.getDataStoreProvider("default primary data store provider"); + Map params = new HashMap(); + URI uri = null; + try { + uri = new URI(this.getPrimaryStorageUrl()); + } catch (URISyntaxException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + params.put("url", this.getPrimaryStorageUrl()); + params.put("server", uri.getHost()); + params.put("path", uri.getPath()); + params.put("protocol", uri.getScheme()); + params.put("dcId", dcId.toString()); + params.put("clusterId", clusterId.toString()); + params.put("name", this.primaryName); + params.put("port", "1"); + params.put("roles", DataStoreRole.Primary.toString()); + params.put("uuid", UUID.nameUUIDFromBytes(this.getPrimaryStorageUrl().getBytes()).toString()); + params.put("providerId", String.valueOf(provider.getId())); + + DataStoreLifeCycle lifeCycle = provider.getLifeCycle(); + DataStore store = lifeCycle.initialize(params); + ClusterScope scope = new ClusterScope(clusterId, podId, dcId); + lifeCycle.attachCluster(store, scope); + } @Test public PrimaryDataStoreInfo createPrimaryDataStore() { - try { + try {/* DataStoreProvider provider = dataStoreProviderMgr.getDataStoreProvider("default primary data store provider"); Map params = new HashMap(); - params.put("url", this.getPrimaryStorageUrl()); + URI uri = new URI(this.getPrimaryStorageUrl()); + params.put("url", this.getPrimaryStorageUrl()); + params.put("server", uri.getHost()); + params.put("path", uri.getPath()); + params.put("protocol", uri.getScheme()); params.put("dcId", dcId.toString()); params.put("clusterId", clusterId.toString()); params.put("name", this.primaryName); + params.put("port", "1"); params.put("roles", DataStoreRole.Primary.toString()); params.put("uuid", UUID.nameUUIDFromBytes(this.getPrimaryStorageUrl().getBytes()).toString()); params.put("providerId", String.valueOf(provider.getId())); @@ -238,6 +284,7 @@ public class volumeServiceTest extends CloudStackTestNGBase { DataStore store = lifeCycle.initialize(params); ClusterScope scope = new ClusterScope(clusterId, podId, dcId); lifeCycle.attachCluster(store, scope); + */ /* PrimaryDataStoreProvider provider = primaryDataStoreProviderMgr.getDataStoreProvider("default primary data store provider"); primaryDataStoreProviderMgr.configure("primary data store mgr", new HashMap()); @@ -306,7 +353,7 @@ public class volumeServiceTest extends CloudStackTestNGBase { } //@Test - @Test + //@Test public void test1() { /*System.out.println(VolumeTypeHelper.getType("Root")); System.out.println(VolumeDiskTypeHelper.getDiskType("vmdk")); diff --git a/engine/storage/integration-test/test/resource/storageContext.xml b/engine/storage/integration-test/test/resource/storageContext.xml index c81fe7d8ee9..0127c96a734 100644 --- a/engine/storage/integration-test/test/resource/storageContext.xml +++ b/engine/storage/integration-test/test/resource/storageContext.xml @@ -1,22 +1,14 @@ - + - - - - - - - - - - - - - - - - + + + - - + + + + + + + + + + + + + + + + + - - - - - - + + org.apache.cloudstack.framework - - + + - + - - + + - + diff --git a/engine/storage/integration-test/test/resource/testng.xml b/engine/storage/integration-test/test/resource/testng.xml index bf9f8f0c196..db32c247d1b 100644 --- a/engine/storage/integration-test/test/resource/testng.xml +++ b/engine/storage/integration-test/test/resource/testng.xml @@ -1,3 +1,4 @@ + - diff --git a/engine/storage/src/org/apache/cloudstack/storage/HypervisorHostEndPoint.java b/engine/storage/src/org/apache/cloudstack/storage/HypervisorHostEndPoint.java index c36a7de734b..6c49b1a0e9e 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/HypervisorHostEndPoint.java +++ b/engine/storage/src/org/apache/cloudstack/storage/HypervisorHostEndPoint.java @@ -29,21 +29,32 @@ import com.cloud.agent.api.Answer; import com.cloud.agent.api.Command; import com.cloud.exception.AgentUnavailableException; import com.cloud.exception.OperationTimedoutException; +import com.cloud.utils.component.ComponentContext; public class HypervisorHostEndPoint implements EndPoint { private static final Logger s_logger = Logger.getLogger(HypervisorHostEndPoint.class); - private final long hostId; - private final String hostAddress; + private long hostId; + private String hostAddress; @Inject AgentManager agentMgr; @Inject HostEndpointRpcServer rpcServer; - public HypervisorHostEndPoint(long hostId, String hostAddress) { + protected HypervisorHostEndPoint() { + + } + + private void configure(long hostId, String hostAddress) { this.hostId = hostId; this.hostAddress = hostAddress; } + public static HypervisorHostEndPoint getHypervisorHostEndPoint(long hostId, String hostAddress) { + HypervisorHostEndPoint ep = ComponentContext.inject(HypervisorHostEndPoint.class); + ep.configure(hostId, hostAddress); + return ep; + } + public String getHostAddr() { return this.hostAddress; } diff --git a/engine/storage/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreVO.java b/engine/storage/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreVO.java index 19e1990b4e9..3e37ec7abe8 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreVO.java +++ b/engine/storage/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreVO.java @@ -98,6 +98,7 @@ public class PrimaryDataStoreVO implements Identity { private Long clusterId; @Column(name = "scope") + @Enumerated(value = EnumType.STRING) private ScopeType scope; public long getId() { diff --git a/engine/storage/src/org/apache/cloudstack/storage/datastore/provider/DataStoreProviderManagerImpl.java b/engine/storage/src/org/apache/cloudstack/storage/datastore/provider/DataStoreProviderManagerImpl.java index 2f6bd6cd5bc..692e84bf5d5 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/datastore/provider/DataStoreProviderManagerImpl.java +++ b/engine/storage/src/org/apache/cloudstack/storage/datastore/provider/DataStoreProviderManagerImpl.java @@ -44,8 +44,8 @@ public class DataStoreProviderManagerImpl implements DataStoreProviderManager { @Override public DataStoreProvider getDataStoreProvider(String name) { - // TODO Auto-generated method stub - return null; + DataStoreProviderVO dspv = providerDao.findByName(name); + return providerMap.get(dspv.getUuid()); } @Override @@ -58,7 +58,7 @@ public class DataStoreProviderManagerImpl implements DataStoreProviderManager { public boolean configure(String name, Map params) throws ConfigurationException { -/* + //TODO: hold global lock List providerVos = providerDao.listAll(); for (DataStoreProvider provider : providers) { @@ -71,20 +71,22 @@ public class DataStoreProviderManagerImpl implements DataStoreProviderManager { break; } } - String uuid = provider.getUuid(); + String uuid = null; if (!existingProvider) { uuid = UUID.nameUUIDFromBytes(provider.getName().getBytes()).toString(); providerVO = new DataStoreProviderVO(); providerVO.setName(provider.getName()); providerVO.setUuid(uuid); providerVO = providerDao.persist(providerVO); + } else { + uuid = providerVO.getUuid(); } params.put("uuid", uuid); params.put("id", providerVO.getId()); provider.configure(params); providerMap.put(uuid, provider); } -*/ + return true; } diff --git a/engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java b/engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java index b39142c8a6d..d45aa72e52b 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java +++ b/engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java @@ -118,7 +118,7 @@ public class DefaultEndPointSelector implements EndPointSelector { return null; } - return new HypervisorHostEndPoint(host.getId(), + return HypervisorHostEndPoint.getHypervisorHostEndPoint(host.getId(), host.getPrivateIpAddress()); } @@ -176,7 +176,7 @@ public class DefaultEndPointSelector implements EndPointSelector { List endPoints = new ArrayList(); if (store.getScope().getScopeType() == ScopeType.HOST) { HostVO host = hostDao.findById(store.getScope().getScopeId()); - endPoints.add(new HypervisorHostEndPoint(host.getId(), + endPoints.add(HypervisorHostEndPoint.getHypervisorHostEndPoint(host.getId(), host.getPrivateIpAddress())); } else if (store.getScope().getScopeType() == ScopeType.CLUSTER) { SearchCriteriaService sc = SearchCriteria2.create(HostVO.class); @@ -184,7 +184,7 @@ public class DefaultEndPointSelector implements EndPointSelector { sc.addAnd(sc.getEntity().getStatus(), Op.EQ, Status.Up); List hosts = sc.find(); for (HostVO host : hosts) { - endPoints.add(new HypervisorHostEndPoint(host.getId(), + endPoints.add(HypervisorHostEndPoint.getHypervisorHostEndPoint(host.getId(), host.getPrivateIpAddress())); } diff --git a/engine/storage/src/org/apache/cloudstack/storage/image/db/ImageDataDaoImpl.java b/engine/storage/src/org/apache/cloudstack/storage/image/db/ImageDataDaoImpl.java index bcff8940a91..082a0788ab4 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/image/db/ImageDataDaoImpl.java +++ b/engine/storage/src/org/apache/cloudstack/storage/image/db/ImageDataDaoImpl.java @@ -76,18 +76,18 @@ public class ImageDataDaoImpl extends GenericDaoBase implemen private static final Logger s_logger = Logger.getLogger(VMTemplateDaoImpl.class); - @Inject VMTemplateZoneDao _templateZoneDao = null; + VMTemplateZoneDao _templateZoneDao = null; - @Inject VMTemplateDetailsDao _templateDetailsDao = null; + VMTemplateDetailsDao _templateDetailsDao = null; - @Inject ConfigurationDao _configDao = null; + ConfigurationDao _configDao = null; - @Inject HostDao _hostDao = null; + HostDao _hostDao = null; - @Inject DomainDao _domainDao = null; + DomainDao _domainDao = null; - @Inject DataCenterDao _dcDao = null; + DataCenterDao _dcDao = null; private final String SELECT_TEMPLATE_HOST_REF = "SELECT t.id, h.data_center_id, t.unique_name, t.name, t.public, t.featured, t.type, t.hvm, t.bits, t.url, t.format, t.created, t.account_id, " + "t.checksum, t.display_text, t.enable_password, t.guest_os_id, t.bootable, t.prepopulate, t.cross_zones, t.hypervisor_type FROM vm_template t"; diff --git a/engine/storage/src/org/apache/cloudstack/storage/volume/datastore/PrimaryDataStoreHelper.java b/engine/storage/src/org/apache/cloudstack/storage/volume/datastore/PrimaryDataStoreHelper.java index a7397e17c4f..20ceaa303fc 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/volume/datastore/PrimaryDataStoreHelper.java +++ b/engine/storage/src/org/apache/cloudstack/storage/volume/datastore/PrimaryDataStoreHelper.java @@ -49,7 +49,6 @@ public class PrimaryDataStoreHelper { dataStoreVO.setPath(params.get("path")); dataStoreVO.setPoolType(params.get("protocol")); dataStoreVO.setPort(Integer.parseInt(params.get("port"))); - //dataStoreVO.setKey(params.get("key")); dataStoreVO.setName(params.get("name")); dataStoreVO.setUuid(params.get("uuid")); dataStoreVO = dataStoreDao.persist(dataStoreVO); diff --git a/engine/storage/volume/src/org/apache/cloudstack/storage/datastore/DefaultPrimaryDataStore.java b/engine/storage/volume/src/org/apache/cloudstack/storage/datastore/DefaultPrimaryDataStore.java index 6ab9120797d..0f11c42fdc0 100644 --- a/engine/storage/volume/src/org/apache/cloudstack/storage/datastore/DefaultPrimaryDataStore.java +++ b/engine/storage/volume/src/org/apache/cloudstack/storage/datastore/DefaultPrimaryDataStore.java @@ -33,6 +33,7 @@ import org.apache.cloudstack.engine.subsystem.api.storage.ScopeType; import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo; import org.apache.cloudstack.engine.subsystem.api.storage.ZoneScope; import org.apache.cloudstack.engine.subsystem.api.storage.disktype.DiskFormat; +import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao; import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreVO; import org.apache.cloudstack.storage.datastore.provider.DataStoreProvider; import org.apache.cloudstack.storage.image.ImageDataFactory; @@ -46,7 +47,6 @@ import org.apache.cloudstack.storage.volume.db.VolumeVO; import org.apache.log4j.Logger; import com.cloud.hypervisor.Hypervisor.HypervisorType; -import com.cloud.storage.dao.StoragePoolHostDao; import com.cloud.utils.component.ComponentContext; public class DefaultPrimaryDataStore implements PrimaryDataStore { @@ -54,6 +54,8 @@ public class DefaultPrimaryDataStore implements PrimaryDataStore { .getLogger(DefaultPrimaryDataStore.class); protected PrimaryDataStoreDriver driver; protected PrimaryDataStoreVO pdsv; + @Inject + protected PrimaryDataStoreDao dataStoreDao; protected PrimaryDataStoreLifeCycle lifeCycle; @Inject private ObjectInDataStoreManager objectInStoreMgr; @@ -66,7 +68,11 @@ public class DefaultPrimaryDataStore implements PrimaryDataStore { @Inject private VolumeDao2 volumeDao; - private DefaultPrimaryDataStore(PrimaryDataStoreVO pdsv, + protected DefaultPrimaryDataStore() { + + } + + public void configure(PrimaryDataStoreVO pdsv, PrimaryDataStoreDriver driver, DataStoreProvider provider) { this.pdsv = pdsv; this.driver = driver; @@ -76,9 +82,9 @@ public class DefaultPrimaryDataStore implements PrimaryDataStore { public static DefaultPrimaryDataStore createDataStore( PrimaryDataStoreVO pdsv, PrimaryDataStoreDriver driver, DataStoreProvider provider) { - DefaultPrimaryDataStore dataStore = new DefaultPrimaryDataStore(pdsv, - driver, provider); - return ComponentContext.inject(dataStore); + DefaultPrimaryDataStore dataStore = (DefaultPrimaryDataStore)ComponentContext.inject(DefaultPrimaryDataStore.class); + dataStore.configure(pdsv, driver, provider); + return dataStore; } @Override @@ -113,12 +119,14 @@ public class DefaultPrimaryDataStore implements PrimaryDataStore { @Override public long getId() { // TODO Auto-generated method stub - return 0; + return this.pdsv.getId(); } @Override public String getUri() { - return this.pdsv.getPoolType() + File.separator + String path = this.pdsv.getPath(); + path.replaceFirst("/*", ""); + return this.pdsv.getPoolType() + ":" + File.separator + File.separator + this.pdsv.getHostAddress() + File.separator + this.pdsv.getPath() + File.separator + "?role=" + this.getRole() @@ -127,11 +135,12 @@ public class DefaultPrimaryDataStore implements PrimaryDataStore { @Override public Scope getScope() { - if (pdsv.getScope() == ScopeType.CLUSTER) { - return new ClusterScope(pdsv.getClusterId(), pdsv.getPodId(), - pdsv.getDataCenterId()); - } else if (pdsv.getScope() == ScopeType.ZONE) { - return new ZoneScope(pdsv.getDataCenterId()); + PrimaryDataStoreVO vo = dataStoreDao.findById(this.pdsv.getId()); + if (vo.getScope() == ScopeType.CLUSTER) { + return new ClusterScope(vo.getClusterId(), vo.getPodId(), + vo.getDataCenterId()); + } else if (vo.getScope() == ScopeType.ZONE) { + return new ZoneScope(vo.getDataCenterId()); } return null; } diff --git a/engine/storage/volume/src/org/apache/cloudstack/storage/datastore/lifecycle/DefaultPrimaryDataStoreLifeCycleImpl.java b/engine/storage/volume/src/org/apache/cloudstack/storage/datastore/lifecycle/DefaultPrimaryDataStoreLifeCycleImpl.java index 709c51ab794..ffe7efdcda7 100644 --- a/engine/storage/volume/src/org/apache/cloudstack/storage/datastore/lifecycle/DefaultPrimaryDataStoreLifeCycleImpl.java +++ b/engine/storage/volume/src/org/apache/cloudstack/storage/datastore/lifecycle/DefaultPrimaryDataStoreLifeCycleImpl.java @@ -44,9 +44,8 @@ import com.cloud.host.dao.HostDao; import com.cloud.hypervisor.Hypervisor.HypervisorType; public class DefaultPrimaryDataStoreLifeCycleImpl implements PrimaryDataStoreLifeCycle { - protected PrimaryDataStore dataStore; @Inject - EndPointSelector selecotr; + EndPointSelector selector; @Inject PrimaryDataStoreDao dataStoreDao; @Inject @@ -67,7 +66,7 @@ public class DefaultPrimaryDataStoreLifeCycleImpl implements PrimaryDataStoreLif protected void attachCluster(DataStore store) { //send down AttachPrimaryDataStoreCmd command to all the hosts in the cluster - List endPoints = selecotr.selectAll(dataStore); + List endPoints = selector.selectAll(store); CreatePrimaryDataStoreCmd createCmd = new CreatePrimaryDataStoreCmd(store.getUri()); EndPoint ep = endPoints.get(0); HostVO host = hostDao.findById(ep.getId()); @@ -76,7 +75,7 @@ public class DefaultPrimaryDataStoreLifeCycleImpl implements PrimaryDataStoreLif } endPoints.get(0).sendMessage(createCmd); - AttachPrimaryDataStoreCmd cmd = new AttachPrimaryDataStoreCmd(dataStore.getUri()); + AttachPrimaryDataStoreCmd cmd = new AttachPrimaryDataStoreCmd(store.getUri()); for (EndPoint endp : endPoints) { endp.sendMessage(cmd); } @@ -92,6 +91,7 @@ public class DefaultPrimaryDataStoreLifeCycleImpl implements PrimaryDataStoreLif dataStoreVO.setScope(scope.getScopeType()); dataStoreDao.update(dataStoreVO.getId(), dataStoreVO); + attachCluster(dataStore); dataStoreVO = dataStoreDao.findById(dataStore.getId()); diff --git a/engine/storage/volume/src/org/apache/cloudstack/storage/datastore/manager/DefaultPrimaryDataStoreProviderManagerImpl.java b/engine/storage/volume/src/org/apache/cloudstack/storage/datastore/manager/DefaultPrimaryDataStoreProviderManagerImpl.java index fd66ffb7315..1a24d87346e 100644 --- a/engine/storage/volume/src/org/apache/cloudstack/storage/datastore/manager/DefaultPrimaryDataStoreProviderManagerImpl.java +++ b/engine/storage/volume/src/org/apache/cloudstack/storage/datastore/manager/DefaultPrimaryDataStoreProviderManagerImpl.java @@ -34,6 +34,8 @@ import org.apache.cloudstack.storage.datastore.provider.DataStoreProviderManager import org.apache.cloudstack.storage.volume.PrimaryDataStoreDriver; import org.springframework.stereotype.Component; +import com.cloud.utils.component.ComponentContext; + @Component public class DefaultPrimaryDataStoreProviderManagerImpl implements PrimaryDataStoreProviderManager { @Inject @@ -49,10 +51,10 @@ public class DefaultPrimaryDataStoreProviderManagerImpl implements PrimaryDataSt PrimaryDataStoreVO dataStoreVO = dataStoreDao.findById(dataStoreId); long providerId = dataStoreVO.getStorageProviderId(); DataStoreProvider provider = providerManager.getDataStoreProviderById(providerId); - DefaultPrimaryDataStore dataStore = DefaultPrimaryDataStore.createDataStore(dataStoreVO, + /*DefaultPrimaryDataStore dataStore = DefaultPrimaryDataStore.createDataStore(dataStoreVO, driverMaps.get(provider.getUuid()), - provider); - + provider);*/ + DefaultPrimaryDataStore dataStore = DefaultPrimaryDataStore.createDataStore(dataStoreVO, driverMaps.get(provider.getUuid()), provider); return dataStore; } diff --git a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeManagerImpl.java b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeManagerImpl.java index 77a59497e69..bcff312626f 100644 --- a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeManagerImpl.java +++ b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeManagerImpl.java @@ -35,7 +35,7 @@ import com.cloud.utils.fsm.StateMachine2; public class VolumeManagerImpl implements VolumeManager { @Inject protected VolumeDao2 _volumeDao; - private final static StateMachine2 s_fsm = new StateMachine2(); + private final StateMachine2 s_fsm = new StateMachine2(); public VolumeManagerImpl() { initStateMachine(); } diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java index b9d65069200..65fbf4adeb8 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java @@ -51,9 +51,9 @@ import com.cloud.hypervisor.vmware.VmwareCleanupMaid; import com.cloud.hypervisor.vmware.manager.VmwareManager; import com.cloud.hypervisor.vmware.mo.VirtualEthernetCardType; import com.cloud.network.NetworkModel; -import com.cloud.network.NetworkVO; import com.cloud.network.Networks.TrafficType; import com.cloud.network.dao.NetworkDao; +import com.cloud.network.dao.NetworkVO; import com.cloud.secstorage.CommandExecLogDao; import com.cloud.secstorage.CommandExecLogVO; import com.cloud.storage.GuestOSVO; diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageResource.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageResource.java index 417de0bf993..b0ddb8eb091 100644 --- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageResource.java +++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageResource.java @@ -570,10 +570,18 @@ public class XenServerStorageResource { } protected Answer execute(AttachPrimaryDataStoreCmd cmd) { - PrimaryDataStoreTO dataStore = null; + String dataStoreUri = cmd.getDataStore(); Connection conn = hypervisorResource.getConnection(); + Map params = null; try { - SR sr = hypervisorResource.getStorageRepository(conn, dataStore.getUuid()); + try { + URI uri = new URI(dataStoreUri); + params = getParameters(uri); + } catch (URISyntaxException e1) { + s_logger.debug("uri exception", e1); + return new CreateVolumeAnswer(cmd, false, e1.toString()); + } + SR sr = hypervisorResource.getStorageRepository(conn, params.get("storeUuid")); hypervisorResource.setupHeartbeatSr(conn, sr, false); long capacity = sr.getPhysicalSize(conn); long available = capacity - sr.getPhysicalUtilisation(conn); diff --git a/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java b/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java index e0a211ab1f9..39b0a9ddc03 100644 --- a/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java +++ b/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java @@ -75,22 +75,22 @@ import com.cloud.exception.ResourceUnavailableException; import com.cloud.exception.StorageUnavailableException; import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.network.ElasticLbVmMapVO; -import com.cloud.network.IPAddressVO; -import com.cloud.network.LoadBalancerVO; import com.cloud.network.Network; import com.cloud.network.Network.Provider; import com.cloud.network.Network.Service; import com.cloud.network.NetworkManager; import com.cloud.network.NetworkModel; -import com.cloud.network.NetworkVO; import com.cloud.network.Networks.TrafficType; import com.cloud.network.PhysicalNetworkServiceProvider; import com.cloud.network.VirtualRouterProvider; import com.cloud.network.VirtualRouterProvider.VirtualRouterProviderType; import com.cloud.network.addr.PublicIp; import com.cloud.network.dao.IPAddressDao; +import com.cloud.network.dao.IPAddressVO; import com.cloud.network.dao.LoadBalancerDao; +import com.cloud.network.dao.LoadBalancerVO; import com.cloud.network.dao.NetworkDao; +import com.cloud.network.dao.NetworkVO; import com.cloud.network.dao.PhysicalNetworkServiceProviderDao; import com.cloud.network.dao.VirtualRouterProviderDao; import com.cloud.network.lb.LoadBalancingRule.LbDestination; diff --git a/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/dao/ElasticLbVmMapDao.java b/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/dao/ElasticLbVmMapDao.java index 725377c1d96..5c03a3cfda3 100644 --- a/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/dao/ElasticLbVmMapDao.java +++ b/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/dao/ElasticLbVmMapDao.java @@ -19,7 +19,7 @@ package com.cloud.network.lb.dao; import java.util.List; import com.cloud.network.ElasticLbVmMapVO; -import com.cloud.network.LoadBalancerVO; +import com.cloud.network.dao.LoadBalancerVO; import com.cloud.utils.db.GenericDao; import com.cloud.vm.DomainRouterVO; diff --git a/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/dao/ElasticLbVmMapDaoImpl.java b/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/dao/ElasticLbVmMapDaoImpl.java index be61f580f75..fcf835c1fab 100644 --- a/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/dao/ElasticLbVmMapDaoImpl.java +++ b/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/dao/ElasticLbVmMapDaoImpl.java @@ -25,9 +25,9 @@ import javax.inject.Inject; import org.springframework.stereotype.Component; import com.cloud.network.ElasticLbVmMapVO; -import com.cloud.network.LoadBalancerVO; import com.cloud.network.dao.LoadBalancerDao; import com.cloud.network.dao.LoadBalancerDaoImpl; +import com.cloud.network.dao.LoadBalancerVO; import com.cloud.network.router.VirtualRouter.Role; import com.cloud.network.router.VirtualRouter.Role; diff --git a/plugins/network-elements/f5/src/com/cloud/api/commands/AddF5LoadBalancerCmd.java b/plugins/network-elements/f5/src/com/cloud/api/commands/AddF5LoadBalancerCmd.java index dcfd72f0a29..1670351c55d 100644 --- a/plugins/network-elements/f5/src/com/cloud/api/commands/AddF5LoadBalancerCmd.java +++ b/plugins/network-elements/f5/src/com/cloud/api/commands/AddF5LoadBalancerCmd.java @@ -31,7 +31,7 @@ import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.ResourceAllocationException; import com.cloud.exception.ResourceUnavailableException; -import com.cloud.network.ExternalLoadBalancerDeviceVO; +import com.cloud.network.dao.ExternalLoadBalancerDeviceVO; import com.cloud.network.element.F5ExternalLoadBalancerElementService; import com.cloud.user.UserContext; import com.cloud.utils.exception.CloudRuntimeException; diff --git a/plugins/network-elements/f5/src/com/cloud/api/commands/ConfigureF5LoadBalancerCmd.java b/plugins/network-elements/f5/src/com/cloud/api/commands/ConfigureF5LoadBalancerCmd.java index 761352aa428..209a25845cb 100644 --- a/plugins/network-elements/f5/src/com/cloud/api/commands/ConfigureF5LoadBalancerCmd.java +++ b/plugins/network-elements/f5/src/com/cloud/api/commands/ConfigureF5LoadBalancerCmd.java @@ -30,7 +30,7 @@ import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.ResourceAllocationException; import com.cloud.exception.ResourceUnavailableException; -import com.cloud.network.ExternalLoadBalancerDeviceVO; +import com.cloud.network.dao.ExternalLoadBalancerDeviceVO; import com.cloud.network.element.F5ExternalLoadBalancerElementService; import com.cloud.user.UserContext; import com.cloud.utils.exception.CloudRuntimeException; diff --git a/plugins/network-elements/f5/src/com/cloud/api/commands/ListF5LoadBalancersCmd.java b/plugins/network-elements/f5/src/com/cloud/api/commands/ListF5LoadBalancersCmd.java index 270447d0a13..d40014954d1 100644 --- a/plugins/network-elements/f5/src/com/cloud/api/commands/ListF5LoadBalancersCmd.java +++ b/plugins/network-elements/f5/src/com/cloud/api/commands/ListF5LoadBalancersCmd.java @@ -34,7 +34,7 @@ import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.ResourceAllocationException; import com.cloud.exception.ResourceUnavailableException; -import com.cloud.network.ExternalLoadBalancerDeviceVO; +import com.cloud.network.dao.ExternalLoadBalancerDeviceVO; import com.cloud.network.element.F5ExternalLoadBalancerElementService; import com.cloud.utils.exception.CloudRuntimeException; diff --git a/plugins/network-elements/f5/src/com/cloud/api/response/F5LoadBalancerResponse.java b/plugins/network-elements/f5/src/com/cloud/api/response/F5LoadBalancerResponse.java index 19e67260b90..6179037706f 100644 --- a/plugins/network-elements/f5/src/com/cloud/api/response/F5LoadBalancerResponse.java +++ b/plugins/network-elements/f5/src/com/cloud/api/response/F5LoadBalancerResponse.java @@ -21,7 +21,8 @@ import org.apache.cloudstack.api.ApiConstants; import com.cloud.serializer.Param; import com.google.gson.annotations.SerializedName; import org.apache.cloudstack.api.BaseResponse; -import com.cloud.network.ExternalLoadBalancerDeviceVO; + +import com.cloud.network.dao.ExternalLoadBalancerDeviceVO; @EntityReference(value=ExternalLoadBalancerDeviceVO.class) public class F5LoadBalancerResponse extends BaseResponse { 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 36f0dad9aef..94c098ed4bb 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 @@ -57,25 +57,25 @@ import com.cloud.host.dao.HostDao; import com.cloud.host.dao.HostDetailsDao; 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.Network; import com.cloud.network.Network.Capability; import com.cloud.network.Network.Provider; import com.cloud.network.Network.Service; -import com.cloud.network.NetworkExternalLoadBalancerVO; import com.cloud.network.NetworkModel; -import com.cloud.network.NetworkVO; import com.cloud.network.Networks.TrafficType; import com.cloud.network.PhysicalNetwork; import com.cloud.network.PhysicalNetworkServiceProvider; -import com.cloud.network.PhysicalNetworkVO; import com.cloud.network.PublicIpAddress; import com.cloud.network.dao.ExternalLoadBalancerDeviceDao; +import com.cloud.network.dao.ExternalLoadBalancerDeviceVO; import com.cloud.network.dao.NetworkDao; import com.cloud.network.dao.NetworkExternalLoadBalancerDao; +import com.cloud.network.dao.NetworkExternalLoadBalancerVO; import com.cloud.network.dao.NetworkServiceMapDao; +import com.cloud.network.dao.NetworkVO; import com.cloud.network.dao.PhysicalNetworkDao; +import com.cloud.network.dao.PhysicalNetworkVO; +import com.cloud.network.dao.ExternalLoadBalancerDeviceVO.LBDeviceState; import com.cloud.network.lb.LoadBalancingRule; import com.cloud.network.resource.F5BigIpResource; import com.cloud.network.rules.LbStickinessMethod; diff --git a/plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElementService.java b/plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElementService.java index 951bc3cc3b1..4a66e3bccbc 100644 --- a/plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElementService.java +++ b/plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElementService.java @@ -28,8 +28,9 @@ import com.cloud.api.commands.ListF5LoadBalancerNetworksCmd; import com.cloud.api.commands.ListF5LoadBalancersCmd; import com.cloud.api.response.F5LoadBalancerResponse; import com.cloud.host.Host; -import com.cloud.network.ExternalLoadBalancerDeviceVO; import com.cloud.network.Network; +import com.cloud.network.dao.ExternalLoadBalancerDeviceVO; + import org.apache.cloudstack.api.response.ExternalLoadBalancerResponse; import com.cloud.utils.component.PluggableService; diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/AddSrxFirewallCmd.java b/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/AddSrxFirewallCmd.java index 2411f9c2d45..f5bb037ca00 100644 --- a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/AddSrxFirewallCmd.java +++ b/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/AddSrxFirewallCmd.java @@ -35,7 +35,7 @@ import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.ResourceAllocationException; import com.cloud.exception.ResourceUnavailableException; -import com.cloud.network.ExternalFirewallDeviceVO; +import com.cloud.network.dao.ExternalFirewallDeviceVO; import com.cloud.network.element.JuniperSRXFirewallElementService; import com.cloud.user.UserContext; import com.cloud.utils.exception.CloudRuntimeException; diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ConfigureSrxFirewallCmd.java b/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ConfigureSrxFirewallCmd.java index 0f2e14cf568..9bffee1f85c 100644 --- a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ConfigureSrxFirewallCmd.java +++ b/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ConfigureSrxFirewallCmd.java @@ -34,7 +34,7 @@ import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.ResourceAllocationException; import com.cloud.exception.ResourceUnavailableException; -import com.cloud.network.ExternalFirewallDeviceVO; +import com.cloud.network.dao.ExternalFirewallDeviceVO; import com.cloud.network.element.JuniperSRXFirewallElementService; import com.cloud.user.UserContext; import com.cloud.utils.exception.CloudRuntimeException; diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ListSrxFirewallsCmd.java b/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ListSrxFirewallsCmd.java index 973ad146a33..320a684bb5a 100644 --- a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ListSrxFirewallsCmd.java +++ b/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ListSrxFirewallsCmd.java @@ -33,7 +33,7 @@ import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.ResourceAllocationException; import com.cloud.exception.ResourceUnavailableException; -import com.cloud.network.ExternalFirewallDeviceVO; +import com.cloud.network.dao.ExternalFirewallDeviceVO; import com.cloud.network.element.JuniperSRXFirewallElementService; import com.cloud.utils.exception.CloudRuntimeException; diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/api/response/SrxFirewallResponse.java b/plugins/network-elements/juniper-srx/src/com/cloud/api/response/SrxFirewallResponse.java index 56aab70f2f3..db947fc16b5 100644 --- a/plugins/network-elements/juniper-srx/src/com/cloud/api/response/SrxFirewallResponse.java +++ b/plugins/network-elements/juniper-srx/src/com/cloud/api/response/SrxFirewallResponse.java @@ -21,7 +21,8 @@ import org.apache.cloudstack.api.EntityReference; import com.cloud.serializer.Param; import com.google.gson.annotations.SerializedName; import org.apache.cloudstack.api.BaseResponse; -import com.cloud.network.ExternalFirewallDeviceVO; + +import com.cloud.network.dao.ExternalFirewallDeviceVO; @EntityReference(value=ExternalFirewallDeviceVO.class) @SuppressWarnings("unused") 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 d13b95d8c1a..622b55c07be 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 @@ -58,26 +58,26 @@ import com.cloud.host.HostVO; import com.cloud.host.dao.HostDao; 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.Network; import com.cloud.network.Network.Capability; import com.cloud.network.Network.Provider; import com.cloud.network.Network.Service; -import com.cloud.network.NetworkExternalFirewallVO; import com.cloud.network.NetworkModel; -import com.cloud.network.NetworkVO; import com.cloud.network.PhysicalNetwork; import com.cloud.network.PhysicalNetworkServiceProvider; -import com.cloud.network.PhysicalNetworkVO; import com.cloud.network.PublicIpAddress; import com.cloud.network.RemoteAccessVpn; import com.cloud.network.VpnUser; import com.cloud.network.dao.ExternalFirewallDeviceDao; +import com.cloud.network.dao.ExternalFirewallDeviceVO; import com.cloud.network.dao.NetworkDao; import com.cloud.network.dao.NetworkExternalFirewallDao; +import com.cloud.network.dao.NetworkExternalFirewallVO; import com.cloud.network.dao.NetworkServiceMapDao; +import com.cloud.network.dao.NetworkVO; import com.cloud.network.dao.PhysicalNetworkDao; +import com.cloud.network.dao.PhysicalNetworkVO; +import com.cloud.network.dao.ExternalFirewallDeviceVO.FirewallDeviceState; import com.cloud.network.resource.JuniperSrxResource; import com.cloud.network.rules.FirewallRule; import com.cloud.network.rules.PortForwardingRule; diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXFirewallElementService.java b/plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXFirewallElementService.java index d5f53843ca1..2da5b471fe5 100644 --- a/plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXFirewallElementService.java +++ b/plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXFirewallElementService.java @@ -28,8 +28,9 @@ import com.cloud.api.commands.ListSrxFirewallNetworksCmd; import com.cloud.api.commands.ListSrxFirewallsCmd; import com.cloud.api.response.SrxFirewallResponse; import com.cloud.host.Host; -import com.cloud.network.ExternalFirewallDeviceVO; import com.cloud.network.Network; +import com.cloud.network.dao.ExternalFirewallDeviceVO; + import org.apache.cloudstack.api.response.ExternalFirewallResponse; import com.cloud.utils.component.PluggableService; diff --git a/plugins/network-elements/netscaler/src/com/cloud/api/commands/AddNetscalerLoadBalancerCmd.java b/plugins/network-elements/netscaler/src/com/cloud/api/commands/AddNetscalerLoadBalancerCmd.java index 356cec53a4a..80c8cb94ea7 100644 --- a/plugins/network-elements/netscaler/src/com/cloud/api/commands/AddNetscalerLoadBalancerCmd.java +++ b/plugins/network-elements/netscaler/src/com/cloud/api/commands/AddNetscalerLoadBalancerCmd.java @@ -28,7 +28,7 @@ import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.ResourceAllocationException; import com.cloud.exception.ResourceUnavailableException; -import com.cloud.network.ExternalLoadBalancerDeviceVO; +import com.cloud.network.dao.ExternalLoadBalancerDeviceVO; import com.cloud.network.element.NetscalerLoadBalancerElementService; import com.cloud.user.UserContext; import com.cloud.utils.exception.CloudRuntimeException; diff --git a/plugins/network-elements/netscaler/src/com/cloud/api/commands/ConfigureNetscalerLoadBalancerCmd.java b/plugins/network-elements/netscaler/src/com/cloud/api/commands/ConfigureNetscalerLoadBalancerCmd.java index d4d1dd3a2d6..a04a48ded95 100644 --- a/plugins/network-elements/netscaler/src/com/cloud/api/commands/ConfigureNetscalerLoadBalancerCmd.java +++ b/plugins/network-elements/netscaler/src/com/cloud/api/commands/ConfigureNetscalerLoadBalancerCmd.java @@ -30,7 +30,7 @@ import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.ResourceAllocationException; import com.cloud.exception.ResourceUnavailableException; -import com.cloud.network.ExternalLoadBalancerDeviceVO; +import com.cloud.network.dao.ExternalLoadBalancerDeviceVO; import com.cloud.network.element.NetscalerLoadBalancerElementService; import com.cloud.user.UserContext; import com.cloud.utils.exception.CloudRuntimeException; diff --git a/plugins/network-elements/netscaler/src/com/cloud/api/commands/ListNetscalerLoadBalancersCmd.java b/plugins/network-elements/netscaler/src/com/cloud/api/commands/ListNetscalerLoadBalancersCmd.java index 566ff7b12ea..25cf479e3e6 100644 --- a/plugins/network-elements/netscaler/src/com/cloud/api/commands/ListNetscalerLoadBalancersCmd.java +++ b/plugins/network-elements/netscaler/src/com/cloud/api/commands/ListNetscalerLoadBalancersCmd.java @@ -36,7 +36,7 @@ import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.ResourceAllocationException; import com.cloud.exception.ResourceUnavailableException; -import com.cloud.network.ExternalLoadBalancerDeviceVO; +import com.cloud.network.dao.ExternalLoadBalancerDeviceVO; import com.cloud.network.element.NetscalerLoadBalancerElementService; import com.cloud.utils.exception.CloudRuntimeException; diff --git a/plugins/network-elements/netscaler/src/com/cloud/api/response/NetscalerLoadBalancerResponse.java b/plugins/network-elements/netscaler/src/com/cloud/api/response/NetscalerLoadBalancerResponse.java index 40be29e560b..bd2588054d2 100644 --- a/plugins/network-elements/netscaler/src/com/cloud/api/response/NetscalerLoadBalancerResponse.java +++ b/plugins/network-elements/netscaler/src/com/cloud/api/response/NetscalerLoadBalancerResponse.java @@ -23,7 +23,8 @@ import org.apache.cloudstack.api.EntityReference; import com.cloud.serializer.Param; import com.google.gson.annotations.SerializedName; import org.apache.cloudstack.api.BaseResponse; -import com.cloud.network.ExternalLoadBalancerDeviceVO; + +import com.cloud.network.dao.ExternalLoadBalancerDeviceVO; @EntityReference(value=ExternalLoadBalancerDeviceVO.class) @SuppressWarnings("unused") 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 868c56a6af3..5a03c0e244a 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 @@ -67,30 +67,30 @@ import com.cloud.host.dao.HostDao; import com.cloud.host.dao.HostDetailsDao; 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.IpAddress; import com.cloud.network.NetScalerPodVO; import com.cloud.network.Network; import com.cloud.network.Network.Capability; import com.cloud.network.Network.Provider; import com.cloud.network.Network.Service; -import com.cloud.network.NetworkExternalLoadBalancerVO; import com.cloud.network.NetworkModel; -import com.cloud.network.NetworkVO; import com.cloud.network.Networks.TrafficType; import com.cloud.network.PhysicalNetwork; import com.cloud.network.PhysicalNetworkServiceProvider; -import com.cloud.network.PhysicalNetworkVO; import com.cloud.network.PublicIpAddress; import com.cloud.network.as.AutoScaleCounter; import com.cloud.network.as.AutoScaleCounter.AutoScaleCounterType; import com.cloud.network.dao.ExternalLoadBalancerDeviceDao; +import com.cloud.network.dao.ExternalLoadBalancerDeviceVO; import com.cloud.network.dao.NetScalerPodDao; import com.cloud.network.dao.NetworkDao; import com.cloud.network.dao.NetworkExternalLoadBalancerDao; +import com.cloud.network.dao.NetworkExternalLoadBalancerVO; import com.cloud.network.dao.NetworkServiceMapDao; +import com.cloud.network.dao.NetworkVO; import com.cloud.network.dao.PhysicalNetworkDao; +import com.cloud.network.dao.PhysicalNetworkVO; +import com.cloud.network.dao.ExternalLoadBalancerDeviceVO.LBDeviceState; import com.cloud.network.lb.LoadBalancingRule; import com.cloud.network.lb.LoadBalancingRule.LbDestination; import com.cloud.network.resource.NetscalerResource; diff --git a/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerLoadBalancerElementService.java b/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerLoadBalancerElementService.java index 158b36e5475..03b7a262d19 100644 --- a/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerLoadBalancerElementService.java +++ b/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerLoadBalancerElementService.java @@ -23,8 +23,8 @@ import com.cloud.api.commands.DeleteNetscalerLoadBalancerCmd; import com.cloud.api.commands.ListNetscalerLoadBalancerNetworksCmd; import com.cloud.api.commands.ListNetscalerLoadBalancersCmd; import com.cloud.api.response.NetscalerLoadBalancerResponse; -import com.cloud.network.ExternalLoadBalancerDeviceVO; import com.cloud.network.Network; +import com.cloud.network.dao.ExternalLoadBalancerDeviceVO; import com.cloud.utils.component.PluggableService; public interface NetscalerLoadBalancerElementService extends PluggableService { 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 2bc7a08ff3b..244c19bf7f0 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 @@ -80,7 +80,6 @@ import com.cloud.network.Network.Provider; import com.cloud.network.Network.Service; import com.cloud.network.NetworkManager; import com.cloud.network.NetworkModel; -import com.cloud.network.NetworkVO; import com.cloud.network.Networks; import com.cloud.network.Networks.BroadcastDomainType; import com.cloud.network.NiciraNvpDeviceVO; @@ -88,17 +87,18 @@ import com.cloud.network.NiciraNvpNicMappingVO; import com.cloud.network.NiciraNvpRouterMappingVO; import com.cloud.network.PhysicalNetwork; import com.cloud.network.PhysicalNetworkServiceProvider; -import com.cloud.network.PhysicalNetworkVO; import com.cloud.network.PublicIpAddress; import com.cloud.network.addr.PublicIp; import com.cloud.network.dao.NetworkDao; import com.cloud.network.dao.NetworkServiceMapDao; +import com.cloud.network.dao.NetworkVO; import com.cloud.network.dao.NiciraNvpDao; import com.cloud.network.dao.NiciraNvpNicMappingDao; import com.cloud.network.dao.NiciraNvpRouterMappingDao; import com.cloud.network.dao.PhysicalNetworkDao; import com.cloud.network.dao.PhysicalNetworkServiceProviderDao; import com.cloud.network.dao.PhysicalNetworkServiceProviderVO; +import com.cloud.network.dao.PhysicalNetworkVO; import com.cloud.network.resource.NiciraNvpResource; import com.cloud.network.rules.PortForwardingRule; import com.cloud.network.rules.StaticNat; diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/network/guru/NiciraNvpGuestNetworkGuru.java b/plugins/network-elements/nicira-nvp/src/com/cloud/network/guru/NiciraNvpGuestNetworkGuru.java index 090e5e3b354..3ba6167a47d 100644 --- a/plugins/network-elements/nicira-nvp/src/com/cloud/network/guru/NiciraNvpGuestNetworkGuru.java +++ b/plugins/network-elements/nicira-nvp/src/com/cloud/network/guru/NiciraNvpGuestNetworkGuru.java @@ -44,17 +44,17 @@ import com.cloud.network.Network; import com.cloud.network.Network.Service; import com.cloud.network.NetworkModel; import com.cloud.network.NetworkProfile; -import com.cloud.network.NetworkVO; import com.cloud.network.Network.GuestType; import com.cloud.network.Network.State; import com.cloud.network.Networks.BroadcastDomainType; import com.cloud.network.NiciraNvpDeviceVO; import com.cloud.network.PhysicalNetwork; import com.cloud.network.PhysicalNetwork.IsolationMethod; -import com.cloud.network.PhysicalNetworkVO; import com.cloud.network.dao.NetworkDao; +import com.cloud.network.dao.NetworkVO; import com.cloud.network.dao.NiciraNvpDao; import com.cloud.network.dao.PhysicalNetworkDao; +import com.cloud.network.dao.PhysicalNetworkVO; import com.cloud.offering.NetworkOffering; import com.cloud.offerings.dao.NetworkOfferingServiceMapDao; import com.cloud.resource.ResourceManager; diff --git a/plugins/network-elements/nicira-nvp/test/com/cloud/network/guru/NiciraNvpGuestNetworkGuruTest.java b/plugins/network-elements/nicira-nvp/test/com/cloud/network/guru/NiciraNvpGuestNetworkGuruTest.java index 124e28f496a..f86e705336c 100644 --- a/plugins/network-elements/nicira-nvp/test/com/cloud/network/guru/NiciraNvpGuestNetworkGuruTest.java +++ b/plugins/network-elements/nicira-nvp/test/com/cloud/network/guru/NiciraNvpGuestNetworkGuruTest.java @@ -46,14 +46,14 @@ import com.cloud.network.Network.State; import com.cloud.network.NetworkManager; import com.cloud.network.NetworkModel; import com.cloud.network.NetworkProfile; -import com.cloud.network.NetworkVO; import com.cloud.network.Networks.BroadcastDomainType; import com.cloud.network.Networks.TrafficType; import com.cloud.network.NiciraNvpDeviceVO; -import com.cloud.network.PhysicalNetworkVO; import com.cloud.network.dao.NetworkDao; +import com.cloud.network.dao.NetworkVO; import com.cloud.network.dao.NiciraNvpDao; import com.cloud.network.dao.PhysicalNetworkDao; +import com.cloud.network.dao.PhysicalNetworkVO; import com.cloud.offering.NetworkOffering; import com.cloud.offerings.dao.NetworkOfferingServiceMapDao; import com.cloud.user.Account; diff --git a/plugins/network-elements/ovs/src/com/cloud/network/guru/OvsGuestNetworkGuru.java b/plugins/network-elements/ovs/src/com/cloud/network/guru/OvsGuestNetworkGuru.java index 91efa751308..18abc59e30a 100644 --- a/plugins/network-elements/ovs/src/com/cloud/network/guru/OvsGuestNetworkGuru.java +++ b/plugins/network-elements/ovs/src/com/cloud/network/guru/OvsGuestNetworkGuru.java @@ -33,10 +33,10 @@ import com.cloud.exception.InsufficientVirtualNetworkCapcityException; import com.cloud.network.Network; import com.cloud.network.Network.GuestType; import com.cloud.network.Network.State; -import com.cloud.network.NetworkVO; import com.cloud.network.Networks.BroadcastDomainType; import com.cloud.network.PhysicalNetwork; import com.cloud.network.PhysicalNetwork.IsolationMethod; +import com.cloud.network.dao.NetworkVO; import com.cloud.network.ovs.OvsTunnelManager; import com.cloud.offering.NetworkOffering; import com.cloud.user.Account; diff --git a/server/src/com/cloud/api/ApiDBUtils.java b/server/src/com/cloud/api/ApiDBUtils.java index 64effbe8cae..cb6dc6fae0c 100755 --- a/server/src/com/cloud/api/ApiDBUtils.java +++ b/server/src/com/cloud/api/ApiDBUtils.java @@ -106,24 +106,16 @@ import com.cloud.host.HostStats; import com.cloud.host.HostVO; import com.cloud.host.dao.HostDao; import com.cloud.hypervisor.Hypervisor.HypervisorType; -import com.cloud.network.IPAddressVO; import com.cloud.network.IpAddress; -import com.cloud.network.LoadBalancerVO; import com.cloud.network.Network; import com.cloud.network.Network.Capability; import com.cloud.network.Network.Provider; import com.cloud.network.Network.Service; -import com.cloud.network.NetworkDomainVO; import com.cloud.network.NetworkManager; import com.cloud.network.NetworkModel; import com.cloud.network.NetworkProfile; -import com.cloud.network.NetworkRuleConfigVO; -import com.cloud.network.NetworkVO; import com.cloud.network.Networks.TrafficType; import com.cloud.network.PhysicalNetworkServiceProvider; -import com.cloud.network.PhysicalNetworkVO; -import com.cloud.network.Site2SiteCustomerGatewayVO; -import com.cloud.network.Site2SiteVpnGatewayVO; import com.cloud.network.as.AutoScalePolicy; import com.cloud.network.as.AutoScalePolicyConditionMapVO; import com.cloud.network.as.AutoScalePolicyVO; @@ -142,17 +134,25 @@ import com.cloud.network.as.dao.CounterDao; import com.cloud.network.dao.FirewallRulesCidrsDao; import com.cloud.network.dao.FirewallRulesDao; import com.cloud.network.dao.IPAddressDao; +import com.cloud.network.dao.IPAddressVO; import com.cloud.network.dao.LoadBalancerDao; +import com.cloud.network.dao.LoadBalancerVO; import com.cloud.network.dao.NetworkDao; import com.cloud.network.dao.NetworkDomainDao; +import com.cloud.network.dao.NetworkDomainVO; import com.cloud.network.dao.NetworkRuleConfigDao; +import com.cloud.network.dao.NetworkRuleConfigVO; +import com.cloud.network.dao.NetworkVO; import com.cloud.network.dao.PhysicalNetworkDao; import com.cloud.network.dao.PhysicalNetworkServiceProviderDao; import com.cloud.network.dao.PhysicalNetworkServiceProviderVO; import com.cloud.network.dao.PhysicalNetworkTrafficTypeDao; import com.cloud.network.dao.PhysicalNetworkTrafficTypeVO; +import com.cloud.network.dao.PhysicalNetworkVO; import com.cloud.network.dao.Site2SiteCustomerGatewayDao; +import com.cloud.network.dao.Site2SiteCustomerGatewayVO; import com.cloud.network.dao.Site2SiteVpnGatewayDao; +import com.cloud.network.dao.Site2SiteVpnGatewayVO; import com.cloud.network.router.VirtualRouter; import com.cloud.network.rules.FirewallRuleVO; import com.cloud.network.security.SecurityGroup; diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java index dfeeb879392..6c703c9fe24 100755 --- a/server/src/com/cloud/api/ApiResponseHelper.java +++ b/server/src/com/cloud/api/ApiResponseHelper.java @@ -156,19 +156,16 @@ import com.cloud.event.Event; import com.cloud.host.Host; import com.cloud.host.HostVO; import com.cloud.hypervisor.HypervisorCapabilities; -import com.cloud.network.IPAddressVO; import com.cloud.network.IpAddress; import com.cloud.network.Network; import com.cloud.network.Network.Capability; import com.cloud.network.Network.Provider; import com.cloud.network.Network.Service; import com.cloud.network.NetworkProfile; -import com.cloud.network.NetworkVO; import com.cloud.network.Networks.TrafficType; import com.cloud.network.PhysicalNetwork; import com.cloud.network.PhysicalNetworkServiceProvider; import com.cloud.network.PhysicalNetworkTrafficType; -import com.cloud.network.PhysicalNetworkVO; import com.cloud.network.RemoteAccessVpn; import com.cloud.network.Site2SiteCustomerGateway; import com.cloud.network.Site2SiteVpnConnection; @@ -182,6 +179,9 @@ import com.cloud.network.as.AutoScaleVmProfileVO; import com.cloud.network.as.Condition; import com.cloud.network.as.ConditionVO; import com.cloud.network.as.Counter; +import com.cloud.network.dao.IPAddressVO; +import com.cloud.network.dao.NetworkVO; +import com.cloud.network.dao.PhysicalNetworkVO; import com.cloud.network.router.VirtualRouter; import com.cloud.network.rules.FirewallRule; import com.cloud.network.rules.FirewallRuleVO; diff --git a/server/src/com/cloud/baremetal/BareMetalVmManagerImpl.java b/server/src/com/cloud/baremetal/BareMetalVmManagerImpl.java index 19f8418237d..407084c65f3 100755 --- a/server/src/com/cloud/baremetal/BareMetalVmManagerImpl.java +++ b/server/src/com/cloud/baremetal/BareMetalVmManagerImpl.java @@ -64,8 +64,8 @@ import com.cloud.host.Host; import com.cloud.host.HostVO; import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.network.Network; -import com.cloud.network.NetworkVO; import com.cloud.network.Networks.TrafficType; +import com.cloud.network.dao.NetworkVO; import com.cloud.org.Grouping; import com.cloud.resource.ResourceManager; import com.cloud.service.ServiceOfferingVO; diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java index 0e3363e11dd..59cb6e871c0 100755 --- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java +++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java @@ -104,7 +104,6 @@ import com.cloud.exception.ResourceAllocationException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.host.HostVO; import com.cloud.hypervisor.Hypervisor.HypervisorType; -import com.cloud.network.IPAddressVO; import com.cloud.network.Network; import com.cloud.network.Network.Capability; import com.cloud.network.Network.GuestType; @@ -113,17 +112,18 @@ import com.cloud.network.Network.Service; import com.cloud.network.NetworkManager; import com.cloud.network.NetworkModel; import com.cloud.network.NetworkService; -import com.cloud.network.NetworkVO; import com.cloud.network.Networks.BroadcastDomainType; import com.cloud.network.Networks.TrafficType; import com.cloud.network.PhysicalNetwork; -import com.cloud.network.PhysicalNetworkVO; import com.cloud.network.dao.FirewallRulesDao; import com.cloud.network.dao.IPAddressDao; +import com.cloud.network.dao.IPAddressVO; import com.cloud.network.dao.NetworkDao; +import com.cloud.network.dao.NetworkVO; import com.cloud.network.dao.PhysicalNetworkDao; import com.cloud.network.dao.PhysicalNetworkTrafficTypeDao; import com.cloud.network.dao.PhysicalNetworkTrafficTypeVO; +import com.cloud.network.dao.PhysicalNetworkVO; import com.cloud.network.vpc.VpcManager; import com.cloud.offering.DiskOffering; import com.cloud.offering.NetworkOffering; diff --git a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java index 52c90af70dc..58dd3f81a12 100755 --- a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java +++ b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java @@ -93,14 +93,14 @@ import com.cloud.info.RunningHostInfoAgregator.ZoneHostInfo; import com.cloud.keystore.KeystoreDao; import com.cloud.keystore.KeystoreManager; import com.cloud.keystore.KeystoreVO; -import com.cloud.network.IPAddressVO; import com.cloud.network.Network; import com.cloud.network.NetworkManager; import com.cloud.network.NetworkModel; -import com.cloud.network.NetworkVO; import com.cloud.network.Networks.TrafficType; import com.cloud.network.dao.IPAddressDao; +import com.cloud.network.dao.IPAddressVO; import com.cloud.network.dao.NetworkDao; +import com.cloud.network.dao.NetworkVO; import com.cloud.network.rules.RulesManager; import com.cloud.offering.NetworkOffering; import com.cloud.offering.ServiceOffering; diff --git a/server/src/com/cloud/dc/dao/DataCenterDaoImpl.java b/server/src/com/cloud/dc/dao/DataCenterDaoImpl.java index 730029de3fc..a63bbd3c068 100755 --- a/server/src/com/cloud/dc/dao/DataCenterDaoImpl.java +++ b/server/src/com/cloud/dc/dao/DataCenterDaoImpl.java @@ -293,7 +293,7 @@ public class DataCenterDaoImpl extends GenericDaoBase implem return true; } - protected DataCenterDaoImpl() { + public DataCenterDaoImpl() { super(); NameSearch = createSearchBuilder(); NameSearch.and("name", NameSearch.entity().getName(), SearchCriteria.Op.EQ); diff --git a/server/src/com/cloud/dc/dao/DataCenterIpAddressDaoImpl.java b/server/src/com/cloud/dc/dao/DataCenterIpAddressDaoImpl.java index ba7dd44e2c9..353402d30cf 100755 --- a/server/src/com/cloud/dc/dao/DataCenterIpAddressDaoImpl.java +++ b/server/src/com/cloud/dc/dao/DataCenterIpAddressDaoImpl.java @@ -198,7 +198,7 @@ public class DataCenterIpAddressDaoImpl extends GenericDaoBase implement protected final SearchBuilder DcSearch; protected final SearchBuilder DetailSearch; - protected DcDetailsDaoImpl() { + public DcDetailsDaoImpl() { DcSearch = createSearchBuilder(); DcSearch.and("dcId", DcSearch.entity().getDcId(), SearchCriteria.Op.EQ); DcSearch.done(); diff --git a/server/src/com/cloud/dc/dao/HostPodDao.java b/server/src/com/cloud/dc/dao/HostPodDao.java index ced348425fd..03f7155d0d2 100644 --- a/server/src/com/cloud/dc/dao/HostPodDao.java +++ b/server/src/com/cloud/dc/dao/HostPodDao.java @@ -26,8 +26,6 @@ import com.cloud.vm.VirtualMachine; public interface HostPodDao extends GenericDao { public List listByDataCenterId(long id); - public List listByDataCenterIdVMTypeAndStates(long id, VirtualMachine.Type type, VirtualMachine.State... states); - public HostPodVO findByName(String name, long dcId); public HashMap> getCurrentPodCidrSubnets(long zoneId, long podIdToSkip); diff --git a/server/src/com/cloud/dc/dao/HostPodDaoImpl.java b/server/src/com/cloud/dc/dao/HostPodDaoImpl.java index 7b635f0998a..07b4ad13db6 100644 --- a/server/src/com/cloud/dc/dao/HostPodDaoImpl.java +++ b/server/src/com/cloud/dc/dao/HostPodDaoImpl.java @@ -24,7 +24,6 @@ import java.util.HashMap; import java.util.List; import javax.ejb.Local; -import javax.inject.Inject; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -33,26 +32,20 @@ import com.cloud.dc.HostPodVO; import com.cloud.org.Grouping; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.GenericSearchBuilder; -import com.cloud.utils.db.JoinBuilder; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.SearchCriteria.Op; import com.cloud.utils.db.Transaction; -import com.cloud.vm.VMInstanceVO; -import com.cloud.vm.VirtualMachine; -import com.cloud.vm.dao.VMInstanceDao; -import com.cloud.vm.dao.VMInstanceDaoImpl; @Component @Local(value={HostPodDao.class}) public class HostPodDaoImpl extends GenericDaoBase implements HostPodDao { private static final Logger s_logger = Logger.getLogger(HostPodDaoImpl.class); - @Inject VMInstanceDao _vmDao; protected SearchBuilder DataCenterAndNameSearch; protected SearchBuilder DataCenterIdSearch; - protected HostPodDaoImpl() { + public HostPodDaoImpl() { DataCenterAndNameSearch = createSearchBuilder(); DataCenterAndNameSearch.and("dc", DataCenterAndNameSearch.entity().getDataCenterId(), SearchCriteria.Op.EQ); DataCenterAndNameSearch.and("name", DataCenterAndNameSearch.entity().getName(), SearchCriteria.Op.EQ); @@ -71,26 +64,6 @@ public class HostPodDaoImpl extends GenericDaoBase implements H return listBy(sc); } - @Override - public List listByDataCenterIdVMTypeAndStates(long id, VirtualMachine.Type type, VirtualMachine.State... states) { - SearchBuilder vmInstanceSearch = _vmDao.createSearchBuilder(); - vmInstanceSearch.and("type", vmInstanceSearch.entity().getType(), SearchCriteria.Op.EQ); - vmInstanceSearch.and("states", vmInstanceSearch.entity().getState(), SearchCriteria.Op.IN); - - SearchBuilder podIdSearch = createSearchBuilder(); - podIdSearch.and("dc", podIdSearch.entity().getDataCenterId(), SearchCriteria.Op.EQ); - podIdSearch.select(null, SearchCriteria.Func.DISTINCT, podIdSearch.entity().getId()); - podIdSearch.join("vmInstanceSearch", vmInstanceSearch, podIdSearch.entity().getId(), - vmInstanceSearch.entity().getPodIdToDeployIn(), JoinBuilder.JoinType.INNER); - podIdSearch.done(); - - SearchCriteria sc = podIdSearch.create(); - sc.setParameters("dc", id); - sc.setJoinParameters("vmInstanceSearch", "type", type); - sc.setJoinParameters("vmInstanceSearch", "states", (Object[]) states); - return listBy(sc); - } - @Override public HostPodVO findByName(String name, long dcId) { SearchCriteria sc = DataCenterAndNameSearch.create(); diff --git a/server/src/com/cloud/dc/dao/PodVlanDaoImpl.java b/server/src/com/cloud/dc/dao/PodVlanDaoImpl.java index 84918b08c99..96cd42cf31f 100755 --- a/server/src/com/cloud/dc/dao/PodVlanDaoImpl.java +++ b/server/src/com/cloud/dc/dao/PodVlanDaoImpl.java @@ -117,7 +117,7 @@ public class PodVlanDaoImpl extends GenericDaoBase implements G update(vo.getId(), vo); } - protected PodVlanDaoImpl() { + public PodVlanDaoImpl() { super(); PodSearchAllocated = createSearchBuilder(); PodSearchAllocated.and("podId", PodSearchAllocated.entity().getPodId(), SearchCriteria.Op.EQ); diff --git a/server/src/com/cloud/host/dao/HostDaoImpl.java b/server/src/com/cloud/host/dao/HostDaoImpl.java index 5d56485c635..50de8e63856 100755 --- a/server/src/com/cloud/host/dao/HostDaoImpl.java +++ b/server/src/com/cloud/host/dao/HostDaoImpl.java @@ -64,7 +64,7 @@ import com.cloud.utils.db.Transaction; import com.cloud.utils.db.UpdateBuilder; import com.cloud.utils.exception.CloudRuntimeException; -@Component + @Local(value = { HostDao.class }) @DB(txn = false) @TableGenerator(name = "host_req_sq", table = "op_host", pkColumnName = "id", valueColumnName = "sequence", allocationSize = 1) diff --git a/server/src/com/cloud/host/dao/HostDetailsDaoImpl.java b/server/src/com/cloud/host/dao/HostDetailsDaoImpl.java index 43f7b07956b..b6a9cef9ee9 100644 --- a/server/src/com/cloud/host/dao/HostDetailsDaoImpl.java +++ b/server/src/com/cloud/host/dao/HostDetailsDaoImpl.java @@ -37,7 +37,7 @@ public class HostDetailsDaoImpl extends GenericDaoBase implement protected final SearchBuilder HostSearch; protected final SearchBuilder DetailSearch; - protected HostDetailsDaoImpl() { + public HostDetailsDaoImpl() { HostSearch = createSearchBuilder(); HostSearch.and("hostId", HostSearch.entity().getHostId(), SearchCriteria.Op.EQ); HostSearch.done(); diff --git a/server/src/com/cloud/host/dao/HostTagsDaoImpl.java b/server/src/com/cloud/host/dao/HostTagsDaoImpl.java index e98e7e29ec9..0e93275d360 100644 --- a/server/src/com/cloud/host/dao/HostTagsDaoImpl.java +++ b/server/src/com/cloud/host/dao/HostTagsDaoImpl.java @@ -34,7 +34,7 @@ import com.cloud.utils.db.Transaction; public class HostTagsDaoImpl extends GenericDaoBase implements HostTagsDao { protected final SearchBuilder HostSearch; - protected HostTagsDaoImpl() { + public HostTagsDaoImpl() { HostSearch = createSearchBuilder(); HostSearch.and("hostId", HostSearch.entity().getHostId(), SearchCriteria.Op.EQ); HostSearch.done(); diff --git a/server/src/com/cloud/network/ExternalFirewallDeviceManager.java b/server/src/com/cloud/network/ExternalFirewallDeviceManager.java index f758ca1d341..2768f57f23b 100644 --- a/server/src/com/cloud/network/ExternalFirewallDeviceManager.java +++ b/server/src/com/cloud/network/ExternalFirewallDeviceManager.java @@ -21,6 +21,7 @@ import java.util.List; import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.host.Host; +import com.cloud.network.dao.ExternalFirewallDeviceVO; import com.cloud.network.rules.FirewallRule; import com.cloud.network.rules.PortForwardingRule; import com.cloud.resource.ServerResource; diff --git a/server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java b/server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java index 3761a1462e3..7623b3f0fb4 100644 --- a/server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java +++ b/server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java @@ -63,16 +63,21 @@ import com.cloud.host.dao.HostDetailsDao; import org.apache.cloudstack.network.ExternalNetworkDeviceManager.NetworkDevice; import com.cloud.network.Networks.TrafficType; import com.cloud.network.dao.ExternalFirewallDeviceDao; +import com.cloud.network.dao.ExternalFirewallDeviceVO; import com.cloud.network.dao.FirewallRulesDao; import com.cloud.network.dao.IPAddressDao; +import com.cloud.network.dao.IPAddressVO; import com.cloud.network.dao.InlineLoadBalancerNicMapDao; +import com.cloud.network.dao.InlineLoadBalancerNicMapVO; import com.cloud.network.dao.LoadBalancerDao; import com.cloud.network.dao.NetworkDao; import com.cloud.network.dao.NetworkExternalFirewallDao; +import com.cloud.network.dao.NetworkExternalFirewallVO; import com.cloud.network.dao.NetworkServiceMapDao; import com.cloud.network.dao.PhysicalNetworkDao; import com.cloud.network.dao.PhysicalNetworkServiceProviderDao; import com.cloud.network.dao.PhysicalNetworkServiceProviderVO; +import com.cloud.network.dao.PhysicalNetworkVO; import com.cloud.network.dao.VpnUserDao; import com.cloud.network.rules.FirewallRule; import com.cloud.network.rules.PortForwardingRule; diff --git a/server/src/com/cloud/network/ExternalLoadBalancerDeviceManager.java b/server/src/com/cloud/network/ExternalLoadBalancerDeviceManager.java index 5e7b98a3124..d979f079691 100644 --- a/server/src/com/cloud/network/ExternalLoadBalancerDeviceManager.java +++ b/server/src/com/cloud/network/ExternalLoadBalancerDeviceManager.java @@ -21,6 +21,7 @@ import java.util.List; import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.host.Host; +import com.cloud.network.dao.ExternalLoadBalancerDeviceVO; import com.cloud.network.rules.FirewallRule; import com.cloud.resource.ServerResource; import com.cloud.utils.component.Manager; diff --git a/server/src/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java b/server/src/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java index d1e1faf97f1..bcefccc3a04 100644 --- a/server/src/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java +++ b/server/src/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java @@ -59,8 +59,6 @@ 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.ExternalLoadBalancerDeviceVO.LBDeviceAllocationState; -import com.cloud.network.ExternalLoadBalancerDeviceVO.LBDeviceState; import org.apache.cloudstack.network.ExternalNetworkDeviceManager.NetworkDevice; import com.cloud.network.Network.Provider; import com.cloud.network.Network.Service; @@ -68,16 +66,23 @@ import com.cloud.network.Networks.TrafficType; import com.cloud.network.addr.PublicIp; import com.cloud.network.dao.ExternalFirewallDeviceDao; import com.cloud.network.dao.ExternalLoadBalancerDeviceDao; +import com.cloud.network.dao.ExternalLoadBalancerDeviceVO; import com.cloud.network.dao.IPAddressDao; +import com.cloud.network.dao.IPAddressVO; import com.cloud.network.dao.InlineLoadBalancerNicMapDao; +import com.cloud.network.dao.InlineLoadBalancerNicMapVO; import com.cloud.network.dao.LoadBalancerDao; import com.cloud.network.dao.NetworkDao; import com.cloud.network.dao.NetworkExternalFirewallDao; import com.cloud.network.dao.NetworkExternalLoadBalancerDao; +import com.cloud.network.dao.NetworkExternalLoadBalancerVO; import com.cloud.network.dao.NetworkServiceMapDao; import com.cloud.network.dao.PhysicalNetworkDao; import com.cloud.network.dao.PhysicalNetworkServiceProviderDao; import com.cloud.network.dao.PhysicalNetworkServiceProviderVO; +import com.cloud.network.dao.PhysicalNetworkVO; +import com.cloud.network.dao.ExternalLoadBalancerDeviceVO.LBDeviceAllocationState; +import com.cloud.network.dao.ExternalLoadBalancerDeviceVO.LBDeviceState; import com.cloud.network.element.IpDeployer; import com.cloud.network.element.NetworkElement; import com.cloud.network.element.StaticNatServiceProvider; diff --git a/server/src/com/cloud/network/ExternalLoadBalancerUsageManagerImpl.java b/server/src/com/cloud/network/ExternalLoadBalancerUsageManagerImpl.java index be22a54f945..ad5a6b75ab9 100644 --- a/server/src/com/cloud/network/ExternalLoadBalancerUsageManagerImpl.java +++ b/server/src/com/cloud/network/ExternalLoadBalancerUsageManagerImpl.java @@ -48,13 +48,18 @@ import com.cloud.host.dao.HostDao; import com.cloud.host.dao.HostDetailsDao; import com.cloud.network.dao.ExternalFirewallDeviceDao; import com.cloud.network.dao.ExternalLoadBalancerDeviceDao; +import com.cloud.network.dao.ExternalLoadBalancerDeviceVO; import com.cloud.network.dao.IPAddressDao; import com.cloud.network.dao.InlineLoadBalancerNicMapDao; +import com.cloud.network.dao.InlineLoadBalancerNicMapVO; import com.cloud.network.dao.LoadBalancerDao; +import com.cloud.network.dao.LoadBalancerVO; import com.cloud.network.dao.NetworkDao; import com.cloud.network.dao.NetworkExternalFirewallDao; import com.cloud.network.dao.NetworkExternalLoadBalancerDao; +import com.cloud.network.dao.NetworkExternalLoadBalancerVO; import com.cloud.network.dao.NetworkServiceMapDao; +import com.cloud.network.dao.NetworkVO; import com.cloud.network.dao.PhysicalNetworkDao; import com.cloud.network.dao.PhysicalNetworkServiceProviderDao; import com.cloud.network.rules.dao.PortForwardingRulesDao; diff --git a/server/src/com/cloud/network/NetworkManager.java b/server/src/com/cloud/network/NetworkManager.java index 546f1bf613c..5c5c8933774 100755 --- a/server/src/com/cloud/network/NetworkManager.java +++ b/server/src/com/cloud/network/NetworkManager.java @@ -34,6 +34,8 @@ import com.cloud.exception.ResourceUnavailableException; import com.cloud.network.Network.Provider; import com.cloud.network.Network.Service; import com.cloud.network.addr.PublicIp; +import com.cloud.network.dao.IPAddressVO; +import com.cloud.network.dao.NetworkVO; import com.cloud.network.element.LoadBalancingServiceProvider; import com.cloud.network.element.StaticNatServiceProvider; import com.cloud.network.element.UserDataServiceProvider; diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java index 706d3328a3e..09ffece8d10 100755 --- a/server/src/com/cloud/network/NetworkManagerImpl.java +++ b/server/src/com/cloud/network/NetworkManagerImpl.java @@ -107,14 +107,19 @@ import com.cloud.network.Networks.TrafficType; import com.cloud.network.addr.PublicIp; import com.cloud.network.dao.FirewallRulesDao; import com.cloud.network.dao.IPAddressDao; +import com.cloud.network.dao.IPAddressVO; import com.cloud.network.dao.LoadBalancerDao; +import com.cloud.network.dao.LoadBalancerVO; import com.cloud.network.dao.NetworkDao; import com.cloud.network.dao.NetworkDomainDao; import com.cloud.network.dao.NetworkServiceMapDao; +import com.cloud.network.dao.NetworkServiceMapVO; +import com.cloud.network.dao.NetworkVO; import com.cloud.network.dao.PhysicalNetworkDao; import com.cloud.network.dao.PhysicalNetworkServiceProviderDao; import com.cloud.network.dao.PhysicalNetworkTrafficTypeDao; import com.cloud.network.dao.PhysicalNetworkTrafficTypeVO; +import com.cloud.network.dao.PhysicalNetworkVO; import com.cloud.network.element.DhcpServiceProvider; import com.cloud.network.element.IpDeployer; import com.cloud.network.element.LoadBalancingServiceProvider; diff --git a/server/src/com/cloud/network/NetworkModelImpl.java b/server/src/com/cloud/network/NetworkModelImpl.java index 307294cafc3..222cd021da7 100644 --- a/server/src/com/cloud/network/NetworkModelImpl.java +++ b/server/src/com/cloud/network/NetworkModelImpl.java @@ -59,14 +59,19 @@ import com.cloud.network.Networks.TrafficType; import com.cloud.network.addr.PublicIp; import com.cloud.network.dao.FirewallRulesDao; import com.cloud.network.dao.IPAddressDao; +import com.cloud.network.dao.IPAddressVO; import com.cloud.network.dao.NetworkDao; import com.cloud.network.dao.NetworkDomainDao; +import com.cloud.network.dao.NetworkDomainVO; import com.cloud.network.dao.NetworkServiceMapDao; +import com.cloud.network.dao.NetworkServiceMapVO; +import com.cloud.network.dao.NetworkVO; import com.cloud.network.dao.PhysicalNetworkDao; import com.cloud.network.dao.PhysicalNetworkServiceProviderDao; import com.cloud.network.dao.PhysicalNetworkServiceProviderVO; import com.cloud.network.dao.PhysicalNetworkTrafficTypeDao; import com.cloud.network.dao.PhysicalNetworkTrafficTypeVO; +import com.cloud.network.dao.PhysicalNetworkVO; import com.cloud.network.element.NetworkElement; import com.cloud.network.element.UserDataServiceProvider; import com.cloud.network.rules.FirewallRule.Purpose; diff --git a/server/src/com/cloud/network/NetworkServiceImpl.java b/server/src/com/cloud/network/NetworkServiceImpl.java index 9b0b0063543..fa552f4183e 100755 --- a/server/src/com/cloud/network/NetworkServiceImpl.java +++ b/server/src/com/cloud/network/NetworkServiceImpl.java @@ -81,14 +81,18 @@ import com.cloud.network.VirtualRouterProvider.VirtualRouterProviderType; import com.cloud.network.addr.PublicIp; import com.cloud.network.dao.FirewallRulesDao; import com.cloud.network.dao.IPAddressDao; +import com.cloud.network.dao.IPAddressVO; import com.cloud.network.dao.NetworkDao; import com.cloud.network.dao.NetworkDomainDao; +import com.cloud.network.dao.NetworkDomainVO; import com.cloud.network.dao.NetworkServiceMapDao; +import com.cloud.network.dao.NetworkVO; import com.cloud.network.dao.PhysicalNetworkDao; import com.cloud.network.dao.PhysicalNetworkServiceProviderDao; import com.cloud.network.dao.PhysicalNetworkServiceProviderVO; import com.cloud.network.dao.PhysicalNetworkTrafficTypeDao; import com.cloud.network.dao.PhysicalNetworkTrafficTypeVO; +import com.cloud.network.dao.PhysicalNetworkVO; import com.cloud.network.element.NetworkElement; import com.cloud.network.element.VirtualRouterElement; import com.cloud.network.element.VpcVirtualRouterElement; diff --git a/server/src/com/cloud/network/NetworkUsageManager.java b/server/src/com/cloud/network/NetworkUsageManager.java index 3d4577b8199..1f0638b3c20 100644 --- a/server/src/com/cloud/network/NetworkUsageManager.java +++ b/server/src/com/cloud/network/NetworkUsageManager.java @@ -23,6 +23,8 @@ import com.cloud.api.commands.DeleteTrafficMonitorCmd; import com.cloud.api.commands.ListTrafficMonitorsCmd; import com.cloud.host.Host; import com.cloud.host.HostVO; +import com.cloud.network.dao.IPAddressVO; + import org.apache.cloudstack.api.response.TrafficMonitorResponse; import com.cloud.utils.component.Manager; diff --git a/server/src/com/cloud/network/NetworkUsageManagerImpl.java b/server/src/com/cloud/network/NetworkUsageManagerImpl.java index f129b687a5e..a3584ac5c32 100755 --- a/server/src/com/cloud/network/NetworkUsageManagerImpl.java +++ b/server/src/com/cloud/network/NetworkUsageManagerImpl.java @@ -63,7 +63,9 @@ import com.cloud.host.Status; import com.cloud.host.dao.HostDao; import com.cloud.host.dao.HostDetailsDao; import com.cloud.network.dao.IPAddressDao; +import com.cloud.network.dao.IPAddressVO; import com.cloud.network.dao.NetworkDao; +import com.cloud.network.dao.NetworkVO; import com.cloud.network.resource.TrafficSentinelResource; import com.cloud.resource.ResourceManager; import com.cloud.resource.ResourceStateAdapter; diff --git a/server/src/com/cloud/network/PortProfileManagerImpl.java b/server/src/com/cloud/network/PortProfileManagerImpl.java index 3d83d3f8755..f17ee6f45b6 100644 --- a/server/src/com/cloud/network/PortProfileManagerImpl.java +++ b/server/src/com/cloud/network/PortProfileManagerImpl.java @@ -22,9 +22,10 @@ import com.cloud.exception.InvalidParameterValueException; import com.cloud.utils.db.DB; import com.cloud.utils.db.Transaction; import com.cloud.utils.exception.CloudRuntimeException; -import com.cloud.network.PortProfileVO.BindingType; -import com.cloud.network.PortProfileVO.PortType; import com.cloud.network.dao.PortProfileDaoImpl; +import com.cloud.network.dao.PortProfileVO; +import com.cloud.network.dao.PortProfileVO.BindingType; +import com.cloud.network.dao.PortProfileVO.PortType; public class PortProfileManagerImpl { diff --git a/server/src/com/cloud/network/StorageNetworkManagerImpl.java b/server/src/com/cloud/network/StorageNetworkManagerImpl.java index b3dd357c225..52ee73d4ab4 100755 --- a/server/src/com/cloud/network/StorageNetworkManagerImpl.java +++ b/server/src/com/cloud/network/StorageNetworkManagerImpl.java @@ -43,6 +43,7 @@ import com.cloud.dc.dao.StorageNetworkIpRangeDao; import com.cloud.exception.InvalidParameterValueException; import com.cloud.network.Networks.TrafficType; import com.cloud.network.dao.NetworkDao; +import com.cloud.network.dao.NetworkVO; import com.cloud.utils.db.DB; import com.cloud.utils.db.SearchCriteria.Op; import com.cloud.utils.db.SearchCriteria2; diff --git a/server/src/com/cloud/network/addr/PublicIp.java b/server/src/com/cloud/network/addr/PublicIp.java index 8ad716fd631..b5a19aa2a76 100644 --- a/server/src/com/cloud/network/addr/PublicIp.java +++ b/server/src/com/cloud/network/addr/PublicIp.java @@ -19,8 +19,8 @@ package com.cloud.network.addr; import java.util.Date; import com.cloud.dc.VlanVO; -import com.cloud.network.IPAddressVO; import com.cloud.network.PublicIpAddress; +import com.cloud.network.dao.IPAddressVO; import com.cloud.utils.net.Ip; import com.cloud.utils.net.NetUtils; diff --git a/server/src/com/cloud/network/as/AutoScaleManagerImpl.java b/server/src/com/cloud/network/as/AutoScaleManagerImpl.java index 7c8a6f5a800..734ea3d63e1 100644 --- a/server/src/com/cloud/network/as/AutoScaleManagerImpl.java +++ b/server/src/com/cloud/network/as/AutoScaleManagerImpl.java @@ -58,7 +58,6 @@ import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.ResourceInUseException; import com.cloud.exception.ResourceUnavailableException; -import com.cloud.network.LoadBalancerVO; import com.cloud.network.Network.Capability; import com.cloud.network.as.AutoScaleCounter.AutoScaleCounterParam; import com.cloud.network.as.dao.AutoScalePolicyConditionMapDao; @@ -71,6 +70,7 @@ import com.cloud.network.as.dao.CounterDao; import com.cloud.network.dao.IPAddressDao; import com.cloud.network.dao.LoadBalancerDao; import com.cloud.network.dao.LoadBalancerVMMapDao; +import com.cloud.network.dao.LoadBalancerVO; import com.cloud.network.dao.NetworkDao; import com.cloud.network.lb.LoadBalancingRulesManager; import com.cloud.offering.ServiceOffering; diff --git a/server/src/com/cloud/network/dao/ExternalFirewallDeviceDao.java b/server/src/com/cloud/network/dao/ExternalFirewallDeviceDao.java index 2d2da6c8c77..bb3ebef0e75 100644 --- a/server/src/com/cloud/network/dao/ExternalFirewallDeviceDao.java +++ b/server/src/com/cloud/network/dao/ExternalFirewallDeviceDao.java @@ -18,9 +18,8 @@ package com.cloud.network.dao; import java.util.List; -import com.cloud.network.ExternalFirewallDeviceVO; -import com.cloud.network.ExternalFirewallDeviceVO.FirewallDeviceAllocationState; -import com.cloud.network.ExternalFirewallDeviceVO.FirewallDeviceState; +import com.cloud.network.dao.ExternalFirewallDeviceVO.FirewallDeviceAllocationState; +import com.cloud.network.dao.ExternalFirewallDeviceVO.FirewallDeviceState; import com.cloud.utils.db.GenericDao; public interface ExternalFirewallDeviceDao extends GenericDao { diff --git a/server/src/com/cloud/network/dao/ExternalFirewallDeviceDaoImpl.java b/server/src/com/cloud/network/dao/ExternalFirewallDeviceDaoImpl.java index ee26df9737e..01f8861f9d1 100644 --- a/server/src/com/cloud/network/dao/ExternalFirewallDeviceDaoImpl.java +++ b/server/src/com/cloud/network/dao/ExternalFirewallDeviceDaoImpl.java @@ -21,9 +21,8 @@ import javax.ejb.Local; import org.springframework.stereotype.Component; -import com.cloud.network.ExternalFirewallDeviceVO; -import com.cloud.network.ExternalFirewallDeviceVO.FirewallDeviceAllocationState; -import com.cloud.network.ExternalFirewallDeviceVO.FirewallDeviceState; +import com.cloud.network.dao.ExternalFirewallDeviceVO.FirewallDeviceAllocationState; +import com.cloud.network.dao.ExternalFirewallDeviceVO.FirewallDeviceState; import com.cloud.utils.db.DB; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; diff --git a/server/src/com/cloud/network/ExternalFirewallDeviceVO.java b/server/src/com/cloud/network/dao/ExternalFirewallDeviceVO.java similarity index 99% rename from server/src/com/cloud/network/ExternalFirewallDeviceVO.java rename to server/src/com/cloud/network/dao/ExternalFirewallDeviceVO.java index 83be8c40b3d..31750b498f8 100644 --- a/server/src/com/cloud/network/ExternalFirewallDeviceVO.java +++ b/server/src/com/cloud/network/dao/ExternalFirewallDeviceVO.java @@ -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.network; +package com.cloud.network.dao; import org.apache.cloudstack.api.Identity; import org.apache.cloudstack.api.InternalIdentity; diff --git a/server/src/com/cloud/network/dao/ExternalLoadBalancerDeviceDao.java b/server/src/com/cloud/network/dao/ExternalLoadBalancerDeviceDao.java index 6a44b2ee630..1bd210710f3 100644 --- a/server/src/com/cloud/network/dao/ExternalLoadBalancerDeviceDao.java +++ b/server/src/com/cloud/network/dao/ExternalLoadBalancerDeviceDao.java @@ -17,9 +17,9 @@ package com.cloud.network.dao; import java.util.List; -import com.cloud.network.ExternalLoadBalancerDeviceVO; -import com.cloud.network.ExternalLoadBalancerDeviceVO.LBDeviceAllocationState; -import com.cloud.network.ExternalLoadBalancerDeviceVO.LBDeviceState; + +import com.cloud.network.dao.ExternalLoadBalancerDeviceVO.LBDeviceAllocationState; +import com.cloud.network.dao.ExternalLoadBalancerDeviceVO.LBDeviceState; import com.cloud.utils.db.GenericDao; public interface ExternalLoadBalancerDeviceDao extends GenericDao { diff --git a/server/src/com/cloud/network/dao/ExternalLoadBalancerDeviceDaoImpl.java b/server/src/com/cloud/network/dao/ExternalLoadBalancerDeviceDaoImpl.java index 6fddfa77f4e..e559fad3a1e 100644 --- a/server/src/com/cloud/network/dao/ExternalLoadBalancerDeviceDaoImpl.java +++ b/server/src/com/cloud/network/dao/ExternalLoadBalancerDeviceDaoImpl.java @@ -21,9 +21,8 @@ import javax.ejb.Local; import org.springframework.stereotype.Component; -import com.cloud.network.ExternalLoadBalancerDeviceVO; -import com.cloud.network.ExternalLoadBalancerDeviceVO.LBDeviceAllocationState; -import com.cloud.network.ExternalLoadBalancerDeviceVO.LBDeviceState; +import com.cloud.network.dao.ExternalLoadBalancerDeviceVO.LBDeviceAllocationState; +import com.cloud.network.dao.ExternalLoadBalancerDeviceVO.LBDeviceState; import com.cloud.utils.db.DB; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; diff --git a/server/src/com/cloud/network/ExternalLoadBalancerDeviceVO.java b/server/src/com/cloud/network/dao/ExternalLoadBalancerDeviceVO.java similarity index 99% rename from server/src/com/cloud/network/ExternalLoadBalancerDeviceVO.java rename to server/src/com/cloud/network/dao/ExternalLoadBalancerDeviceVO.java index d77352a9614..cd9dffd8f94 100644 --- a/server/src/com/cloud/network/ExternalLoadBalancerDeviceVO.java +++ b/server/src/com/cloud/network/dao/ExternalLoadBalancerDeviceVO.java @@ -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.network; +package com.cloud.network.dao; import org.apache.cloudstack.api.Identity; import org.apache.cloudstack.api.InternalIdentity; diff --git a/server/src/com/cloud/network/dao/FirewallRulesCidrsDao.java b/server/src/com/cloud/network/dao/FirewallRulesCidrsDao.java index c50a128e55d..d020ea72eac 100644 --- a/server/src/com/cloud/network/dao/FirewallRulesCidrsDao.java +++ b/server/src/com/cloud/network/dao/FirewallRulesCidrsDao.java @@ -18,7 +18,6 @@ package com.cloud.network.dao; import java.util.List; -import com.cloud.network.FirewallRulesCidrsVO; import com.cloud.utils.db.GenericDao; public interface FirewallRulesCidrsDao extends GenericDao { diff --git a/server/src/com/cloud/network/dao/FirewallRulesCidrsDaoImpl.java b/server/src/com/cloud/network/dao/FirewallRulesCidrsDaoImpl.java index 85f3d8e0934..b007e19e779 100644 --- a/server/src/com/cloud/network/dao/FirewallRulesCidrsDaoImpl.java +++ b/server/src/com/cloud/network/dao/FirewallRulesCidrsDaoImpl.java @@ -24,7 +24,6 @@ import javax.ejb.Local; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; -import com.cloud.network.FirewallRulesCidrsVO; import com.cloud.utils.db.DB; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; diff --git a/server/src/com/cloud/network/FirewallRulesCidrsVO.java b/server/src/com/cloud/network/dao/FirewallRulesCidrsVO.java similarity index 98% rename from server/src/com/cloud/network/FirewallRulesCidrsVO.java rename to server/src/com/cloud/network/dao/FirewallRulesCidrsVO.java index 0048dce8dab..75b8919d645 100644 --- a/server/src/com/cloud/network/FirewallRulesCidrsVO.java +++ b/server/src/com/cloud/network/dao/FirewallRulesCidrsVO.java @@ -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.network; +package com.cloud.network.dao; import org.apache.cloudstack.api.InternalIdentity; diff --git a/server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java b/server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java index 0c79676b8e1..e671f6f73de 100644 --- a/server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java +++ b/server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java @@ -23,7 +23,6 @@ import javax.inject.Inject; import org.springframework.stereotype.Component; -import com.cloud.network.IPAddressVO; import com.cloud.network.rules.FirewallRule; import com.cloud.network.rules.FirewallRule.FirewallRuleType; import com.cloud.network.rules.FirewallRule.Purpose; diff --git a/server/src/com/cloud/network/dao/IPAddressDao.java b/server/src/com/cloud/network/dao/IPAddressDao.java index ccf3f06b33c..9cdb975d208 100755 --- a/server/src/com/cloud/network/dao/IPAddressDao.java +++ b/server/src/com/cloud/network/dao/IPAddressDao.java @@ -19,7 +19,6 @@ package com.cloud.network.dao; import java.util.List; import com.cloud.dc.Vlan.VlanType; -import com.cloud.network.IPAddressVO; import com.cloud.utils.db.GenericDao; import com.cloud.utils.net.Ip; diff --git a/server/src/com/cloud/network/dao/IPAddressDaoImpl.java b/server/src/com/cloud/network/dao/IPAddressDaoImpl.java index 4d6bd080e2a..e7067d98156 100755 --- a/server/src/com/cloud/network/dao/IPAddressDaoImpl.java +++ b/server/src/com/cloud/network/dao/IPAddressDaoImpl.java @@ -31,7 +31,6 @@ import org.springframework.stereotype.Component; import com.cloud.dc.Vlan.VlanType; import com.cloud.dc.VlanVO; import com.cloud.dc.dao.VlanDaoImpl; -import com.cloud.network.IPAddressVO; import com.cloud.network.IpAddress.State; import com.cloud.server.ResourceTag.TaggedResourceType; import com.cloud.tags.dao.ResourceTagsDaoImpl; diff --git a/server/src/com/cloud/network/IPAddressVO.java b/server/src/com/cloud/network/dao/IPAddressVO.java similarity index 98% rename from server/src/com/cloud/network/IPAddressVO.java rename to server/src/com/cloud/network/dao/IPAddressVO.java index c17d68f0787..00da5eb9a39 100644 --- a/server/src/com/cloud/network/IPAddressVO.java +++ b/server/src/com/cloud/network/dao/IPAddressVO.java @@ -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.network; +package com.cloud.network.dao; import java.util.Date; import java.util.UUID; @@ -32,6 +32,9 @@ import javax.persistence.TemporalType; import javax.persistence.Transient; import org.apache.cloudstack.api.Identity; + +import com.cloud.network.IpAddress; +import com.cloud.network.IpAddress.State; import com.cloud.utils.net.Ip; import org.apache.cloudstack.api.InternalIdentity; diff --git a/server/src/com/cloud/network/dao/InlineLoadBalancerNicMapDao.java b/server/src/com/cloud/network/dao/InlineLoadBalancerNicMapDao.java index 6f73075b0f8..36a8eef9a70 100644 --- a/server/src/com/cloud/network/dao/InlineLoadBalancerNicMapDao.java +++ b/server/src/com/cloud/network/dao/InlineLoadBalancerNicMapDao.java @@ -16,7 +16,6 @@ // under the License. package com.cloud.network.dao; -import com.cloud.network.InlineLoadBalancerNicMapVO; import com.cloud.utils.db.GenericDao; public interface InlineLoadBalancerNicMapDao extends GenericDao { diff --git a/server/src/com/cloud/network/dao/InlineLoadBalancerNicMapDaoImpl.java b/server/src/com/cloud/network/dao/InlineLoadBalancerNicMapDaoImpl.java index 1d21d4f696d..f3f04ed7f08 100644 --- a/server/src/com/cloud/network/dao/InlineLoadBalancerNicMapDaoImpl.java +++ b/server/src/com/cloud/network/dao/InlineLoadBalancerNicMapDaoImpl.java @@ -20,7 +20,6 @@ import javax.ejb.Local; import org.springframework.stereotype.Component; -import com.cloud.network.InlineLoadBalancerNicMapVO; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchCriteria; diff --git a/server/src/com/cloud/network/InlineLoadBalancerNicMapVO.java b/server/src/com/cloud/network/dao/InlineLoadBalancerNicMapVO.java similarity index 98% rename from server/src/com/cloud/network/InlineLoadBalancerNicMapVO.java rename to server/src/com/cloud/network/dao/InlineLoadBalancerNicMapVO.java index 297aa2d26e4..35aeefa1fdb 100644 --- a/server/src/com/cloud/network/InlineLoadBalancerNicMapVO.java +++ b/server/src/com/cloud/network/dao/InlineLoadBalancerNicMapVO.java @@ -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.network; +package com.cloud.network.dao; import org.apache.cloudstack.api.InternalIdentity; diff --git a/server/src/com/cloud/network/dao/LBStickinessPolicyDao.java b/server/src/com/cloud/network/dao/LBStickinessPolicyDao.java index 0e9c0af4aee..9a25c1a4e96 100644 --- a/server/src/com/cloud/network/dao/LBStickinessPolicyDao.java +++ b/server/src/com/cloud/network/dao/LBStickinessPolicyDao.java @@ -18,7 +18,6 @@ package com.cloud.network.dao; import java.util.List; -import com.cloud.network.LBStickinessPolicyVO; import com.cloud.utils.db.GenericDao; diff --git a/server/src/com/cloud/network/dao/LBStickinessPolicyDaoImpl.java b/server/src/com/cloud/network/dao/LBStickinessPolicyDaoImpl.java index 59e31f24440..43b46692bb3 100644 --- a/server/src/com/cloud/network/dao/LBStickinessPolicyDaoImpl.java +++ b/server/src/com/cloud/network/dao/LBStickinessPolicyDaoImpl.java @@ -22,7 +22,6 @@ import javax.ejb.Local; import org.springframework.stereotype.Component; -import com.cloud.network.LBStickinessPolicyVO; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchCriteria; diff --git a/server/src/com/cloud/network/LBStickinessPolicyVO.java b/server/src/com/cloud/network/dao/LBStickinessPolicyVO.java similarity index 99% rename from server/src/com/cloud/network/LBStickinessPolicyVO.java rename to server/src/com/cloud/network/dao/LBStickinessPolicyVO.java index 9a629ce017c..3fbba68c32d 100644 --- a/server/src/com/cloud/network/LBStickinessPolicyVO.java +++ b/server/src/com/cloud/network/dao/LBStickinessPolicyVO.java @@ -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.network; +package com.cloud.network.dao; import java.util.ArrayList; import java.util.HashMap; diff --git a/server/src/com/cloud/network/dao/LoadBalancerDao.java b/server/src/com/cloud/network/dao/LoadBalancerDao.java index 3e772a04d75..611282e5693 100644 --- a/server/src/com/cloud/network/dao/LoadBalancerDao.java +++ b/server/src/com/cloud/network/dao/LoadBalancerDao.java @@ -18,7 +18,6 @@ package com.cloud.network.dao; import java.util.List; -import com.cloud.network.LoadBalancerVO; import com.cloud.utils.db.GenericDao; public interface LoadBalancerDao extends GenericDao { diff --git a/server/src/com/cloud/network/dao/LoadBalancerDaoImpl.java b/server/src/com/cloud/network/dao/LoadBalancerDaoImpl.java index ec9dbc57a71..547dc608e73 100644 --- a/server/src/com/cloud/network/dao/LoadBalancerDaoImpl.java +++ b/server/src/com/cloud/network/dao/LoadBalancerDaoImpl.java @@ -27,7 +27,6 @@ import javax.inject.Inject; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; -import com.cloud.network.LoadBalancerVO; import com.cloud.network.rules.FirewallRule.State; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; diff --git a/server/src/com/cloud/network/dao/LoadBalancerVMMapDao.java b/server/src/com/cloud/network/dao/LoadBalancerVMMapDao.java index f717344ac2e..e122d0a9510 100644 --- a/server/src/com/cloud/network/dao/LoadBalancerVMMapDao.java +++ b/server/src/com/cloud/network/dao/LoadBalancerVMMapDao.java @@ -18,7 +18,6 @@ package com.cloud.network.dao; import java.util.List; -import com.cloud.network.LoadBalancerVMMapVO; import com.cloud.utils.db.GenericDao; public interface LoadBalancerVMMapDao extends GenericDao { diff --git a/server/src/com/cloud/network/dao/LoadBalancerVMMapDaoImpl.java b/server/src/com/cloud/network/dao/LoadBalancerVMMapDaoImpl.java index a1a1c4fffa6..8f979cd680f 100644 --- a/server/src/com/cloud/network/dao/LoadBalancerVMMapDaoImpl.java +++ b/server/src/com/cloud/network/dao/LoadBalancerVMMapDaoImpl.java @@ -22,7 +22,6 @@ import javax.ejb.Local; import org.springframework.stereotype.Component; -import com.cloud.network.LoadBalancerVMMapVO; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.GenericSearchBuilder; import com.cloud.utils.db.SearchCriteria; diff --git a/server/src/com/cloud/network/LoadBalancerVMMapVO.java b/server/src/com/cloud/network/dao/LoadBalancerVMMapVO.java similarity index 98% rename from server/src/com/cloud/network/LoadBalancerVMMapVO.java rename to server/src/com/cloud/network/dao/LoadBalancerVMMapVO.java index 3cc66dc9011..8856993a982 100644 --- a/server/src/com/cloud/network/LoadBalancerVMMapVO.java +++ b/server/src/com/cloud/network/dao/LoadBalancerVMMapVO.java @@ -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.network; +package com.cloud.network.dao; import org.apache.cloudstack.api.InternalIdentity; diff --git a/server/src/com/cloud/network/LoadBalancerVO.java b/server/src/com/cloud/network/dao/LoadBalancerVO.java similarity index 98% rename from server/src/com/cloud/network/LoadBalancerVO.java rename to server/src/com/cloud/network/dao/LoadBalancerVO.java index df7c01d5644..5422f41774b 100644 --- a/server/src/com/cloud/network/LoadBalancerVO.java +++ b/server/src/com/cloud/network/dao/LoadBalancerVO.java @@ -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.network; +package com.cloud.network.dao; import javax.persistence.Column; import javax.persistence.DiscriminatorValue; diff --git a/server/src/com/cloud/network/NetworkAccountDaoImpl.java b/server/src/com/cloud/network/dao/NetworkAccountDaoImpl.java similarity index 97% rename from server/src/com/cloud/network/NetworkAccountDaoImpl.java rename to server/src/com/cloud/network/dao/NetworkAccountDaoImpl.java index e8ff27cc543..f0b71562f62 100644 --- a/server/src/com/cloud/network/NetworkAccountDaoImpl.java +++ b/server/src/com/cloud/network/dao/NetworkAccountDaoImpl.java @@ -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.network; +package com.cloud.network.dao; import org.springframework.stereotype.Component; diff --git a/server/src/com/cloud/network/NetworkAccountVO.java b/server/src/com/cloud/network/dao/NetworkAccountVO.java similarity index 98% rename from server/src/com/cloud/network/NetworkAccountVO.java rename to server/src/com/cloud/network/dao/NetworkAccountVO.java index b51e78cce4c..afce805e155 100644 --- a/server/src/com/cloud/network/NetworkAccountVO.java +++ b/server/src/com/cloud/network/dao/NetworkAccountVO.java @@ -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.network; +package com.cloud.network.dao; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/server/src/com/cloud/network/dao/NetworkDao.java b/server/src/com/cloud/network/dao/NetworkDao.java index 1fefb75a360..342a2c5017d 100644 --- a/server/src/com/cloud/network/dao/NetworkDao.java +++ b/server/src/com/cloud/network/dao/NetworkDao.java @@ -21,8 +21,6 @@ import java.util.Map; import com.cloud.network.Network; import com.cloud.network.Network.GuestType; -import com.cloud.network.NetworkAccountVO; -import com.cloud.network.NetworkVO; import com.cloud.network.Networks.TrafficType; import com.cloud.utils.db.GenericDao; import com.cloud.utils.db.SearchBuilder; diff --git a/server/src/com/cloud/network/dao/NetworkDaoImpl.java b/server/src/com/cloud/network/dao/NetworkDaoImpl.java index 206373ec8fb..60f421bab75 100644 --- a/server/src/com/cloud/network/dao/NetworkDaoImpl.java +++ b/server/src/com/cloud/network/dao/NetworkDaoImpl.java @@ -32,11 +32,6 @@ import com.cloud.network.Network; import com.cloud.network.Network.GuestType; import com.cloud.network.Network.Provider; import com.cloud.network.Network.Service; -import com.cloud.network.NetworkAccountDaoImpl; -import com.cloud.network.NetworkAccountVO; -import com.cloud.network.NetworkDomainVO; -import com.cloud.network.NetworkServiceMapVO; -import com.cloud.network.NetworkVO; import com.cloud.network.Networks.BroadcastDomainType; import com.cloud.network.Networks.Mode; import com.cloud.network.Networks.TrafficType; diff --git a/server/src/com/cloud/network/dao/NetworkDomainDao.java b/server/src/com/cloud/network/dao/NetworkDomainDao.java index df808bfd511..66898925c55 100644 --- a/server/src/com/cloud/network/dao/NetworkDomainDao.java +++ b/server/src/com/cloud/network/dao/NetworkDomainDao.java @@ -18,7 +18,6 @@ package com.cloud.network.dao; import java.util.List; -import com.cloud.network.NetworkDomainVO; import com.cloud.utils.db.GenericDao; public interface NetworkDomainDao extends GenericDao{ diff --git a/server/src/com/cloud/network/dao/NetworkDomainDaoImpl.java b/server/src/com/cloud/network/dao/NetworkDomainDaoImpl.java index ba7bb23a292..bbb920337c8 100644 --- a/server/src/com/cloud/network/dao/NetworkDomainDaoImpl.java +++ b/server/src/com/cloud/network/dao/NetworkDomainDaoImpl.java @@ -23,7 +23,6 @@ import javax.ejb.Local; import org.springframework.stereotype.Component; -import com.cloud.network.NetworkDomainVO; import com.cloud.utils.db.DB; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; diff --git a/server/src/com/cloud/network/NetworkDomainVO.java b/server/src/com/cloud/network/dao/NetworkDomainVO.java similarity index 97% rename from server/src/com/cloud/network/NetworkDomainVO.java rename to server/src/com/cloud/network/dao/NetworkDomainVO.java index 9b79887f7a7..bb4e9047720 100644 --- a/server/src/com/cloud/network/NetworkDomainVO.java +++ b/server/src/com/cloud/network/dao/NetworkDomainVO.java @@ -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.network; +package com.cloud.network.dao; import javax.persistence.Column; import javax.persistence.Entity; @@ -40,6 +40,7 @@ public class NetworkDomainVO implements PartOf, InternalIdentity { long networkId; @Column(name="subdomain_access") + public Boolean subdomainAccess; protected NetworkDomainVO() { diff --git a/server/src/com/cloud/network/dao/NetworkExternalFirewallDao.java b/server/src/com/cloud/network/dao/NetworkExternalFirewallDao.java index fdef207a8f5..9e255dcf892 100644 --- a/server/src/com/cloud/network/dao/NetworkExternalFirewallDao.java +++ b/server/src/com/cloud/network/dao/NetworkExternalFirewallDao.java @@ -18,7 +18,6 @@ package com.cloud.network.dao; import java.util.List; -import com.cloud.network.NetworkExternalFirewallVO; import com.cloud.utils.db.GenericDao; public interface NetworkExternalFirewallDao extends GenericDao { diff --git a/server/src/com/cloud/network/dao/NetworkExternalFirewallDaoImpl.java b/server/src/com/cloud/network/dao/NetworkExternalFirewallDaoImpl.java index a90da618b2d..b1767609429 100644 --- a/server/src/com/cloud/network/dao/NetworkExternalFirewallDaoImpl.java +++ b/server/src/com/cloud/network/dao/NetworkExternalFirewallDaoImpl.java @@ -23,7 +23,6 @@ import javax.ejb.Local; import org.springframework.stereotype.Component; -import com.cloud.network.NetworkExternalFirewallVO; import com.cloud.utils.db.DB; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; diff --git a/server/src/com/cloud/network/NetworkExternalFirewallVO.java b/server/src/com/cloud/network/dao/NetworkExternalFirewallVO.java similarity index 98% rename from server/src/com/cloud/network/NetworkExternalFirewallVO.java rename to server/src/com/cloud/network/dao/NetworkExternalFirewallVO.java index 800e737137d..3c33dd5fb7f 100644 --- a/server/src/com/cloud/network/NetworkExternalFirewallVO.java +++ b/server/src/com/cloud/network/dao/NetworkExternalFirewallVO.java @@ -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.network; +package com.cloud.network.dao; import java.util.Date; import java.util.UUID; diff --git a/server/src/com/cloud/network/dao/NetworkExternalLoadBalancerDao.java b/server/src/com/cloud/network/dao/NetworkExternalLoadBalancerDao.java index 62a4f921dc0..527d376a2ec 100644 --- a/server/src/com/cloud/network/dao/NetworkExternalLoadBalancerDao.java +++ b/server/src/com/cloud/network/dao/NetworkExternalLoadBalancerDao.java @@ -18,7 +18,6 @@ package com.cloud.network.dao; import java.util.List; -import com.cloud.network.NetworkExternalLoadBalancerVO; import com.cloud.utils.db.GenericDao; public interface NetworkExternalLoadBalancerDao extends GenericDao { diff --git a/server/src/com/cloud/network/dao/NetworkExternalLoadBalancerDaoImpl.java b/server/src/com/cloud/network/dao/NetworkExternalLoadBalancerDaoImpl.java index 3995d564aa5..c29c164fd28 100644 --- a/server/src/com/cloud/network/dao/NetworkExternalLoadBalancerDaoImpl.java +++ b/server/src/com/cloud/network/dao/NetworkExternalLoadBalancerDaoImpl.java @@ -22,7 +22,6 @@ import javax.ejb.Local; import org.springframework.stereotype.Component; -import com.cloud.network.NetworkExternalLoadBalancerVO; import com.cloud.utils.db.DB; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; diff --git a/server/src/com/cloud/network/NetworkExternalLoadBalancerVO.java b/server/src/com/cloud/network/dao/NetworkExternalLoadBalancerVO.java similarity index 98% rename from server/src/com/cloud/network/NetworkExternalLoadBalancerVO.java rename to server/src/com/cloud/network/dao/NetworkExternalLoadBalancerVO.java index 17f9ffd2fee..820759ca71d 100644 --- a/server/src/com/cloud/network/NetworkExternalLoadBalancerVO.java +++ b/server/src/com/cloud/network/dao/NetworkExternalLoadBalancerVO.java @@ -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.network; +package com.cloud.network.dao; import java.util.Date; import java.util.UUID; diff --git a/server/src/com/cloud/network/dao/NetworkRuleConfigDao.java b/server/src/com/cloud/network/dao/NetworkRuleConfigDao.java index 3016926d84a..80e070aed88 100644 --- a/server/src/com/cloud/network/dao/NetworkRuleConfigDao.java +++ b/server/src/com/cloud/network/dao/NetworkRuleConfigDao.java @@ -18,7 +18,6 @@ package com.cloud.network.dao; import java.util.List; -import com.cloud.network.NetworkRuleConfigVO; import com.cloud.utils.db.GenericDao; public interface NetworkRuleConfigDao extends GenericDao { diff --git a/server/src/com/cloud/network/dao/NetworkRuleConfigDaoImpl.java b/server/src/com/cloud/network/dao/NetworkRuleConfigDaoImpl.java index 4d8b9d51e0d..a5af4fea428 100644 --- a/server/src/com/cloud/network/dao/NetworkRuleConfigDaoImpl.java +++ b/server/src/com/cloud/network/dao/NetworkRuleConfigDaoImpl.java @@ -22,7 +22,6 @@ import javax.ejb.Local; import org.springframework.stereotype.Component; -import com.cloud.network.NetworkRuleConfigVO; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; diff --git a/server/src/com/cloud/network/NetworkRuleConfigVO.java b/server/src/com/cloud/network/dao/NetworkRuleConfigVO.java similarity index 98% rename from server/src/com/cloud/network/NetworkRuleConfigVO.java rename to server/src/com/cloud/network/dao/NetworkRuleConfigVO.java index bbfae43b222..542c0bb90ae 100644 --- a/server/src/com/cloud/network/NetworkRuleConfigVO.java +++ b/server/src/com/cloud/network/dao/NetworkRuleConfigVO.java @@ -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.network; +package com.cloud.network.dao; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/server/src/com/cloud/network/dao/NetworkServiceMapDao.java b/server/src/com/cloud/network/dao/NetworkServiceMapDao.java index fbd3b14c35e..79b97bec0f1 100644 --- a/server/src/com/cloud/network/dao/NetworkServiceMapDao.java +++ b/server/src/com/cloud/network/dao/NetworkServiceMapDao.java @@ -20,7 +20,6 @@ import java.util.List; import com.cloud.network.Network.Provider; import com.cloud.network.Network.Service; -import com.cloud.network.NetworkServiceMapVO; import com.cloud.utils.db.GenericDao; /** diff --git a/server/src/com/cloud/network/dao/NetworkServiceMapDaoImpl.java b/server/src/com/cloud/network/dao/NetworkServiceMapDaoImpl.java index e603fd825aa..13fbfbc401f 100644 --- a/server/src/com/cloud/network/dao/NetworkServiceMapDaoImpl.java +++ b/server/src/com/cloud/network/dao/NetworkServiceMapDaoImpl.java @@ -26,7 +26,6 @@ import org.springframework.stereotype.Component; import com.cloud.exception.UnsupportedServiceException; import com.cloud.network.Network.Provider; import com.cloud.network.Network.Service; -import com.cloud.network.NetworkServiceMapVO; import com.cloud.utils.db.DB; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.GenericSearchBuilder; diff --git a/server/src/com/cloud/network/NetworkServiceMapVO.java b/server/src/com/cloud/network/dao/NetworkServiceMapVO.java similarity index 97% rename from server/src/com/cloud/network/NetworkServiceMapVO.java rename to server/src/com/cloud/network/dao/NetworkServiceMapVO.java index 592522d614d..7bb480b642c 100644 --- a/server/src/com/cloud/network/NetworkServiceMapVO.java +++ b/server/src/com/cloud/network/dao/NetworkServiceMapVO.java @@ -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.network; +package com.cloud.network.dao; import java.util.Date; @@ -25,6 +25,7 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; +import com.cloud.network.Network; import com.cloud.network.Network.Provider; import com.cloud.network.Network.Service; import com.cloud.utils.db.GenericDao; diff --git a/server/src/com/cloud/network/NetworkVO.java b/server/src/com/cloud/network/dao/NetworkVO.java similarity index 98% rename from server/src/com/cloud/network/NetworkVO.java rename to server/src/com/cloud/network/dao/NetworkVO.java index 14b643b29b7..b89cb6584c8 100644 --- a/server/src/com/cloud/network/NetworkVO.java +++ b/server/src/com/cloud/network/dao/NetworkVO.java @@ -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.network; +package com.cloud.network.dao; import java.net.URI; import java.util.Date; @@ -30,6 +30,11 @@ import javax.persistence.TableGenerator; import javax.persistence.Transient; import org.apache.cloudstack.acl.ControlledEntity; + +import com.cloud.network.Network; +import com.cloud.network.Networks; +import com.cloud.network.Network.GuestType; +import com.cloud.network.Network.State; import com.cloud.network.Networks.BroadcastDomainType; import com.cloud.network.Networks.Mode; import com.cloud.network.Networks.TrafficType; diff --git a/server/src/com/cloud/network/dao/PhysicalNetworkDao.java b/server/src/com/cloud/network/dao/PhysicalNetworkDao.java index 94e7b3ce232..891fbfdb3bd 100644 --- a/server/src/com/cloud/network/dao/PhysicalNetworkDao.java +++ b/server/src/com/cloud/network/dao/PhysicalNetworkDao.java @@ -19,7 +19,6 @@ package com.cloud.network.dao; import java.util.List; import com.cloud.network.Networks.TrafficType; -import com.cloud.network.PhysicalNetworkVO; import com.cloud.utils.db.GenericDao; public interface PhysicalNetworkDao extends GenericDao { diff --git a/server/src/com/cloud/network/dao/PhysicalNetworkDaoImpl.java b/server/src/com/cloud/network/dao/PhysicalNetworkDaoImpl.java index f4648fbcde7..8e67d8bb5e8 100644 --- a/server/src/com/cloud/network/dao/PhysicalNetworkDaoImpl.java +++ b/server/src/com/cloud/network/dao/PhysicalNetworkDaoImpl.java @@ -24,7 +24,6 @@ import javax.inject.Inject; import org.springframework.stereotype.Component; import com.cloud.network.Networks.TrafficType; -import com.cloud.network.PhysicalNetworkVO; import com.cloud.utils.db.DB; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.JoinBuilder; diff --git a/server/src/com/cloud/network/PhysicalNetworkVO.java b/server/src/com/cloud/network/dao/PhysicalNetworkVO.java similarity index 97% rename from server/src/com/cloud/network/PhysicalNetworkVO.java rename to server/src/com/cloud/network/dao/PhysicalNetworkVO.java index 9bf8601c503..e5ffcfb7c0d 100644 --- a/server/src/com/cloud/network/PhysicalNetworkVO.java +++ b/server/src/com/cloud/network/dao/PhysicalNetworkVO.java @@ -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.network; +package com.cloud.network.dao; import java.util.ArrayList; import java.util.Date; @@ -33,6 +33,9 @@ import javax.persistence.JoinColumn; import javax.persistence.Table; import javax.persistence.TableGenerator; +import com.cloud.network.PhysicalNetwork; +import com.cloud.network.PhysicalNetwork.BroadcastDomainRange; +import com.cloud.network.PhysicalNetwork.State; import com.cloud.utils.NumbersUtil; import com.cloud.utils.db.GenericDao; import org.apache.cloudstack.api.InternalIdentity; diff --git a/server/src/com/cloud/network/dao/PortProfileDao.java b/server/src/com/cloud/network/dao/PortProfileDao.java index 4d4aafd2ea3..5ecd8f4a830 100644 --- a/server/src/com/cloud/network/dao/PortProfileDao.java +++ b/server/src/com/cloud/network/dao/PortProfileDao.java @@ -17,7 +17,6 @@ package com.cloud.network.dao; import java.util.List; -import com.cloud.network.PortProfileVO; import com.cloud.utils.db.GenericDao; public interface PortProfileDao extends GenericDao { diff --git a/server/src/com/cloud/network/dao/PortProfileDaoImpl.java b/server/src/com/cloud/network/dao/PortProfileDaoImpl.java index 80e6368810b..61fe52a23bc 100644 --- a/server/src/com/cloud/network/dao/PortProfileDaoImpl.java +++ b/server/src/com/cloud/network/dao/PortProfileDaoImpl.java @@ -25,7 +25,6 @@ import javax.ejb.Local; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; -import com.cloud.network.PortProfileVO; import com.cloud.utils.db.DB; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; diff --git a/server/src/com/cloud/network/PortProfileVO.java b/server/src/com/cloud/network/dao/PortProfileVO.java similarity index 99% rename from server/src/com/cloud/network/PortProfileVO.java rename to server/src/com/cloud/network/dao/PortProfileVO.java index 8a7b9d88fe4..6227348ab5c 100644 --- a/server/src/com/cloud/network/PortProfileVO.java +++ b/server/src/com/cloud/network/dao/PortProfileVO.java @@ -16,7 +16,7 @@ // under the License. -package com.cloud.network; +package com.cloud.network.dao; import java.util.UUID; diff --git a/server/src/com/cloud/network/dao/RemoteAccessVpnDao.java b/server/src/com/cloud/network/dao/RemoteAccessVpnDao.java index 6b67514848e..6e3b48355e7 100644 --- a/server/src/com/cloud/network/dao/RemoteAccessVpnDao.java +++ b/server/src/com/cloud/network/dao/RemoteAccessVpnDao.java @@ -19,7 +19,6 @@ package com.cloud.network.dao; import java.util.List; import com.cloud.network.RemoteAccessVpn; -import com.cloud.network.RemoteAccessVpnVO; import com.cloud.utils.db.GenericDao; public interface RemoteAccessVpnDao extends GenericDao { diff --git a/server/src/com/cloud/network/dao/RemoteAccessVpnDaoImpl.java b/server/src/com/cloud/network/dao/RemoteAccessVpnDaoImpl.java index d91226ea1ca..ed732d8e43d 100644 --- a/server/src/com/cloud/network/dao/RemoteAccessVpnDaoImpl.java +++ b/server/src/com/cloud/network/dao/RemoteAccessVpnDaoImpl.java @@ -24,7 +24,6 @@ import org.apache.log4j.Logger; import org.springframework.stereotype.Component; import com.cloud.network.RemoteAccessVpn; -import com.cloud.network.RemoteAccessVpnVO; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; diff --git a/server/src/com/cloud/network/RemoteAccessVpnVO.java b/server/src/com/cloud/network/dao/RemoteAccessVpnVO.java similarity index 95% rename from server/src/com/cloud/network/RemoteAccessVpnVO.java rename to server/src/com/cloud/network/dao/RemoteAccessVpnVO.java index 7c3aab101bc..478decfe47b 100644 --- a/server/src/com/cloud/network/RemoteAccessVpnVO.java +++ b/server/src/com/cloud/network/dao/RemoteAccessVpnVO.java @@ -14,13 +14,16 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.network; +package com.cloud.network.dao; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; +import com.cloud.network.RemoteAccessVpn; +import com.cloud.network.RemoteAccessVpn.State; + @Entity @Table(name=("remote_access_vpn")) public class RemoteAccessVpnVO implements RemoteAccessVpn { diff --git a/server/src/com/cloud/network/dao/RouterNetworkDaoImpl.java b/server/src/com/cloud/network/dao/RouterNetworkDaoImpl.java index 06c6f8a5d63..e560713aca5 100644 --- a/server/src/com/cloud/network/dao/RouterNetworkDaoImpl.java +++ b/server/src/com/cloud/network/dao/RouterNetworkDaoImpl.java @@ -20,7 +20,6 @@ import java.util.List; import org.springframework.stereotype.Component; -import com.cloud.network.RouterNetworkVO; import com.cloud.utils.db.GenericDao; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.GenericSearchBuilder; diff --git a/server/src/com/cloud/network/RouterNetworkVO.java b/server/src/com/cloud/network/dao/RouterNetworkVO.java similarity index 96% rename from server/src/com/cloud/network/RouterNetworkVO.java rename to server/src/com/cloud/network/dao/RouterNetworkVO.java index ee58521e2a2..c4fe9a5fef6 100644 --- a/server/src/com/cloud/network/RouterNetworkVO.java +++ b/server/src/com/cloud/network/dao/RouterNetworkVO.java @@ -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.network; +package com.cloud.network.dao; import javax.persistence.Column; import javax.persistence.Entity; @@ -25,6 +25,7 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; +import com.cloud.network.Network; import com.cloud.network.Network.GuestType; import org.apache.cloudstack.api.InternalIdentity; diff --git a/server/src/com/cloud/network/dao/Site2SiteCustomerGatewayDao.java b/server/src/com/cloud/network/dao/Site2SiteCustomerGatewayDao.java index 997322b6846..20ef12d2681 100644 --- a/server/src/com/cloud/network/dao/Site2SiteCustomerGatewayDao.java +++ b/server/src/com/cloud/network/dao/Site2SiteCustomerGatewayDao.java @@ -18,7 +18,6 @@ package com.cloud.network.dao; import java.util.List; -import com.cloud.network.Site2SiteCustomerGatewayVO; import com.cloud.utils.db.GenericDao; public interface Site2SiteCustomerGatewayDao extends GenericDao { diff --git a/server/src/com/cloud/network/dao/Site2SiteCustomerGatewayDaoImpl.java b/server/src/com/cloud/network/dao/Site2SiteCustomerGatewayDaoImpl.java index 449b2a9648b..fcb533adfff 100644 --- a/server/src/com/cloud/network/dao/Site2SiteCustomerGatewayDaoImpl.java +++ b/server/src/com/cloud/network/dao/Site2SiteCustomerGatewayDaoImpl.java @@ -23,7 +23,6 @@ import javax.ejb.Local; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; -import com.cloud.network.Site2SiteCustomerGatewayVO; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; diff --git a/server/src/com/cloud/network/Site2SiteCustomerGatewayVO.java b/server/src/com/cloud/network/dao/Site2SiteCustomerGatewayVO.java similarity index 98% rename from server/src/com/cloud/network/Site2SiteCustomerGatewayVO.java rename to server/src/com/cloud/network/dao/Site2SiteCustomerGatewayVO.java index c327b1e33e5..80130efe233 100644 --- a/server/src/com/cloud/network/Site2SiteCustomerGatewayVO.java +++ b/server/src/com/cloud/network/dao/Site2SiteCustomerGatewayVO.java @@ -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.network; +package com.cloud.network.dao; import java.util.Date; import java.util.UUID; @@ -26,6 +26,7 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; +import com.cloud.network.Site2SiteCustomerGateway; import com.cloud.utils.db.GenericDao; import org.apache.cloudstack.api.InternalIdentity; diff --git a/server/src/com/cloud/network/dao/Site2SiteVpnConnectionDao.java b/server/src/com/cloud/network/dao/Site2SiteVpnConnectionDao.java index e3391ba07fb..66d5a4a56ce 100644 --- a/server/src/com/cloud/network/dao/Site2SiteVpnConnectionDao.java +++ b/server/src/com/cloud/network/dao/Site2SiteVpnConnectionDao.java @@ -18,7 +18,6 @@ package com.cloud.network.dao; import java.util.List; -import com.cloud.network.Site2SiteVpnConnectionVO; import com.cloud.utils.db.GenericDao; public interface Site2SiteVpnConnectionDao extends GenericDao { diff --git a/server/src/com/cloud/network/dao/Site2SiteVpnConnectionDaoImpl.java b/server/src/com/cloud/network/dao/Site2SiteVpnConnectionDaoImpl.java index 8ad61767cae..2830abe699f 100644 --- a/server/src/com/cloud/network/dao/Site2SiteVpnConnectionDaoImpl.java +++ b/server/src/com/cloud/network/dao/Site2SiteVpnConnectionDaoImpl.java @@ -25,8 +25,6 @@ import javax.inject.Inject; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; -import com.cloud.network.Site2SiteVpnConnectionVO; -import com.cloud.network.Site2SiteVpnGatewayVO; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.JoinBuilder.JoinType; import com.cloud.utils.db.SearchBuilder; diff --git a/server/src/com/cloud/network/Site2SiteVpnConnectionVO.java b/server/src/com/cloud/network/dao/Site2SiteVpnConnectionVO.java similarity index 96% rename from server/src/com/cloud/network/Site2SiteVpnConnectionVO.java rename to server/src/com/cloud/network/dao/Site2SiteVpnConnectionVO.java index 99f807f06b2..f8eeb8a9912 100644 --- a/server/src/com/cloud/network/Site2SiteVpnConnectionVO.java +++ b/server/src/com/cloud/network/dao/Site2SiteVpnConnectionVO.java @@ -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.network; +package com.cloud.network.dao; import java.util.Date; import java.util.UUID; @@ -28,6 +28,8 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; +import com.cloud.network.Site2SiteVpnConnection; +import com.cloud.network.Site2SiteVpnConnection.State; import com.cloud.utils.db.GenericDao; import org.apache.cloudstack.api.InternalIdentity; diff --git a/server/src/com/cloud/network/dao/Site2SiteVpnGatewayDao.java b/server/src/com/cloud/network/dao/Site2SiteVpnGatewayDao.java index b084e6ef38c..9b393e60c1c 100644 --- a/server/src/com/cloud/network/dao/Site2SiteVpnGatewayDao.java +++ b/server/src/com/cloud/network/dao/Site2SiteVpnGatewayDao.java @@ -16,7 +16,6 @@ // under the License. package com.cloud.network.dao; -import com.cloud.network.Site2SiteVpnGatewayVO; import com.cloud.utils.db.GenericDao; public interface Site2SiteVpnGatewayDao extends GenericDao { diff --git a/server/src/com/cloud/network/dao/Site2SiteVpnGatewayDaoImpl.java b/server/src/com/cloud/network/dao/Site2SiteVpnGatewayDaoImpl.java index 491b172c082..8305978f26c 100644 --- a/server/src/com/cloud/network/dao/Site2SiteVpnGatewayDaoImpl.java +++ b/server/src/com/cloud/network/dao/Site2SiteVpnGatewayDaoImpl.java @@ -22,7 +22,6 @@ import javax.inject.Inject; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; -import com.cloud.network.Site2SiteVpnGatewayVO; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; diff --git a/server/src/com/cloud/network/Site2SiteVpnGatewayVO.java b/server/src/com/cloud/network/dao/Site2SiteVpnGatewayVO.java similarity index 97% rename from server/src/com/cloud/network/Site2SiteVpnGatewayVO.java rename to server/src/com/cloud/network/dao/Site2SiteVpnGatewayVO.java index ada50c40869..1e12971d973 100644 --- a/server/src/com/cloud/network/Site2SiteVpnGatewayVO.java +++ b/server/src/com/cloud/network/dao/Site2SiteVpnGatewayVO.java @@ -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.network; +package com.cloud.network.dao; import java.util.Date; import java.util.UUID; @@ -26,6 +26,7 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; +import com.cloud.network.Site2SiteVpnGateway; import com.cloud.utils.db.GenericDao; import org.apache.cloudstack.api.InternalIdentity; diff --git a/server/src/com/cloud/network/firewall/FirewallManagerImpl.java b/server/src/com/cloud/network/firewall/FirewallManagerImpl.java index c3fc03ba424..d9123501060 100644 --- a/server/src/com/cloud/network/firewall/FirewallManagerImpl.java +++ b/server/src/com/cloud/network/firewall/FirewallManagerImpl.java @@ -42,7 +42,6 @@ import com.cloud.event.dao.UsageEventDao; import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.NetworkRuleConflictException; import com.cloud.exception.ResourceUnavailableException; -import com.cloud.network.IPAddressVO; import com.cloud.network.IpAddress; import com.cloud.network.Network; import com.cloud.network.Network.Capability; @@ -53,6 +52,7 @@ import com.cloud.network.NetworkRuleApplier; import com.cloud.network.dao.FirewallRulesCidrsDao; import com.cloud.network.dao.FirewallRulesDao; import com.cloud.network.dao.IPAddressDao; +import com.cloud.network.dao.IPAddressVO; import com.cloud.network.element.FirewallServiceProvider; import com.cloud.network.element.NetworkACLServiceProvider; import com.cloud.network.element.PortForwardingServiceProvider; diff --git a/server/src/com/cloud/network/guru/ControlNetworkGuru.java b/server/src/com/cloud/network/guru/ControlNetworkGuru.java index d095e349324..060038d2420 100755 --- a/server/src/com/cloud/network/guru/ControlNetworkGuru.java +++ b/server/src/com/cloud/network/guru/ControlNetworkGuru.java @@ -38,11 +38,11 @@ import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.network.Network; import com.cloud.network.NetworkModel; import com.cloud.network.NetworkProfile; -import com.cloud.network.NetworkVO; import com.cloud.network.Networks.AddressFormat; import com.cloud.network.Networks.BroadcastDomainType; import com.cloud.network.Networks.Mode; import com.cloud.network.Networks.TrafficType; +import com.cloud.network.dao.NetworkVO; import com.cloud.offering.NetworkOffering; import com.cloud.user.Account; import com.cloud.utils.exception.CloudRuntimeException; diff --git a/server/src/com/cloud/network/guru/DirectNetworkGuru.java b/server/src/com/cloud/network/guru/DirectNetworkGuru.java index 209031bcd6e..4be7491cc45 100755 --- a/server/src/com/cloud/network/guru/DirectNetworkGuru.java +++ b/server/src/com/cloud/network/guru/DirectNetworkGuru.java @@ -31,7 +31,6 @@ import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientAddressCapacityException; import com.cloud.exception.InsufficientVirtualNetworkCapcityException; import com.cloud.exception.InvalidParameterValueException; -import com.cloud.network.IPAddressVO; import com.cloud.network.Network; import com.cloud.network.Network.GuestType; import com.cloud.network.Network.Service; @@ -39,11 +38,12 @@ import com.cloud.network.Network.State; import com.cloud.network.NetworkManager; import com.cloud.network.NetworkModel; import com.cloud.network.NetworkProfile; -import com.cloud.network.NetworkVO; import com.cloud.network.Networks.BroadcastDomainType; import com.cloud.network.Networks.Mode; import com.cloud.network.Networks.TrafficType; import com.cloud.network.dao.IPAddressDao; +import com.cloud.network.dao.IPAddressVO; +import com.cloud.network.dao.NetworkVO; import com.cloud.offering.NetworkOffering; import com.cloud.offerings.dao.NetworkOfferingDao; import com.cloud.user.Account; diff --git a/server/src/com/cloud/network/guru/DirectPodBasedNetworkGuru.java b/server/src/com/cloud/network/guru/DirectPodBasedNetworkGuru.java index 362f4fe8ae4..ead7c277493 100755 --- a/server/src/com/cloud/network/guru/DirectPodBasedNetworkGuru.java +++ b/server/src/com/cloud/network/guru/DirectPodBasedNetworkGuru.java @@ -38,13 +38,13 @@ import com.cloud.deploy.DeployDestination; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientAddressCapacityException; import com.cloud.exception.InsufficientVirtualNetworkCapcityException; -import com.cloud.network.IPAddressVO; import com.cloud.network.Network; import com.cloud.network.NetworkManager; import com.cloud.network.Networks.AddressFormat; import com.cloud.network.Networks.BroadcastDomainType; import com.cloud.network.addr.PublicIp; import com.cloud.network.dao.IPAddressDao; +import com.cloud.network.dao.IPAddressVO; import com.cloud.offering.NetworkOffering; import com.cloud.offerings.dao.NetworkOfferingDao; import com.cloud.utils.db.DB; diff --git a/server/src/com/cloud/network/guru/ExternalGuestNetworkGuru.java b/server/src/com/cloud/network/guru/ExternalGuestNetworkGuru.java index a883ef0f26b..ba694017b0b 100644 --- a/server/src/com/cloud/network/guru/ExternalGuestNetworkGuru.java +++ b/server/src/com/cloud/network/guru/ExternalGuestNetworkGuru.java @@ -38,11 +38,11 @@ import com.cloud.network.Network; import com.cloud.network.Network.GuestType; import com.cloud.network.Network.State; import com.cloud.network.NetworkManager; -import com.cloud.network.NetworkVO; import com.cloud.network.Networks.BroadcastDomainType; import com.cloud.network.PhysicalNetwork; import com.cloud.network.PhysicalNetwork.IsolationMethod; import com.cloud.network.dao.NetworkDao; +import com.cloud.network.dao.NetworkVO; import com.cloud.network.rules.PortForwardingRuleVO; import com.cloud.network.rules.dao.PortForwardingRulesDao; import com.cloud.offering.NetworkOffering; diff --git a/server/src/com/cloud/network/guru/GuestNetworkGuru.java b/server/src/com/cloud/network/guru/GuestNetworkGuru.java index 2d7865f75e1..cfdca941880 100755 --- a/server/src/com/cloud/network/guru/GuestNetworkGuru.java +++ b/server/src/com/cloud/network/guru/GuestNetworkGuru.java @@ -43,23 +43,23 @@ import com.cloud.event.EventVO; import com.cloud.exception.InsufficientAddressCapacityException; import com.cloud.exception.InsufficientVirtualNetworkCapcityException; import com.cloud.exception.InvalidParameterValueException; -import com.cloud.network.IPAddressVO; import com.cloud.network.Network; import com.cloud.network.Network.State; import com.cloud.network.NetworkManager; import com.cloud.network.NetworkModel; import com.cloud.network.NetworkProfile; -import com.cloud.network.NetworkVO; import com.cloud.network.Networks.AddressFormat; import com.cloud.network.Networks.BroadcastDomainType; import com.cloud.network.Networks.Mode; import com.cloud.network.Networks.TrafficType; import com.cloud.network.PhysicalNetwork; import com.cloud.network.PhysicalNetwork.IsolationMethod; -import com.cloud.network.PhysicalNetworkVO; import com.cloud.network.dao.IPAddressDao; +import com.cloud.network.dao.IPAddressVO; import com.cloud.network.dao.NetworkDao; +import com.cloud.network.dao.NetworkVO; import com.cloud.network.dao.PhysicalNetworkDao; +import com.cloud.network.dao.PhysicalNetworkVO; import com.cloud.offering.NetworkOffering; import com.cloud.user.Account; import com.cloud.user.UserContext; diff --git a/server/src/com/cloud/network/guru/PodBasedNetworkGuru.java b/server/src/com/cloud/network/guru/PodBasedNetworkGuru.java index fd706897e3c..f89ce54aeea 100755 --- a/server/src/com/cloud/network/guru/PodBasedNetworkGuru.java +++ b/server/src/com/cloud/network/guru/PodBasedNetworkGuru.java @@ -31,11 +31,11 @@ import com.cloud.exception.InsufficientAddressCapacityException; import com.cloud.exception.InsufficientVirtualNetworkCapcityException; import com.cloud.network.Network; import com.cloud.network.NetworkProfile; -import com.cloud.network.NetworkVO; import com.cloud.network.Networks.AddressFormat; import com.cloud.network.Networks.BroadcastDomainType; import com.cloud.network.Networks.Mode; import com.cloud.network.Networks.TrafficType; +import com.cloud.network.dao.NetworkVO; import com.cloud.network.StorageNetworkManager; import com.cloud.offering.NetworkOffering; import com.cloud.user.Account; diff --git a/server/src/com/cloud/network/guru/PrivateNetworkGuru.java b/server/src/com/cloud/network/guru/PrivateNetworkGuru.java index bebfd539bc4..2e266e7b780 100644 --- a/server/src/com/cloud/network/guru/PrivateNetworkGuru.java +++ b/server/src/com/cloud/network/guru/PrivateNetworkGuru.java @@ -34,12 +34,12 @@ import com.cloud.network.Network.GuestType; import com.cloud.network.Network.State; import com.cloud.network.NetworkModel; import com.cloud.network.NetworkProfile; -import com.cloud.network.NetworkVO; import com.cloud.network.Networks.AddressFormat; import com.cloud.network.Networks.BroadcastDomainType; import com.cloud.network.Networks.IsolationType; import com.cloud.network.Networks.Mode; import com.cloud.network.Networks.TrafficType; +import com.cloud.network.dao.NetworkVO; import com.cloud.network.vpc.PrivateIpAddress; import com.cloud.network.vpc.PrivateIpVO; import com.cloud.network.vpc.dao.PrivateIpDao; diff --git a/server/src/com/cloud/network/guru/PublicNetworkGuru.java b/server/src/com/cloud/network/guru/PublicNetworkGuru.java index 52e1662311e..e6e519daaca 100755 --- a/server/src/com/cloud/network/guru/PublicNetworkGuru.java +++ b/server/src/com/cloud/network/guru/PublicNetworkGuru.java @@ -30,12 +30,10 @@ import com.cloud.deploy.DeploymentPlan; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientAddressCapacityException; import com.cloud.exception.InsufficientVirtualNetworkCapcityException; -import com.cloud.network.IPAddressVO; import com.cloud.network.Network; import com.cloud.network.Network.State; import com.cloud.network.NetworkManager; import com.cloud.network.NetworkProfile; -import com.cloud.network.NetworkVO; import com.cloud.network.Networks.AddressFormat; import com.cloud.network.Networks.BroadcastDomainType; import com.cloud.network.Networks.IsolationType; @@ -43,6 +41,8 @@ import com.cloud.network.Networks.Mode; import com.cloud.network.Networks.TrafficType; import com.cloud.network.addr.PublicIp; import com.cloud.network.dao.IPAddressDao; +import com.cloud.network.dao.IPAddressVO; +import com.cloud.network.dao.NetworkVO; import com.cloud.offering.NetworkOffering; import com.cloud.user.Account; import com.cloud.utils.component.AdapterBase; diff --git a/server/src/com/cloud/network/guru/StorageNetworkGuru.java b/server/src/com/cloud/network/guru/StorageNetworkGuru.java index 092ae7c816b..1d01184e0c5 100755 --- a/server/src/com/cloud/network/guru/StorageNetworkGuru.java +++ b/server/src/com/cloud/network/guru/StorageNetworkGuru.java @@ -29,13 +29,13 @@ import com.cloud.exception.InsufficientAddressCapacityException; import com.cloud.exception.InsufficientVirtualNetworkCapcityException; import com.cloud.network.Network; import com.cloud.network.NetworkProfile; -import com.cloud.network.NetworkVO; import com.cloud.network.Networks.AddressFormat; import com.cloud.network.Networks.BroadcastDomainType; import com.cloud.network.Networks.Mode; import com.cloud.network.Networks.TrafficType; import com.cloud.network.StorageNetworkManager; import com.cloud.network.dao.NetworkDao; +import com.cloud.network.dao.NetworkVO; import com.cloud.offering.NetworkOffering; import com.cloud.user.Account; import com.cloud.utils.net.NetUtils; diff --git a/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java b/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java index e52f63a0b1c..fe24b280e74 100755 --- a/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java +++ b/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java @@ -60,11 +60,7 @@ import com.cloud.exception.NetworkRuleConflictException; import com.cloud.exception.PermissionDeniedException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.network.ExternalLoadBalancerUsageManager; -import com.cloud.network.IPAddressVO; import com.cloud.network.IpAddress; -import com.cloud.network.LBStickinessPolicyVO; -import com.cloud.network.LoadBalancerVMMapVO; -import com.cloud.network.LoadBalancerVO; import com.cloud.network.Network; import com.cloud.network.Network.Capability; import com.cloud.network.Network.Provider; @@ -72,7 +68,6 @@ import com.cloud.network.Network.Service; import com.cloud.network.NetworkManager; import com.cloud.network.NetworkModel; import com.cloud.network.NetworkRuleApplier; -import com.cloud.network.NetworkVO; import com.cloud.network.as.AutoScalePolicy; import com.cloud.network.as.AutoScalePolicyConditionMapVO; import com.cloud.network.as.AutoScaleVmGroup; @@ -91,11 +86,16 @@ import com.cloud.network.as.dao.CounterDao; import com.cloud.network.dao.FirewallRulesCidrsDao; import com.cloud.network.dao.FirewallRulesDao; import com.cloud.network.dao.IPAddressDao; +import com.cloud.network.dao.IPAddressVO; import com.cloud.network.dao.LBStickinessPolicyDao; +import com.cloud.network.dao.LBStickinessPolicyVO; import com.cloud.network.dao.LoadBalancerDao; import com.cloud.network.dao.LoadBalancerVMMapDao; +import com.cloud.network.dao.LoadBalancerVMMapVO; +import com.cloud.network.dao.LoadBalancerVO; import com.cloud.network.dao.NetworkDao; import com.cloud.network.dao.NetworkServiceMapDao; +import com.cloud.network.dao.NetworkVO; import com.cloud.network.element.LoadBalancingServiceProvider; import com.cloud.network.lb.LoadBalancingRule.LbAutoScalePolicy; import com.cloud.network.lb.LoadBalancingRule.LbAutoScaleVmGroup; diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java index 2f625cca0a3..e40dca36dcf 100755 --- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java +++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java @@ -126,16 +126,13 @@ import com.cloud.host.HostVO; import com.cloud.host.Status; import com.cloud.host.dao.HostDao; import com.cloud.hypervisor.Hypervisor.HypervisorType; -import com.cloud.network.IPAddressVO; import com.cloud.network.IpAddress; -import com.cloud.network.LoadBalancerVO; import com.cloud.network.Network; import com.cloud.network.Network.GuestType; import com.cloud.network.Network.Provider; import com.cloud.network.Network.Service; import com.cloud.network.NetworkManager; import com.cloud.network.NetworkModel; -import com.cloud.network.NetworkVO; import com.cloud.network.Networks.BroadcastDomainType; import com.cloud.network.Networks.IsolationType; import com.cloud.network.Networks.TrafficType; @@ -144,7 +141,6 @@ import com.cloud.network.PublicIpAddress; import com.cloud.network.RemoteAccessVpn; import com.cloud.network.Site2SiteCustomerGateway; import com.cloud.network.Site2SiteVpnConnection; -import com.cloud.network.Site2SiteVpnConnectionVO; import com.cloud.network.SshKeysDistriMonitor; import com.cloud.network.VirtualNetworkApplianceService; import com.cloud.network.VirtualRouterProvider; @@ -154,13 +150,17 @@ import com.cloud.network.VpnUserVO; import com.cloud.network.addr.PublicIp; import com.cloud.network.dao.FirewallRulesDao; import com.cloud.network.dao.IPAddressDao; +import com.cloud.network.dao.IPAddressVO; import com.cloud.network.dao.LoadBalancerDao; import com.cloud.network.dao.LoadBalancerVMMapDao; +import com.cloud.network.dao.LoadBalancerVO; import com.cloud.network.dao.NetworkDao; +import com.cloud.network.dao.NetworkVO; import com.cloud.network.dao.PhysicalNetworkServiceProviderDao; import com.cloud.network.dao.RemoteAccessVpnDao; import com.cloud.network.dao.Site2SiteCustomerGatewayDao; import com.cloud.network.dao.Site2SiteVpnConnectionDao; +import com.cloud.network.dao.Site2SiteVpnConnectionVO; import com.cloud.network.dao.Site2SiteVpnGatewayDao; import com.cloud.network.dao.VirtualRouterProviderDao; import com.cloud.network.dao.VpnUserDao; @@ -212,6 +212,9 @@ import com.cloud.utils.concurrency.NamedThreadFactory; import com.cloud.utils.db.DB; import com.cloud.utils.db.Filter; import com.cloud.utils.db.GlobalLock; +import com.cloud.utils.db.JoinBuilder; +import com.cloud.utils.db.SearchBuilder; +import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.Transaction; import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.net.MacAddress; @@ -235,6 +238,7 @@ import com.cloud.vm.dao.DomainRouterDao; import com.cloud.vm.dao.NicDao; import com.cloud.vm.dao.UserVmDao; import com.cloud.vm.dao.UserVmDetailsDao; +import com.cloud.vm.dao.VMInstanceDao; /** * VirtualNetworkApplianceManagerImpl manages the different types of virtual network appliances available in the Cloud Stack. @@ -286,6 +290,7 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian ServiceOfferingDao _serviceOfferingDao = null; @Inject UserVmDao _userVmDao; + @Inject VMInstanceDao _vmDao; @Inject UserStatisticsDao _statsDao = null; @Inject @@ -336,6 +341,7 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian Site2SiteVpnConnectionDao _s2sVpnConnectionDao; @Inject Site2SiteVpnManager _s2sVpnMgr; + int _routerRamSize; int _routerCpuMHz; @@ -1389,7 +1395,7 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian if (dest.getDataCenter().getNetworkType() == NetworkType.Basic) { // Find all pods in the data center with running or starting user vms long dcId = dest.getDataCenter().getId(); - List pods = _podDao.listByDataCenterIdVMTypeAndStates(dcId, VirtualMachine.Type.User, VirtualMachine.State.Starting, VirtualMachine.State.Running); + List pods = listByDataCenterIdVMTypeAndStates(dcId, VirtualMachine.Type.User, VirtualMachine.State.Starting, VirtualMachine.State.Running); // Loop through all the pods skip those with running or starting VRs for (HostPodVO pod: pods) { @@ -1498,6 +1504,26 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian } return routers; } + + protected List listByDataCenterIdVMTypeAndStates(long id, VirtualMachine.Type type, VirtualMachine.State... states) { + SearchBuilder vmInstanceSearch = _vmDao.createSearchBuilder(); + vmInstanceSearch.and("type", vmInstanceSearch.entity().getType(), SearchCriteria.Op.EQ); + vmInstanceSearch.and("states", vmInstanceSearch.entity().getState(), SearchCriteria.Op.IN); + + SearchBuilder podIdSearch = _podDao.createSearchBuilder(); + podIdSearch.and("dc", podIdSearch.entity().getDataCenterId(), SearchCriteria.Op.EQ); + podIdSearch.select(null, SearchCriteria.Func.DISTINCT, podIdSearch.entity().getId()); + podIdSearch.join("vmInstanceSearch", vmInstanceSearch, podIdSearch.entity().getId(), + vmInstanceSearch.entity().getPodIdToDeployIn(), JoinBuilder.JoinType.INNER); + podIdSearch.done(); + + SearchCriteria sc = podIdSearch.create(); + sc.setParameters("dc", id); + sc.setJoinParameters("vmInstanceSearch", "type", type); + sc.setJoinParameters("vmInstanceSearch", "states", (Object[]) states); + return _podDao.search(sc, null); + } + protected DomainRouterVO deployRouter(Account owner, DeployDestination dest, DeploymentPlan plan, Map params, boolean isRedundant, VirtualRouterProvider vrProvider, long svcOffId, diff --git a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java index aa731baeeb6..01a46b59d97 100644 --- a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java +++ b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java @@ -64,13 +64,11 @@ import com.cloud.exception.InsufficientServerCapacityException; import com.cloud.exception.OperationTimedoutException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.exception.StorageUnavailableException; -import com.cloud.network.IPAddressVO; import com.cloud.network.IpAddress; import com.cloud.network.Network; import com.cloud.network.Network.Provider; import com.cloud.network.Network.Service; import com.cloud.network.NetworkService; -import com.cloud.network.NetworkVO; import com.cloud.network.Networks.AddressFormat; import com.cloud.network.Networks.BroadcastDomainType; import com.cloud.network.Networks.IsolationType; @@ -78,18 +76,20 @@ import com.cloud.network.Networks.TrafficType; import com.cloud.network.PhysicalNetwork; import com.cloud.network.PhysicalNetworkServiceProvider; import com.cloud.network.PublicIpAddress; -import com.cloud.network.Site2SiteCustomerGatewayVO; import com.cloud.network.Site2SiteVpnConnection; -import com.cloud.network.Site2SiteVpnGatewayVO; import com.cloud.network.VirtualRouterProvider; import com.cloud.network.VirtualRouterProvider.VirtualRouterProviderType; import com.cloud.network.VpcVirtualNetworkApplianceService; import com.cloud.network.addr.PublicIp; import com.cloud.network.dao.FirewallRulesDao; import com.cloud.network.dao.IPAddressDao; +import com.cloud.network.dao.IPAddressVO; +import com.cloud.network.dao.NetworkVO; import com.cloud.network.dao.PhysicalNetworkDao; +import com.cloud.network.dao.Site2SiteCustomerGatewayVO; import com.cloud.network.dao.Site2SiteVpnConnectionDao; import com.cloud.network.dao.Site2SiteVpnGatewayDao; +import com.cloud.network.dao.Site2SiteVpnGatewayVO; import com.cloud.network.rules.FirewallRule; import com.cloud.network.vpc.NetworkACLManager; import com.cloud.network.vpc.PrivateGateway; diff --git a/server/src/com/cloud/network/rules/FirewallManager.java b/server/src/com/cloud/network/rules/FirewallManager.java index 8473c56f2b9..7a99a5ea95c 100644 --- a/server/src/com/cloud/network/rules/FirewallManager.java +++ b/server/src/com/cloud/network/rules/FirewallManager.java @@ -20,7 +20,7 @@ import java.util.List; import com.cloud.exception.NetworkRuleConflictException; import com.cloud.exception.ResourceUnavailableException; -import com.cloud.network.IPAddressVO; +import com.cloud.network.dao.IPAddressVO; import com.cloud.network.firewall.FirewallService; import com.cloud.network.rules.FirewallRule.FirewallRuleType; import com.cloud.network.rules.FirewallRule.Purpose; diff --git a/server/src/com/cloud/network/rules/RulesManagerImpl.java b/server/src/com/cloud/network/rules/RulesManagerImpl.java index e4f473558bd..ea77a43b1f7 100755 --- a/server/src/com/cloud/network/rules/RulesManagerImpl.java +++ b/server/src/com/cloud/network/rules/RulesManagerImpl.java @@ -41,7 +41,6 @@ import com.cloud.exception.InsufficientAddressCapacityException; import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.NetworkRuleConflictException; import com.cloud.exception.ResourceUnavailableException; -import com.cloud.network.IPAddressVO; import com.cloud.network.IpAddress; import com.cloud.network.Network; import com.cloud.network.Network.Service; @@ -50,6 +49,7 @@ import com.cloud.network.NetworkModel; import com.cloud.network.dao.FirewallRulesCidrsDao; import com.cloud.network.dao.FirewallRulesDao; import com.cloud.network.dao.IPAddressDao; +import com.cloud.network.dao.IPAddressVO; import com.cloud.network.rules.FirewallRule.FirewallRuleType; import com.cloud.network.rules.FirewallRule.Purpose; import com.cloud.network.rules.dao.PortForwardingRulesDao; diff --git a/server/src/com/cloud/network/security/dao/SecurityGroupVMMapDaoImpl.java b/server/src/com/cloud/network/security/dao/SecurityGroupVMMapDaoImpl.java index 4adeaa971c4..46135d18029 100644 --- a/server/src/com/cloud/network/security/dao/SecurityGroupVMMapDaoImpl.java +++ b/server/src/com/cloud/network/security/dao/SecurityGroupVMMapDaoImpl.java @@ -24,7 +24,7 @@ import org.springframework.stereotype.Component; import com.cloud.dc.VlanVO; import com.cloud.dc.Vlan.VlanType; -import com.cloud.network.IPAddressVO; +import com.cloud.network.dao.IPAddressVO; import com.cloud.network.security.SecurityGroupVMMapVO; import com.cloud.utils.Pair; import com.cloud.utils.db.Filter; diff --git a/server/src/com/cloud/network/vpc/VpcManagerImpl.java b/server/src/com/cloud/network/vpc/VpcManagerImpl.java index 94d4e029d35..161369617a3 100644 --- a/server/src/com/cloud/network/vpc/VpcManagerImpl.java +++ b/server/src/com/cloud/network/vpc/VpcManagerImpl.java @@ -57,7 +57,6 @@ import com.cloud.exception.PermissionDeniedException; import com.cloud.exception.ResourceAllocationException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.hypervisor.Hypervisor.HypervisorType; -import com.cloud.network.IPAddressVO; import com.cloud.network.IpAddress; import com.cloud.network.Network; import com.cloud.network.Network.GuestType; @@ -66,14 +65,15 @@ import com.cloud.network.Network.Service; import com.cloud.network.NetworkManager; import com.cloud.network.NetworkModel; import com.cloud.network.NetworkService; -import com.cloud.network.NetworkVO; import com.cloud.network.Networks.BroadcastDomainType; import com.cloud.network.Networks.TrafficType; import com.cloud.network.PhysicalNetwork; import com.cloud.network.addr.PublicIp; import com.cloud.network.dao.FirewallRulesDao; import com.cloud.network.dao.IPAddressDao; +import com.cloud.network.dao.IPAddressVO; import com.cloud.network.dao.NetworkDao; +import com.cloud.network.dao.NetworkVO; import com.cloud.network.dao.PhysicalNetworkDao; import com.cloud.network.dao.Site2SiteVpnGatewayDao; import com.cloud.network.element.VpcProvider; diff --git a/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java b/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java index 1a33538b6df..277203f2488 100755 --- a/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java +++ b/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java @@ -41,19 +41,19 @@ import com.cloud.exception.AccountLimitException; import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.NetworkRuleConflictException; import com.cloud.exception.ResourceUnavailableException; -import com.cloud.network.IPAddressVO; import com.cloud.network.Network; import com.cloud.network.Network.Service; import com.cloud.network.NetworkModel; import com.cloud.network.PublicIpAddress; import com.cloud.network.RemoteAccessVpn; -import com.cloud.network.RemoteAccessVpnVO; import com.cloud.network.VpnUser; import com.cloud.network.VpnUser.State; import com.cloud.network.VpnUserVO; import com.cloud.network.dao.FirewallRulesDao; import com.cloud.network.dao.IPAddressDao; +import com.cloud.network.dao.IPAddressVO; import com.cloud.network.dao.RemoteAccessVpnDao; +import com.cloud.network.dao.RemoteAccessVpnVO; import com.cloud.network.dao.VpnUserDao; import com.cloud.network.element.RemoteAccessVPNServiceProvider; import com.cloud.network.rules.FirewallManager; diff --git a/server/src/com/cloud/network/vpn/Site2SiteVpnManager.java b/server/src/com/cloud/network/vpn/Site2SiteVpnManager.java index 80513a98a20..e00bd0634c3 100644 --- a/server/src/com/cloud/network/vpn/Site2SiteVpnManager.java +++ b/server/src/com/cloud/network/vpn/Site2SiteVpnManager.java @@ -18,7 +18,7 @@ package com.cloud.network.vpn; import java.util.List; -import com.cloud.network.Site2SiteVpnConnectionVO; +import com.cloud.network.dao.Site2SiteVpnConnectionVO; import com.cloud.vm.DomainRouterVO; public interface Site2SiteVpnManager extends Site2SiteVpnService { diff --git a/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java b/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java index 88e01214016..e446366a8ab 100644 --- a/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java +++ b/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java @@ -45,18 +45,18 @@ import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.NetworkRuleConflictException; import com.cloud.exception.ResourceUnavailableException; -import com.cloud.network.IPAddressVO; import com.cloud.network.Site2SiteCustomerGateway; -import com.cloud.network.Site2SiteCustomerGatewayVO; import com.cloud.network.Site2SiteVpnConnection; import com.cloud.network.Site2SiteVpnConnection.State; -import com.cloud.network.Site2SiteVpnConnectionVO; import com.cloud.network.Site2SiteVpnGateway; -import com.cloud.network.Site2SiteVpnGatewayVO; import com.cloud.network.dao.IPAddressDao; +import com.cloud.network.dao.IPAddressVO; import com.cloud.network.dao.Site2SiteCustomerGatewayDao; +import com.cloud.network.dao.Site2SiteCustomerGatewayVO; import com.cloud.network.dao.Site2SiteVpnConnectionDao; +import com.cloud.network.dao.Site2SiteVpnConnectionVO; import com.cloud.network.dao.Site2SiteVpnGatewayDao; +import com.cloud.network.dao.Site2SiteVpnGatewayVO; import com.cloud.network.element.Site2SiteVpnServiceProvider; import com.cloud.network.vpc.VpcManager; import com.cloud.network.vpc.VpcVO; diff --git a/server/src/com/cloud/resource/ResourceManagerImpl.java b/server/src/com/cloud/resource/ResourceManagerImpl.java index 2934da3d1d3..5edd529e876 100755 --- a/server/src/com/cloud/resource/ResourceManagerImpl.java +++ b/server/src/com/cloud/resource/ResourceManagerImpl.java @@ -102,8 +102,8 @@ import com.cloud.host.dao.HostTagsDao; import com.cloud.hypervisor.Hypervisor; import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.hypervisor.kvm.discoverer.KvmDummyResourceBase; -import com.cloud.network.IPAddressVO; import com.cloud.network.dao.IPAddressDao; +import com.cloud.network.dao.IPAddressVO; import com.cloud.org.Cluster; import com.cloud.org.Grouping; import com.cloud.org.Grouping.AllocationState; diff --git a/server/src/com/cloud/server/ConfigurationServerImpl.java b/server/src/com/cloud/server/ConfigurationServerImpl.java index d7c0a3c00dc..3e9fb6a22b8 100755 --- a/server/src/com/cloud/server/ConfigurationServerImpl.java +++ b/server/src/com/cloud/server/ConfigurationServerImpl.java @@ -69,11 +69,11 @@ import com.cloud.network.Network.GuestType; import com.cloud.network.Network.Provider; import com.cloud.network.Network.Service; import com.cloud.network.Network.State; -import com.cloud.network.NetworkVO; import com.cloud.network.Networks.BroadcastDomainType; import com.cloud.network.Networks.Mode; import com.cloud.network.Networks.TrafficType; import com.cloud.network.dao.NetworkDao; +import com.cloud.network.dao.NetworkVO; import com.cloud.network.guru.ControlNetworkGuru; import com.cloud.network.guru.DirectPodBasedNetworkGuru; import com.cloud.network.guru.PodBasedNetworkGuru; diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java index 0e85c169b48..79bc91d394d 100755 --- a/server/src/com/cloud/server/ManagementServerImpl.java +++ b/server/src/com/cloud/server/ManagementServerImpl.java @@ -161,13 +161,13 @@ import com.cloud.hypervisor.HypervisorCapabilitiesVO; import com.cloud.hypervisor.dao.HypervisorCapabilitiesDao; import com.cloud.info.ConsoleProxyInfo; import com.cloud.keystore.KeystoreManager; -import com.cloud.network.IPAddressVO; import com.cloud.network.IpAddress; -import com.cloud.network.LoadBalancerVO; -import com.cloud.network.NetworkVO; import com.cloud.network.dao.IPAddressDao; +import com.cloud.network.dao.IPAddressVO; import com.cloud.network.dao.LoadBalancerDao; +import com.cloud.network.dao.LoadBalancerVO; import com.cloud.network.dao.NetworkDao; +import com.cloud.network.dao.NetworkVO; import com.cloud.org.Cluster; import com.cloud.org.Grouping.AllocationState; import com.cloud.projects.Project; diff --git a/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java b/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java index aed514b28b7..5c3e992fdd9 100755 --- a/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java +++ b/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java @@ -76,14 +76,14 @@ import com.cloud.info.RunningHostCountInfo; import com.cloud.info.RunningHostInfoAgregator; import com.cloud.info.RunningHostInfoAgregator.ZoneHostInfo; import com.cloud.keystore.KeystoreManager; -import com.cloud.network.IPAddressVO; import com.cloud.network.Network; import com.cloud.network.NetworkManager; import com.cloud.network.NetworkModel; -import com.cloud.network.NetworkVO; import com.cloud.network.Networks.TrafficType; import com.cloud.network.dao.IPAddressDao; +import com.cloud.network.dao.IPAddressVO; import com.cloud.network.dao.NetworkDao; +import com.cloud.network.dao.NetworkVO; import com.cloud.network.rules.RulesManager; import com.cloud.offering.NetworkOffering; import com.cloud.offering.ServiceOffering; diff --git a/server/src/com/cloud/user/AccountManagerImpl.java b/server/src/com/cloud/user/AccountManagerImpl.java index cf8602c22d2..379f7fb5e06 100755 --- a/server/src/com/cloud/user/AccountManagerImpl.java +++ b/server/src/com/cloud/user/AccountManagerImpl.java @@ -72,16 +72,16 @@ import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.OperationTimedoutException; import com.cloud.exception.PermissionDeniedException; import com.cloud.exception.ResourceUnavailableException; -import com.cloud.network.IPAddressVO; import com.cloud.network.IpAddress; import com.cloud.network.NetworkManager; -import com.cloud.network.NetworkVO; -import com.cloud.network.RemoteAccessVpnVO; import com.cloud.network.VpnUserVO; import com.cloud.network.as.AutoScaleManager; import com.cloud.network.dao.IPAddressDao; +import com.cloud.network.dao.IPAddressVO; import com.cloud.network.dao.NetworkDao; +import com.cloud.network.dao.NetworkVO; import com.cloud.network.dao.RemoteAccessVpnDao; +import com.cloud.network.dao.RemoteAccessVpnVO; import com.cloud.network.dao.VpnUserDao; import com.cloud.network.security.SecurityGroupManager; import com.cloud.network.security.dao.SecurityGroupDao; diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java index 0464420842b..bf3da4cba61 100644 --- a/server/src/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/com/cloud/vm/UserVmManagerImpl.java @@ -119,21 +119,21 @@ import com.cloud.host.HostVO; import com.cloud.host.dao.HostDao; import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.hypervisor.dao.HypervisorCapabilitiesDao; -import com.cloud.network.IPAddressVO; -import com.cloud.network.LoadBalancerVMMapVO; import com.cloud.network.Network; import com.cloud.network.Network.Provider; import com.cloud.network.Network.Service; import com.cloud.network.NetworkManager; import com.cloud.network.NetworkModel; -import com.cloud.network.NetworkVO; import com.cloud.network.Networks.TrafficType; import com.cloud.network.PhysicalNetwork; import com.cloud.network.dao.FirewallRulesDao; import com.cloud.network.dao.IPAddressDao; +import com.cloud.network.dao.IPAddressVO; import com.cloud.network.dao.LoadBalancerVMMapDao; +import com.cloud.network.dao.LoadBalancerVMMapVO; import com.cloud.network.dao.NetworkDao; import com.cloud.network.dao.NetworkServiceMapDao; +import com.cloud.network.dao.NetworkVO; import com.cloud.network.dao.PhysicalNetworkDao; import com.cloud.network.element.UserDataServiceProvider; import com.cloud.network.lb.LoadBalancingRulesManager; diff --git a/server/src/com/cloud/vm/UserVmStateListener.java b/server/src/com/cloud/vm/UserVmStateListener.java index 4d9bcc563fd..a47a8ba5175 100644 --- a/server/src/com/cloud/vm/UserVmStateListener.java +++ b/server/src/com/cloud/vm/UserVmStateListener.java @@ -21,8 +21,8 @@ import java.util.List; import com.cloud.event.EventTypes; import com.cloud.event.UsageEventVO; import com.cloud.event.dao.UsageEventDao; -import com.cloud.network.NetworkVO; import com.cloud.network.dao.NetworkDao; +import com.cloud.network.dao.NetworkVO; import com.cloud.utils.fsm.StateListener; import com.cloud.vm.VirtualMachine.Event; import com.cloud.vm.VirtualMachine.State; diff --git a/server/src/com/cloud/vm/VirtualMachineManager.java b/server/src/com/cloud/vm/VirtualMachineManager.java index 4f04617baba..ae06924f1e4 100644 --- a/server/src/com/cloud/vm/VirtualMachineManager.java +++ b/server/src/com/cloud/vm/VirtualMachineManager.java @@ -34,7 +34,7 @@ import com.cloud.exception.ResourceUnavailableException; import com.cloud.exception.VirtualMachineMigrationException; import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.network.Network; -import com.cloud.network.NetworkVO; +import com.cloud.network.dao.NetworkVO; import com.cloud.offering.ServiceOffering; import com.cloud.service.ServiceOfferingVO; import com.cloud.storage.DiskOfferingVO; diff --git a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java index 64c55cacf1d..c76b543658e 100755 --- a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java +++ b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java @@ -110,8 +110,8 @@ import com.cloud.hypervisor.HypervisorGuruManager; import com.cloud.network.Network; import com.cloud.network.NetworkManager; import com.cloud.network.NetworkModel; -import com.cloud.network.NetworkVO; import com.cloud.network.dao.NetworkDao; +import com.cloud.network.dao.NetworkVO; import com.cloud.offering.ServiceOffering; import com.cloud.org.Cluster; import com.cloud.resource.ResourceManager; diff --git a/server/src/com/cloud/vm/dao/DomainRouterDaoImpl.java b/server/src/com/cloud/vm/dao/DomainRouterDaoImpl.java index cfe9f43f5f3..c0110168146 100755 --- a/server/src/com/cloud/vm/dao/DomainRouterDaoImpl.java +++ b/server/src/com/cloud/vm/dao/DomainRouterDaoImpl.java @@ -27,8 +27,8 @@ import org.springframework.stereotype.Component; import com.cloud.host.HostVO; import com.cloud.host.dao.HostDaoImpl; import com.cloud.network.Network; -import com.cloud.network.RouterNetworkVO; import com.cloud.network.dao.RouterNetworkDaoImpl; +import com.cloud.network.dao.RouterNetworkVO; import com.cloud.network.router.VirtualRouter; import com.cloud.network.router.VirtualRouter.Role; import com.cloud.offering.NetworkOffering; diff --git a/server/test/com/cloud/network/MockFirewallManagerImpl.java b/server/test/com/cloud/network/MockFirewallManagerImpl.java index 1a79acf746b..c7d4e86800a 100644 --- a/server/test/com/cloud/network/MockFirewallManagerImpl.java +++ b/server/test/com/cloud/network/MockFirewallManagerImpl.java @@ -26,6 +26,7 @@ import org.apache.cloudstack.api.command.user.firewall.ListFirewallRulesCmd; import com.cloud.exception.NetworkRuleConflictException; import com.cloud.exception.ResourceUnavailableException; +import com.cloud.network.dao.IPAddressVO; import com.cloud.network.firewall.FirewallService; import com.cloud.network.rules.FirewallManager; import com.cloud.network.rules.FirewallRule; diff --git a/server/test/com/cloud/network/MockNetworkManagerImpl.java b/server/test/com/cloud/network/MockNetworkManagerImpl.java index ef5b9c9f9b7..08c94f4112c 100755 --- a/server/test/com/cloud/network/MockNetworkManagerImpl.java +++ b/server/test/com/cloud/network/MockNetworkManagerImpl.java @@ -44,6 +44,8 @@ import com.cloud.network.Network.Provider; import com.cloud.network.Network.Service; import com.cloud.network.Networks.TrafficType; import com.cloud.network.addr.PublicIp; +import com.cloud.network.dao.IPAddressVO; +import com.cloud.network.dao.NetworkVO; import com.cloud.network.element.LoadBalancingServiceProvider; import com.cloud.network.element.StaticNatServiceProvider; import com.cloud.network.element.UserDataServiceProvider; diff --git a/server/test/com/cloud/network/MockNetworkModelImpl.java b/server/test/com/cloud/network/MockNetworkModelImpl.java index 1771660f86c..003b718a604 100644 --- a/server/test/com/cloud/network/MockNetworkModelImpl.java +++ b/server/test/com/cloud/network/MockNetworkModelImpl.java @@ -34,6 +34,8 @@ import com.cloud.network.Network.Provider; import com.cloud.network.Network.Service; import com.cloud.network.Networks.TrafficType; import com.cloud.network.addr.PublicIp; +import com.cloud.network.dao.IPAddressVO; +import com.cloud.network.dao.NetworkVO; import com.cloud.network.element.NetworkElement; import com.cloud.network.element.UserDataServiceProvider; import com.cloud.network.rules.FirewallRule; diff --git a/server/test/com/cloud/network/NetworkModelTest.java b/server/test/com/cloud/network/NetworkModelTest.java index 3fd61a19c1b..8e8fb9943c4 100644 --- a/server/test/com/cloud/network/NetworkModelTest.java +++ b/server/test/com/cloud/network/NetworkModelTest.java @@ -36,6 +36,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import com.cloud.dc.VlanVO; import com.cloud.dc.dao.VlanDao; import com.cloud.network.dao.IPAddressDao; +import com.cloud.network.dao.IPAddressVO; import com.cloud.user.Account; import com.cloud.utils.db.Filter; import com.cloud.utils.db.SearchBuilder; diff --git a/server/test/com/cloud/vm/MockVirtualMachineManagerImpl.java b/server/test/com/cloud/vm/MockVirtualMachineManagerImpl.java index 6723198b81a..559b6fa645a 100755 --- a/server/test/com/cloud/vm/MockVirtualMachineManagerImpl.java +++ b/server/test/com/cloud/vm/MockVirtualMachineManagerImpl.java @@ -37,7 +37,7 @@ import com.cloud.exception.ResourceUnavailableException; import com.cloud.exception.VirtualMachineMigrationException; import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.network.Network; -import com.cloud.network.NetworkVO; +import com.cloud.network.dao.NetworkVO; import com.cloud.offering.ServiceOffering; import com.cloud.service.ServiceOfferingVO; import com.cloud.storage.DiskOfferingVO; diff --git a/server/test/com/cloud/vpc/MockNetworkManagerImpl.java b/server/test/com/cloud/vpc/MockNetworkManagerImpl.java index d1a9454f4d5..cd9bec7fbd0 100644 --- a/server/test/com/cloud/vpc/MockNetworkManagerImpl.java +++ b/server/test/com/cloud/vpc/MockNetworkManagerImpl.java @@ -43,7 +43,6 @@ import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.InsufficientVirtualNetworkCapcityException; import com.cloud.exception.ResourceAllocationException; import com.cloud.exception.ResourceUnavailableException; -import com.cloud.network.IPAddressVO; import com.cloud.network.IpAddress; import com.cloud.network.Network; import com.cloud.network.Network.Provider; @@ -52,14 +51,15 @@ import com.cloud.network.NetworkManager; import com.cloud.network.NetworkProfile; import com.cloud.network.NetworkRuleApplier; import com.cloud.network.NetworkService; -import com.cloud.network.NetworkVO; import com.cloud.network.Networks.TrafficType; import com.cloud.network.PhysicalNetwork; import com.cloud.network.PhysicalNetworkServiceProvider; import com.cloud.network.PhysicalNetworkTrafficType; import com.cloud.network.PublicIpAddress; import com.cloud.network.addr.PublicIp; +import com.cloud.network.dao.IPAddressVO; import com.cloud.network.dao.NetworkServiceMapDao; +import com.cloud.network.dao.NetworkVO; import com.cloud.network.element.LoadBalancingServiceProvider; import com.cloud.network.element.NetworkElement; import com.cloud.network.element.StaticNatServiceProvider; diff --git a/server/test/com/cloud/vpc/MockSite2SiteVpnManagerImpl.java b/server/test/com/cloud/vpc/MockSite2SiteVpnManagerImpl.java index 3f0ead20d74..14b7c6035b7 100644 --- a/server/test/com/cloud/vpc/MockSite2SiteVpnManagerImpl.java +++ b/server/test/com/cloud/vpc/MockSite2SiteVpnManagerImpl.java @@ -39,8 +39,8 @@ import com.cloud.exception.NetworkRuleConflictException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.network.Site2SiteCustomerGateway; import com.cloud.network.Site2SiteVpnConnection; -import com.cloud.network.Site2SiteVpnConnectionVO; import com.cloud.network.Site2SiteVpnGateway; +import com.cloud.network.dao.Site2SiteVpnConnectionVO; import com.cloud.network.vpn.Site2SiteVpnManager; import com.cloud.network.vpn.Site2SiteVpnService; import com.cloud.utils.Pair; diff --git a/server/test/com/cloud/vpc/dao/MockNetworkDaoImpl.java b/server/test/com/cloud/vpc/dao/MockNetworkDaoImpl.java index 7c9a5823516..de1bbb9b588 100644 --- a/server/test/com/cloud/vpc/dao/MockNetworkDaoImpl.java +++ b/server/test/com/cloud/vpc/dao/MockNetworkDaoImpl.java @@ -23,10 +23,10 @@ import java.util.Map; import javax.ejb.Local; import com.cloud.network.Network.GuestType; -import com.cloud.network.NetworkAccountVO; -import com.cloud.network.NetworkVO; import com.cloud.network.Networks.TrafficType; +import com.cloud.network.dao.NetworkAccountVO; import com.cloud.network.dao.NetworkDao; +import com.cloud.network.dao.NetworkVO; import com.cloud.utils.db.DB; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; diff --git a/server/test/com/cloud/vpc/dao/MockNetworkServiceMapDaoImpl.java b/server/test/com/cloud/vpc/dao/MockNetworkServiceMapDaoImpl.java index 51536a924f6..002b61dcbc4 100644 --- a/server/test/com/cloud/vpc/dao/MockNetworkServiceMapDaoImpl.java +++ b/server/test/com/cloud/vpc/dao/MockNetworkServiceMapDaoImpl.java @@ -22,8 +22,8 @@ import javax.ejb.Local; import com.cloud.network.Network.Provider; import com.cloud.network.Network.Service; -import com.cloud.network.NetworkServiceMapVO; import com.cloud.network.dao.NetworkServiceMapDao; +import com.cloud.network.dao.NetworkServiceMapVO; import com.cloud.utils.db.DB; import com.cloud.utils.db.GenericDaoBase; diff --git a/setup/db/4.1-new-db-schema.sql b/setup/db/4.1-new-db-schema.sql index 07564b6072b..84fbd91979b 100644 --- a/setup/db/4.1-new-db-schema.sql +++ b/setup/db/4.1-new-db-schema.sql @@ -17,7 +17,7 @@ alter table vm_template add image_data_store_id bigint unsigned; alter table storage_pool add storage_provider_id bigint unsigned; -alter table storage_pool add configurator_key varchar(255); +alter table storage_pool add scope varchar(255); alter table storage_pool modify id bigint unsigned AUTO_INCREMENT UNIQUE NOT NULL; alter table template_spool_ref add state varchar(255); alter table template_spool_ref add update_count bigint unsigned; @@ -26,6 +26,7 @@ alter table volumes drop foreign key `fk_volumes__account_id`; CREATE TABLE `cloud`.`data_store_provider` ( `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id', `name` varchar(255) NOT NULL COMMENT 'name of primary data store provider', + `uuid` varchar(255) NOT NULL COMMENT 'uuid of primary data store provider', PRIMARY KEY(`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; @@ -63,4 +64,4 @@ CREATE TABLE `cloud`.`vm_network_map` ( `vm_id` bigint unsigned NOT NULL COMMENT 'vm id', `network_id` bigint unsigned NOT NULL COMMENT 'network id', PRIMARY KEY(`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; \ No newline at end of file +) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/utils/src/com/cloud/utils/component/ComponentContext.java b/utils/src/com/cloud/utils/component/ComponentContext.java index 5347f2e0504..7757c062553 100644 --- a/utils/src/com/cloud/utils/component/ComponentContext.java +++ b/utils/src/com/cloud/utils/component/ComponentContext.java @@ -23,6 +23,7 @@ import org.apache.log4j.Logger; import org.springframework.aop.Advisor; import org.springframework.aop.framework.Advised; import org.springframework.aop.framework.ProxyFactory; +import org.springframework.aop.framework.ProxyFactoryBean; import org.springframework.aop.support.DefaultPointcutAdvisor; import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.beans.factory.config.AutowireCapableBeanFactory; @@ -151,7 +152,9 @@ public class ComponentContext implements ApplicationContextAware { public static T inject(Object instance) { // autowire dynamically loaded object AutowireCapableBeanFactory beanFactory = s_appContext.getAutowireCapableBeanFactory(); + beanFactory.autowireBean(instance); + beanFactory.initializeBean(instance, null); Advisor advisor = new DefaultPointcutAdvisor(new MatchAnyMethodPointcut(), new TransactionContextBuilder());