Update "SRpairedLeaves" test for sdfabric-ci1 POD
Also remove Tucson POD related files
Change-Id: I79c68930d29b158e29454bc37f37cd3c736c44d6
diff --git a/TestON/tests/USECASE/SegmentRouting/SRStaging/SRpairedLeaves/SRpairedLeaves.params b/TestON/tests/USECASE/SegmentRouting/SRStaging/SRpairedLeaves/SRpairedLeaves.params
index 7e05ccd..949cf12 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRStaging/SRpairedLeaves/SRpairedLeaves.params
+++ b/TestON/tests/USECASE/SegmentRouting/SRStaging/SRpairedLeaves/SRpairedLeaves.params
@@ -1,8 +1,9 @@
<PARAMS>
- <testcases>1,2,101,102,103,104,301</testcases>
+ <!-- Disable case 301 for now since it requires additional settings for upstream router. -->
+ <testcases>1,2,101,102,103,104</testcases>
<GRAPH>
- <nodeCluster>pairedleaves</nodeCluster>
+ <nodeCluster>ci1-sdfabric</nodeCluster>
<builds>20</builds>
<jobName>SRpairedLeaves</jobName>
<branch>master</branch>
@@ -34,18 +35,16 @@
</kubernetes>
<PERF>
- <traffic_host>Compute1 Compute2</traffic_host>
- <pcap_host>Compute3</pcap_host>
+ <traffic_host>Host1 Host2</traffic_host>
+ <pcap_host>Host3</pcap_host>
<pcap_cmd_arguments>-t e -F pcap -s 100 </pcap_cmd_arguments>
<iterations>1</iterations>
<topo>
<leaf1>
- <ports>176 180 184 188</ports>
- <note>eNB</note>
+ <ports>100 101</ports>
</leaf1>
<leaf2>
- <ports>260 268 276 284</ports>
- <note>upstream</note>
+ <ports>100 101</ports>
</leaf2>
</topo>
</PERF>
diff --git a/TestON/tests/USECASE/SegmentRouting/SRStaging/SRpairedLeaves/SRpairedLeaves.py b/TestON/tests/USECASE/SegmentRouting/SRStaging/SRpairedLeaves/SRpairedLeaves.py
index ecdb769..95867df 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRStaging/SRpairedLeaves/SRpairedLeaves.py
+++ b/TestON/tests/USECASE/SegmentRouting/SRStaging/SRpairedLeaves/SRpairedLeaves.py
@@ -35,7 +35,7 @@
description="%s tests on the %s pod" % ( descPrefix, pod ) )
switches = int( main.params[ 'TOPO' ][ 'switchNum' ] )
links = int( main.params[ 'TOPO' ][ 'linkNum' ] )
- hosts = [ 'h1', 'h2', 'h3', 'mgmt' ]
+ hosts = [ 'h1', 'h2', 'h3']
run.verifyTopology( main, switches, links, main.Cluster.numCtrls )
run.verifyPing( main, hosts, hosts )
main.funcs.cleanup( main )
@@ -64,7 +64,7 @@
topology='0x2',
onosNodes=3,
description="%s tests on the %s pod" % ( descPrefix, pod ) )
- hosts = [ 'h1', 'h2', 'h3', 'mgmt' ]
+ hosts = [ 'h1', 'h2', 'h3' ]
run.pingAllFabricIntfs( main, hosts, dumpFlows=False )
main.funcs.cleanup( main )
@@ -93,8 +93,8 @@
topology='0x2',
onosNodes=3,
description="%s tests on the %s pod" % ( descPrefix, pod ) )
- srcComponent = getattr( main, 'Compute1' )
- dstComponent = getattr( main, 'Compute2' )
+ srcComponent = getattr( main, 'Host1' )
+ dstComponent = getattr( main, 'Host2' )
targets = main.funcs.getHostConnections( main, srcComponent )
shortDesc = descPrefix + "-Failure"
@@ -135,8 +135,8 @@
topology='0x2',
onosNodes=3,
description="%s tests on the %s pod" % ( descPrefix, pod ) )
- srcComponent = getattr( main, 'Compute2' )
- dstComponent = getattr( main, 'Compute1' )
+ srcComponent = getattr( main, 'Host2' )
+ dstComponent = getattr( main, 'Host1' )
targets = main.funcs.getHostConnections( main, dstComponent )
shortDesc = descPrefix + "-Failure"
@@ -177,8 +177,8 @@
topology='0x2',
onosNodes=3,
description="%s tests on the %s pod" % ( descPrefix, pod ) )
- srcComponent = getattr( main, 'Compute1' )
- dstComponent = getattr( main, 'Compute3' )
+ srcComponent = getattr( main, 'Host1' )
+ dstComponent = getattr( main, 'Host3' )
targets = main.funcs.getHostConnections( main, srcComponent )
shortDesc = descPrefix + "-Failure"
@@ -219,8 +219,8 @@
topology='0x2',
onosNodes=3,
description="%s tests on the %s pod" % ( descPrefix, pod ) )
- srcComponent = getattr( main, 'Compute3' )
- dstComponent = getattr( main, 'Compute1' )
+ srcComponent = getattr( main, 'Host3' )
+ dstComponent = getattr( main, 'Host1' )
targets = main.funcs.getHostConnections( main, dstComponent )
shortDesc = descPrefix + "-Failure"
@@ -610,7 +610,7 @@
route-add 8.8.8.8/32 via <mgmt server fabric ip
"""
- srcComponent = getattr( main, 'Compute1' )
+ srcComponent = getattr( main, 'Host1' )
nextHopComponent = getattr( main, 'ManagmentServer' )
# Add route in host to outside host via gateway ip
diff --git a/TestON/tests/USECASE/SegmentRouting/SRStaging/SRpairedLeaves/SRpairedLeaves.topo b/TestON/tests/USECASE/SegmentRouting/SRStaging/SRpairedLeaves/SRpairedLeaves.topo
index 3f74e30..b7c2ff0 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRStaging/SRpairedLeaves/SRpairedLeaves.topo
+++ b/TestON/tests/USECASE/SegmentRouting/SRStaging/SRpairedLeaves/SRpairedLeaves.topo
@@ -9,7 +9,7 @@
<jump_host></jump_host>
<home>~</home> # defines where onos home is on the build machine. Defaults to "~/onos/" if empty.
<COMPONENTS>
- <kubeConfig>~/.kube/dev-pairedleaves-tucson</kubeConfig> # If set, will attempt to use this file for setting up port-forwarding
+ <kubeConfig>~/.kube/01-ci1-sdfabric.yaml</kubeConfig> # If set, will attempt to use this file for setting up port-forwarding
<useDocker>True</useDocker> # Whether to use docker for ONOS nodes
<docker_prompt>\$</docker_prompt>
<cluster_name></cluster_name> # Used as a prefix for cluster components. Defaults to 'ONOS'
@@ -27,7 +27,7 @@
</ONOScell>
<Leaf1>
- <host>10.76.28.70</host>
+ <host>10.70.10.94</host>
<user>root</user>
<password>onl</password>
<type>StratumOSSwitchDriver</type>
@@ -45,7 +45,7 @@
</Leaf1>
<Leaf2>
- <host>10.76.28.71</host>
+ <host>10.70.10.95</host>
<user>root</user>
<password>onl</password>
<type>StratumOSSwitchDriver</type>
@@ -62,9 +62,9 @@
</COMPONENTS>
</Leaf2>
- <Compute1>
- <host>10.76.28.74</host>
- <user>jenkins</user>
+ <Host1>
+ <host>10.70.10.105</host>
+ <user>sdfab</user>
<password></password>
<type>HostDriver</type>
<connect_order>6</connect_order>
@@ -73,27 +73,19 @@
<mac></mac>
<inband>false</inband>
<dhcp>True</dhcp>
- <ip>10.32.11.2</ip>
+ <ip>10.32.11.1</ip>
<shortName>h1</shortName>
<port1></port1>
<link1></link1>
- <ifaceName>pairbond</ifaceName>
- <routes>
- <route1>
- <network></network>
- <netmask></netmask>
- <gw></gw>
- <interface></interface>
- </route1>
- </routes>
+ <ifaceName>bond0</ifaceName>
<sudo_required>true</sudo_required>
<scapy_path>/usr/bin/scapy</scapy_path>
</COMPONENTS>
- </Compute1>
+ </Host1>
- <Compute2>
- <host>10.76.28.72</host>
- <user>jenkins</user>
+ <Host2>
+ <host>10.70.10.106</host>
+ <user>sdfab</user>
<password></password>
<type>HostDriver</type>
<connect_order>7</connect_order>
@@ -102,27 +94,19 @@
<mac></mac>
<inband>false</inband>
<dhcp>True</dhcp>
- <ip>10.32.11.3</ip>
+ <ip>10.32.11.2</ip>
<shortName>h2</shortName>
<port1></port1>
<link1></link1>
- <ifaceName>pairbond</ifaceName>
- <routes>
- <route1>
- <network></network>
- <netmask></netmask>
- <gw></gw>
- <interface></interface>
- </route1>
- </routes>
+ <ifaceName>bond0</ifaceName>
<sudo_required>true</sudo_required>
<scapy_path>/usr/bin/scapy</scapy_path>
</COMPONENTS>
- </Compute2>
+ </Host2>
- <Compute3>
- <host>10.76.28.68</host>
- <user>jenkins</user>
+ <Host3>
+ <host>10.70.10.107</host>
+ <user>sdfab</user>
<password></password>
<type>HostDriver</type>
<connect_order>8</connect_order>
@@ -131,56 +115,19 @@
<mac></mac>
<inband>false</inband>
<dhcp>True</dhcp>
- <ip>10.32.11.194</ip>
+ <ip>10.32.11.193</ip>
<shortName>h3</shortName>
<port1></port1>
<link1></link1>
- <ifaceName>eno2</ifaceName>
- <routes>
- <route1>
- <network></network>
- <netmask></netmask>
- <gw></gw>
- <interface></interface>
- </route1>
- </routes>
+ <ifaceName>ens17</ifaceName>
<sudo_required>true</sudo_required>
<scapy_path>/usr/bin/scapy</scapy_path>
</COMPONENTS>
- </Compute3>
-
- <ManagmentServer>
- <host>10.76.28.66</host>
- <user>jenkins</user>
- <password></password>
- <type>HostDriver</type>
- <connect_order>1</connect_order>
- <COMPONENTS>
- <mac></mac>
- <inband>false</inband>
- <dhcp>True</dhcp>
- <ip>10.32.11.1</ip>
- <shortName>mgmt</shortName>
- <port1></port1>
- <link1></link1>
- <ifaceName>pairbond</ifaceName>
- <routes>
- <route1>
- <network></network>
- <netmask></netmask>
- <gw></gw>
- <interface></interface>
- </route1>
- </routes>
- <sudo_required>true</sudo_required>
- <scapy_path>/usr/bin/scapy</scapy_path>
-
- </COMPONENTS>
- </ManagmentServer>
+ </Host3>
<NetworkBench>
- <host>10.76.28.66</host>
- <user>jenkins</user>
+ <host>10.70.10.105</host>
+ <user>sdfab</user>
<password></password>
<type>NetworkDriver</type>
<connect_order>1</connect_order>