vol-376 add curciut and rmeote ID
Change-Id: Iff55c9e724571813187f10fd9bf54b3c2bd559ad
diff --git a/app/src/main/java/org/opencord/sadis/impl/SadisConfig.java b/app/src/main/java/org/opencord/sadis/impl/SadisConfig.java
index 85a5bd6..c7efc21 100644
--- a/app/src/main/java/org/opencord/sadis/impl/SadisConfig.java
+++ b/app/src/main/java/org/opencord/sadis/impl/SadisConfig.java
@@ -63,7 +63,9 @@
* "slot" : int,
* "hardwareidentifier" : string,
* "ipAddress" : string,
- * "nasId" : string
+ * "nasId" : string,
+ * "circuitId" : string,
+ * "removeId" : string
* }, ...
* ]
* }
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 18b63ac..af3a71f 100644
--- a/app/src/main/java/org/opencord/sadis/impl/SubscriberAndDeviceInformationCodec.java
+++ b/app/src/main/java/org/opencord/sadis/impl/SubscriberAndDeviceInformationCodec.java
@@ -33,7 +33,10 @@
.put("hardwareIdentifier", (entry.hardwareIdentifier() == null) ? "" :
entry.hardwareIdentifier().toString())
.put("ipAddress", (entry.ipAddress() == null) ? "" : entry.ipAddress().toString())
- .put("nasId", entry.nasId());
+ .put("nasId", entry.nasId())
+ .put("circuiltId", (entry.circuitId() == null) ? "" : entry.circuitId())
+ .put("remoteId", (entry.remoteId() == null) ? "" : entry.remoteId());
+
return result;
}
}
diff --git a/app/src/main/resources/config.json b/app/src/main/resources/config.json
deleted file mode 100644
index eff6202..0000000
--- a/app/src/main/resources/config.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
- "integration":
- {
- "url": "http://localhost:8090",
- "cache":
- {
- "enabled": true,
- "maxsize": 50,
- "ttl": "PT1m"
- }
- },
-
- "entries":
- [
- {
- "id": "1",
- "cTag": 2,
- "sTag": 2,
- "nasPortId": "1/1/2",
- "port": 125,
- "slot": 3,
- "hardwareIdentifier": "aa:bb:cc:dd:ee:ff",
- "ipAddress":"10.10.10.10",
- "nasId":"XXX-NASID"
- },
-
- {
- "id": "2",
- "cTag": 4,
- "sTag": 4,
- "nasPortId": "1/1/2",
- "port": 129,
- "slot": 4,
- "hardwareIdentifier": "aa:bb:cc:dd:ee:ff",
- "ipAddress":"1.1.1.1",
- "nasId":"YYY-NASID"
- },
-
- {
- "id": "cc:dd:ee:ff:aa:bb",
- "hardwareIdentifier": "cc:dd:ee:ff:aa:bb",
- "ipAddress":"12.12.12.12",
- "nasId":"CCC-NASID"
- }
- ]
-}