commit 3b225bb788c8ce4d4a60a91a8f8b628705acb6cf
author amit.ghosh <amit.ghosh@radisys.com> Thu Feb 17 18:41:00 2022 +0100
committer amit.ghosh <amit.ghosh@radisys.com> Tue Feb 22 21:04:10 2022 +0100
tree 5890f372ccd48c9b8ef9945215e5d9694a78ee1e
parent 1e792b48c9270175384c0574ec3bff11f113fbfb

[VOL-4617] - Update Sadis with nniDhcpTrapVid and doc for interpretation of UniTagInformation attributes for FTTB

Change-Id: Ie766d05d6d4d4d2f11fc7e3b18f1f045e8c6b83f

app/src/main/java/org/opencord/sadis/impl/SubscriberAndDeviceInformationCodec.java

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 4208a5e..1c4ab8c 100644
--- a/app/src/main/java/org/opencord/sadis/impl/SubscriberAndDeviceInformationCodec.java
+++ b/app/src/main/java/org/opencord/sadis/impl/SubscriberAndDeviceInformationCodec.java
@@ -19,6 +19,7 @@
 import com.google.common.collect.Lists;
 import org.onlab.packet.Ip4Address;
 import org.onlab.packet.MacAddress;
+import org.onlab.packet.VlanId;
 import org.onosproject.codec.CodecContext;
 import org.onosproject.codec.JsonCodec;
 import org.opencord.sadis.SubscriberAndDeviceInformation;
@@ -39,6 +40,7 @@
     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 NNI_DHCP_TRAP_VID = "nniDhcpTrapVid";
     private static final String EMPTY_STRING = "";
     private static final int NO_VALUE = -1;
 
@@ -63,6 +65,7 @@
                 .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(NNI_DHCP_TRAP_VID, entry.nniDhcpTrapVid().toShort())
                 .put(UNI_TAG_LIST, uniTagListNodes.toString());
     }
 
@@ -83,6 +86,8 @@
         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());
+        info.setNniDhcpTrapVid(json.get(NNI_DHCP_TRAP_VID) == null ? VlanId.vlanId(VlanId.NO_VID) :
+        VlanId.vlanId(json.get(NNI_DHCP_TRAP_VID).shortValue()));
 
         if (json.get(HARDWARE_IDENTIFIER) != null) {
             info.setHardwareIdentifier(MacAddress.valueOf(json.get(HARDWARE_IDENTIFIER).asText()));