VPC: 1) In unittest, removed the unsed Dao from components scan 2) Netscaler and InternalLb element shouldn't impelement VPC provider as they provide only LB services support
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/59316a4d Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/59316a4d Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/59316a4d Branch: refs/heads/vmsync Commit: 59316a4d190bc5e999a2070f5731bbe197b84a0a Parents: 846729a Author: Alena Prokharchyk <[email protected]> Authored: Fri May 10 09:58:55 2013 -0700 Committer: Alena Prokharchyk <[email protected]> Committed: Fri May 10 10:42:56 2013 -0700 ---------------------------------------------------------------------- .../ElementChildTestConfiguration.java | 3 +- .../internallbvmmgr/LbChildTestConfiguration.java | 4 +- .../cloud/network/element/NetscalerElement.java | 30 +-------------- .../src/com/cloud/network/vpc/VpcManagerImpl.java | 2 - .../cloudstack/lb/ChildTestConfiguration.java | 4 +- 5 files changed, 9 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/59316a4d/plugins/network-elements/internal-loadbalancer/test/org/apache/cloudstack/internallbelement/ElementChildTestConfiguration.java ---------------------------------------------------------------------- diff --git a/plugins/network-elements/internal-loadbalancer/test/org/apache/cloudstack/internallbelement/ElementChildTestConfiguration.java b/plugins/network-elements/internal-loadbalancer/test/org/apache/cloudstack/internallbelement/ElementChildTestConfiguration.java index 6959b95..8a67e84 100644 --- a/plugins/network-elements/internal-loadbalancer/test/org/apache/cloudstack/internallbelement/ElementChildTestConfiguration.java +++ b/plugins/network-elements/internal-loadbalancer/test/org/apache/cloudstack/internallbelement/ElementChildTestConfiguration.java @@ -40,12 +40,13 @@ import com.cloud.network.dao.NetworkServiceMapDao; import com.cloud.network.dao.PhysicalNetworkServiceProviderDao; import com.cloud.network.dao.VirtualRouterProviderDao; import com.cloud.user.AccountManager; +import com.cloud.utils.net.NetUtils; import com.cloud.vm.dao.DomainRouterDao; @Configuration @ComponentScan( basePackageClasses={ - AccountVlanMapDaoImpl.class + NetUtils.class, }, includeFilters={@Filter(value=ElementChildTestConfiguration.Library.class, type=FilterType.CUSTOM)}, useDefaultFilters=false http://git-wip-us.apache.org/repos/asf/cloudstack/blob/59316a4d/plugins/network-elements/internal-loadbalancer/test/org/apache/cloudstack/internallbvmmgr/LbChildTestConfiguration.java ---------------------------------------------------------------------- diff --git a/plugins/network-elements/internal-loadbalancer/test/org/apache/cloudstack/internallbvmmgr/LbChildTestConfiguration.java b/plugins/network-elements/internal-loadbalancer/test/org/apache/cloudstack/internallbvmmgr/LbChildTestConfiguration.java index 0f24f96..79354ef 100644 --- a/plugins/network-elements/internal-loadbalancer/test/org/apache/cloudstack/internallbvmmgr/LbChildTestConfiguration.java +++ b/plugins/network-elements/internal-loadbalancer/test/org/apache/cloudstack/internallbvmmgr/LbChildTestConfiguration.java @@ -46,14 +46,16 @@ import com.cloud.server.ConfigurationServer; import com.cloud.service.dao.ServiceOfferingDao; import com.cloud.storage.dao.VMTemplateDao; import com.cloud.user.AccountManager; +import com.cloud.utils.net.NetUtils; import com.cloud.vm.VirtualMachineManager; import com.cloud.vm.dao.DomainRouterDao; import com.cloud.vm.dao.NicDao; + @Configuration @ComponentScan( basePackageClasses={ - AccountVlanMapDaoImpl.class + NetUtils.class, }, includeFilters={@Filter(value=LbChildTestConfiguration.Library.class, type=FilterType.CUSTOM)}, useDefaultFilters=false http://git-wip-us.apache.org/repos/asf/cloudstack/blob/59316a4d/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java ---------------------------------------------------------------------- diff --git a/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java b/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java index 4f2a0a1..60d6674 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 @@ -120,7 +120,7 @@ import com.google.gson.Gson; @Local(value = {NetworkElement.class, StaticNatServiceProvider.class, LoadBalancingServiceProvider.class, GslbServiceProvider.class}) public class NetscalerElement extends ExternalLoadBalancerDeviceManagerImpl implements LoadBalancingServiceProvider, NetscalerLoadBalancerElementService, ExternalLoadBalancerDeviceManager, IpDeployer, StaticNatServiceProvider, - GslbServiceProvider, VpcProvider { + GslbServiceProvider { private static final Logger s_logger = Logger.getLogger(NetscalerElement.class); public static final AutoScaleCounterType AutoScaleCounterSnmp = new AutoScaleCounterType("snmp"); @@ -1003,32 +1003,4 @@ public class NetscalerElement extends ExternalLoadBalancerDeviceManagerImpl impl return true; } - @Override - public boolean implementVpc(Vpc vpc, DeployDestination dest, ReservationContext context) - throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException { - return true; - } - - @Override - public boolean shutdownVpc(Vpc vpc, ReservationContext context) throws ConcurrentOperationException, - ResourceUnavailableException { - return true; - } - - @Override - public boolean createPrivateGateway(PrivateGateway gateway) throws ConcurrentOperationException, - ResourceUnavailableException { - return true; - } - - @Override - public boolean deletePrivateGateway(PrivateGateway privateGateway) throws ConcurrentOperationException, - ResourceUnavailableException { - return true; - } - - @Override - public boolean applyStaticRoutes(Vpc vpc, List<StaticRouteProfile> routes) throws ResourceUnavailableException { - return true; - } } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/59316a4d/server/src/com/cloud/network/vpc/VpcManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/vpc/VpcManagerImpl.java b/server/src/com/cloud/network/vpc/VpcManagerImpl.java index 3e6a598..09776ae 100644 --- a/server/src/com/cloud/network/vpc/VpcManagerImpl.java +++ b/server/src/com/cloud/network/vpc/VpcManagerImpl.java @@ -1184,8 +1184,6 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis if (vpcElements == null) { vpcElements = new ArrayList<VpcProvider>(); vpcElements.add((VpcProvider)_ntwkModel.getElementImplementingProvider(Provider.VPCVirtualRouter.getName())); - vpcElements.add((VpcProvider)_ntwkModel.getElementImplementingProvider(Provider.Netscaler.getName())); - vpcElements.add((VpcProvider)_ntwkModel.getElementImplementingProvider(Provider.InternalLbVm.getName())); } if (vpcElements == null) { http://git-wip-us.apache.org/repos/asf/cloudstack/blob/59316a4d/server/test/org/apache/cloudstack/lb/ChildTestConfiguration.java ---------------------------------------------------------------------- diff --git a/server/test/org/apache/cloudstack/lb/ChildTestConfiguration.java b/server/test/org/apache/cloudstack/lb/ChildTestConfiguration.java index 918de81..a5b84ed 100644 --- a/server/test/org/apache/cloudstack/lb/ChildTestConfiguration.java +++ b/server/test/org/apache/cloudstack/lb/ChildTestConfiguration.java @@ -38,11 +38,13 @@ import com.cloud.network.dao.FirewallRulesDao; import com.cloud.network.lb.LoadBalancingRulesManager; import com.cloud.tags.dao.ResourceTagDao; import com.cloud.user.AccountManager; +import com.cloud.utils.net.NetUtils; + @Configuration @ComponentScan( basePackageClasses={ - AccountVlanMapDaoImpl.class + NetUtils.class }, includeFilters={@Filter(value=ChildTestConfiguration.Library.class, type=FilterType.CUSTOM)}, useDefaultFilters=false
