Github user koushik-das commented on a diff in the pull request:
https://github.com/apache/cloudstack/pull/788#discussion_r39025559
--- Diff: server/src/com/cloud/network/router/NetworkHelperImpl.java ---
@@ -610,20 +608,22 @@ protected HypervisorType
getClusterToStartDomainRouterForOvm(final long podId) {
throw new CloudRuntimeException(errMsg);
}
- @Override
- public LinkedHashMap<Network, List<? extends NicProfile>>
configureDefaultNics(final RouterDeploymentDefinition
routerDeploymentDefinition) throws ConcurrentOperationException,
InsufficientAddressCapacityException {
-
- final LinkedHashMap<Network, List<? extends NicProfile>> networks
= new LinkedHashMap<Network, List<? extends NicProfile>>(3);
+ protected LinkedHashMap<Network, List<? extends NicProfile>>
configureControlNic(final RouterDeploymentDefinition
routerDeploymentDefinition) {
+ final LinkedHashMap<Network, List<? extends NicProfile>>
controlConfig = new LinkedHashMap<Network, List<? extends NicProfile>>(3);
- // 1) Control network
s_logger.debug("Adding nic for Virtual Router in Control network
");
final List<? extends NetworkOffering> offerings =
_networkModel.getSystemAccountNetworkOfferings(NetworkOffering.SystemControlNetwork);
final NetworkOffering controlOffering = offerings.get(0);
- final Network controlConfig =
_networkMgr.setupNetwork(s_systemAccount, controlOffering,
routerDeploymentDefinition.getPlan(), null, null, false).get(0);
+ final Network controlNic =
_networkMgr.setupNetwork(s_systemAccount, controlOffering,
routerDeploymentDefinition.getPlan(), null, null, false).get(0);
- networks.put(controlConfig, new ArrayList<NicProfile>());
+ controlConfig.put(controlNic, new ArrayList<NicProfile>());
+
+ return controlConfig;
+ }
+
+ protected LinkedHashMap<Network, List<? extends NicProfile>>
configurePublicNic(final RouterDeploymentDefinition routerDeploymentDefinition,
final boolean hasGuestNic) {
+ final LinkedHashMap<Network, List<? extends NicProfile>>
publicConfig = new LinkedHashMap<Network, List<? extends NicProfile>>(3);
--- End diff --
In the individual configure methods, why is the initial size of the hash
map 3? :)
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
