- Remove vlan config from address.json for non-vlan test case
- Copy the address.json and sdnip.json files for VLAN test case to vlan folder
diff --git a/TestON/tests/PeeringRouterTest/addresses.json b/TestON/tests/PeeringRouterTest/addresses.json
index f800c1f..4e829ba 100644
--- a/TestON/tests/PeeringRouterTest/addresses.json
+++ b/TestON/tests/PeeringRouterTest/addresses.json
@@ -5,28 +5,24 @@
"port" : "1",
"ips" : ["192.168.10.101/24"],
"mac" : "00:00:00:00:00:01",
- "vlan" : "10"
},
{
"dpid" : "00:00:00:00:00:00:00:01",
"port" : "2",
"ips" : ["192.168.20.101/24"],
"mac" : "00:00:00:00:00:01",
- "vlan" : "20"
},
{
"dpid" : "00:00:00:00:00:00:00:01",
"port" : "3",
"ips" : ["192.168.30.101/24"],
"mac" : "00:00:00:00:00:01",
- "vlan" : "30"
},
{
"dpid" : "00:00:00:00:00:00:00:01",
"port" : "4",
"ips" : ["192.168.60.101/24"],
"mac" : "00:00:00:00:00:01",
- "vlan" : "60"
}
]
diff --git a/TestON/tests/PeeringRouterTest/vlan/addresses.json b/TestON/tests/PeeringRouterTest/vlan/addresses.json
new file mode 100644
index 0000000..f800c1f
--- /dev/null
+++ b/TestON/tests/PeeringRouterTest/vlan/addresses.json
@@ -0,0 +1,33 @@
+{
+ "addresses" : [
+ {
+ "dpid" : "00:00:00:00:00:00:00:01",
+ "port" : "1",
+ "ips" : ["192.168.10.101/24"],
+ "mac" : "00:00:00:00:00:01",
+ "vlan" : "10"
+ },
+ {
+ "dpid" : "00:00:00:00:00:00:00:01",
+ "port" : "2",
+ "ips" : ["192.168.20.101/24"],
+ "mac" : "00:00:00:00:00:01",
+ "vlan" : "20"
+ },
+ {
+ "dpid" : "00:00:00:00:00:00:00:01",
+ "port" : "3",
+ "ips" : ["192.168.30.101/24"],
+ "mac" : "00:00:00:00:00:01",
+ "vlan" : "30"
+ },
+ {
+ "dpid" : "00:00:00:00:00:00:00:01",
+ "port" : "4",
+ "ips" : ["192.168.60.101/24"],
+ "mac" : "00:00:00:00:00:01",
+ "vlan" : "60"
+ }
+
+ ]
+}
diff --git a/TestON/tests/PeeringRouterTest/vlan/sdnip.json b/TestON/tests/PeeringRouterTest/vlan/sdnip.json
new file mode 100644
index 0000000..5b61d05
--- /dev/null
+++ b/TestON/tests/PeeringRouterTest/vlan/sdnip.json
@@ -0,0 +1,59 @@
+{
+
+ "bgpPeers" : [
+ {
+ "attachmentDpid" : "00:00:00:00:00:00:00:01",
+ "attachmentPort" : "1",
+ "ipAddress" : "192.168.10.1"
+ },
+ {
+ "attachmentDpid" : "00:00:00:00:00:00:00:01",
+ "attachmentPort" : "2",
+ "ipAddress" : "192.168.20.1"
+ },
+ {
+ "attachmentDpid" : "00:00:00:00:00:00:00:01",
+ "attachmentPort" : "3",
+ "ipAddress" : "192.168.30.1"
+ },
+ {
+ "attachmentDpid" : "00:00:00:00:00:00:00:01",
+ "attachmentPort" : "4",
+ "ipAddress" : "192.168.60.2"
+ }
+
+ ],
+ "bgpSpeakers" : [
+ {
+ "name" : "bgpSpeaker1",
+ "attachmentDpid" : "00:00:00:00:00:00:00:02",
+ "attachmentPort" : "1",
+ "macAddress" : "00:00:00:00:00:02",
+ "interfaceAddresses" : [
+ {
+ "interfaceDpid" : "00:00:00:00:00:00:00:01",
+ "interfacePort" : "1",
+ "ipAddress" : "192.168.10.101"
+ },
+ {
+ "interfaceDpid" : "00:00:00:00:00:00:00:01",
+ "interfacePort" : "2",
+ "ipAddress" : "192.168.20.101"
+ },
+ {
+ "interfaceDpid" : "00:00:00:00:00:00:00:01",
+ "interfacePort" : "3",
+ "ipAddress" : "192.168.30.101"
+ },
+ {
+ "interfaceDpid" : "00:00:00:00:00:00:00:01",
+ "interfacePort" : "4",
+ "ipAddress" : "192.168.60.101"
+ }
+
+ ]
+
+ }
+
+ ]
+}