Add suites with randomized ip6 profiles

+ Replace pair of traffic profiles (2n and 3n) with single nodeless one.
+ Compared to incremental suites, randomized ones add IP6_RND tag.

Change-Id: I2f0dfc9e04bbcd0f88e95b92edf2da2c73faaab6
Signed-off-by: Vratko Polak <vrpolak@cisco.com>

6 files changed, 25 insertions, 16 deletions

diff --git a/GPL/traffic_profiles/trex/trex-stl-3n-ethip6-ip6dst10000.py b/GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst10000-rnd.py
index 9aa4fd5ee4..0e335909f4 100644
--- a/GPL/traffic_profiles/trex/trex-stl-3n-ethip6-ip6dst10000.py
+++ b/GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst10000-rnd.py
@@ -93,12 +93,14 @@ class TrafficStreams(TrafficStreamsBaseClass):
         # Direction 0 --> 1
         vm1 = STLScVmRaw(
             [
-                STLVmFlowVar(
+                STLVmFlowVarRepeatableRandom(
                     name=u"ipv6_dst",
                     min_value=base_p1,
                     max_value=base_p1 + count_p1,
                     size=8,
-                    op=u"inc"
+                    seed=1,
+                    # Cycle length. TRex does not allow any higher value.
+                    limit=(2**24 - 1)
                 ),
                 STLVmWrFlowVar(
                     fv_name=u"ipv6_dst",
@@ -110,12 +112,13 @@ class TrafficStreams(TrafficStreamsBaseClass):
         # Direction 1 --> 0
         vm2 = STLScVmRaw(
             [
-                STLVmFlowVar(
+                STLVmFlowVarRepeatableRandom(
                     name=u"ipv6_dst",
                     min_value=base_p2,
                     max_value=base_p2 + count_p2,
                     size=8,
-                    op=u"inc"
+                    seed=2,
+                    limit=(2**24 - 1)
                 ),
                 STLVmWrFlowVar(
                     fv_name=u"ipv6_dst",
diff --git a/GPL/traffic_profiles/trex/trex-stl-2n-ethip6-ip6dst10000.py b/GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst10000.py
index 9aa4fd5ee4..9aa4fd5ee4 100644
--- a/GPL/traffic_profiles/trex/trex-stl-2n-ethip6-ip6dst10000.py
+++ b/GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst10000.py
diff --git a/GPL/traffic_profiles/trex/trex-stl-3n-ethip6-ip6dst100000.py b/GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst100000-rnd.py
index f78d98c64f..daa160d53a 100644
--- a/GPL/traffic_profiles/trex/trex-stl-3n-ethip6-ip6dst100000.py
+++ b/GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst100000-rnd.py
@@ -93,12 +93,14 @@ class TrafficStreams(TrafficStreamsBaseClass):
         # Direction 0 --> 1
         vm1 = STLScVmRaw(
             [
-                STLVmFlowVar(
+                STLVmFlowVarRepeatableRandom(
                     name=u"ipv6_dst",
                     min_value=base_p1,
                     max_value=base_p1 + count_p1,
                     size=8,
-                    op=u"inc"
+                    seed=1,
+                    # Cycle length. TRex does not allow any higher value.
+                    limit=(2**24 - 1)
                 ),
                 STLVmWrFlowVar(
                     fv_name=u"ipv6_dst",
@@ -110,12 +112,13 @@ class TrafficStreams(TrafficStreamsBaseClass):
         # Direction 1 --> 0
         vm2 = STLScVmRaw(
             [
-                STLVmFlowVar(
+                STLVmFlowVarRepeatableRandom(
                     name=u"ipv6_dst",
                     min_value=base_p2,
                     max_value=base_p2 + count_p2,
                     size=8,
-                    op=u"inc"
+                    seed=2,
+                    limit=(2**24 - 1)
                 ),
                 STLVmWrFlowVar(
                     fv_name=u"ipv6_dst",
diff --git a/GPL/traffic_profiles/trex/trex-stl-2n-ethip6-ip6dst100000.py b/GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst100000.py
index f78d98c64f..f78d98c64f 100644
--- a/GPL/traffic_profiles/trex/trex-stl-2n-ethip6-ip6dst100000.py
+++ b/GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst100000.py
diff --git a/GPL/traffic_profiles/trex/trex-stl-2n-ethip6-ip6dst1000000.py b/GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst1000000-rnd.py
index dbe8f76032..a372e1ae3b 100644
--- a/GPL/traffic_profiles/trex/trex-stl-2n-ethip6-ip6dst1000000.py
+++ b/GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst1000000-rnd.py
@@ -85,20 +85,22 @@ class TrafficStreams(TrafficStreamsBaseClass):
         base_pkt_b = (
             Ether() /
             IPv6(
-                  src=self.p2_src_start_ip,
-                  dst=self.p2_dst_start_ip
+                src=self.p2_src_start_ip,
+                dst=self.p2_dst_start_ip
             )
         )
 
         # Direction 0 --> 1
         vm1 = STLScVmRaw(
             [
-                STLVmFlowVar(
+                STLVmFlowVarRepeatableRandom(
                     name=u"ipv6_dst",
                     min_value=base_p1,
                     max_value=base_p1 + count_p1,
                     size=8,
-                    op=u"inc"
+                    seed=1,
+                    # Cycle length. TRex does not allow any higher value.
+                    limit=(2**24 - 1)
                 ),
                 STLVmWrFlowVar(
                     fv_name=u"ipv6_dst",
@@ -110,12 +112,13 @@ class TrafficStreams(TrafficStreamsBaseClass):
         # Direction 1 --> 0
         vm2 = STLScVmRaw(
             [
-                STLVmFlowVar(
+                STLVmFlowVarRepeatableRandom(
                     name=u"ipv6_dst",
                     min_value=base_p2,
                     max_value=base_p2 + count_p2,
                     size=8,
-                    op=u"inc"
+                    seed=2,
+                    limit=(2**24 - 1)
                 ),
                 STLVmWrFlowVar(
                     fv_name=u"ipv6_dst",
diff --git a/GPL/traffic_profiles/trex/trex-stl-3n-ethip6-ip6dst1000000.py b/GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst1000000.py
index e18353884b..572eed4256 100644
--- a/GPL/traffic_profiles/trex/trex-stl-3n-ethip6-ip6dst1000000.py
+++ b/GPL/traffic_profiles/trex/trex-stl-ethip6-ip6dst1000000.py
@@ -85,8 +85,8 @@ class TrafficStreams(TrafficStreamsBaseClass):
         base_pkt_b = (
             Ether() /
             IPv6(
-              src=self.p2_src_start_ip,
-              dst=self.p2_dst_start_ip
+                src=self.p2_src_start_ip,
+                dst=self.p2_dst_start_ip
             )
         )