add abiilty to optionally push a SADIS configuration
diff --git a/onos-files/dhcp-to-controller-flow.json b/onos-files/dhcp-to-controller-flow.json
deleted file mode 100644
index f2d31a2..0000000
--- a/onos-files/dhcp-to-controller-flow.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
- "priority": 40000,
- "timeout": 0,
- "isPermanent": true,
- "deviceId": "of:0000000000000001",
- "treatment": {
- "instructions": [
- {
- "type": "OUTPUT",
- "port": "CONTROLLER"
- }
- ]
- },
- "selector": {
- "criteria": [
- {
- "type": "IN_PORT",
- "port": 1
- },
- {
- "type": "VLAN_VID",
- "vlanId": 222
- }
- ]
- }
-}
diff --git a/onos-files/olt-onos-netcfg.json b/onos-files/olt-onos-netcfg.json
deleted file mode 100644
index 8a47b49..0000000
--- a/onos-files/olt-onos-netcfg.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
- "devices": {
- "of:0000aabbccddeeff": {
- "basic": {
- "driver": "voltha"
- }
- }
- },
- "apps": {
- "org.opencord.aaa": {
- "AAA": {
- "radiusIp": "10.1.5.3",
- "nasIp": "10.1.5.3",
- "radiusServerPort": "1812",
- "radiusSecret": "SECRET"
- }
- },
- "org.opencord.sadis": {
- "sadis": {
- "integration": {
- "cache": {
- "enabled": false,
- "maxsize": 50,
- "ttl": "PT0m"
- }
- },
- "entries": [
- {
- "id": "PSMO12345678",
- "cTag": 111,
- "sTag": 222,
- "nasPortId": "",
- "circuitId": "",
- "remoteId": ""
- },
- {
- "id": "10.1.4.4:50060",
- "hardwareIdentifier": "aa:bb:cc:dd:ee:ff",
- "ipAddress": "10.233.111.16",
- "nasId": "10.1.4.4:50060",
- "uplinkPort": 2
- }
- ]
- }
- },
- "org.opencord.dhcpl2relay": {
- "dhcpl2relay" : {
- "useOltUplinkForServerPktInOut": true
- }
- }
- }
-}
diff --git a/onos-files/onos-aaa.json b/onos-files/onos-aaa.json
new file mode 100644
index 0000000..82413fe
--- /dev/null
+++ b/onos-files/onos-aaa.json
@@ -0,0 +1,8 @@
+{
+ "AAA": {
+ "radiusIp": ":RADIUS_IP:",
+ "nasIp": ":RADIUS_IP:",
+ "radiusServerPort": "1812",
+ "radiusSecret": "SECRET"
+ }
+}
diff --git a/onos-files/onos-dhcpl2relay.json b/onos-files/onos-dhcpl2relay.json
new file mode 100644
index 0000000..a9162dc
--- /dev/null
+++ b/onos-files/onos-dhcpl2relay.json
@@ -0,0 +1,5 @@
+{
+ "dhcpl2relay" : {
+ "useOltUplinkForServerPktInOut": true
+ }
+}
diff --git a/onos-files/onos-kafka.json b/onos-files/onos-kafka.json
new file mode 100644
index 0000000..43eada6
--- /dev/null
+++ b/onos-files/onos-kafka.json
@@ -0,0 +1,5 @@
+{
+ "kafka": {
+ "bootstrapServers": "voltha-kafka.voltha.svc.cluster.local:9092"
+ }
+}
diff --git a/onos-files/onos-sadis-no-tp.json b/onos-files/onos-sadis-no-tp.json
new file mode 100644
index 0000000..1208325
--- /dev/null
+++ b/onos-files/onos-sadis-no-tp.json
@@ -0,0 +1,29 @@
+{
+ "sadis": {
+ "integration": {
+ "cache": {
+ "enabled": false,
+ "maxsize": 50,
+ "ttl": "PT0m"
+ }
+ },
+ "entries": [
+ {
+ "id": "BBSIMOLT000",
+ "hardwareIdentifier": "0f:f1:ce:c0:ff:ee",
+ "nasId": "BBSIMOLT000",
+ "uplinkPort": 65536
+ },
+ {
+ "id": "BBSM00000001-1",
+ "cTag": 900,
+ "sTag": 900,
+ "nasPortId": "BBSM00000001-1",
+ "circuitId": "BBSM00000001-1",
+ "remoteId": "BBSIMOLT000"
+ }
+ ]
+ }
+ }
+ }
+}
diff --git a/onos-files/onos-sadis-tp.json b/onos-files/onos-sadis-tp.json
new file mode 100644
index 0000000..5a21c85
--- /dev/null
+++ b/onos-files/onos-sadis-tp.json
@@ -0,0 +1,49 @@
+{
+ "sadis": {
+ "integration": {
+ "cache": {
+ "enabled": false,
+ "maxsize": 50,
+ "ttl": "PT0m"
+ }
+ },
+ "entries": [
+ {
+ "id": "BBSIMOLT000",
+ "hardwareIdentifier": "0f:f1:ce:c0:ff:ee",
+ "nasId": "BBSIMOLT000",
+ "uplinkPort": 65536
+ },
+ {
+ "id": "BBSM00000001-1",
+ "cTag": 900,
+ "sTag": 900,
+ "nasPortId": "BBSM00000001-1",
+ "circuitId": "BBSM00000001-1",
+ "remoteId": "BBSIMOLT000",
+ "technologyProfileId": 64,
+ "upstreamBandwidthProfile": "Default",
+ "downstreamBandwidthProfile": "Default"
+ }
+ ]
+ },
+ "bandwidthprofile": {
+ "integration": {
+ "cache": {
+ "enabled": true,
+ "maxsize": 40,
+ "ttl": "PT1m"
+ }
+ },
+ "entries": [
+ {
+ "id": "Default",
+ "cir": 1000000,
+ "cbs": 1001,
+ "eir": 1002,
+ "ebs": 1003,
+ "air": 1004
+ }
+ ]
+ }
+}
diff --git a/onos-files/radius-config.json b/onos-files/radius-config.json
deleted file mode 100644
index e8c3803..0000000
--- a/onos-files/radius-config.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "apps": {
- "org.opencord.aaa": {
- "AAA": {
- "radiusIp": ":RADIUS_IP:",
- "nasIp": ":RADIUS_IP:",
- "radiusServerPort": "1812",
- "radiusSecret": "SECRET"
- }
- }
- }
-}