commit 42d4b78288151041604c48459a3ff12444a28674
author Matt Jeanneret <mj3580@att.com> Sat Mar 23 10:43:11 2019 -0400
committer khenaidoo Nursimulu <knursimu@ciena.com> Mon Apr 08 14:32:36 2019 +0000
tree 8ace12c53b706b29c190097141526b51d8102824
parent b0037422e6f976e4793f3a6b14e7a9df5d973fbf

VOL-1489: Compose file now uses configured onos

Update network-cfg.json config to suit your environment

Note that the sadis entry for the olt must be
the serial number reported by the olt adapter.

Note also the devices entry for the olt must be
the mac address reported by the olt adapter

Change-Id: I5065c4e60909b608419c4d24b8842bf71e872c5b

compose/network-cfg.json

diff --git a/compose/network-cfg.json b/compose/network-cfg.json
new file mode 100644
index 0000000..033071b
--- /dev/null
+++ b/compose/network-cfg.json
@@ -0,0 +1,55 @@
+{
+  "devices" : {
+    "of:0000aabbccddeeff" : {
+      "accessDevice" : {
+        "uplink" : "65536",
+        "vlan" : "12"
+      },
+      "basic" : {
+        "driver" : "voltha"
+      }
+    }
+  },
+  "apps" : {
+    "org.opencord.dhcpl2relay" : {
+      "dhcpl2relay" : {
+        "useOltUplinkForServerPktInOut" : true
+      }
+    },
+    "org.opencord.aaa" : {
+      "AAA" : {
+        "radiusIp" : "172.16.0.1",
+        "radiusServerPort" : "1645",
+        "radiusSecret" : "secret",
+        "nasIp" : "172.16.0.10",
+        "radiusConnectionType" : "socket",
+        "packetCustomizer" : "att"
+      }
+    },
+    "org.opencord.sadis" : {
+      "sadis" : {
+        "integration" : {
+          "cache" : {
+            "enabled" : true,
+            "maxsize" : 50,
+            "ttl" : "PT1m"
+          }
+        },
+        "entries" : [ {
+          "id" : "EC1829000886",
+          "uplinkPort" : 65536,
+          "hardwareIdentifier" : "3c:2c:99:f7:c6:82",
+          "ipAddress" : "10.64.1.207",
+          "nasId" : "ATLEDGEVOLT1"
+        }, {
+          "id" : "BRCM33333333",
+          "cTag" : 21,
+          "sTag" : 12,
+          "nasPortId" : "PON 1/1/3/1:4.1.1",
+          "circuitId" : "PON 1/1/3/1:4.1.1-CID",
+          "remoteId" : "ATLEDGEVOLT1-RID"
+        }]
+      }
+    }
+  }
+}

compose/system-test.yml

diff --git a/compose/system-test.yml b/compose/system-test.yml
index 9ab55ac..1d6bc51 100644
--- a/compose/system-test.yml
+++ b/compose/system-test.yml
@@ -144,6 +144,7 @@
       ONOS_APPS: 'drivers,openflow-base'
     volumes:
     - "/var/run/docker.sock:/tmp/docker.sock"
+    - "./network-cfg.json:/root/onos/config/network-cfg.json"
     networks:
     - default
     restart: unless-stopped