[VOL-4179] Multi UNI changes for Sadis
Review fixes finished
Multi UNI changes for Sadis implemented. New bandwidth profile fields are added for Olt device.
Inside of constructor made it more readible
Change-Id: I82bf45a6a4e7aa056fdfb555ba32a63da3a01284
diff --git a/app/src/main/java/org/opencord/sadis/impl/SubscriberAndDeviceInformationConfig.java b/app/src/main/java/org/opencord/sadis/impl/SubscriberAndDeviceInformationConfig.java
index d794433..43170a8 100644
--- a/app/src/main/java/org/opencord/sadis/impl/SubscriberAndDeviceInformationConfig.java
+++ b/app/src/main/java/org/opencord/sadis/impl/SubscriberAndDeviceInformationConfig.java
@@ -62,23 +62,25 @@
* "remoteId" : string,
* "uniTagList": [
* {
- * "uniTagMatch" : int,
- * "ponCTag" : string,
- * "ponSTag" : string,
- * "usPonCTagPriority" : int,
- * "dsPonCTagPriority" : int,
- * "usPonSTagPriority" : int,
- * "dsPonSTagPriority" : int,
- * "technologyProfileId" : int,
- * "upstreamBandwidthProfile" : string,
- * "downstreamBandwidthProfile": string,
- * "enableMacLearning" : string,
- * "configuredDacAddress" : string,
- * "isDhcpRequired" : string,
- * "isIgmpRequired" : string,
- * "serviceName" : string
+ * "uniTagMatch" : int,
+ * "ponCTag" : string,
+ * "ponSTag" : string,
+ * "usPonCTagPriority" : int,
+ * "dsPonCTagPriority" : int,
+ * "usPonSTagPriority" : int,
+ * "dsPonSTagPriority" : int,
+ * "technologyProfileId" : int,
+ * "upstreamBandwidthProfile" : string,
+ * "downstreamBandwidthProfile" : string,
+ * "upstreamOltBandwidthProfile" : string,
+ * "downstreamOltBandwidthProfile" : string,
+ * "enableMacLearning" : string,
+ * "configuredDacAddress" : string,
+ * "isDhcpRequired" : string,
+ * "isIgmpRequired" : string,
+ * "serviceName" : string
* }
- * ]
+ * ]
* }, ...
* ]
* }
@@ -100,6 +102,8 @@
private static final String TP_ID = "technologyProfileId";
private static final String US_BW = "upstreamBandwidthProfile";
private static final String DS_BW = "downstreamBandwidthProfile";
+ private static final String US_OLT_BW = "upstreamOltBandwidthProfile";
+ private static final String DS_OLT_BW = "downstreamOltBandwidthProfile";
private static final String SERVICE_NAME = "serviceName";
private static final String IS_DHCP_REQ = "isDhcpRequired";
private static final String IS_IGMP_REQ = "isIgmpRequired";
@@ -156,6 +160,8 @@
}
public UniTagInformation getUniTagInformation(JsonNode node) {
+ String usBw = node.get(US_BW) == null ? null : node.get(US_BW).asText();
+ String dsBw = node.get(DS_BW) == null ? null : node.get(DS_BW).asText();
return new UniTagInformation.Builder()
.setUniTagMatch(VlanId.vlanId(node.get(UNI_TAG_MATCH) == null ? VlanId.NO_VID
: (short) node.get(UNI_TAG_MATCH).asInt()))
@@ -172,10 +178,12 @@
.setEnableMacLearning(node.get(MAC_LEARNING) == null ? false :
node.get(MAC_LEARNING).asBoolean())
.setTechnologyProfileId(node.get(TP_ID).asInt())
- .setUpstreamBandwidthProfile(node.get(US_BW) == null ? null
- : node.get(US_BW).asText())
- .setDownstreamBandwidthProfile(node.get(DS_BW) == null ? null
- : node.get(DS_BW).asText())
+ .setUpstreamBandwidthProfile(usBw)
+ .setDownstreamBandwidthProfile(dsBw)
+ .setUpstreamOltBandwidthProfile(node.get(US_OLT_BW) == null ? usBw
+ : node.get(US_OLT_BW).asText())
+ .setDownstreamOltBandwidthProfile(node.get(DS_OLT_BW) == null ? dsBw
+ : node.get(DS_OLT_BW).asText())
.setServiceName(node.get(SERVICE_NAME) == null ? NO_SN :
node.get(SERVICE_NAME).asText())
.setIsDhcpRequired(node.get(IS_DHCP_REQ) == null ? false : node.get(IS_DHCP_REQ).asBoolean())