NSB update

[yardstick.git] / samples / vnf_samples / traffic_profiles / ipv4_throughput_vpe.yaml

diff --git a/samples/vnf_samples/traffic_profiles/ipv4_throughput_vpe.yaml b/samples/vnf_samples/traffic_profiles/ipv4_throughput_vpe.yaml
index cfa166a..e935bdb 100644 (file)
--- a/samples/vnf_samples/traffic_profiles/ipv4_throughput_vpe.yaml
+++ b/samples/vnf_samples/traffic_profiles/ipv4_throughput_vpe.yaml
@@ -45,7 +45,7 @@ traffic_profile:
   # that specifies a range (e.g. ipv4 address, port)
 
 
-private:
+private_1:
       ipv4:
         outer_l2:
             framesize:
@@ -69,15 +69,15 @@ private:
 
         outer_l3v4:
             proto: "tcp"
-            srcip4: "{{get(flow, 'flow.srcip4_range', '192.168.0.0-192.168.255.255') }}"
-            dstip4: "{{get(flow, 'flow.dstip4_range', '192.16.0.0-192.16.0.31') }}"
+            srcip4: "{{get(flow, 'flow.srcip4_range_1', '192.168.0.0-192.168.255.255') }}"
+            dstip4: "{{get(flow, 'flow.dstip4_range_1', '192.16.0.0-192.16.0.31') }}"
             ttl: 32
             dscp: 32
 
         outer_l4:
             srcport: "{{get(flow, 'flow.srcport_range', '0') }}"
             dstport: "{{get(flow, 'flow.dstport_range', '0') }}"
-public:
+public_1:
       ipv4:
         outer_l2:
             framesize:
@@ -91,8 +91,62 @@ public:
 
         outer_l3v4:
             proto: "tcp"
-            srcip4: "{{get(flow, 'flow.dstip4_range', '192.16.0.0-192.16.0.31') }}"
-            dstip4: "{{get(flow, 'flow.srcip4_range', '192.168.0.0-192.168.255.255') }}"
+            srcip4: "{{get(flow, 'flow.dstip4_range_1', '192.16.0.0-192.16.0.31') }}"
+            dstip4: "{{get(flow, 'flow.srcip4_range_1', '192.168.0.0-192.168.255.255') }}"
+            ttl: 32
+            dscp: 32
+
+        outer_l4:
+            srcport: "{{get(flow, 'flow.dstport_range', '0') }}"
+            dstport: "{{get(flow, 'flow.srcport_range', '0') }}"
+private_2:
+      ipv4:
+        outer_l2:
+            framesize:
+                64B: "{{ get(imix, 'imix.private.imix_small', '0') }}"
+                128B: "{{ get(imix, 'imix.private.imix_128B', '0') }}"
+                256B: "{{ get(imix, 'imix.private.imix_256B', '0') }}"
+                373b: "{{ get(imix, 'imix.private.imix_373B', '0') }}"
+                570B: "{{get(imix, 'imix.private.imix_570B', '0') }}"
+                1400B: "{{get(imix, 'imix.private.imix_1400B', '0') }}"
+                1518B: "{{get(imix, 'imix.private.imix_1500B', '0') }}"
+
+            QinQ:
+                S-VLAN:
+                    id: 128
+                    priority: 0
+                    cfi: 0
+                C-VLAN:
+                    id: 512
+                    priority: 0
+                    cfi: 0
+
+        outer_l3v4:
+            proto: "tcp"
+            srcip4: "{{get(flow, 'flow.srcip4_range_2', '192.168.0.0-192.168.255.255') }}"
+            dstip4: "{{get(flow, 'flow.dstip4_range_2', '192.16.0.0-192.16.0.31') }}"
+            ttl: 32
+            dscp: 32
+
+        outer_l4:
+            srcport: "{{get(flow, 'flow.srcport_range', '0') }}"
+            dstport: "{{get(flow, 'flow.dstport_range', '0') }}"
+public_2:
+      ipv4:
+        outer_l2:
+            framesize:
+                64B: "{{ get(imix, 'imix.private.imix_small', '0') }}"
+                128B: "{{ get(imix, 'imix.private.imix_128B', '0') }}"
+                256B: "{{ get(imix, 'imix.private.imix_256B', '0') }}"
+                373b: "{{ get(imix, 'imix.private.imix_373B', '0') }}"
+                570B: "{{get(imix, 'imix.private.imix_570B', '0') }}"
+                1400B: "{{get(imix, 'imix.private.imix_1400B', '0') }}"
+                1518B: "{{get(imix, 'imix.private.imix_1500B', '0') }}"
+
+        outer_l3v4:
+            proto: "tcp"
+            srcip4: "{{get(flow, 'flow.dstip4_range_2', '192.16.0.0-192.16.0.31') }}"
+            dstip4: "{{get(flow, 'flow.srcip4_range_2', '192.168.0.0-192.168.255.255') }}"
             ttl: 32
             dscp: 32