Skip to content

Commit 44be176

Browse files
DaanHooglandDaanHoogland
committed
rename networkMgr to networkMdl to prevent name clashes in mocks of
VirtualRouterElement and VirtualNetworkApplianceManagerImpl
1 parent c804660 commit 44be176

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

‎server/src/com/cloud/network/element/VirtualRouterElement.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ public class VirtualRouterElement extends AdapterBase implements VirtualRouterEl
121121
@Inject
122122
NetworkDao _networksDao;
123123
@Inject
124-
NetworkModel _networkMgr;
124+
NetworkModel _networkMdl;
125125
@Inject
126126
LoadBalancingRulesManager _lbMgr;
127127
@Inject
@@ -155,7 +155,7 @@ public class VirtualRouterElement extends AdapterBase implements VirtualRouterEl
155155
IPAddressDao _ipAddressDao;
156156

157157
protected boolean canHandle(Network network, Service service) {
158-
Long physicalNetworkId = _networkMgr.getPhysicalNetworkId(network);
158+
Long physicalNetworkId = _networkMdl.getPhysicalNetworkId(network);
159159
if (physicalNetworkId == null) {
160160
return false;
161161
}
@@ -164,17 +164,17 @@ protected boolean canHandle(Network network, Service service) {
164164
return false;
165165
}
166166

167-
if (!_networkMgr.isProviderEnabledInPhysicalNetwork(physicalNetworkId, Network.Provider.VirtualRouter.getName())) {
167+
if (!_networkMdl.isProviderEnabledInPhysicalNetwork(physicalNetworkId, Network.Provider.VirtualRouter.getName())) {
168168
return false;
169169
}
170170

171171
if (service == null) {
172-
if (!_networkMgr.isProviderForNetwork(getProvider(), network.getId())) {
172+
if (!_networkMdl.isProviderForNetwork(getProvider(), network.getId())) {
173173
s_logger.trace("Element " + getProvider().getName() + " is not a provider for the network " + network);
174174
return false;
175175
}
176176
} else {
177-
if (!_networkMgr.isProviderSupportServiceInNetwork(network.getId(), service, getProvider())) {
177+
if (!_networkMdl.isProviderSupportServiceInNetwork(network.getId(), service, getProvider())) {
178178
s_logger.trace("Element " + getProvider().getName() + " doesn't support service " + service.getName() + " in the network " + network);
179179
return false;
180180
}
@@ -224,7 +224,7 @@ public boolean prepare(Network network, NicProfile nic, VirtualMachineProfile vm
224224
if (offering.isSystemOnly()) {
225225
return false;
226226
}
227-
if (!_networkMgr.isProviderEnabledInPhysicalNetwork(_networkMgr.getPhysicalNetworkId(network), getProvider().getName())) {
227+
if (!_networkMdl.isProviderEnabledInPhysicalNetwork(_networkMdl.getPhysicalNetworkId(network), getProvider().getName())) {
228228
return false;
229229
}
230230

@@ -252,7 +252,7 @@ public boolean applyFWRules(Network config, List<? extends FirewallRule> rules)
252252
if (rules != null && rules.size() == 1) {
253253
// for VR no need to add default egress rule to DENY traffic
254254
if (rules.get(0).getTrafficType() == FirewallRule.TrafficType.Egress && rules.get(0).getType() == FirewallRule.FirewallRuleType.System &&
255-
!_networkMgr.getNetworkEgressDefaultPolicy(config.getId()))
255+
!_networkMdl.getNetworkEgressDefaultPolicy(config.getId()))
256256
return true;
257257
}
258258

@@ -949,11 +949,11 @@ public boolean addPasswordAndUserdata(Network network, NicProfile nic, VirtualMa
949949

950950
protected List<DomainRouterVO> getRouters(Network network, DeployDestination dest) {
951951
boolean publicNetwork = false;
952-
if (_networkMgr.isProviderSupportServiceInNetwork(network.getId(), Service.SourceNat, getProvider())) {
952+
if (_networkMdl.isProviderSupportServiceInNetwork(network.getId(), Service.SourceNat, getProvider())) {
953953
publicNetwork = true;
954954
}
955955
boolean isPodBased =
956-
(dest.getDataCenter().getNetworkType() == NetworkType.Basic || _networkMgr.isSecurityGroupSupportedInNetwork(network)) &&
956+
(dest.getDataCenter().getNetworkType() == NetworkType.Basic || _networkMdl.isSecurityGroupSupportedInNetwork(network)) &&
957957
network.getTrafficType() == TrafficType.Guest;
958958

959959
List<DomainRouterVO> routers;

‎server/src/com/cloud/network/element/VpcVirtualRouterElement.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public class VpcVirtualRouterElement extends VirtualRouterElement implements Vpc
9696

9797
@Override
9898
protected boolean canHandle(Network network, Service service) {
99-
Long physicalNetworkId = _networkMgr.getPhysicalNetworkId(network);
99+
Long physicalNetworkId = _networkMdl.getPhysicalNetworkId(network);
100100
if (physicalNetworkId == null) {
101101
return false;
102102
}
@@ -105,17 +105,17 @@ protected boolean canHandle(Network network, Service service) {
105105
return false;
106106
}
107107

108-
if (!_networkMgr.isProviderEnabledInPhysicalNetwork(physicalNetworkId, Network.Provider.VPCVirtualRouter.getName())) {
108+
if (!_networkMdl.isProviderEnabledInPhysicalNetwork(physicalNetworkId, Network.Provider.VPCVirtualRouter.getName())) {
109109
return false;
110110
}
111111

112112
if (service == null) {
113-
if (!_networkMgr.isProviderForNetwork(getProvider(), network.getId())) {
113+
if (!_networkMdl.isProviderForNetwork(getProvider(), network.getId())) {
114114
s_logger.trace("Element " + getProvider().getName() + " is not a provider for the network " + network);
115115
return false;
116116
}
117117
} else {
118-
if (!_networkMgr.isProviderSupportServiceInNetwork(network.getId(), service, getProvider())) {
118+
if (!_networkMdl.isProviderSupportServiceInNetwork(network.getId(), service, getProvider())) {
119119
s_logger.trace("Element " + getProvider().getName() + " doesn't support service " + service.getName() + " in the network " + network);
120120
return false;
121121
}
@@ -179,7 +179,7 @@ public boolean implement(Network network, NetworkOffering offering, DeployDestin
179179

180180
DomainRouterVO router = routers.get(0);
181181
//Add router to guest network if needed
182-
if (!_networkMgr.isVmPartOfNetwork(router.getId(), network.getId())) {
182+
if (!_networkMdl.isVmPartOfNetwork(router.getId(), network.getId())) {
183183
Map<VirtualMachineProfile.Param, Object> paramsForRouter = new HashMap<VirtualMachineProfile.Param, Object>(1);
184184
if (network.getState() == State.Setup) {
185185
paramsForRouter.put(VirtualMachineProfile.Param.ReProgramGuestNetworks, true);
@@ -224,7 +224,7 @@ public boolean prepare(Network network, NicProfile nic, VirtualMachineProfile vm
224224

225225
DomainRouterVO router = routers.get(0);
226226
//Add router to guest network if needed
227-
if (!_networkMgr.isVmPartOfNetwork(router.getId(), network.getId())) {
227+
if (!_networkMdl.isVmPartOfNetwork(router.getId(), network.getId())) {
228228
Map<VirtualMachineProfile.Param, Object> paramsForRouter = new HashMap<VirtualMachineProfile.Param, Object>(1);
229229
// need to reprogram guest network if it comes in a setup state
230230
if (network.getState() == State.Setup) {
@@ -253,7 +253,7 @@ public boolean shutdown(Network network, ReservationContext context, boolean cle
253253
List<? extends VirtualRouter> routers = _routerDao.listByVpcId(vpcId);
254254
for (VirtualRouter router : routers) {
255255
//1) Check if router is already a part of the network
256-
if (!_networkMgr.isVmPartOfNetwork(router.getId(), network.getId())) {
256+
if (!_networkMdl.isVmPartOfNetwork(router.getId(), network.getId())) {
257257
s_logger.debug("Router " + router + " is not a part the network " + network);
258258
continue;
259259
}
@@ -281,7 +281,7 @@ public boolean destroy(Network config, ReservationContext context) throws Concur
281281
List<? extends VirtualRouter> routers = _routerDao.listByVpcId(vpcId);
282282
for (VirtualRouter router : routers) {
283283
//1) Check if router is already a part of the network
284-
if (!_networkMgr.isVmPartOfNetwork(router.getId(), config.getId())) {
284+
if (!_networkMdl.isVmPartOfNetwork(router.getId(), config.getId())) {
285285
s_logger.debug("Router " + router + " is not a part the network " + config);
286286
continue;
287287
}

0 commit comments

Comments
 (0)