SPGW processing now happening on leaf 1
So we can deploy both leafs with fabric+spgw+int, but with GTP traffic
terminated at the ingress leaf.
Change-Id: I027e54c3b86df7c9ca33afa96276e3fb26ddbe22
diff --git a/mwc-provision-dev-cavium-test.sh b/mwc-provision-dev-cavium-test.sh
index c2465ea..ff4387e 100755
--- a/mwc-provision-dev-cavium-test.sh
+++ b/mwc-provision-dev-cavium-test.sh
@@ -20,6 +20,6 @@
# sleep 5
onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/dev-pod/cavium-spine1.json
sleep 5
-bash fpcagent/scripts/addP4DPN.sh ${MWC_HEAD_IP} device:tofino:leaf2
+bash fpcagent/scripts/addP4DPN.sh ${MWC_HEAD_IP} device:tofino:leaf1
sleep 2
sshpass -p rocks ssh onos@${MWC_HEAD_IP} -p8101 -o "UserKnownHostsFile=/dev/null" -o "StrictHostKeyChecking=no" "route-add ${UE_SUBNET} ${ENODEB_ADDR}"
diff --git a/mwc-provision-dev-mlx-test.sh b/mwc-provision-dev-mlx-test.sh
index 2ce42fc..97a2ecc 100755
--- a/mwc-provision-dev-mlx-test.sh
+++ b/mwc-provision-dev-mlx-test.sh
@@ -20,6 +20,6 @@
sleep 5
# onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/dev-pod/cavium-spine1.json
# sleep 5
-bash fpcagent/scripts/addP4DPN.sh ${MWC_HEAD_IP} device:tofino:leaf2
+bash fpcagent/scripts/addP4DPN.sh ${MWC_HEAD_IP} device:tofino:leaf1
sleep 2
sshpass -p rocks ssh onos@${MWC_HEAD_IP} -p8101 -o "UserKnownHostsFile=/dev/null" -o "StrictHostKeyChecking=no" "route-add ${UE_SUBNET} ${ENODEB_ADDR}"
diff --git a/mwc-provision-dev.sh b/mwc-provision-dev.sh
index d6579d2..9f064b9 100755
--- a/mwc-provision-dev.sh
+++ b/mwc-provision-dev.sh
@@ -6,8 +6,12 @@
set -ex
-onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/dev-pod/mwc-demo.json
+onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/dev-pod/sr-conf-base.json
sleep 2
+onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/dev-pod/sr-conf-cavium.json
+sleep 1
+onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/dev-pod/sr-conf-mellanox.json
+sleep 1
onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/dev-pod/hosts.json
sleep 2
onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/dev-pod/tofino-leaf1-netcfg.json
@@ -18,6 +22,6 @@
sleep 5
onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/dev-pod/cavium-spine1.json
sleep 5
-bash fpcagent/scripts/addP4DPN.sh ${MWC_HEAD_IP} device:tofino:leaf2
+bash fpcagent/scripts/addP4DPN.sh ${MWC_HEAD_IP} device:tofino:leaf1
sleep 2
sshpass -p rocks ssh onos@${MWC_HEAD_IP} -p8101 -o "UserKnownHostsFile=/dev/null" -o "StrictHostKeyChecking=no" "route-add ${UE_SUBNET} ${ENODEB_ADDR}"
diff --git a/p4-pod-configs/dev-pod/tofino-leaf1-netcfg.json b/p4-pod-configs/dev-pod/tofino-leaf1-netcfg.json
index 8210578..39b6032 100644
--- a/p4-pod-configs/dev-pod/tofino-leaf1-netcfg.json
+++ b/p4-pod-configs/dev-pod/tofino-leaf1-netcfg.json
@@ -11,7 +11,7 @@
}
},
"piPipeconf": {
- "piPipeconfId": "org.onosproject.pipelines.fabric.mavericks"
+ "piPipeconfId": "org.onosproject.pipelines.fabric-spgw-int.mavericks"
},
"ports": {
"1/0": {