Repository: cloudstack Updated Branches: refs/heads/master c804660c7 -> 44be17648
rename networkMgr to networkMdl to prevent name clashes in mocks of VirtualRouterElement and VirtualNetworkApplianceManagerImpl Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/44be1764 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/44be1764 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/44be1764 Branch: refs/heads/master Commit: 44be1764863b369c9bcc5c8cc7ddd05405649071 Parents: c804660 Author: Daan Hoogland <d...@onecht.net> Authored: Wed Jul 23 21:19:31 2014 +0200 Committer: Daan Hoogland <d...@onecht.net> Committed: Wed Jul 23 21:19:31 2014 +0200 ---------------------------------------------------------------------- .../network/element/VirtualRouterElement.java | 18 +++++++++--------- .../network/element/VpcVirtualRouterElement.java | 16 ++++++++-------- 2 files changed, 17 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/44be1764/server/src/com/cloud/network/element/VirtualRouterElement.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/element/VirtualRouterElement.java b/server/src/com/cloud/network/element/VirtualRouterElement.java index e4660b7..bdebd39 100755 --- a/server/src/com/cloud/network/element/VirtualRouterElement.java +++ b/server/src/com/cloud/network/element/VirtualRouterElement.java @@ -121,7 +121,7 @@ NetworkMigrationResponder, AggregatedCommandExecutor { @Inject NetworkDao _networksDao; @Inject - NetworkModel _networkMgr; + NetworkModel _networkMdl; @Inject LoadBalancingRulesManager _lbMgr; @Inject @@ -155,7 +155,7 @@ NetworkMigrationResponder, AggregatedCommandExecutor { IPAddressDao _ipAddressDao; protected boolean canHandle(Network network, Service service) { - Long physicalNetworkId = _networkMgr.getPhysicalNetworkId(network); + Long physicalNetworkId = _networkMdl.getPhysicalNetworkId(network); if (physicalNetworkId == null) { return false; } @@ -164,17 +164,17 @@ NetworkMigrationResponder, AggregatedCommandExecutor { return false; } - if (!_networkMgr.isProviderEnabledInPhysicalNetwork(physicalNetworkId, Network.Provider.VirtualRouter.getName())) { + if (!_networkMdl.isProviderEnabledInPhysicalNetwork(physicalNetworkId, Network.Provider.VirtualRouter.getName())) { return false; } if (service == null) { - if (!_networkMgr.isProviderForNetwork(getProvider(), network.getId())) { + if (!_networkMdl.isProviderForNetwork(getProvider(), network.getId())) { s_logger.trace("Element " + getProvider().getName() + " is not a provider for the network " + network); return false; } } else { - if (!_networkMgr.isProviderSupportServiceInNetwork(network.getId(), service, getProvider())) { + if (!_networkMdl.isProviderSupportServiceInNetwork(network.getId(), service, getProvider())) { s_logger.trace("Element " + getProvider().getName() + " doesn't support service " + service.getName() + " in the network " + network); return false; } @@ -224,7 +224,7 @@ NetworkMigrationResponder, AggregatedCommandExecutor { if (offering.isSystemOnly()) { return false; } - if (!_networkMgr.isProviderEnabledInPhysicalNetwork(_networkMgr.getPhysicalNetworkId(network), getProvider().getName())) { + if (!_networkMdl.isProviderEnabledInPhysicalNetwork(_networkMdl.getPhysicalNetworkId(network), getProvider().getName())) { return false; } @@ -252,7 +252,7 @@ NetworkMigrationResponder, AggregatedCommandExecutor { if (rules != null && rules.size() == 1) { // for VR no need to add default egress rule to DENY traffic if (rules.get(0).getTrafficType() == FirewallRule.TrafficType.Egress && rules.get(0).getType() == FirewallRule.FirewallRuleType.System && - !_networkMgr.getNetworkEgressDefaultPolicy(config.getId())) + !_networkMdl.getNetworkEgressDefaultPolicy(config.getId())) return true; } @@ -949,11 +949,11 @@ NetworkMigrationResponder, AggregatedCommandExecutor { protected List<DomainRouterVO> getRouters(Network network, DeployDestination dest) { boolean publicNetwork = false; - if (_networkMgr.isProviderSupportServiceInNetwork(network.getId(), Service.SourceNat, getProvider())) { + if (_networkMdl.isProviderSupportServiceInNetwork(network.getId(), Service.SourceNat, getProvider())) { publicNetwork = true; } boolean isPodBased = - (dest.getDataCenter().getNetworkType() == NetworkType.Basic || _networkMgr.isSecurityGroupSupportedInNetwork(network)) && + (dest.getDataCenter().getNetworkType() == NetworkType.Basic || _networkMdl.isSecurityGroupSupportedInNetwork(network)) && network.getTrafficType() == TrafficType.Guest; List<DomainRouterVO> routers; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/44be1764/server/src/com/cloud/network/element/VpcVirtualRouterElement.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/element/VpcVirtualRouterElement.java b/server/src/com/cloud/network/element/VpcVirtualRouterElement.java index b433fe4..d583383 100644 --- a/server/src/com/cloud/network/element/VpcVirtualRouterElement.java +++ b/server/src/com/cloud/network/element/VpcVirtualRouterElement.java @@ -96,7 +96,7 @@ public class VpcVirtualRouterElement extends VirtualRouterElement implements Vpc @Override protected boolean canHandle(Network network, Service service) { - Long physicalNetworkId = _networkMgr.getPhysicalNetworkId(network); + Long physicalNetworkId = _networkMdl.getPhysicalNetworkId(network); if (physicalNetworkId == null) { return false; } @@ -105,17 +105,17 @@ public class VpcVirtualRouterElement extends VirtualRouterElement implements Vpc return false; } - if (!_networkMgr.isProviderEnabledInPhysicalNetwork(physicalNetworkId, Network.Provider.VPCVirtualRouter.getName())) { + if (!_networkMdl.isProviderEnabledInPhysicalNetwork(physicalNetworkId, Network.Provider.VPCVirtualRouter.getName())) { return false; } if (service == null) { - if (!_networkMgr.isProviderForNetwork(getProvider(), network.getId())) { + if (!_networkMdl.isProviderForNetwork(getProvider(), network.getId())) { s_logger.trace("Element " + getProvider().getName() + " is not a provider for the network " + network); return false; } } else { - if (!_networkMgr.isProviderSupportServiceInNetwork(network.getId(), service, getProvider())) { + if (!_networkMdl.isProviderSupportServiceInNetwork(network.getId(), service, getProvider())) { s_logger.trace("Element " + getProvider().getName() + " doesn't support service " + service.getName() + " in the network " + network); return false; } @@ -179,7 +179,7 @@ public class VpcVirtualRouterElement extends VirtualRouterElement implements Vpc DomainRouterVO router = routers.get(0); //Add router to guest network if needed - if (!_networkMgr.isVmPartOfNetwork(router.getId(), network.getId())) { + if (!_networkMdl.isVmPartOfNetwork(router.getId(), network.getId())) { Map<VirtualMachineProfile.Param, Object> paramsForRouter = new HashMap<VirtualMachineProfile.Param, Object>(1); if (network.getState() == State.Setup) { paramsForRouter.put(VirtualMachineProfile.Param.ReProgramGuestNetworks, true); @@ -224,7 +224,7 @@ public class VpcVirtualRouterElement extends VirtualRouterElement implements Vpc DomainRouterVO router = routers.get(0); //Add router to guest network if needed - if (!_networkMgr.isVmPartOfNetwork(router.getId(), network.getId())) { + if (!_networkMdl.isVmPartOfNetwork(router.getId(), network.getId())) { Map<VirtualMachineProfile.Param, Object> paramsForRouter = new HashMap<VirtualMachineProfile.Param, Object>(1); // need to reprogram guest network if it comes in a setup state if (network.getState() == State.Setup) { @@ -253,7 +253,7 @@ public class VpcVirtualRouterElement extends VirtualRouterElement implements Vpc List<? extends VirtualRouter> routers = _routerDao.listByVpcId(vpcId); for (VirtualRouter router : routers) { //1) Check if router is already a part of the network - if (!_networkMgr.isVmPartOfNetwork(router.getId(), network.getId())) { + if (!_networkMdl.isVmPartOfNetwork(router.getId(), network.getId())) { s_logger.debug("Router " + router + " is not a part the network " + network); continue; } @@ -281,7 +281,7 @@ public class VpcVirtualRouterElement extends VirtualRouterElement implements Vpc List<? extends VirtualRouter> routers = _routerDao.listByVpcId(vpcId); for (VirtualRouter router : routers) { //1) Check if router is already a part of the network - if (!_networkMgr.isVmPartOfNetwork(router.getId(), config.getId())) { + if (!_networkMdl.isVmPartOfNetwork(router.getId(), config.getId())) { s_logger.debug("Router " + router + " is not a part the network " + config); continue; }
