Added INt report exporter host to config
Change-Id: I498d720b4541623d40c6f57835e1e4f8135491f1
diff --git a/p4-pod-configs/dev-pod/hosts.json b/p4-pod-configs/dev-pod/hosts.json
index b304c19..21f8da3 100644
--- a/p4-pod-configs/dev-pod/hosts.json
+++ b/p4-pod-configs/dev-pod/hosts.json
@@ -70,9 +70,9 @@
"locations": ["device:tofino:leaf1/172"]
}
},
- "52:74:B7:2C:04:F3/None": {
+ "D0:50:99:C0:3B:20/None": {
"basic": {
- "name": "INT report exporter",
+ "name": "INT report exporter (Netcope)",
"ips": ["10.6.1.100"],
"locations": ["device:tofino:leaf1/183"]
}
diff --git a/p4-pod-configs/dev-pod/mwc-demo-mlx-test.json b/p4-pod-configs/dev-pod/mwc-demo-mlx-test.json
deleted file mode 100644
index ed5fa58..0000000
--- a/p4-pod-configs/dev-pod/mwc-demo-mlx-test.json
+++ /dev/null
@@ -1,134 +0,0 @@
-{
- "devices": {
- "device:tofino:leaf1": {
- "segmentrouting": {
- "name": "leaf1",
- "ipv4NodeSid": 204,
- "ipv4Loopback": "192.168.0.204",
- "ipv6NodeSid": 214,
- "ipv6Loopback": "2000::c0a8:0204",
- "routerMac": "00:00:00:00:02:04",
- "isEdgeRouter": true,
- "adjacencySids": []
- }
- },
- "device:tofino:leaf2": {
- "segmentrouting": {
- "name": "leaf2",
- "ipv4NodeSid": 205,
- "ipv4Loopback": "192.168.0.205",
- "ipv6NodeSid": 215,
- "ipv6Loopback": "2000::c0a8:0205",
- "routerMac": "00:00:00:00:02:05",
- "isEdgeRouter": true,
- "adjacencySids": []
- }
- },
- "device:mellanox:spine2": {
- "segmentrouting": {
- "name": "spine2",
- "ipv4NodeSid": 227,
- "ipv4Loopback": "192.168.0.227",
- "ipv6NodeSid": 237,
- "ipv6Loopback": "2000::c0a8:0227",
- "routerMac": "00:00:00:00:02:27",
- "isEdgeRouter": false,
- "adjacencySids": []
- }
- }
- },
- "ports": {
- "device:tofino:leaf1/180": {
- "interfaces": [
- {
- "name": "leaf1-3/0-compute-1",
- "ips": [
- "10.6.1.254/24",
- "118.0.0.254/24",
- "119.0.0.254/24"
- ],
- "vlan-untagged": 10
- }
- ]
- },
- "device:tofino:leaf1/181": {
- "interfaces": [
- {
- "name": "leaf1-3/1-mgmt25-enb",
- "ips": [
- "118.0.0.254/24",
- "119.0.0.254/24"
- ],
- "vlan-untagged": 10
- }
- ]
- },
- "device:tofino:leaf1/182": {
- "interfaces": [
- {
- "name": "leaf1-3/2--head-node(ProgRAN)",
- "ips": [
- "118.0.0.254/24"
- ],
- "vlan-untagged": 10
- }
- ]
- },
- "device:tofino:leaf2/180": {
- "interfaces": [
- {
- "name": "leaf2-3/0-compute-2",
- "ips": [
- "10.6.2.254/24",
- "122.0.0.254/24"
- ],
- "vlan-untagged": 20
- }
- ]
- },
- "device:tofino:leaf2/181": {
- "interfaces": [
- {
- "name": "leaf2-3/1-P4-DP",
- "ips": [
- "140.0.0.2/24"
- ],
- "vlan-untagged": 20
- }
- ]
- },
- "device:tofino:leaf2/182": {
- "interfaces": [
- {
- "name": "leaf2-3/2-------mgmt-27---ARM",
- "ips": [
- "150.0.0.254/24"
- ],
- "vlan-untagged": 150
- }
- ]
- },
- "device:tofino:leaf1/172": {
- "interfaces": [
- {
- "name": "leaf1-5/0--int-sink",
- "ips": [
- "160.0.1.254/24"
- ],
- "vlan-untagged": 161
- }
- ]
- },
- "device:tofino:leaf2/172": {
- "interfaces": [
- {
- "name": "leaf2-5/0--int-source",
- "ips": [
- "160.0.2.254/24"
- ],
- "vlan-untagged": 162
- }
- ]
- }
- }
-}
diff --git a/p4-pod-configs/dev-pod/mwc-demo.json b/p4-pod-configs/dev-pod/mwc-demo.json
deleted file mode 100644
index a17d921..0000000
--- a/p4-pod-configs/dev-pod/mwc-demo.json
+++ /dev/null
@@ -1,157 +0,0 @@
-{
- "devices": {
- "device:tofino:leaf1": {
- "segmentrouting": {
- "name": "leaf1",
- "ipv4NodeSid": 204,
- "ipv4Loopback": "192.168.0.204",
- "ipv6NodeSid": 214,
- "ipv6Loopback": "2000::c0a8:0204",
- "routerMac": "00:00:00:00:02:04",
- "isEdgeRouter": true,
- "adjacencySids": []
- }
- },
- "device:tofino:leaf2": {
- "segmentrouting": {
- "name": "leaf2",
- "ipv4NodeSid": 205,
- "ipv4Loopback": "192.168.0.205",
- "ipv6NodeSid": 215,
- "ipv6Loopback": "2000::c0a8:0205",
- "routerMac": "00:00:00:00:02:05",
- "isEdgeRouter": true,
- "adjacencySids": []
- }
- },
- "device:cavium:spine1": {
- "segmentrouting": {
- "name": "spine1",
- "ipv4NodeSid": 226,
- "ipv4Loopback": "192.168.0.226",
- "ipv6NodeSid": 236,
- "ipv6Loopback": "2000::c0a8:0226",
- "routerMac": "00:00:00:00:02:26",
- "isEdgeRouter": false,
- "adjacencySids": []
- }
- },
- "device:mellanox:spine2": {
- "segmentrouting": {
- "name": "spine2",
- "ipv4NodeSid": 227,
- "ipv4Loopback": "192.168.0.227",
- "ipv6NodeSid": 237,
- "ipv6Loopback": "2000::c0a8:0227",
- "routerMac": "00:00:00:00:02:27",
- "isEdgeRouter": false,
- "adjacencySids": []
- }
- }
- },
- "ports": {
- "device:tofino:leaf1/180": {
- "interfaces": [
- {
- "name": "leaf1-3/0-compute-1",
- "ips": [
- "10.6.1.254/24",
- "118.0.0.254/24",
- "119.0.0.254/24"
- ],
- "vlan-untagged": 10
- }
- ]
- },
- "device:tofino:leaf1/181": {
- "interfaces": [
- {
- "name": "leaf1-3/1-mgmt25-enb",
- "ips": [
- "118.0.0.254/24",
- "119.0.0.254/24"
- ],
- "vlan-untagged": 10
- }
- ]
- },
- "device:tofino:leaf1/182": {
- "interfaces": [
- {
- "name": "leaf1-3/2--head-node(ProgRAN)",
- "ips": [
- "118.0.0.254/24"
- ],
- "vlan-untagged": 10
- }
- ]
- },
- "device:tofino:leaf1/183": {
- "interfaces": [
- {
- "name": "leaf1-3/3--mgmtXX--nc-int-exp",
- "ips": [
- "10.6.1.254/24"
- ],
- "vlan-untagged": 10
- }
- ]
- },
- "device:tofino:leaf2/180": {
- "interfaces": [
- {
- "name": "leaf2-3/0-compute-2",
- "ips": [
- "10.6.2.254/24",
- "122.0.0.254/24"
- ],
- "vlan-untagged": 20
- }
- ]
- },
- "device:tofino:leaf2/181": {
- "interfaces": [
- {
- "name": "leaf2-3/1-P4-DP",
- "ips": [
- "140.0.0.2/24"
- ],
- "vlan-untagged": 20
- }
- ]
- },
- "device:tofino:leaf2/182": {
- "interfaces": [
- {
- "name": "leaf2-3/2-------mgmt-27---ARM",
- "ips": [
- "150.0.0.254/24"
- ],
- "vlan-untagged": 150
- }
- ]
- },
- "device:tofino:leaf1/172": {
- "interfaces": [
- {
- "name": "leaf1-5/0-nc1-int-source",
- "ips": [
- "160.0.1.254/24"
- ],
- "vlan-untagged": 160
- }
- ]
- },
- "device:tofino:leaf2/172": {
- "interfaces": [
- {
- "name": "leaf2-5/0-nc2-int-sink",
- "ips": [
- "160.0.2.254/24"
- ],
- "vlan-untagged": 160
- }
- ]
- }
- }
-}
diff --git a/p4-pod-configs/dev-pod/sr-conf-base.json b/p4-pod-configs/dev-pod/sr-conf-base.json
index 0caec66..c2e62cf 100644
--- a/p4-pod-configs/dev-pod/sr-conf-base.json
+++ b/p4-pod-configs/dev-pod/sr-conf-base.json
@@ -29,7 +29,7 @@
"device:tofino:leaf1/180": {
"interfaces": [
{
- "name": "leaf1-3/0-compute-1",
+ "name": "leaf1/3/0--compute-1",
"ips": [
"10.6.1.254/24",
"118.0.0.254/24",
@@ -42,7 +42,7 @@
"device:tofino:leaf1/181": {
"interfaces": [
{
- "name": "leaf1-3/1-mgmt25-enb",
+ "name": "leaf1/3/1--mgmt25--enb",
"ips": [
"118.0.0.254/24",
"119.0.0.254/24"
@@ -54,7 +54,7 @@
"device:tofino:leaf1/182": {
"interfaces": [
{
- "name": "leaf1-3/2--head-node(ProgRAN)",
+ "name": "leaf1/3/2--head-node-ProgRAN",
"ips": [
"118.0.0.254/24"
],
@@ -62,10 +62,21 @@
}
]
},
+ "device:tofino:leaf1/183": {
+ "interfaces": [
+ {
+ "name": "leaf1/3/3--mgmt28--nc-int-exp",
+ "ips": [
+ "10.6.1.254/24"
+ ],
+ "vlan-untagged": 10
+ }
+ ]
+ },
"device:tofino:leaf2/180": {
"interfaces": [
{
- "name": "leaf2-3/0-compute-2",
+ "name": "leaf2/3/0--compute-2",
"ips": [
"10.6.2.254/24",
"122.0.0.254/24"
@@ -77,7 +88,7 @@
"device:tofino:leaf2/181": {
"interfaces": [
{
- "name": "leaf2-3/1-P4-DP",
+ "name": "leaf2/3/1--SPGW-DP",
"ips": [
"140.0.0.2/24"
],
@@ -88,7 +99,7 @@
"device:tofino:leaf2/182": {
"interfaces": [
{
- "name": "leaf2-3/2-------mgmt-27---ARM",
+ "name": "leaf2/3/2--mgmt27--ARM",
"ips": [
"150.0.0.254/24"
],
@@ -99,7 +110,7 @@
"device:tofino:leaf1/172": {
"interfaces": [
{
- "name": "leaf1-5/0--int-sink",
+ "name": "leaf1/5/0--nc1-int-source",
"ips": [
"160.0.1.254/24"
],
@@ -110,7 +121,7 @@
"device:tofino:leaf2/172": {
"interfaces": [
{
- "name": "leaf2-5/0--int-source",
+ "name": "leaf2/5/0--nc2-int-sink",
"ips": [
"160.0.2.254/24"
],