SEBA-814 To support Multi-Tcont on TT-workflow, SADIS configuration
is updated.
Change-Id: I48cb3c3894f8e711b74165152d5712c593cc3c03
diff --git a/app/src/main/java/org/opencord/sadis/impl/SubscriberAndDeviceInformationCodec.java b/app/src/main/java/org/opencord/sadis/impl/SubscriberAndDeviceInformationCodec.java
index e3f2996..4208a5e 100644
--- a/app/src/main/java/org/opencord/sadis/impl/SubscriberAndDeviceInformationCodec.java
+++ b/app/src/main/java/org/opencord/sadis/impl/SubscriberAndDeviceInformationCodec.java
@@ -16,31 +16,91 @@
package org.opencord.sadis.impl;
import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.google.common.collect.Lists;
+import org.onlab.packet.Ip4Address;
+import org.onlab.packet.MacAddress;
import org.onosproject.codec.CodecContext;
import org.onosproject.codec.JsonCodec;
import org.opencord.sadis.SubscriberAndDeviceInformation;
+import org.opencord.sadis.UniTagInformation;
-public class SubscriberAndDeviceInformationCodec extends JsonCodec<SubscriberAndDeviceInformation> {
- @Override
- public ObjectNode encode(SubscriberAndDeviceInformation entry, CodecContext context) {
- return context.mapper().createObjectNode()
- .put("id", entry.id())
- .put("cTag", (entry.cTag() == null) ? "" : entry.cTag().toString())
- .put("sTag", (entry.sTag() == null) ? "" : entry.sTag().toString())
- .put("nasPortId", entry.nasPortId())
- .put("uplinkPort", entry.uplinkPort())
- .put("slot", entry.slot())
- .put("hardwareIdentifier", (entry.hardwareIdentifier() == null) ? "" :
- entry.hardwareIdentifier().toString())
- .put("ipAddress", (entry.ipAddress() == null) ? "" : entry.ipAddress().toString())
- .put("nasId", entry.nasId())
- .put("circuiltId", (entry.circuitId() == null) ? "" : entry.circuitId())
- .put("remoteId", (entry.remoteId() == null) ? "" : entry.remoteId())
- .put("technologyProfileId", entry.technologyProfileId())
- .put("upstreamBandwidthProfile", (entry.upstreamBandwidthProfile() == null) ?
- "" : entry.upstreamBandwidthProfile())
- .put("downstreamBandwidthProfile", (entry.downstreamBandwidthProfile() == null) ?
- "" : entry.downstreamBandwidthProfile());
+import java.util.ArrayList;
+import java.util.List;
- }
+public class SubscriberAndDeviceInformationCodec extends JsonCodec<SubscriberAndDeviceInformation> {
+
+ private static final String ID = "id";
+ private static final String NAS_PORT_ID = "nasPortId";
+ private static final String UPLINK_PORT = "uplinkPort";
+ private static final String SLOT = "slot";
+ private static final String HARDWARE_IDENTIFIER = "hardwareIdentifier";
+ private static final String IP_ADDRESS = "ipAddress";
+ private static final String NAS_ID = "nasId";
+ private static final String CIRCUIT_ID = "circuitId";
+ private static final String REMOTE_ID = "remoteId";
+ private static final String UNI_TAG_LIST = "uniTagList";
+ private static final String EMPTY_STRING = "";
+ private static final int NO_VALUE = -1;
+
+ @Override
+ public ObjectNode encode(SubscriberAndDeviceInformation entry, CodecContext context) {
+
+ List<ObjectNode> uniTagListNodes = Lists.newArrayList();
+ List<UniTagInformation> uniTagList = entry.uniTagList();
+ if (uniTagList != null) {
+ for (UniTagInformation uniTagInformation : uniTagList) {
+ uniTagListNodes.add(context.encode(uniTagInformation, UniTagInformation.class));
+ }
+ }
+ return context.mapper().createObjectNode()
+ .put(ID, entry.id())
+ .put(NAS_PORT_ID, entry.nasPortId())
+ .put(UPLINK_PORT, entry.uplinkPort())
+ .put(SLOT, entry.slot())
+ .put(HARDWARE_IDENTIFIER, (entry.hardwareIdentifier() == null) ? EMPTY_STRING :
+ entry.hardwareIdentifier().toString())
+ .put(IP_ADDRESS, (entry.ipAddress() == null) ? EMPTY_STRING : entry.ipAddress().toString())
+ .put(NAS_ID, entry.nasId())
+ .put(CIRCUIT_ID, (entry.circuitId() == null) ? EMPTY_STRING : entry.circuitId())
+ .put(REMOTE_ID, (entry.remoteId() == null) ? EMPTY_STRING : entry.remoteId())
+ .put(UNI_TAG_LIST, uniTagListNodes.toString());
+ }
+
+ @Override
+ public SubscriberAndDeviceInformation decode(ObjectNode json, CodecContext context) {
+ if (json == null || !json.isObject()) {
+ return null;
+ }
+ if (json.get(ID) == null) {
+ return null;
+ }
+
+ SubscriberAndDeviceInformation info = new SubscriberAndDeviceInformation();
+ info.setId(json.get(ID).asText());
+ info.setNasPortId(json.get(NAS_PORT_ID) == null ? EMPTY_STRING : json.get(NAS_PORT_ID).asText());
+ info.setUplinkPort(json.get(UPLINK_PORT) == null ? NO_VALUE : json.get(UPLINK_PORT).asInt());
+ info.setSlot(json.get(SLOT) == null ? NO_VALUE : json.get(SLOT).asInt());
+ info.setNasId(json.get(NAS_ID) == null ? EMPTY_STRING : json.get(NAS_ID).asText());
+ info.setCircuitId(json.get(CIRCUIT_ID) == null ? EMPTY_STRING : json.get(CIRCUIT_ID).asText());
+ info.setRemoteId(json.get(REMOTE_ID) == null ? EMPTY_STRING : json.get(REMOTE_ID).asText());
+
+ if (json.get(HARDWARE_IDENTIFIER) != null) {
+ info.setHardwareIdentifier(MacAddress.valueOf(json.get(HARDWARE_IDENTIFIER).asText()));
+ }
+
+ if (json.get(IP_ADDRESS) != null) {
+ info.setIPAddress(Ip4Address.valueOf(json.get(IP_ADDRESS).asText()));
+ }
+
+ if (json.get(UNI_TAG_LIST) != null) {
+ List<UniTagInformation> uniTagList = new ArrayList<>();
+ json.get(UNI_TAG_LIST).forEach(entry -> {
+ uniTagList.add(new SubscriberAndDeviceInformationConfig()
+ .getUniTagInformation(entry));
+
+ });
+ info.setUniTagList(uniTagList);
+ }
+ return info;
+ }
}