Add new higher density NF tests

Change-Id: Ib2f3f3f8dc3e202dc1db53c739d9309be2ed8a60
Signed-off-by: Peter Mikus <pmikus@cisco.com>
(cherry picked from commit 1ac36a9fd34043609b81901f2de37deb0a113ea5)

6 files changed, 463 insertions, 2 deletions

diff --git a/resources/libraries/python/TrafficGenerator.py b/resources/libraries/python/TrafficGenerator.py
index da364cbded..270c2403af 100644
--- a/resources/libraries/python/TrafficGenerator.py
+++ b/resources/libraries/python/TrafficGenerator.py
@@ -425,8 +425,8 @@ class TrafficGenerator(AbstractMeasurer):
         command = (
             "sh -c '{tool}/resources/tools/trex/trex_stateless_profile.py"
             " --profile {prof}/resources/traffic_profiles/trex/{traffic}.py"
-            " --duration {duration!r} --frame_size {frame_size} --rate {rate!r}"
-            " --warmup_time {warmup!r} --port_0 {p_0} --port_1 {p_1}").format(
+            " --duration {duration} --frame_size {frame_size} --rate {rate}"
+            " --warmup_time {warmup} --port_0 {p_0} --port_1 {p_1}").format(
                 tool=Constants.REMOTE_FW_DIR, prof=Constants.REMOTE_FW_DIR,
                 traffic=traffic_profile, duration=duration,
                 frame_size=frame_size, rate=rate, warmup=warmup_time, p_0=p_0,
diff --git a/resources/libraries/python/autogen/Regenerator.py b/resources/libraries/python/autogen/Regenerator.py
index 85625c4c35..c2df94c4cf 100644
--- a/resources/libraries/python/autogen/Regenerator.py
+++ b/resources/libraries/python/autogen/Regenerator.py
@@ -124,6 +124,11 @@ class Regenerator(object):
                     # CSIT lab only has 28 (physical) core processors,
                     # so these test would fail when attempting to assign cores.
                     emit = False
+            if "-24vm1t-" in suite_id or "-24dcr1t-" in suite_id:
+                if kwargs["phy_cores"] > 3:
+                    # CSIT lab only has 28 (physical) core processors,
+                    # so these test would fail when attempting to assign cores.
+                    emit = False
             if "soak" in suite_id:
                 # Soak test take too long, do not risk other than tc01.
                 if kwargs["phy_cores"] != 1:
diff --git a/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-10c2n.py b/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-10c2n.py
new file mode 100644
index 0000000000..fb9c4fd6fb
--- /dev/null
+++ b/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-10c2n.py
@@ -0,0 +1,114 @@
+# Copyright (c) 2019 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Stream profile for T-rex traffic generator.
+
+Stream profile:
+ - Two streams sent in directions 0 --> 1 and 1 --> 0 at the same time.
+ - Packet: ETH / IP /
+ - Direction 0 --> 1:
+   - Destination MAC address: 52:54:00:00:nf_id:01
+   - Source IP address range:      10.10.10.1 - 10.10.10.254
+   - Destination IP address range: 20.20.20.1
+ - Direction 1 --> 0:
+    - Destination MAC address: 52:54:00:00:nf_id:02
+   - Source IP address range:      20.20.20.1 - 20.20.20.254
+   - Destination IP address range: 10.10.10.1
+"""
+
+from trex_stl_lib.api import *
+from profile_trex_stateless_base_class import TrafficStreamsBaseClass
+
+
+class TrafficStreams(TrafficStreamsBaseClass):
+    """Stream profile."""
+
+    def __init__(self):
+        """Initialization and setting of streams' parameters."""
+
+        super(TrafficStreamsBaseClass, self).__init__()
+
+        # Service density parameters.
+        self.nf_chains = 10
+        self.nf_nodes = 2
+
+        # MACs used in packet headers.
+        self.p1_dst_start_mac = '52:54:00:00:00:01'
+        self.p2_dst_start_mac = '52:54:00:00:00:02'
+
+        # IPs used in packet headers.
+        self.p1_src_start_ip = '10.10.10.1'
+        self.p1_src_end_ip = '10.10.10.254'
+        self.p1_dst_start_ip = '20.20.20.1'
+
+        self.p2_src_start_ip = '20.20.20.1'
+        self.p2_src_end_ip = '20.20.20.254'
+        self.p2_dst_start_ip = '10.10.10.1'
+
+    def define_packets(self):
+        """Defines the packets to be sent from the traffic generator.
+
+        Packet definition: | ETH | IP |
+
+        :returns: Packets to be sent from the traffic generator.
+        :rtype: tuple
+        """
+
+        # Direction 0 --> 1
+        base_pkt_a = (Ether(dst=self.p1_dst_start_mac) /
+                      IP(src=self.p1_src_start_ip,
+                         dst=self.p1_dst_start_ip,
+                         proto=61))
+        # Direction 1 --> 0
+        base_pkt_b = (Ether(dst=self.p2_dst_start_mac) /
+                      IP(src=self.p2_src_start_ip,
+                         dst=self.p2_dst_start_ip,
+                         proto=61))
+
+        # Direction 0 --> 1
+        vm1 = STLScVmRaw([STLVmFlowVar(name="mac_dst",
+                                       min_value=1,
+                                       max_value=self.nf_chains*self.nf_nodes,
+                                       size=1, step=self.nf_nodes, op="inc"),
+                          STLVmWrFlowVar(fv_name="mac_dst", pkt_offset=4),
+                          STLVmFlowVar(name="src",
+                                       min_value=self.p1_src_start_ip,
+                                       max_value=self.p1_src_end_ip,
+                                       size=4, op="inc"),
+                          STLVmWrFlowVar(fv_name="src", pkt_offset="IP.src"),
+                          STLVmFixIpv4(offset="IP")])
+        # Direction 1 --> 0
+        vm2 = STLScVmRaw([STLVmFlowVar(name="mac_dst",
+                                       min_value=self.nf_nodes,
+                                       max_value=self.nf_chains*self.nf_nodes,
+                                       size=1, step=self.nf_nodes, op="inc"),
+                          STLVmWrFlowVar(fv_name="mac_dst", pkt_offset=4),
+                          STLVmFlowVar(name="src",
+                                       min_value=self.p2_src_start_ip,
+                                       max_value=self.p2_src_end_ip,
+                                       size=4, op="inc"),
+                          STLVmWrFlowVar(fv_name="src", pkt_offset="IP.src"),
+                          STLVmFixIpv4(offset="IP")])
+
+        return base_pkt_a, base_pkt_b, vm1, vm2
+
+
+def register():
+    """Register this traffic profile to T-rex.
+
+    Do not change this function.
+
+    :return: Traffic streams.
+    :rtype: Object
+    """
+    return TrafficStreams()
diff --git a/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-2c10n.py b/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-2c10n.py
new file mode 100644
index 0000000000..f4a3400eb8
--- /dev/null
+++ b/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-2c10n.py
@@ -0,0 +1,114 @@
+# Copyright (c) 2019 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Stream profile for T-rex traffic generator.
+
+Stream profile:
+ - Two streams sent in directions 0 --> 1 and 1 --> 0 at the same time.
+ - Packet: ETH / IP /
+ - Direction 0 --> 1:
+   - Destination MAC address: 52:54:00:00:nf_id:01
+   - Source IP address range:      10.10.10.1 - 10.10.10.254
+   - Destination IP address range: 20.20.20.1
+ - Direction 1 --> 0:
+    - Destination MAC address: 52:54:00:00:nf_id:02
+   - Source IP address range:      20.20.20.1 - 20.20.20.254
+   - Destination IP address range: 10.10.10.1
+"""
+
+from trex_stl_lib.api import *
+from profile_trex_stateless_base_class import TrafficStreamsBaseClass
+
+
+class TrafficStreams(TrafficStreamsBaseClass):
+    """Stream profile."""
+
+    def __init__(self):
+        """Initialization and setting of streams' parameters."""
+
+        super(TrafficStreamsBaseClass, self).__init__()
+
+        # Service density parameters.
+        self.nf_chains = 2
+        self.nf_nodes = 10
+
+        # MACs used in packet headers.
+        self.p1_dst_start_mac = '52:54:00:00:00:01'
+        self.p2_dst_start_mac = '52:54:00:00:00:02'
+
+        # IPs used in packet headers.
+        self.p1_src_start_ip = '10.10.10.1'
+        self.p1_src_end_ip = '10.10.10.254'
+        self.p1_dst_start_ip = '20.20.20.1'
+
+        self.p2_src_start_ip = '20.20.20.1'
+        self.p2_src_end_ip = '20.20.20.254'
+        self.p2_dst_start_ip = '10.10.10.1'
+
+    def define_packets(self):
+        """Defines the packets to be sent from the traffic generator.
+
+        Packet definition: | ETH | IP |
+
+        :returns: Packets to be sent from the traffic generator.
+        :rtype: tuple
+        """
+
+        # Direction 0 --> 1
+        base_pkt_a = (Ether(dst=self.p1_dst_start_mac) /
+                      IP(src=self.p1_src_start_ip,
+                         dst=self.p1_dst_start_ip,
+                         proto=61))
+        # Direction 1 --> 0
+        base_pkt_b = (Ether(dst=self.p2_dst_start_mac) /
+                      IP(src=self.p2_src_start_ip,
+                         dst=self.p2_dst_start_ip,
+                         proto=61))
+
+        # Direction 0 --> 1
+        vm1 = STLScVmRaw([STLVmFlowVar(name="mac_dst",
+                                       min_value=1,
+                                       max_value=self.nf_chains*self.nf_nodes,
+                                       size=1, step=self.nf_nodes, op="inc"),
+                          STLVmWrFlowVar(fv_name="mac_dst", pkt_offset=4),
+                          STLVmFlowVar(name="src",
+                                       min_value=self.p1_src_start_ip,
+                                       max_value=self.p1_src_end_ip,
+                                       size=4, op="inc"),
+                          STLVmWrFlowVar(fv_name="src", pkt_offset="IP.src"),
+                          STLVmFixIpv4(offset="IP")])
+        # Direction 1 --> 0
+        vm2 = STLScVmRaw([STLVmFlowVar(name="mac_dst",
+                                       min_value=self.nf_nodes,
+                                       max_value=self.nf_chains*self.nf_nodes,
+                                       size=1, step=self.nf_nodes, op="inc"),
+                          STLVmWrFlowVar(fv_name="mac_dst", pkt_offset=4),
+                          STLVmFlowVar(name="src",
+                                       min_value=self.p2_src_start_ip,
+                                       max_value=self.p2_src_end_ip,
+                                       size=4, op="inc"),
+                          STLVmWrFlowVar(fv_name="src", pkt_offset="IP.src"),
+                          STLVmFixIpv4(offset="IP")])
+
+        return base_pkt_a, base_pkt_b, vm1, vm2
+
+
+def register():
+    """Register this traffic profile to T-rex.
+
+    Do not change this function.
+
+    :return: Traffic streams.
+    :rtype: Object
+    """
+    return TrafficStreams()
diff --git a/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-4c6n.py b/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-4c6n.py
new file mode 100644
index 0000000000..913bbd3188
--- /dev/null
+++ b/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-4c6n.py
@@ -0,0 +1,114 @@
+# Copyright (c) 2019 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Stream profile for T-rex traffic generator.
+
+Stream profile:
+ - Two streams sent in directions 0 --> 1 and 1 --> 0 at the same time.
+ - Packet: ETH / IP /
+ - Direction 0 --> 1:
+   - Destination MAC address: 52:54:00:00:nf_id:01
+   - Source IP address range:      10.10.10.1 - 10.10.10.254
+   - Destination IP address range: 20.20.20.1
+ - Direction 1 --> 0:
+    - Destination MAC address: 52:54:00:00:nf_id:02
+   - Source IP address range:      20.20.20.1 - 20.20.20.254
+   - Destination IP address range: 10.10.10.1
+"""
+
+from trex_stl_lib.api import *
+from profile_trex_stateless_base_class import TrafficStreamsBaseClass
+
+
+class TrafficStreams(TrafficStreamsBaseClass):
+    """Stream profile."""
+
+    def __init__(self):
+        """Initialization and setting of streams' parameters."""
+
+        super(TrafficStreamsBaseClass, self).__init__()
+
+        # Service density parameters.
+        self.nf_chains = 4
+        self.nf_nodes = 6
+
+        # MACs used in packet headers.
+        self.p1_dst_start_mac = '52:54:00:00:00:01'
+        self.p2_dst_start_mac = '52:54:00:00:00:02'
+
+        # IPs used in packet headers.
+        self.p1_src_start_ip = '10.10.10.1'
+        self.p1_src_end_ip = '10.10.10.254'
+        self.p1_dst_start_ip = '20.20.20.1'
+
+        self.p2_src_start_ip = '20.20.20.1'
+        self.p2_src_end_ip = '20.20.20.254'
+        self.p2_dst_start_ip = '10.10.10.1'
+
+    def define_packets(self):
+        """Defines the packets to be sent from the traffic generator.
+
+        Packet definition: | ETH | IP |
+
+        :returns: Packets to be sent from the traffic generator.
+        :rtype: tuple
+        """
+
+        # Direction 0 --> 1
+        base_pkt_a = (Ether(dst=self.p1_dst_start_mac) /
+                      IP(src=self.p1_src_start_ip,
+                         dst=self.p1_dst_start_ip,
+                         proto=61))
+        # Direction 1 --> 0
+        base_pkt_b = (Ether(dst=self.p2_dst_start_mac) /
+                      IP(src=self.p2_src_start_ip,
+                         dst=self.p2_dst_start_ip,
+                         proto=61))
+
+        # Direction 0 --> 1
+        vm1 = STLScVmRaw([STLVmFlowVar(name="mac_dst",
+                                       min_value=1,
+                                       max_value=self.nf_chains*self.nf_nodes,
+                                       size=1, step=self.nf_nodes, op="inc"),
+                          STLVmWrFlowVar(fv_name="mac_dst", pkt_offset=4),
+                          STLVmFlowVar(name="src",
+                                       min_value=self.p1_src_start_ip,
+                                       max_value=self.p1_src_end_ip,
+                                       size=4, op="inc"),
+                          STLVmWrFlowVar(fv_name="src", pkt_offset="IP.src"),
+                          STLVmFixIpv4(offset="IP")])
+        # Direction 1 --> 0
+        vm2 = STLScVmRaw([STLVmFlowVar(name="mac_dst",
+                                       min_value=self.nf_nodes,
+                                       max_value=self.nf_chains*self.nf_nodes,
+                                       size=1, step=self.nf_nodes, op="inc"),
+                          STLVmWrFlowVar(fv_name="mac_dst", pkt_offset=4),
+                          STLVmFlowVar(name="src",
+                                       min_value=self.p2_src_start_ip,
+                                       max_value=self.p2_src_end_ip,
+                                       size=4, op="inc"),
+                          STLVmWrFlowVar(fv_name="src", pkt_offset="IP.src"),
+                          STLVmFixIpv4(offset="IP")])
+
+        return base_pkt_a, base_pkt_b, vm1, vm2
+
+
+def register():
+    """Register this traffic profile to T-rex.
+
+    Do not change this function.
+
+    :return: Traffic streams.
+    :rtype: Object
+    """
+    return TrafficStreams()
diff --git a/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-6c4n.py b/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-6c4n.py
new file mode 100644
index 0000000000..f8dd4da4bc
--- /dev/null
+++ b/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-6c4n.py
@@ -0,0 +1,114 @@
+# Copyright (c) 2019 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Stream profile for T-rex traffic generator.
+
+Stream profile:
+ - Two streams sent in directions 0 --> 1 and 1 --> 0 at the same time.
+ - Packet: ETH / IP /
+ - Direction 0 --> 1:
+   - Destination MAC address: 52:54:00:00:nf_id:01
+   - Source IP address range:      10.10.10.1 - 10.10.10.254
+   - Destination IP address range: 20.20.20.1
+ - Direction 1 --> 0:
+    - Destination MAC address: 52:54:00:00:nf_id:02
+   - Source IP address range:      20.20.20.1 - 20.20.20.254
+   - Destination IP address range: 10.10.10.1
+"""
+
+from trex_stl_lib.api import *
+from profile_trex_stateless_base_class import TrafficStreamsBaseClass
+
+
+class TrafficStreams(TrafficStreamsBaseClass):
+    """Stream profile."""
+
+    def __init__(self):
+        """Initialization and setting of streams' parameters."""
+
+        super(TrafficStreamsBaseClass, self).__init__()
+
+        # Service density parameters.
+        self.nf_chains = 6
+        self.nf_nodes = 4
+
+        # MACs used in packet headers.
+        self.p1_dst_start_mac = '52:54:00:00:00:01'
+        self.p2_dst_start_mac = '52:54:00:00:00:02'
+
+        # IPs used in packet headers.
+        self.p1_src_start_ip = '10.10.10.1'
+        self.p1_src_end_ip = '10.10.10.254'
+        self.p1_dst_start_ip = '20.20.20.1'
+
+        self.p2_src_start_ip = '20.20.20.1'
+        self.p2_src_end_ip = '20.20.20.254'
+        self.p2_dst_start_ip = '10.10.10.1'
+
+    def define_packets(self):
+        """Defines the packets to be sent from the traffic generator.
+
+        Packet definition: | ETH | IP |
+
+        :returns: Packets to be sent from the traffic generator.
+        :rtype: tuple
+        """
+
+        # Direction 0 --> 1
+        base_pkt_a = (Ether(dst=self.p1_dst_start_mac) /
+                      IP(src=self.p1_src_start_ip,
+                         dst=self.p1_dst_start_ip,
+                         proto=61))
+        # Direction 1 --> 0
+        base_pkt_b = (Ether(dst=self.p2_dst_start_mac) /
+                      IP(src=self.p2_src_start_ip,
+                         dst=self.p2_dst_start_ip,
+                         proto=61))
+
+        # Direction 0 --> 1
+        vm1 = STLScVmRaw([STLVmFlowVar(name="mac_dst",
+                                       min_value=1,
+                                       max_value=self.nf_chains*self.nf_nodes,
+                                       size=1, step=self.nf_nodes, op="inc"),
+                          STLVmWrFlowVar(fv_name="mac_dst", pkt_offset=4),
+                          STLVmFlowVar(name="src",
+                                       min_value=self.p1_src_start_ip,
+                                       max_value=self.p1_src_end_ip,
+                                       size=4, op="inc"),
+                          STLVmWrFlowVar(fv_name="src", pkt_offset="IP.src"),
+                          STLVmFixIpv4(offset="IP")])
+        # Direction 1 --> 0
+        vm2 = STLScVmRaw([STLVmFlowVar(name="mac_dst",
+                                       min_value=self.nf_nodes,
+                                       max_value=self.nf_chains*self.nf_nodes,
+                                       size=1, step=self.nf_nodes, op="inc"),
+                          STLVmWrFlowVar(fv_name="mac_dst", pkt_offset=4),
+                          STLVmFlowVar(name="src",
+                                       min_value=self.p2_src_start_ip,
+                                       max_value=self.p2_src_end_ip,
+                                       size=4, op="inc"),
+                          STLVmWrFlowVar(fv_name="src", pkt_offset="IP.src"),
+                          STLVmFixIpv4(offset="IP")])
+
+        return base_pkt_a, base_pkt_b, vm1, vm2
+
+
+def register():
+    """Register this traffic profile to T-rex.
+
+    Do not change this function.
+
+    :return: Traffic streams.
+    :rtype: Object
+    """
+    return TrafficStreams()