[ONOS-7780] Migrate more SRMulticast test cases to POD
Change-Id: If6a33e67d98869730c41527acb957f090d43261a
diff --git a/TestON/tests/USECASE/SegmentRouting/SRMulticast/SRMulticast.params.flex b/TestON/tests/USECASE/SegmentRouting/SRMulticast/SRMulticast.params.flex
index c40f97e..fa4d15c 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRMulticast/SRMulticast.params.flex
+++ b/TestON/tests/USECASE/SegmentRouting/SRMulticast/SRMulticast.params.flex
@@ -1,5 +1,5 @@
<PARAMS>
- <testcases>1,1</testcases>
+ <testcases>1,2,4</testcases>
<GRAPH>
<nodeCluster>Fabric</nodeCluster>
@@ -14,6 +14,7 @@
<DEPENDENCY>
<useCommonConf>False</useCommonConf>
<useCommonTopo>True</useCommonTopo>
+ <confName>flex</confName>
<topology>hagg_fabric.py</topology>
<lib>routinglib.py,trellislib.py</lib>
<conf>bgpdbgp1.conf,bgpdbgp2.conf,bgpdr1.conf,bgpdr2.conf,dhcpd6.conf,dhcpd.conf,zebradbgp1.conf,zebradbgp2.conf</conf>
@@ -48,7 +49,7 @@
</RETRY>
<SCAPY>
- <HOSTNAMES>h1,h2</HOSTNAMES>
+ <HOSTNAMES>h1,h2,h3,h4</HOSTNAMES>
</SCAPY>
<TOPO>
diff --git a/TestON/tests/USECASE/SegmentRouting/SRMulticast/SRMulticast.topo.flex b/TestON/tests/USECASE/SegmentRouting/SRMulticast/SRMulticast.topo.flex
index 60d109a..8c32a0c 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRMulticast/SRMulticast.topo.flex
+++ b/TestON/tests/USECASE/SegmentRouting/SRMulticast/SRMulticast.topo.flex
@@ -184,6 +184,40 @@
</COMPONENTS>
</Host2>
+ <Host3>
+ <host>10.192.21.61</host>
+ <user>vyatta</user>
+ <password>vyatta</password>
+ <type>HostDriver</type>
+ <connect_order>15</connect_order>
+ <COMPONENTS>
+ <ip>10.0.202.7</ip>
+ <ip6></ip6>
+ <shortName>h3</shortName>
+ <ifaceName>bond0</ifaceName>
+ <inband>True</inband>
+ <username>ubuntu</username>
+ <password>ubuntu</password>
+ </COMPONENTS>
+ </Host3>
+
+ <Host4>
+ <host>10.192.21.61</host>
+ <user>vyatta</user>
+ <password>vyatta</password>
+ <type>HostDriver</type>
+ <connect_order>16</connect_order>
+ <COMPONENTS>
+ <ip>10.0.204.7</ip>
+ <ip6></ip6>
+ <shortName>h4</shortName>
+ <ifaceName>bond0</ifaceName>
+ <inband>True</inband>
+ <username>ubuntu</username>
+ <password>ubuntu</password>
+ </COMPONENTS>
+ </Host4>
+
<NetworkBench>
<host>localhost</host>
<user>sdn</user>
diff --git a/TestON/tests/USECASE/SegmentRouting/SRMulticast/dependencies/SRMulticastTest.py b/TestON/tests/USECASE/SegmentRouting/SRMulticast/dependencies/SRMulticastTest.py
index 8758fd8..33e9656 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRMulticast/dependencies/SRMulticastTest.py
+++ b/TestON/tests/USECASE/SegmentRouting/SRMulticast/dependencies/SRMulticastTest.py
@@ -37,10 +37,10 @@
lib.installOnos( main, skipPackage=skipPackage, cliSleep=5 )
# Load configuration files
main.step( "Load configurations" )
- main.cfgName = "TEST_CONFIG_ipv4=1_ipv6=1" if hasattr( main, "Mininet1" ) else "flex"
+ main.cfgName = "TEST_CONFIG_ipv4=1_ipv6=1" if hasattr( main, "Mininet1" ) else main.params[ "DEPENDENCY" ][ "confName" ]
lib.loadJson( main )
time.sleep( float( main.params[ "timers" ][ "loadNetcfgSleep" ] ) )
- main.cfgName = "common" if hasattr( main, "Mininet1" ) else "flex"
+ main.cfgName = "common" if hasattr( main, "Mininet1" ) else main.params[ "DEPENDENCY" ][ "confName" ]
lib.loadMulticastConfig( main )
lib.loadHost( main )
diff --git a/TestON/tests/USECASE/SegmentRouting/SRMulticast/dependencies/host/flex.host b/TestON/tests/USECASE/SegmentRouting/SRMulticast/dependencies/host/flex.host
index 7647b9e..16924b4 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRMulticast/dependencies/host/flex.host
+++ b/TestON/tests/USECASE/SegmentRouting/SRMulticast/dependencies/host/flex.host
@@ -2,11 +2,15 @@
"onos":
{
"12:1C:B7:5C:69:68/None": "10.0.202.8",
- "A2:9B:16:E8:2A:52/None": "10.0.204.8"
+ "A2:9B:16:E8:2A:52/None": "10.0.204.8",
+ "0A:5E:0D:F3:EC:D4/None": "10.0.202.7",
+ "EA:DA:19:1E:CB:7D/None": "10.0.204.7"
},
"network":
{
"h1": "10.0.202.8",
- "h2": "10.0.204.8"
+ "h2": "10.0.204.8",
+ "h3": "10.0.202.7",
+ "h4": "10.0.204.7"
}
}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRMulticast/dependencies/multicast/flex.multicastConfig b/TestON/tests/USECASE/SegmentRouting/SRMulticast/dependencies/multicast/flex.multicastConfig
index 0e0ccc9..cae5007 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRMulticast/dependencies/multicast/flex.multicastConfig
+++ b/TestON/tests/USECASE/SegmentRouting/SRMulticast/dependencies/multicast/flex.multicastConfig
@@ -17,10 +17,22 @@
],
"dst": [
{
+ "host": "h3",
+ "id": "0A:5E:0D:F3:EC:D4/None",
+ "interface": "bond0",
+ "dualHomed": "True"
+ },
+ {
"host": "h2",
"id": "A2:9B:16:E8:2A:52/None",
"interface": "bond0",
"dualHomed": "True"
+ },
+ {
+ "host": "h4",
+ "id": "EA:DA:19:1E:CB:7D/None",
+ "interface": "bond0",
+ "dualHomed": "True"
}
]
}