[ONOS-5514] add vlan interfaces to Sdn-ip tests
Change-Id: I9e873275907c8dbbac43c3c47868fb3702b8801a
diff --git a/TestON/tests/USECASE/USECASE_SdnipFunction/network-cfg.json b/TestON/tests/USECASE/USECASE_SdnipFunction/network-cfg.json
index 303b1bd..bf6fa1a 100644
--- a/TestON/tests/USECASE/USECASE_SdnipFunction/network-cfg.json
+++ b/TestON/tests/USECASE/USECASE_SdnipFunction/network-cfg.json
@@ -3,6 +3,7 @@
"of:00000000000000a8/5" : {
"interfaces" : [
{
+ "name": "sw8-5",
"ips" : [ "10.0.5.101/24" ],
"mac" : "00:00:00:00:00:01"
}
@@ -11,6 +12,7 @@
"of:0000000000000a32/4" : {
"interfaces" : [
{
+ "name" : "sw32-4",
"ips" : [ "10.0.4.101/24" ],
"mac" : "00:00:00:00:00:01"
}
@@ -19,10 +21,51 @@
"of:0000000000000a28/3" : {
"interfaces" : [
{
+ "name" : "sw28-3",
"ips" : [ "10.0.6.101/24" ],
"mac" : "00:00:00:00:00:01"
}
]
+ },
+ "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:02",
+ "vlan" : "20"
+ }
+ ]
+ },
+ "of:00000000000000a9/3" : {
+ "interfaces" : [
+ {
+ "name" : "sw9-3",
+ "ips" : [ "10.0.8.101/24" ],
+ "mac" : "00:00:00:00:00:02",
+ "vlan" : "20"
+ }
+ ]
}
},
"apps" : {
@@ -30,13 +73,33 @@
"bgp" : {
"bgpSpeakers" : [
{
+ "name": "bgpSpeaker1",
"connectPoint" : "of:0000000000000a24/1",
"peers" : [
"10.0.4.1",
"10.0.5.1",
"10.0.6.1"
]
+ },
+ {
+ "name": "bgpSpeaker2",
+ "vlan": "20",
+ "connectPoint" : "of:0000000000000a24/2",
+ "peers" : [
+ "10.0.7.1",
+ "10.0.8.1"
+ ]
+ },
+ {
+ "name": "bgpSpeaker3",
+ "vlan": "10",
+ "connectPoint" : "of:0000000000000a24/3",
+ "peers" : [
+ "10.0.9.1",
+ "10.0.20.1"
+ ]
}
+
]
}
}