Updated configs to remove vendor name from device ID
Also running demo pod with two cavium spines
Change-Id: I3a220b0025f1eb5e4e80a7a7ae6737345b3e98ab
diff --git a/mwc-provision-cavium-test.sh b/mwc-provision-cavium-test.sh
deleted file mode 100755
index 7efc631..0000000
--- a/mwc-provision-cavium-test.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-MWC_HEAD_IP="10.128.13.3"
-ENODEB_ADDR="119.0.0.10"
-UE_SUBNET="17.255.0.0/16"
-
-set -ex
-
-onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/mwc-pod/sr-conf-base.json
-sleep 2
-onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/mwc-pod/sr-conf-cavium.json
-sleep 1
-onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/mwc-pod/hosts.json
-sleep 2
-onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/mwc-pod/tofino-leaf1-netcfg.json
-sleep 5
-onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/mwc-pod/tofino-leaf2-netcfg.json
-sleep 5
-onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/mwc-pod/cavium-spine1.json
-sleep 5
-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-cavium-test.sh b/mwc-provision-dev-cavium-test.sh
deleted file mode 100755
index ff4387e..0000000
--- a/mwc-provision-dev-cavium-test.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-
-MWC_HEAD_IP="10.128.13.3"
-ENODEB_ADDR="119.0.0.10"
-UE_SUBNET="17.255.0.0/16"
-
-set -ex
-
-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/hosts.json
-sleep 2
-onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/dev-pod/tofino-leaf1-netcfg.json
-sleep 5
-onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/dev-pod/tofino-leaf2-netcfg.json
-sleep 5
-# 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
-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
deleted file mode 100755
index 97a2ecc..0000000
--- a/mwc-provision-dev-mlx-test.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-
-MWC_HEAD_IP="10.128.13.3"
-ENODEB_ADDR="119.0.0.10"
-UE_SUBNET="17.255.0.0/16"
-
-set -ex
-
-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-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
-sleep 5
-onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/dev-pod/tofino-leaf2-netcfg.json
-sleep 5
-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
-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
deleted file mode 100755
index 9f064b9..0000000
--- a/mwc-provision-dev.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/usr/bin/env bash
-
-MWC_HEAD_IP="10.128.13.3"
-ENODEB_ADDR="119.0.0.10"
-UE_SUBNET="17.255.0.0/16"
-
-set -ex
-
-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
-sleep 5
-onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/dev-pod/tofino-leaf2-netcfg.json
-sleep 5
-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
-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-mlx-test.sh b/mwc-provision-mlx-test.sh
deleted file mode 100755
index 8ed2006..0000000
--- a/mwc-provision-mlx-test.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-MWC_HEAD_IP="10.128.13.3"
-ENODEB_ADDR="119.0.0.10"
-UE_SUBNET="17.255.0.0/16"
-
-set -ex
-
-onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/mwc-pod/sr-conf-base.json
-sleep 2
-onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/mwc-pod/sr-conf-mellanox.json
-sleep 1
-onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/mwc-pod/hosts.json
-sleep 2
-onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/mwc-pod/tofino-leaf1-netcfg.json
-sleep 5
-onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/mwc-pod/tofino-leaf2-netcfg.json
-sleep 5
-onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/mwc-pod/mellanox-spine2.json
-sleep 5
-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.sh b/mwc-provision.sh
index aff7e7a..1b044ec 100755
--- a/mwc-provision.sh
+++ b/mwc-provision.sh
@@ -4,25 +4,30 @@
ENODEB_ADDR="119.0.0.10"
UE_SUBNET="17.255.0.0/16"
+function onos_cli {
+ sshpass -p rocks ssh onos@${MWC_HEAD_IP} -p8101 -o "UserKnownHostsFile=/dev/null" -o "StrictHostKeyChecking=no" "$@"
+}
+
set -ex
onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/mwc-pod/sr-conf-base.json
sleep 2
-onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/mwc-pod/sr-conf-cavium.json
+onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/mwc-pod/sr-conf-spine1.json
sleep 1
-onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/mwc-pod/sr-conf-mellanox.json
+onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/mwc-pod/sr-conf-spine2.json
sleep 1
onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/mwc-pod/hosts.json
sleep 2
-onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/mwc-pod/mellanox-spine2.json
-sleep 3
onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/mwc-pod/cavium-spine1.json
sleep 3
+onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/mwc-pod/cavium-spine2.json
+sleep 3
onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/mwc-pod/tofino-leaf1-netcfg.json
sleep 5
onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/mwc-pod/tofino-leaf2-netcfg.json
sleep 5
-bash fpcagent/scripts/addP4DPN.sh ${MWC_HEAD_IP} device:tofino:leaf1
+bash fpcagent/scripts/addP4DPN.sh ${MWC_HEAD_IP} device:leaf1
sleep 1
-sshpass -p rocks ssh onos@${MWC_HEAD_IP} -p8101 -o "UserKnownHostsFile=/dev/null" -o "StrictHostKeyChecking=no" "route-add ${UE_SUBNET} ${ENODEB_ADDR}"
-
+onos_cli route-add ${UE_SUBNET} ${ENODEB_ADDR}
+onos_cli cfg set org.onosproject.net.flow.impl.FlowRuleManager fallbackFlowPollFrequency 5
+onos_cli cfg set org.onosproject.net.group.impl.GroupManager fallbackGroupPollFrequency 5
diff --git a/p4-pod-configs/dev-pod/cavium-spine1.json b/p4-pod-configs/dev-pod/cavium-spine1.json
index 102ca0f..3b7d6e7 100644
--- a/p4-pod-configs/dev-pod/cavium-spine1.json
+++ b/p4-pod-configs/dev-pod/cavium-spine1.json
@@ -1,10 +1,10 @@
{
"devices": {
- "device:cavium:spine1": {
+ "device:spine1": {
"generalprovider": {
"p4runtime": {
"ip": "10.128.13.101",
- "deviceKeyId": "p4runtime:device:cavium:spine1",
+ "deviceKeyId": "p4runtime:device:spine1",
"port": 50051,
"deviceId": 1
}
diff --git a/p4-pod-configs/dev-pod/hosts.json b/p4-pod-configs/dev-pod/hosts.json
index dca6f5f..537cab1 100644
--- a/p4-pod-configs/dev-pod/hosts.json
+++ b/p4-pod-configs/dev-pod/hosts.json
@@ -7,7 +7,7 @@
"10.6.1.3"
],
"locations": [
- "device:tofino:leaf1/180"
+ "device:leaf1/180"
]
}
},
@@ -19,7 +19,7 @@
"118.0.0.10"
],
"locations": [
- "device:tofino:leaf1/181"
+ "device:leaf1/181"
]
}
},
@@ -30,7 +30,7 @@
"10.6.2.2"
],
"locations": [
- "device:tofino:leaf2/180"
+ "device:leaf2/180"
]
}
},
@@ -41,7 +41,7 @@
"150.0.0.10"
],
"locations": [
- "device:tofino:leaf2/182"
+ "device:leaf2/182"
]
}
},
@@ -52,7 +52,7 @@
"119.0.0.2"
],
"locations": [
- "device:tofino:leaf1/180"
+ "device:leaf1/180"
]
}
},
@@ -63,7 +63,7 @@
"118.0.0.2"
],
"locations": [
- "device:tofino:leaf1/180"
+ "device:leaf1/180"
]
}
},
@@ -74,7 +74,7 @@
"122.0.0.2"
],
"locations": [
- "device:tofino:leaf2/180"
+ "device:leaf2/180"
]
}
},
@@ -85,7 +85,7 @@
"118.0.0.11"
],
"locations": [
- "device:tofino:leaf1/182"
+ "device:leaf1/182"
]
}
},
@@ -105,7 +105,7 @@
"160.0.2.10"
],
"locations": [
- "device:tofino:leaf2/172"
+ "device:leaf2/172"
]
}
},
@@ -125,7 +125,7 @@
"160.0.1.10"
],
"locations": [
- "device:tofino:leaf1/172"
+ "device:leaf1/172"
]
}
},
@@ -136,7 +136,7 @@
"10.6.1.100"
],
"locations": [
- "device:tofino:leaf1/183"
+ "device:leaf1/183"
]
}
}
diff --git a/p4-pod-configs/dev-pod/mellanox-spine2.json b/p4-pod-configs/dev-pod/mellanox-spine2.json
index c96f1fd..a385dcf 100644
--- a/p4-pod-configs/dev-pod/mellanox-spine2.json
+++ b/p4-pod-configs/dev-pod/mellanox-spine2.json
@@ -1,10 +1,10 @@
{
"devices": {
- "device:mellanox:spine2": {
+ "device:spine2": {
"generalprovider": {
"p4runtime": {
"ip": "10.128.13.103",
- "deviceKeyId": "p4runtime:device:mellanox:spine2",
+ "deviceKeyId": "p4runtime:device:spine2",
"port": 50051,
"deviceId": 0
}
diff --git a/p4-pod-configs/dev-pod/sr-conf-base.json b/p4-pod-configs/dev-pod/sr-conf-base.json
index 8ba63e3..f67bd68 100644
--- a/p4-pod-configs/dev-pod/sr-conf-base.json
+++ b/p4-pod-configs/dev-pod/sr-conf-base.json
@@ -1,6 +1,6 @@
{
"devices": {
- "device:tofino:leaf1": {
+ "device:leaf1": {
"segmentrouting": {
"name": "leaf1",
"ipv4NodeSid": 204,
@@ -12,7 +12,7 @@
"adjacencySids": []
}
},
- "device:tofino:leaf2": {
+ "device:leaf2": {
"segmentrouting": {
"name": "leaf2",
"ipv4NodeSid": 205,
@@ -26,7 +26,7 @@
}
},
"ports": {
- "device:tofino:leaf1/180": {
+ "device:leaf1/180": {
"interfaces": [
{
"name": "leaf1/3/0--compute-1--ens802f0",
@@ -39,7 +39,7 @@
}
]
},
- "device:tofino:leaf1/181": {
+ "device:leaf1/181": {
"interfaces": [
{
"name": "leaf1/3/1--mgmt25--enb",
@@ -51,10 +51,10 @@
}
]
},
- "device:tofino:leaf1/182": {
+ "device:leaf1/182": {
"interfaces": [ ]
},
- "device:tofino:leaf1/183": {
+ "device:leaf1/183": {
"interfaces": [
{
"name": "leaf1/3/3--mgmt28--nc-int-exp",
@@ -65,7 +65,7 @@
}
]
},
- "device:tofino:leaf2/180": {
+ "device:leaf2/180": {
"interfaces": [
{
"name": "leaf2/3/0--compute-2",
@@ -77,7 +77,7 @@
}
]
},
- "device:tofino:leaf2/181": {
+ "device:leaf2/181": {
"interfaces": [
{
"name": "leaf2/3/1--SPGW-DP",
@@ -88,7 +88,7 @@
}
]
},
- "device:tofino:leaf2/182": {
+ "device:leaf2/182": {
"interfaces": [
{
"name": "leaf2/3/2--mgmt27--ARM",
@@ -99,10 +99,10 @@
}
]
},
- "device:tofino:leaf2/183": {
+ "device:leaf2/183": {
"interfaces": [ ]
},
- "device:tofino:leaf1/172": {
+ "device:leaf1/172": {
"interfaces": [
{
"name": "leaf1/5/0--nc1-int-source",
@@ -113,7 +113,7 @@
}
]
},
- "device:tofino:leaf2/172": {
+ "device:leaf2/172": {
"interfaces": [
{
"name": "leaf2/5/0--nc2-int-sink",
diff --git a/p4-pod-configs/dev-pod/sr-conf-cavium.json b/p4-pod-configs/dev-pod/sr-conf-cavium.json
index 91591a8..55eb7b0 100644
--- a/p4-pod-configs/dev-pod/sr-conf-cavium.json
+++ b/p4-pod-configs/dev-pod/sr-conf-cavium.json
@@ -1,6 +1,6 @@
{
"devices": {
- "device:cavium:spine1": {
+ "device:spine1": {
"segmentrouting": {
"name": "spine1",
"ipv4NodeSid": 226,
diff --git a/p4-pod-configs/dev-pod/sr-conf-int-to-compute-1.json b/p4-pod-configs/dev-pod/sr-conf-int-to-compute-1.json
index f2fa4e9..9e52fd9 100644
--- a/p4-pod-configs/dev-pod/sr-conf-int-to-compute-1.json
+++ b/p4-pod-configs/dev-pod/sr-conf-int-to-compute-1.json
@@ -1,12 +1,12 @@
{
"ports": {
- "device:tofino:leaf2/160": {
+ "device:leaf2/160": {
"interfaces": [ ]
},
- "device:tofino:leaf2/183": {
+ "device:leaf2/183": {
"interfaces": [ ]
},
- "device:tofino:leaf1/182": {
+ "device:leaf1/182": {
"interfaces": [
{
"name": "leaf1/3/2--compute-1--ens802f1",
@@ -35,7 +35,7 @@
"160.0.2.10"
],
"locations": [
- "device:tofino:leaf1/182"
+ "device:leaf1/182"
]
}
}
diff --git a/p4-pod-configs/dev-pod/sr-conf-mellanox.json b/p4-pod-configs/dev-pod/sr-conf-mellanox.json
index 00cddbe..4c6e144 100644
--- a/p4-pod-configs/dev-pod/sr-conf-mellanox.json
+++ b/p4-pod-configs/dev-pod/sr-conf-mellanox.json
@@ -1,6 +1,6 @@
{
"devices": {
- "device:mellanox:spine2": {
+ "device:spine2": {
"segmentrouting": {
"name": "spine2",
"ipv4NodeSid": 227,
diff --git a/p4-pod-configs/dev-pod/tofino-leaf1-netcfg.json b/p4-pod-configs/dev-pod/tofino-leaf1-netcfg.json
index 76f0dce..9e47a4c 100644
--- a/p4-pod-configs/dev-pod/tofino-leaf1-netcfg.json
+++ b/p4-pod-configs/dev-pod/tofino-leaf1-netcfg.json
@@ -1,11 +1,11 @@
{
"devices": {
- "device:tofino:leaf1": {
+ "device:leaf1": {
"chassisId": "000000000204",
"generalprovider": {
"p4runtime": {
"ip": "10.128.13.221",
- "deviceKeyId": "p4runtime:device:tofino:leaf1",
+ "deviceKeyId": "p4runtime:device:leaf1",
"port": 50051,
"deviceId": 0
}
diff --git a/p4-pod-configs/dev-pod/tofino-leaf2-netcfg.json b/p4-pod-configs/dev-pod/tofino-leaf2-netcfg.json
index cf58289..629f5e0 100644
--- a/p4-pod-configs/dev-pod/tofino-leaf2-netcfg.json
+++ b/p4-pod-configs/dev-pod/tofino-leaf2-netcfg.json
@@ -1,11 +1,11 @@
{
"devices": {
- "device:tofino:leaf2": {
+ "device:leaf2": {
"chassisId": "000000000205",
"generalprovider": {
"p4runtime": {
"ip": "10.128.13.222",
- "deviceKeyId": "p4runtime:device:tofino:leaf2",
+ "deviceKeyId": "p4runtime:device:leaf2",
"port": 50051,
"deviceId": 0
}
diff --git a/p4-pod-configs/mwc-pod/cavium-spine1.json b/p4-pod-configs/mwc-pod/cavium-spine1.json
index 102ca0f..3b7d6e7 100644
--- a/p4-pod-configs/mwc-pod/cavium-spine1.json
+++ b/p4-pod-configs/mwc-pod/cavium-spine1.json
@@ -1,10 +1,10 @@
{
"devices": {
- "device:cavium:spine1": {
+ "device:spine1": {
"generalprovider": {
"p4runtime": {
"ip": "10.128.13.101",
- "deviceKeyId": "p4runtime:device:cavium:spine1",
+ "deviceKeyId": "p4runtime:device:spine1",
"port": 50051,
"deviceId": 1
}
diff --git a/p4-pod-configs/mwc-pod/cavium-spine2.json b/p4-pod-configs/mwc-pod/cavium-spine2.json
new file mode 100644
index 0000000..a930931
--- /dev/null
+++ b/p4-pod-configs/mwc-pod/cavium-spine2.json
@@ -0,0 +1,40 @@
+{
+ "devices": {
+ "device:spine2": {
+ "generalprovider": {
+ "p4runtime": {
+ "ip": "10.128.13.102",
+ "deviceKeyId": "p4runtime:device:spine2",
+ "port": 50051,
+ "deviceId": 1
+ }
+ },
+ "piPipeconf": {
+ "piPipeconfId": "org.onosproject.pipelines.fabric"
+ },
+ "ports": {
+ "9": {
+ "name": "9",
+ "speed": 100000,
+ "enabled": true,
+ "number": 9,
+ "removed": false,
+ "type": "copper"
+ },
+ "10": {
+ "name": "10",
+ "speed": 100000,
+ "enabled": true,
+ "number": 10,
+ "removed": false,
+ "type": "copper"
+ }
+ },
+ "basic": {
+ "driver": "cavium-pro",
+ "name": "spine2"
+ }
+ }
+ }
+}
+
diff --git a/p4-pod-configs/mwc-pod/hosts.json b/p4-pod-configs/mwc-pod/hosts.json
index db72039..5d8e695 100644
--- a/p4-pod-configs/mwc-pod/hosts.json
+++ b/p4-pod-configs/mwc-pod/hosts.json
@@ -7,7 +7,7 @@
"10.6.1.3"
],
"locations": [
- "device:tofino:leaf1/144"
+ "device:leaf1/144"
]
}
},
@@ -19,7 +19,7 @@
"118.0.0.10"
],
"locations": [
- "device:tofino:leaf1/145"
+ "device:leaf1/145"
]
}
},
@@ -30,7 +30,7 @@
"10.6.2.2"
],
"locations": [
- "device:tofino:leaf2/144"
+ "device:leaf2/144"
]
}
},
@@ -41,7 +41,7 @@
"150.0.0.10"
],
"locations": [
- "device:tofino:leaf2/146"
+ "device:leaf2/146"
]
}
},
@@ -52,7 +52,7 @@
"119.0.0.2"
],
"locations": [
- "device:tofino:leaf1/144"
+ "device:leaf1/144"
]
}
},
@@ -63,7 +63,7 @@
"118.0.0.2"
],
"locations": [
- "device:tofino:leaf1/144"
+ "device:leaf1/144"
]
}
},
@@ -74,7 +74,7 @@
"122.0.0.4"
],
"locations": [
- "device:tofino:leaf2/144"
+ "device:leaf2/144"
]
}
},
@@ -94,7 +94,7 @@
"160.0.2.10"
],
"locations": [
- "device:tofino:leaf2/160"
+ "device:leaf2/160"
]
}
},
@@ -114,7 +114,7 @@
"160.0.1.10"
],
"locations": [
- "device:tofino:leaf1/160"
+ "device:leaf1/160"
]
}
},
@@ -125,7 +125,7 @@
"10.6.1.100"
],
"locations": [
- "device:tofino:leaf1/147"
+ "device:leaf1/147"
]
}
}
diff --git a/p4-pod-configs/mwc-pod/mellanox-spine2.json b/p4-pod-configs/mwc-pod/mellanox-spine2.json
index c96f1fd..a385dcf 100644
--- a/p4-pod-configs/mwc-pod/mellanox-spine2.json
+++ b/p4-pod-configs/mwc-pod/mellanox-spine2.json
@@ -1,10 +1,10 @@
{
"devices": {
- "device:mellanox:spine2": {
+ "device:spine2": {
"generalprovider": {
"p4runtime": {
"ip": "10.128.13.103",
- "deviceKeyId": "p4runtime:device:mellanox:spine2",
+ "deviceKeyId": "p4runtime:device:spine2",
"port": 50051,
"deviceId": 0
}
diff --git a/p4-pod-configs/mwc-pod/sr-conf-base.json b/p4-pod-configs/mwc-pod/sr-conf-base.json
index 8ebdb55..f03a365 100644
--- a/p4-pod-configs/mwc-pod/sr-conf-base.json
+++ b/p4-pod-configs/mwc-pod/sr-conf-base.json
@@ -1,6 +1,6 @@
{
"devices": {
- "device:tofino:leaf1": {
+ "device:leaf1": {
"segmentrouting": {
"name": "leaf1",
"ipv4NodeSid": 204,
@@ -12,7 +12,7 @@
"adjacencySids": []
}
},
- "device:tofino:leaf2": {
+ "device:leaf2": {
"segmentrouting": {
"name": "leaf2",
"ipv4NodeSid": 205,
@@ -26,7 +26,7 @@
}
},
"ports": {
- "device:tofino:leaf1/144": {
+ "device:leaf1/144": {
"interfaces": [
{
"name": "leaf1/3/0--compute-1--ens802f0",
@@ -39,7 +39,7 @@
}
]
},
- "device:tofino:leaf1/145": {
+ "device:leaf1/145": {
"interfaces": [
{
"name": "leaf1/3/1--mgmt25--enb",
@@ -51,10 +51,10 @@
}
]
},
- "device:tofino:leaf1/146": {
+ "device:leaf1/146": {
"interfaces": [ ]
},
- "device:tofino:leaf1/147": {
+ "device:leaf1/147": {
"interfaces": [
{
"name": "leaf1/3/3--mgmt28--nc-int-exp",
@@ -65,7 +65,7 @@
}
]
},
- "device:tofino:leaf2/144": {
+ "device:leaf2/144": {
"interfaces": [
{
"name": "leaf2/3/0--compute-2",
@@ -77,7 +77,7 @@
}
]
},
- "device:tofino:leaf2/145": {
+ "device:leaf2/145": {
"interfaces": [
{
"name": "leaf2/3/1--SPGW-DP",
@@ -88,7 +88,7 @@
}
]
},
- "device:tofino:leaf2/146": {
+ "device:leaf2/146": {
"interfaces": [
{
"name": "leaf2/3/2--mgmt27--ARM",
@@ -99,10 +99,10 @@
}
]
},
- "device:tofino:leaf2/147": {
+ "device:leaf2/147": {
"interfaces": [ ]
},
- "device:tofino:leaf1/160": {
+ "device:leaf1/160": {
"interfaces": [
{
"name": "leaf1/5/0--nc1-int-source",
@@ -113,7 +113,7 @@
}
]
},
- "device:tofino:leaf2/160": {
+ "device:leaf2/160": {
"interfaces": [
{
"name": "leaf2/5/0--nc2-int-sink",
diff --git a/p4-pod-configs/mwc-pod/sr-conf-int-to-compute-1.json b/p4-pod-configs/mwc-pod/sr-conf-int-to-compute-1.json
index 9852ab2..9e42618 100644
--- a/p4-pod-configs/mwc-pod/sr-conf-int-to-compute-1.json
+++ b/p4-pod-configs/mwc-pod/sr-conf-int-to-compute-1.json
@@ -1,12 +1,12 @@
{
"ports": {
- "device:tofino:leaf2/160": {
+ "device:leaf2/160": {
"interfaces": [ ]
},
- "device:tofino:leaf2/147": {
+ "device:leaf2/147": {
"interfaces": [ ]
},
- "device:tofino:leaf1/146": {
+ "device:leaf1/146": {
"interfaces": [
{
"name": "leaf1/3/2--compute-1--ens802f1",
@@ -35,7 +35,7 @@
"160.0.2.10"
],
"locations": [
- "device:tofino:leaf1/146"
+ "device:leaf1/146"
]
}
}
diff --git a/p4-pod-configs/mwc-pod/sr-conf-int-to-compute-2.json b/p4-pod-configs/mwc-pod/sr-conf-int-to-compute-2.json
index 2174094..a656580 100644
--- a/p4-pod-configs/mwc-pod/sr-conf-int-to-compute-2.json
+++ b/p4-pod-configs/mwc-pod/sr-conf-int-to-compute-2.json
@@ -1,12 +1,12 @@
{
"ports": {
- "device:tofino:leaf2/160": {
+ "device:leaf2/160": {
"interfaces": [ ]
},
- "device:tofino:leaf1/146": {
+ "device:leaf1/146": {
"interfaces": [ ]
},
- "device:tofino:leaf2/147": {
+ "device:leaf2/147": {
"interfaces": [
{
"name": "leaf2/3/3--compute-1--ens802f1",
@@ -35,7 +35,7 @@
"160.0.2.10"
],
"locations": [
- "device:tofino:leaf2/147"
+ "device:leaf2/147"
]
}
}
diff --git a/p4-pod-configs/mwc-pod/sr-conf-cavium.json b/p4-pod-configs/mwc-pod/sr-conf-spine1.json
similarity index 91%
rename from p4-pod-configs/mwc-pod/sr-conf-cavium.json
rename to p4-pod-configs/mwc-pod/sr-conf-spine1.json
index 91591a8..55eb7b0 100644
--- a/p4-pod-configs/mwc-pod/sr-conf-cavium.json
+++ b/p4-pod-configs/mwc-pod/sr-conf-spine1.json
@@ -1,6 +1,6 @@
{
"devices": {
- "device:cavium:spine1": {
+ "device:spine1": {
"segmentrouting": {
"name": "spine1",
"ipv4NodeSid": 226,
diff --git a/p4-pod-configs/mwc-pod/sr-conf-mellanox.json b/p4-pod-configs/mwc-pod/sr-conf-spine2.json
similarity index 90%
rename from p4-pod-configs/mwc-pod/sr-conf-mellanox.json
rename to p4-pod-configs/mwc-pod/sr-conf-spine2.json
index 00cddbe..4c6e144 100644
--- a/p4-pod-configs/mwc-pod/sr-conf-mellanox.json
+++ b/p4-pod-configs/mwc-pod/sr-conf-spine2.json
@@ -1,6 +1,6 @@
{
"devices": {
- "device:mellanox:spine2": {
+ "device:spine2": {
"segmentrouting": {
"name": "spine2",
"ipv4NodeSid": 227,
diff --git a/p4-pod-configs/mwc-pod/tofino-leaf1-netcfg.json b/p4-pod-configs/mwc-pod/tofino-leaf1-netcfg.json
index 7a427e9..b8a83d8 100644
--- a/p4-pod-configs/mwc-pod/tofino-leaf1-netcfg.json
+++ b/p4-pod-configs/mwc-pod/tofino-leaf1-netcfg.json
@@ -1,11 +1,11 @@
{
"devices": {
- "device:tofino:leaf1": {
+ "device:leaf1": {
"chassisId": "000000000204",
"generalprovider": {
"p4runtime": {
"ip": "10.128.13.221",
- "deviceKeyId": "p4runtime:device:tofino:leaf1",
+ "deviceKeyId": "p4runtime:device:leaf1",
"port": 50051,
"deviceId": 0
}
diff --git a/p4-pod-configs/mwc-pod/tofino-leaf2-netcfg.json b/p4-pod-configs/mwc-pod/tofino-leaf2-netcfg.json
index c6069af..30a5ad3 100644
--- a/p4-pod-configs/mwc-pod/tofino-leaf2-netcfg.json
+++ b/p4-pod-configs/mwc-pod/tofino-leaf2-netcfg.json
@@ -1,11 +1,11 @@
{
"devices": {
- "device:tofino:leaf2": {
+ "device:leaf2": {
"chassisId": "000000000205",
"generalprovider": {
"p4runtime": {
"ip": "10.128.13.222",
- "deviceKeyId": "p4runtime:device:tofino:leaf2",
+ "deviceKeyId": "p4runtime:device:leaf2",
"port": 50051,
"deviceId": 0
}