Merge "Update QoS tests for sdfabric-ci1 POD"
diff --git a/TestON/tests/USECASE/SegmentRouting/Policing/Policing.params b/TestON/tests/USECASE/SegmentRouting/Policing/Policing.params
index 532e13e..5ea8a33 100644
--- a/TestON/tests/USECASE/SegmentRouting/Policing/Policing.params
+++ b/TestON/tests/USECASE/SegmentRouting/Policing/Policing.params
@@ -2,7 +2,7 @@
<testcases>1,2</testcases>
<GRAPH>
- <nodeCluster>pairedleaves</nodeCluster>
+ <nodeCluster>ci1-sdfabric</nodeCluster>
<builds>20</builds>
<jobName>QOS</jobName>
<branch>master</branch>
@@ -22,8 +22,8 @@
<enodebs>
<enodeb_1>
<host>TRexClient</host>
- <enb_address>10.32.11.124</enb_address>
- <interface>pairbond</interface> <!-- useless for this test, we use TRex to generate traffic -->
+ <enb_address>10.32.11.123</enb_address>
+ <interface>bond0</interface> <!-- useless for this test, we use TRex to generate traffic -->
<ues>ue1,ue2</ues>
</enodeb_1>
</enodebs>
@@ -65,7 +65,12 @@
</UP4>
<TREX>
- <port_stats>0,2,3</port_stats> <!-- TRex port 0 = PDN, TRex port 2 = eNodeB, TRex port 3 = second eNB -->
+ <!--
+ TRex port 0 = PDN (10.32.11.125)
+ TRex port 2 = eNodeB (10.32.11.123)
+ TRex port 3 = second eNB (10.32.11.122)
+ -->
+ <port_stats>0,2,3</port_stats>
<flows>
<UE1>
<name>UE1: Conformant Session</name>
@@ -80,7 +85,7 @@
<eth_dst>00:00:0A:4C:1C:46</eth_dst>
<gtp_teid>100</gtp_teid>
<s1u_addr>10.32.11.126</s1u_addr>
- <enb_addr>10.32.11.124</enb_addr>
+ <enb_addr>10.32.11.123</enb_addr>
</packet>
<latency_stats>true</latency_stats>
<flow_id>20</flow_id>
@@ -100,7 +105,7 @@
<eth_dst>00:00:0A:4C:1C:46</eth_dst>
<gtp_teid>200</gtp_teid>
<s1u_addr>10.32.11.126</s1u_addr>
- <enb_addr>10.32.11.124</enb_addr>
+ <enb_addr>10.32.11.123</enb_addr>
</packet>
<latency_stats>true</latency_stats>
<flow_id>21</flow_id>
@@ -119,7 +124,7 @@
<eth_dst>00:00:0A:4C:1C:46</eth_dst>
<gtp_teid>100</gtp_teid>
<s1u_addr>10.32.11.126</s1u_addr>
- <enb_addr>10.32.11.124</enb_addr>
+ <enb_addr>10.32.11.123</enb_addr>
</packet>
<latency_stats>true</latency_stats>
<flow_id>30</flow_id>
@@ -139,7 +144,7 @@
<eth_dst>00:00:0A:4C:1C:46</eth_dst>
<gtp_teid>200</gtp_teid>
<s1u_addr>10.32.11.126</s1u_addr>
- <enb_addr>10.32.11.124</enb_addr>
+ <enb_addr>10.32.11.123</enb_addr>
</packet>
<latency_stats>true</latency_stats>
<flow_id>31</flow_id>
diff --git a/TestON/tests/USECASE/SegmentRouting/Policing/Policing.topo b/TestON/tests/USECASE/SegmentRouting/Policing/Policing.topo
index 7aee367..cdb0182 100644
--- a/TestON/tests/USECASE/SegmentRouting/Policing/Policing.topo
+++ b/TestON/tests/USECASE/SegmentRouting/Policing/Policing.topo
@@ -9,7 +9,7 @@
<jump_host></jump_host>
<home>~/onos</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/ci1-sdfabric</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'
@@ -33,7 +33,7 @@
<type>TrexClientDriver</type>
<connect_order>5</connect_order>
<COMPONENTS>
- <trex_address>10.76.28.72</trex_address> <!-- Compute2 -->
+ <trex_address>10.70.10.98</trex_address> <!-- Lottanics -->
<trex_config>trex_config.yaml</trex_config> <!-- relative path starting from ./dependencies-->
<force_restart>True</force_restart>
<software_mode>True</software_mode>
@@ -41,9 +41,9 @@
</COMPONENTS>
</TRexClient>
- <!-- This component is not needed, but required to use the Testcaselib -->
+ <!-- This component is not needed, but required to use the Testcaselib -->
<NetworkBench>
- <host>10.76.28.66</host>
+ <host>localhost</host>
<user>jenkins</user>
<password></password>
<type>NetworkDriver</type>
diff --git a/TestON/tests/USECASE/SegmentRouting/Policing/dependencies/trex_config.yaml b/TestON/tests/USECASE/SegmentRouting/Policing/dependencies/trex_config.yaml
index 5309605..2918267 100644
--- a/TestON/tests/USECASE/SegmentRouting/Policing/dependencies/trex_config.yaml
+++ b/TestON/tests/USECASE/SegmentRouting/Policing/dependencies/trex_config.yaml
@@ -1,13 +1,13 @@
-# TRex Port ID=0 --> PCI BUS: d8:00.0, NUMA: 1 (CPU2), Linux Intf: enp216s0f0 connected to leaf1/0 (PDN)
-# TRex Port ID=1 --> PCI BUS: d8:00.1, NUMA: 1 (CPU2), Linux Intf: enp216s0f1 not connected, but required by TRex to have an even number of interfaces
-# TRex Port ID=2 --> PCI BUS: 5e:00.0, NUMA: 0 (CPU1), Linux Intf: enp94s0f0 connected to leaf2/0 (eNodeB)
-# TRex Port ID=3 --> PCI BUS: 5e:00.1, NUMA: 0 (CPU1), Linux Intf: enp94s0f1 connected to leaf2/4
+# TRex Port ID=0 --> PCI BUS: 88:00.1, NUMA: 1, connected to leaf1 port 30
+# TRex Port ID=1 --> PCI BUS: 88:00.0, NUMA: 1, connected to leaf2 port 30
+# TRex Port ID=2 --> PCI BUS: 1c:00.1, NUMA: 0, connected to leaf2 port 32
+# TRex Port ID=3 --> PCI BUS: 1c:00.0, NUMA: 0, connected to leaf2 port 31
- version: 2
port_limit: 4
- interfaces: [ 'd8:00.0', 'd8:00.1', '5e:00.0', '5e:00.1']
+ interfaces: ['88:00.1', '88:00.0', '1c:00.1', '1c:00.0']
port_bandwidth_gb: 40
- c: 20
+ c: 16
port_info:
- src_mac: 40:A6:B7:22:AB:40
dest_mac: 00:00:0A:4C:1C:46
diff --git a/TestON/tests/USECASE/SegmentRouting/QOSNonMobile/QOSNonMobile.params b/TestON/tests/USECASE/SegmentRouting/QOSNonMobile/QOSNonMobile.params
index dce6647..9293090 100644
--- a/TestON/tests/USECASE/SegmentRouting/QOSNonMobile/QOSNonMobile.params
+++ b/TestON/tests/USECASE/SegmentRouting/QOSNonMobile/QOSNonMobile.params
@@ -2,7 +2,7 @@
<testcases>1,2</testcases>
<GRAPH>
- <nodeCluster>pairedleaves</nodeCluster>
+ <nodeCluster>sdfabric-ci1</nodeCluster>
<builds>20</builds>
<jobName>QOS</jobName>
<branch>master</branch>
@@ -74,9 +74,9 @@
<packet>
<pktlen>1400</pktlen>
<ip_src>10.32.11.125</ip_src>
- <ip_dst>10.32.11.124</ip_dst>
+ <ip_dst>10.32.11.123</ip_dst>
<eth_src>40:A6:B7:22:AB:40</eth_src>
- <eth_dst>00:00:0A:4C:1C:46</eth_dst>
+ <eth_dst>40:A6:B7:22:AB:20</eth_dst>
<udp_dport>100</udp_dport>
</packet>
</BE_TO_ENB>
@@ -87,9 +87,9 @@
<packet>
<pktlen>1400</pktlen>
<ip_src>10.32.11.125</ip_src>
- <ip_dst>10.32.11.124</ip_dst>
+ <ip_dst>10.32.11.123</ip_dst>
<eth_src>40:A6:B7:22:AB:40</eth_src>
- <eth_dst>00:00:0A:4C:1C:46</eth_dst>
+ <eth_dst>40:A6:B7:22:AB:20</eth_dst>
<udp_dport>200</udp_dport>
</packet>
<latency_stats>true</latency_stats>
@@ -105,10 +105,10 @@
<trex_port>2</trex_port>
<packet>
<pktlen>1400</pktlen>
- <ip_src>10.32.11.124</ip_src>
+ <ip_src>10.32.11.123</ip_src>
<ip_dst>10.32.11.125</ip_dst>
<eth_src>40:A6:B7:22:AB:20</eth_src>
- <eth_dst>00:00:0A:4C:1C:46</eth_dst>
+ <eth_dst>40:A6:B7:22:AB:40</eth_dst>
<udp_dport>100</udp_dport>
</packet>
</BE_1_TO_PDN>
@@ -118,10 +118,10 @@
<trex_port>3</trex_port>
<packet>
<pktlen>1400</pktlen>
- <ip_src>10.32.11.123</ip_src>
+ <ip_src>10.32.11.122</ip_src>
<ip_dst>10.32.11.125</ip_dst>
<eth_src>40:A6:B7:22:AB:21</eth_src>
- <eth_dst>00:00:0A:4C:1C:46</eth_dst>
+ <eth_dst>40:A6:B7:22:AB:40</eth_dst>
<udp_dport>100</udp_dport>
</packet>
</BE_2_TO_PDN>
@@ -131,10 +131,10 @@
<trex_port>3</trex_port>
<packet>
<pktlen>1400</pktlen>
- <ip_src>10.32.11.123</ip_src>
+ <ip_src>10.32.11.122</ip_src>
<ip_dst>10.32.11.125</ip_dst>
<eth_src>40:A6:B7:22:AB:21</eth_src>
- <eth_dst>00:00:0A:4C:1C:46</eth_dst>
+ <eth_dst>40:A6:B7:22:AB:40</eth_dst>
<udp_dport>200</udp_dport>
</packet>
<latency_stats>true</latency_stats>
diff --git a/TestON/tests/USECASE/SegmentRouting/QOSNonMobile/QOSNonMobile.topo b/TestON/tests/USECASE/SegmentRouting/QOSNonMobile/QOSNonMobile.topo
index 377a168..1ef6f7c 100644
--- a/TestON/tests/USECASE/SegmentRouting/QOSNonMobile/QOSNonMobile.topo
+++ b/TestON/tests/USECASE/SegmentRouting/QOSNonMobile/QOSNonMobile.topo
@@ -9,7 +9,7 @@
<jump_host></jump_host>
<home>~/onos</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/ci1-sdfabric</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'
@@ -33,7 +33,7 @@
<type>TrexClientDriver</type>
<connect_order>5</connect_order>
<COMPONENTS>
- <trex_address>10.76.28.72</trex_address> <!-- Compute2 -->
+ <trex_address>10.70.10.98</trex_address> <!-- Lottanics -->
<trex_config>trex_config.yaml</trex_config> <!-- relative path starting from ./dependencies-->
<force_restart>True</force_restart>
<software_mode>False</software_mode>
@@ -43,7 +43,7 @@
<!-- This component is not needed, but required to use the Testcaselib -->
<NetworkBench>
- <host>10.76.28.66</host>
+ <host>localhost</host>
<user>jenkins</user>
<password></password>
<type>NetworkDriver</type>
diff --git a/TestON/tests/USECASE/SegmentRouting/QOSNonMobile/dependencies/trex_config.yaml b/TestON/tests/USECASE/SegmentRouting/QOSNonMobile/dependencies/trex_config.yaml
index 6fbeddb..2918267 100644
--- a/TestON/tests/USECASE/SegmentRouting/QOSNonMobile/dependencies/trex_config.yaml
+++ b/TestON/tests/USECASE/SegmentRouting/QOSNonMobile/dependencies/trex_config.yaml
@@ -1,13 +1,13 @@
-# TRex Port ID=0 --> PCI BUS: d8:00.0, Linux Intf: enp216s0f0 connected to leaf1/0 (PDN)
-# TRex Port ID=1 --> PCI BUS: d8:00.1, Linux Intf: enp216s0f1 not connected, but required by TRex to have an even number of interfaces
-# TRex Port ID=2 --> PCI BUS: 5e:00.0, Linux Intf: enp94s0f0 connected to leaf2/0 (eNodeB)
-# TRex Port ID=3 --> PCI BUS: 5e:00.1, Linux Intf: enp94s0f1 connected to leaf2/4
+# TRex Port ID=0 --> PCI BUS: 88:00.1, NUMA: 1, connected to leaf1 port 30
+# TRex Port ID=1 --> PCI BUS: 88:00.0, NUMA: 1, connected to leaf2 port 30
+# TRex Port ID=2 --> PCI BUS: 1c:00.1, NUMA: 0, connected to leaf2 port 32
+# TRex Port ID=3 --> PCI BUS: 1c:00.0, NUMA: 0, connected to leaf2 port 31
- version: 2
port_limit: 4
- interfaces: [ 'd8:00.0', 'd8:00.1', '5e:00.0', '5e:00.1']
+ interfaces: ['88:00.1', '88:00.0', '1c:00.1', '1c:00.0']
port_bandwidth_gb: 40
- c: 20
+ c: 16
port_info:
- src_mac: 40:A6:B7:22:AB:40
dest_mac: 00:00:0A:4C:1C:46