From 809f9d965e46b90e2f316e2f25214d6a7683ef04 Mon Sep 17 00:00:00 2001 From: prachi Date: Tue, 25 Oct 2011 18:48:50 -0700 Subject: [PATCH] Fixed NetworkMgr: getNetworkCapabilities. The key used to get the capabilities from the provider capabilities map was wrong. --- .../src/com/cloud/configuration/ConfigurationManagerImpl.java | 1 + server/src/com/cloud/network/NetworkManagerImpl.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java index e9661946e8b..1a44e8feebe 100755 --- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java +++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java @@ -1808,6 +1808,7 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura Boolean forVirtualNetwork = cmd.isForVirtualNetwork(); Long networkId = cmd.getNetworkID(); String networkVlanId = null; + Long physicalNetworkId = cmd.getPhysicalNetworkId(); //projectId and accountName can't be specified together String accountName = cmd.getAccountName(); diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java index cdcf3fdf4a6..08ceb40dc4d 100755 --- a/server/src/com/cloud/network/NetworkManagerImpl.java +++ b/server/src/com/cloud/network/NetworkManagerImpl.java @@ -2623,8 +2623,8 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag NetworkElement element = getElementImplementingProvider(instance.getProvider()); if(element != null){ Map> elementCapabilities = element.getCapabilities();; - if (elementCapabilities != null && elementCapabilities.get(service) != null) { - networkCapabilities.put(service, elementCapabilities.get(instance.getService())); + if (elementCapabilities != null) { + networkCapabilities.put(service, elementCapabilities.get(service)); } } }