[ONOS-5514] add vlan interfaces in SDNIPClusterTest
Change-Id: I432ed8b164c357468a80b7f80df02a67ae98dbbe
diff --git a/TestON/tests/USECASE/USECASE_SdnipFunctionCluster/network-cfg.json b/TestON/tests/USECASE/USECASE_SdnipFunctionCluster/network-cfg.json
index 602a72f..5efd5a7 100644
--- a/TestON/tests/USECASE/USECASE_SdnipFunctionCluster/network-cfg.json
+++ b/TestON/tests/USECASE/USECASE_SdnipFunctionCluster/network-cfg.json
@@ -3,10 +3,12 @@
"of:00000000000000a8/5" : {
"interfaces" : [
{
+ "name": "sw8-5-1",
"ips" : [ "10.0.5.101/24" ],
"mac" : "00:00:00:00:00:01"
},
{
+ "name": "sw8-5-2",
"ips" : [ "10.0.15.101/24" ],
"mac" : "00:00:00:00:00:02"
}
@@ -15,10 +17,12 @@
"of:0000000000000a32/4" : {
"interfaces" : [
{
+ "name": "sw32-4-1",
"ips" : [ "10.0.4.101/24" ],
"mac" : "00:00:00:00:00:01"
},
{
+ "name": "sw32-4-2",
"ips" : [ "10.0.14.101/24" ],
"mac" : "00:00:00:00:00:02"
}
@@ -27,14 +31,56 @@
"of:0000000000000a28/3" : {
"interfaces" : [
{
+ "name": "sw28-3-1",
"ips" : [ "10.0.6.101/24" ],
"mac" : "00:00:00:00:00:01"
},
{
+ "name": "sw28-3-2",
"ips" : [ "10.0.16.101/24" ],
"mac" : "00:00:00:00:00:02"
}
]
+ },
+ "of:00000000000000a5/5" : {
+ "interfaces" : [
+ {
+ "name" : "sw5-5",
+ "ips" : [ "10.0.20.101/24" ],
+ "mac" : "00:00:00:00:00:03",
+ "vlan" : "10"
+ }
+ ]
+ },
+ "of:00000000000000a5/4" : {
+ "interfaces" : [
+ {
+ "name" : "sw5-4",
+ "ips" : [ "10.0.9.101/24" ],
+ "mac" : "00:00:00:00:00:03",
+ "vlan" : "10"
+ }
+ ]
+ },
+ "of:00000000000000a7/3" : {
+ "interfaces" : [
+ {
+ "name" : "sw7-3",
+ "ips" : [ "10.0.7.101/24" ],
+ "mac" : "00:00:00:00:00:04",
+ "vlan" : "20"
+ }
+ ]
+ },
+ "of:00000000000000a9/3" : {
+ "interfaces" : [
+ {
+ "name" : "sw9-3",
+ "ips" : [ "10.0.8.101/24" ],
+ "mac" : "00:00:00:00:00:04",
+ "vlan" : "20"
+ }
+ ]
}
},
"apps" : {
@@ -42,7 +88,7 @@
"bgp" : {
"bgpSpeakers" : [
{
- "name" : "speaker1",
+ "name" : "bgpSpeaker1",
"connectPoint" : "of:0000000000000a24/1",
"peers" : [
"10.0.4.1",
@@ -51,13 +97,31 @@
]
},
{
- "name" : "speaker2",
+ "name" : "bgpSpeaker2",
"connectPoint" : "of:0000000000000a24/2",
"peers" : [
"10.0.14.1",
"10.0.15.1",
"10.0.16.1"
]
+ },
+ {
+ "name": "bgpSpeaker3",
+ "vlan": "10",
+ "connectPoint" : "of:0000000000000a24/3",
+ "peers" : [
+ "10.0.9.1",
+ "10.0.20.1"
+ ]
+ },
+ {
+ "name": "bgpSpeaker4",
+ "vlan": "20",
+ "connectPoint" : "of:0000000000000a24/4",
+ "peers" : [
+ "10.0.7.1",
+ "10.0.8.1"
+ ]
}
]
}