Address comments in gerrit 20328
Create a new class XconnecEndpoint to cover both physical port and load balancer
Also change the CLI load balancer identifier to "LB:"
Change-Id: I0b4cd6e474d8b21468d87fcadd9280fdf7d6aafa
diff --git a/app/src/main/java/org/onosproject/segmentrouting/xconnect/api/XconnectCodec.java b/app/src/main/java/org/onosproject/segmentrouting/xconnect/api/XconnectCodec.java
index 08558a8..1154e40 100644
--- a/app/src/main/java/org/onosproject/segmentrouting/xconnect/api/XconnectCodec.java
+++ b/app/src/main/java/org/onosproject/segmentrouting/xconnect/api/XconnectCodec.java
@@ -28,10 +28,13 @@
import java.util.Set;
+/**
+ * Codec for Xconnect.
+ */
public class XconnectCodec extends JsonCodec<XconnectDesc> {
private static final String DEVICE_ID = "deviceId";
private static final String VLAN_ID = "vlanId";
- private static final String PORTS = "ports";
+ private static final String ENDPOINTS = "endpoints";
private static Logger log = LoggerFactory.getLogger(XconnectCodec.class);
@@ -40,8 +43,8 @@
final ObjectNode result = context.mapper().createObjectNode();
result.put(DEVICE_ID, desc.key().deviceId().toString());
result.put(VLAN_ID, desc.key().vlanId().toString());
- final ArrayNode portNode = result.putArray(PORTS);
- desc.ports().forEach(port -> portNode.add(port.toString()));
+ final ArrayNode portNode = result.putArray(ENDPOINTS);
+ desc.endpoints().forEach(endpoint -> portNode.add(endpoint.toString()));
return result;
}
@@ -51,13 +54,14 @@
DeviceId deviceId = DeviceId.deviceId(json.path(DEVICE_ID).asText());
VlanId vlanId = VlanId.vlanId(json.path(VLAN_ID).asText());
- Set<String> ports = Sets.newHashSet();
- JsonNode portNodes = json.get(PORTS);
- if (portNodes != null) {
- portNodes.forEach(portNode -> ports.add(portNode.asText()));
+ Set<XconnectEndpoint> endpoints = Sets.newHashSet();
+ JsonNode endpointNodes = json.get(ENDPOINTS);
+ if (endpointNodes != null) {
+ XconnectEndpoint endpoint = XconnectEndpoint.fromString(endpointNodes.asText());
+ endpointNodes.forEach(endpointNode -> endpoints.add(endpoint));
}
XconnectKey key = new XconnectKey(deviceId, vlanId);
- return new XconnectDesc(key, ports);
+ return new XconnectDesc(key, endpoints);
}
}