Github user jburwell commented on a diff in the pull request:
https://github.com/apache/cloudstack/pull/1579#discussion_r90452834
--- Diff:
plugins/network-elements/nuage-vsp/src/com/cloud/network/guru/NuageVspGuestNetworkGuru.java
---
@@ -317,20 +368,28 @@ private void updateDhcpOptionsForExistingVms(Network
network, HostVO nuageVspHos
if(s_logger.isDebugEnabled()) {
s_logger.debug(String.format("DomainRouter is added to an
existing network: %s in state: %s", network.getName(), network.getState()));
}
- List<VspDhcpVMOption> dhcpOptions = Lists.newLinkedList();
- for (NicVO userNic :_nicDao.listByNetworkId(network.getId())) {
- if (userNic.getVmType() != VirtualMachine.Type.DomainRouter) {
- boolean defaultHasDns =
getDefaultHasDns(networkHasDnsCache, userNic);
-
dhcpOptions.add(_nuageVspEntityBuilder.buildVmDhcpOption(userNic,
defaultHasDns, networkHasDns));
- }
+
+ List<NicVO> userNics = _nicDao.listByNetworkId(network.getId());
+ LinkedListMultimap<Long, VspDhcpVMOption> dhcpOptionsPerDomain =
LinkedListMultimap.create();
+
+ for (NicVO userNic : userNics) {
+ if (userNic.getVmType() == VirtualMachine.Type.DomainRouter)
continue;
--- End diff --
Per our coding standards, all `if` blocks must be wrapped in curly braces.
---
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 [email protected] or file a JIRA ticket
with INFRA.
---
