[SEBA-187] updations to tests to have one AGG switch
Change-Id: Ib1b81e2f26ac1b7d01f4cbdc95e5ee5d07f8200a
diff --git a/src/test/cord-api/Tests/FabricConfig.txt b/src/test/cord-api/Tests/FabricConfig.txt
index fc57902..410b169 100644
--- a/src/test/cord-api/Tests/FabricConfig.txt
+++ b/src/test/cord-api/Tests/FabricConfig.txt
@@ -28,10 +28,6 @@
INTERFACECREATE 0
Test Get FabricPortInterface-1
INTERFACERETRIEVE 0
-Test Create FarbicSwitch-2
- CREATE 1
-Test Get FabricSwitch-2
- RETRIEVE 1
Test Create FabricSwitchPort-2
PORTCREATE 1
Test Get FabricSwitchPort-2
@@ -40,14 +36,6 @@
INTERFACECREATE 1
Test Get FabricPortInterface-2
INTERFACERETRIEVE 1
-Test Create FarbicSwitch-3
- CREATE 2
-Test Get FabricSwitch-3
- RETRIEVE 2
-Test Create FarbicSwitch-4
- CREATE 3
-Test Get FabricSwitch-4
- RETRIEVE 3
*** Keywords ***
Read InputFile
diff --git a/src/test/cord-api/Tests/data/FabricPortInterface.json b/src/test/cord-api/Tests/data/FabricPortInterface.json
index 7a5061b..a0e724f 100644
--- a/src/test/cord-api/Tests/data/FabricPortInterface.json
+++ b/src/test/cord-api/Tests/data/FabricPortInterface.json
@@ -1,12 +1,12 @@
{
"FabricPortInterface" : [
{
- "name": "OLT Leaf1- Interface-1",
+ "name": "Switch Interface-1",
"ips": "10.8.2.254/24",
- "port_id": 8
+ "port_id": 1
},
{
- "name": "OLT Leaf2- Interface-2",
+ "name": "Switch Interface-2",
"ips": "10.8.3.254/24",
"vlanUntagged": 100,
"port_id": 9
diff --git a/src/test/cord-api/Tests/data/FabricSwitch.json b/src/test/cord-api/Tests/data/FabricSwitch.json
index 6f32b22..8c2ac96 100644
--- a/src/test/cord-api/Tests/data/FabricSwitch.json
+++ b/src/test/cord-api/Tests/data/FabricSwitch.json
@@ -2,39 +2,12 @@
"FabricSwitchInfo" : [
{
"driver": "ofdpa3",
- "ipv4Loopback": "192.168.9.22",
- "ipv4NodeSid": 18,
- "isEdgeRouter": true,
- "name": "Fabric Switch - Leaf1",
- "ofId": "of:0000cc37abd93769",
- "routerMac": "00:00:00:00:00:01"
- },
- {
- "driver": "ofdpa3",
- "ipv4Loopback": "192.168.9.23",
- "ipv4NodeSid": 17,
- "isEdgeRouter": true,
- "name": "Fabric Switch - Leaf2",
- "ofId": "of:0000cc37abb6b564",
- "routerMac": "00:00:00:00:00:02"
- },
- {
- "driver": "ofdpa3",
"ipv4Loopback": "192.168.9.24",
"ipv4NodeSid": 19,
"isEdgeRouter": false,
- "name": "Fabric Switch - Spine1",
+ "name": "Fabric Switch - 1",
"ofId": "of:0000cc37ab5b6da8",
"routerMac": "00:00:00:00:00:03"
- },
- {
- "driver": "ofdpa3",
- "ipv4Loopback": "192.168.9.25",
- "ipv4NodeSid": 20,
- "isEdgeRouter": false,
- "name": "Fabric Switch - Spine2",
- "ofId": "of:0000cc37abd9386d",
- "routerMac": "00:00:00:00:00:04"
}
]
}
diff --git a/src/test/cord-api/Tests/data/FabricSwitchPort.json b/src/test/cord-api/Tests/data/FabricSwitchPort.json
index 712c755..53d282e 100644
--- a/src/test/cord-api/Tests/data/FabricSwitchPort.json
+++ b/src/test/cord-api/Tests/data/FabricSwitchPort.json
@@ -6,8 +6,8 @@
"host_learning": false
},
{
- "portId": 5,
- "switch_id" : 6
+ "portId": 8,
+ "switch_id" : 1
}
]
}
diff --git a/src/test/cord-api/Tests/data/RealOLTDevice.json b/src/test/cord-api/Tests/data/RealOLTDevice.json
index 802c3d1..0ac640d 100644
--- a/src/test/cord-api/Tests/data/RealOLTDevice.json
+++ b/src/test/cord-api/Tests/data/RealOLTDevice.json
@@ -4,7 +4,7 @@
"device_type": "openolt",
"host": "10.192.4.218",
"port": 9191,
- "switch_datapath_id": "of:0000cc37abd93769",
+ "switch_datapath_id": "of:0000cc37ab5b6da8",
"switch_port": "7",
"outer_tpid": "0x8100",
"name": "olt-1",