commit e6bd49457a32aaf42956bdb45fccfd5ff12998ce
author Carmelo Cascone <carmelo@opennetworking.org> Thu Feb 15 14:35:16 2018 -0800
committer Carmelo Cascone <carmelo@opennetworking.org> Thu Feb 15 22:56:21 2018 +0000
tree bc09226462e6de12f0028ffbfc250fa7eef867f0
parent 5da1995c3497cc9fca0790e6da40cae9276c7851

Static host config for dev pod

Change-Id: I7ea0e8a83ea1227542d627cee386ad601edcedb7

mwc-provision-dev.sh

diff --git a/mwc-provision-dev.sh b/mwc-provision-dev.sh
index 05e32c5..7fdda48 100755
--- a/mwc-provision-dev.sh
+++ b/mwc-provision-dev.sh
@@ -11,6 +11,8 @@
 onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/dev-pod/mellanox-spine2.json
 sleep 5
 onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/dev-pod/cavium-spine1.json
+sleep 5
+onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/dev-pod/hosts.json
 sleep 10
 onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/dev-pod/mwc-demo.json
 sleep 10

p4-pod-configs/dev-pod/hosts.json

diff --git a/p4-pod-configs/dev-pod/hosts.json b/p4-pod-configs/dev-pod/hosts.json
new file mode 100644
index 0000000..41fb944
--- /dev/null
+++ b/p4-pod-configs/dev-pod/hosts.json
@@ -0,0 +1,46 @@
+{
+  "hosts": {
+    "00:1E:67:D2:EC:7F/None": {
+      "basic": {
+        "ips": ["10.6.1.3"],
+        "locations": ["device:tofino:leaf1/180"]
+      }
+    },
+    "00:AD:DE:00:00:80/None": {
+      "basic": {
+        "ips": ["119.0.0.10", "118.0.0.10"],
+        "locations": ["device:tofino:leaf1/181"]
+      }
+    },
+    "00:1E:67:D2:EE:EE/None": {
+      "basic": {
+        "ips": ["10.6.2.2"],
+        "locations": ["device:tofino:leaf2/180"]
+      }
+    },
+    "00:9D:0F:57:D5:BD/None": {
+      "basic": {
+        "ips": ["150.0.0.10"],
+        "locations": ["device:tofino:leaf2/182"]
+      }
+    },
+    "fa:16:3e:65:60:e1/None": {
+      "basic": {
+        "ips": ["119.0.0.2"],
+        "locations": ["device:tofino:leaf1/180"]
+      }
+    },
+    "fa:16:3e:bc:0c:27/None": {
+      "basic": {
+        "ips": ["118.0.0.2"],
+        "locations": ["device:tofino:leaf1/180"]
+      }
+    },
+    "FA:16:3E:45:13:C2/None": {
+      "basic": {
+        "ips": ["118.0.0.5"],
+        "locations": ["device:tofino:leaf1/180"]
+      }
+    }
+  }
+}

tools/package/bin/onos-service

diff --git a/tools/package/bin/onos-service b/tools/package/bin/onos-service
index 4dd0c01..60573de 100755
--- a/tools/package/bin/onos-service
+++ b/tools/package/bin/onos-service
@@ -22,7 +22,7 @@
 ONOS_APPS=${ONOS_APPS:-}  # Empty means don't activate any new apps
 
 # MWC-2018
-ONOS_APPS="drivers.barefoot-pro,drivers.cavium-pro,drivers.mellanox-pro,pipelines.fabric-pro,hostprovider,lldpprovider,proxyarp,segmentrouting,org.onosproject.fpcagent"
+ONOS_APPS="drivers.barefoot-pro,drivers.cavium-pro,drivers.mellanox-pro,pipelines.fabric-pro,netcfghostprovider,lldpprovider,proxyarp,segmentrouting,org.onosproject.fpcagent"
 
 cd $ONOS_HOME