mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2026-05-05 12:16:13 +02:00
Code Issues Projects Releases Wiki Activity

ONOS-6896: Unable to change/add a friendly name to a host

Browse Source 
- modified locations method so that it only
  throws exception if the locations where
  defined, but are empty
- modified locations method to use interfaces
  instead of concrete HashSet class
- modified locations method so that it returns
  null if locations where not defined, instead
  of empty hash set

Change-Id: I178fa8a6acfdcbd6ad2230ce450cf4cf87320662
This commit is contained in:
Szymon Giermakowski 2017-08-29 22:02:48 +02:00 committed by Ray Milkey
parent 7d7d46eef0
commit f3578de08b
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
core/api/src/main/java/org/onosproject/net/config/basics/BasicHostConfig.java
View File

@ -16,6 +16,7 @@
package org.onosproject.net.config.basics;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.google.common.collect.ImmutableSet;
import org.onlab.packet.IpAddress;
import org.onosproject.net.ConnectPoint;
import org.onosproject.net.HostId;
@ -40,7 +41,7 @@ public final class BasicHostConfig extends BasicElementConfig<HostId> {
this.locations();
this.ipAddresses();
return hasOnlyFields(ALLOWED, NAME, LOC_TYPE, LATITUDE, LONGITUDE,
GRID_Y, GRID_Y, UI_TYPE, RACK_ADDRESS, OWNER, IPS, LOCATIONS);
GRID_Y, GRID_Y, UI_TYPE, RACK_ADDRESS, OWNER, IPS, LOCATIONS);
}
@Override
@ -57,21 +58,29 @@ public final class BasicHostConfig extends BasicElementConfig<HostId> {
/**
* Returns the location of the host.
*
* @return location of the host
* @throws IllegalArgumentException if not specified with correct format
* @return location of the host or null if none specified
* @throws IllegalArgumentException if locations are set but empty or not
* specified with correct format
*/
public Set<HostLocation> locations() {
HashSet<HostLocation> locations = new HashSet<>();
if (object.has(LOCATIONS)) {
ArrayNode locationNodes = (ArrayNode) object.path(LOCATIONS);
locationNodes.forEach(n -> {
ConnectPoint cp = ConnectPoint.deviceConnectPoint((n.asText()));
locations.add(new HostLocation(cp, 0));
});
if (!object.has(LOCATIONS)) {
return null; //no locations are specified
}
ImmutableSet.Builder<HostLocation> locationsSetBuilder = ImmutableSet.<HostLocation>builder();
ArrayNode locationNodes = (ArrayNode) object.path(LOCATIONS);
locationNodes.forEach(n -> {
ConnectPoint cp = ConnectPoint.deviceConnectPoint((n.asText()));
locationsSetBuilder.add(new HostLocation(cp, 0));
});
Set<HostLocation> locations = locationsSetBuilder.build();
if (locations.isEmpty()) {
throw new IllegalArgumentException("Host should have at least one location");
}
return locations;
}
@ -110,4 +119,4 @@ public final class BasicHostConfig extends BasicElementConfig<HostId> {
public BasicHostConfig setIps(Set<IpAddress> ipAddresses) {
return (BasicHostConfig) setOrClear(IPS, ipAddresses);
}
}
}