etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed NetworkMgr: getNetworkCapabilities. 

The key used to get the capabilities from the provider capabilities map was wrong.
This commit is contained in:
prachi 2011-10-25 18:48:50 -07:00
parent 96843be30a
commit 809f9d965e
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
View File

@ -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();

4
server/src/com/cloud/network/NetworkManagerImpl.java
View File

@ -2623,8 +2623,8 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
NetworkElement element = getElementImplementingProvider(instance.getProvider());
if(element != null){
Map<Service, Map<Capability, String>> 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));
}
}
}