Updated configs to remove vendor name from device ID
Also running demo pod with two cavium spines
Change-Id: I3a220b0025f1eb5e4e80a7a7ae6737345b3e98ab
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
}