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

Assert when capability is not supported by service

Browse Source
This commit is contained in:
alena 2010-12-23 11:29:02 -08:00
parent 6b653f2c3a
commit eb1f1da035
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
api/src/com/cloud/network/Network.java
View File

@ -36,6 +36,7 @@ public interface Network extends ControlledEntity {
public Service(String name, Capability... caps) { public Service(String name, Capability... caps) {
this.name = name; this.name = name;
this.caps = caps;
} }
public String getName() { public String getName() {
@ -45,6 +46,21 @@ public interface Network extends ControlledEntity {
public Capability[] getCapabilities() { public Capability[] getCapabilities() {
return caps; return caps;
} }
public boolean containsCapability(Capability cap) {
boolean success = false;
if (caps != null) {
int length = caps.length;
for (int i = 0; i< length; i++) {
if (caps[i].getName().equalsIgnoreCase(cap.getName())) {
success = true;
break;
}
}
}
return success;
}
} }
public static class Provider { public static class Provider {

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

@ -2142,7 +2142,7 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
public Map<Service, Map<Capability, String>> getZoneCapabilities(long zoneId) { public Map<Service, Map<Capability, String>> getZoneCapabilities(long zoneId) {
DataCenterVO dc = _dcDao.findById(zoneId); DataCenterVO dc = _dcDao.findById(zoneId);
if (dc == null) { if (dc == null) {
throw new InvalidParameterValueException("Zone id=" + dc.getId() + " doesn't exist in the system."); throw new InvalidParameterValueException("Zone id=" + zoneId + " doesn't exist in the system.");
} }
//Get all service providers from the datacenter //Get all service providers from the datacenter
@ -2168,7 +2168,14 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
Service service = it.next(); Service service = it.next();
if (providers.get(service).equalsIgnoreCase(element.getProvider().getName())) { if (providers.get(service).equalsIgnoreCase(element.getProvider().getName())) {
if (elementCapabilities.containsKey(service)) { if (elementCapabilities.containsKey(service)) {
networkCapabilities.put(service, elementCapabilities.get(service)); Map<Capability, String> capabilities = elementCapabilities.get(service);
//Verify if Service support capability
if (capabilities != null) {
for (Capability capability : capabilities.keySet()) {
assert(service.containsCapability(capability)) : "Capability " + capability.getName() + " is not supported by the service " + service.getName();
}
}
networkCapabilities.put(service, capabilities);
it.remove(); it.remove();
} }
} }