Several fix for host
Change-Id: Ic7ed5233d734932dd162fd96c6afc0965ede3267
diff --git a/mwc-provision-dev.sh b/mwc-provision-dev.sh
index 7fdda48..62d8782 100755
--- a/mwc-provision-dev.sh
+++ b/mwc-provision-dev.sh
@@ -12,8 +12,8 @@
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
+onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/dev-pod/hosts.json
+sleep 5
bash fpcagent/scripts/addP4DPN.sh ${MWC_HEAD_IP} device:tofino:leaf2
diff --git a/providers/host/src/main/java/org/onosproject/provider/host/impl/HostLocationProvider.java b/providers/host/src/main/java/org/onosproject/provider/host/impl/HostLocationProvider.java
index 0633d12..b047af2 100644
--- a/providers/host/src/main/java/org/onosproject/provider/host/impl/HostLocationProvider.java
+++ b/providers/host/src/main/java/org/onosproject/provider/host/impl/HostLocationProvider.java
@@ -506,6 +506,11 @@
@Override
public void process(PacketContext context) {
+ // FIXME: MWC-2018 HACK - ignore packet ins as we rely on the the netcfg host config
+ // But segmentrouting needs this provider
+ }
+
+ public void processPacketIn(PacketContext context) {
if (context == null) {
return;
}
diff --git a/tools/package/bin/onos-service b/tools/package/bin/onos-service
index 60573de..6a77adb 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,netcfghostprovider,lldpprovider,proxyarp,segmentrouting,org.onosproject.fpcagent"
+ONOS_APPS="drivers.barefoot-pro,drivers.cavium-pro,drivers.mellanox-pro,pipelines.fabric-pro,netcfghostprovider,hostprovider,lldpprovider,proxyarp,segmentrouting,org.onosproject.fpcagent"
cd $ONOS_HOME