apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 20:02:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

NAAS: fixing NPE in createnetworkoffering with out service capabilities specified

Browse Source
This commit is contained in:
Murali Reddy 2011-11-09 11:48:06 -08:00
parent 0353133369
commit aaf3b99228
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2988,9 +2988,10 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura
} }
void validateLoadBalancerServiceCapabilities(Map<Capability, String> lbServiceCapabilityMap) { void validateLoadBalancerServiceCapabilities(Map<Capability, String> lbServiceCapabilityMap) {
if ((lbServiceCapabilityMap != null) && (lbServiceCapabilityMap.keySet().size() > 1 || !lbServiceCapabilityMap.containsKey(Capability.SupportedLBIsolation.getName()))) { if (lbServiceCapabilityMap != null) {
throw new InvalidParameterValueException("Only Load balancer isolation capability can be sepcified for LB service"); if (lbServiceCapabilityMap.keySet().size() > 1 || !lbServiceCapabilityMap.containsKey(Capability.SupportedLBIsolation.getName())) {
} else { throw new InvalidParameterValueException("Only Load balancer isolation capability can be sepcified for LB service");
}
String isolationCapability = lbServiceCapabilityMap.get(Capability.SupportedLBIsolation.getName()); String isolationCapability = lbServiceCapabilityMap.get(Capability.SupportedLBIsolation.getName());
boolean dedicatedLb = isolationCapability.contains("dedicated"); boolean dedicatedLb = isolationCapability.contains("dedicated");
boolean sharedLB = isolationCapability.contains("shared"); boolean sharedLB = isolationCapability.contains("shared");
@ -3001,9 +3002,10 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura
} }
void validateFirewallServiceCapablities(Map<Capability, String> fwServiceCapabilityMap) { void validateFirewallServiceCapablities(Map<Capability, String> fwServiceCapabilityMap) {
if ((fwServiceCapabilityMap != null) && (fwServiceCapabilityMap.keySet().size() > 1) || !fwServiceCapabilityMap.containsKey(Capability.SupportedSourceNatTypes.getName())) { if (fwServiceCapabilityMap != null) {
throw new InvalidParameterValueException("Only Supported Source NAT type capability can be sepcified for firewall service"); if (fwServiceCapabilityMap.keySet().size() > 1 || !fwServiceCapabilityMap.containsKey(Capability.SupportedSourceNatTypes.getName())) {
} else { throw new InvalidParameterValueException("Only Supported Source NAT type capability can be sepcified for firewall service");
}
String sourceNatType = fwServiceCapabilityMap.get(Capability.SupportedSourceNatTypes.getName()); String sourceNatType = fwServiceCapabilityMap.get(Capability.SupportedSourceNatTypes.getName());
boolean perAccount = sourceNatType.contains("peraccount"); boolean perAccount = sourceNatType.contains("peraccount");
boolean perZone = sourceNatType.contains("perzone"); boolean perZone = sourceNatType.contains("perzone");
@ -3012,7 +3014,7 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura
} }
} }
} }
@Override @Override
@DB @DB
public NetworkOfferingVO createNetworkOffering(long userId, String name, String displayText, TrafficType trafficType, String tags, Integer maxConnections, boolean specifyVlan, public NetworkOfferingVO createNetworkOffering(long userId, String name, String displayText, TrafficType trafficType, String tags, Integer maxConnections, boolean specifyVlan,