Auto create ixia config based on the traffic profile

Change-Id: I031cc7f24f0c0816eb577a4d1606a714f68a5f83
Signed-off-by: Deepak S <deepak.s@linux.intel.com>
Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>

7 files changed, 30 insertions, 233 deletions

diff --git a/samples/vnf_samples/nsut/acl/ixia_traffic.cfg b/samples/vnf_samples/nsut/acl/ixia_traffic.cfg
deleted file mode 100644
index 3f7e33471..000000000
--- a/samples/vnf_samples/nsut/acl/ixia_traffic.cfg
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-    "uplink_0": {
-        "id": 1,
-        "bidir": "False",
-        "duration": 60,
-        "iload": "100",
-        "outer_l2": {
-            "dstmac": "00:00:00:00:00:03",
-            "framesPerSecond": true,
-            "framesize": 64,
-            "srcmac": "00:00:00:00:00:01"
-        },
-        "outer_l3": {
-            "dscp": 0,
-            "dstip4": "152.16.40.20",
-            "proto": "udp",
-            "srcip4": "152.16.100.20",
-            "ttl": 32
-        },
-        "outer_l4": {
-            "dstport": "2001",
-            "srcport": "1234"
-        },
-        "traffic_type": "continuous"
-    },
-    "downlink_0": {
-        "id": 2,
-        "bidir": "False",
-        "duration": 60,
-        "iload": "100",
-        "outer_l2": {
-            "dstmac": "00:00:00:00:00:04",
-            "framesPerSecond": true,
-            "framesize": 64,
-            "srcmac": "00:00:00:00:00:01"
-        },
-        "outer_l3": {
-            "count": 1024,
-            "dscp": 0,
-            "dstip4": "152.16.100.20",
-            "proto": "udp",
-            "srcip4": "152.16.40.20",
-            "ttl": 32
-        },
-        "outer_l4": {
-            "dstport": "1234",
-            "srcport": "2001"
-        },
-        "traffic_type": "continuous"
-    }
-}
diff --git a/samples/vnf_samples/nsut/cgnapt/ixia_traffic.cfg b/samples/vnf_samples/nsut/cgnapt/ixia_traffic.cfg
deleted file mode 100644
index 3f7e33471..000000000
--- a/samples/vnf_samples/nsut/cgnapt/ixia_traffic.cfg
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-    "uplink_0": {
-        "id": 1,
-        "bidir": "False",
-        "duration": 60,
-        "iload": "100",
-        "outer_l2": {
-            "dstmac": "00:00:00:00:00:03",
-            "framesPerSecond": true,
-            "framesize": 64,
-            "srcmac": "00:00:00:00:00:01"
-        },
-        "outer_l3": {
-            "dscp": 0,
-            "dstip4": "152.16.40.20",
-            "proto": "udp",
-            "srcip4": "152.16.100.20",
-            "ttl": 32
-        },
-        "outer_l4": {
-            "dstport": "2001",
-            "srcport": "1234"
-        },
-        "traffic_type": "continuous"
-    },
-    "downlink_0": {
-        "id": 2,
-        "bidir": "False",
-        "duration": 60,
-        "iload": "100",
-        "outer_l2": {
-            "dstmac": "00:00:00:00:00:04",
-            "framesPerSecond": true,
-            "framesize": 64,
-            "srcmac": "00:00:00:00:00:01"
-        },
-        "outer_l3": {
-            "count": 1024,
-            "dscp": 0,
-            "dstip4": "152.16.100.20",
-            "proto": "udp",
-            "srcip4": "152.16.40.20",
-            "ttl": 32
-        },
-        "outer_l4": {
-            "dstport": "1234",
-            "srcport": "2001"
-        },
-        "traffic_type": "continuous"
-    }
-}
diff --git a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_ixia.yaml b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_ixia.yaml
index 7d6203c0c..0f1ddd606 100644
--- a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_ixia.yaml
+++ b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_ixia.yaml
@@ -28,7 +28,7 @@ scenarios:
     flow:
       src_ip: [{'tg__0': 'xe0'}]
       dst_ip: [{'tg__0': 'xe1'}]
-      publicip: ["152.16.40.10"]
+      public_ip: ["152.16.40.10"]
       count: 1
     traffic_type: 4
     rfc2544:
@@ -44,4 +44,4 @@ context:
   type: Node
   name: yardstick
   nfvi_type: baremetal
-  file: /etc/yardstick/nodes/pod.yaml
+  file: /etc/yardstick/nodes/pod_ixia.yaml
diff --git a/samples/vnf_samples/nsut/vfw/ixia_traffic.cfg b/samples/vnf_samples/nsut/vfw/ixia_traffic.cfg
deleted file mode 100644
index 3f7e33471..000000000
--- a/samples/vnf_samples/nsut/vfw/ixia_traffic.cfg
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-    "uplink_0": {
-        "id": 1,
-        "bidir": "False",
-        "duration": 60,
-        "iload": "100",
-        "outer_l2": {
-            "dstmac": "00:00:00:00:00:03",
-            "framesPerSecond": true,
-            "framesize": 64,
-            "srcmac": "00:00:00:00:00:01"
-        },
-        "outer_l3": {
-            "dscp": 0,
-            "dstip4": "152.16.40.20",
-            "proto": "udp",
-            "srcip4": "152.16.100.20",
-            "ttl": 32
-        },
-        "outer_l4": {
-            "dstport": "2001",
-            "srcport": "1234"
-        },
-        "traffic_type": "continuous"
-    },
-    "downlink_0": {
-        "id": 2,
-        "bidir": "False",
-        "duration": 60,
-        "iload": "100",
-        "outer_l2": {
-            "dstmac": "00:00:00:00:00:04",
-            "framesPerSecond": true,
-            "framesize": 64,
-            "srcmac": "00:00:00:00:00:01"
-        },
-        "outer_l3": {
-            "count": 1024,
-            "dscp": 0,
-            "dstip4": "152.16.100.20",
-            "proto": "udp",
-            "srcip4": "152.16.40.20",
-            "ttl": 32
-        },
-        "outer_l4": {
-            "dstport": "1234",
-            "srcport": "2001"
-        },
-        "traffic_type": "continuous"
-    }
-}
diff --git a/samples/vnf_samples/nsut/vpe/ixia_traffic.cfg b/samples/vnf_samples/nsut/vpe/ixia_traffic.cfg
deleted file mode 100644
index a0cf372cf..000000000
--- a/samples/vnf_samples/nsut/vpe/ixia_traffic.cfg
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright (c) 2016-2017 Intel Corporation
-#
-# 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.
-{
-    "uplink_0": {
-        "id": 1,
-        "bidir": "False",
-        "duration": 60,
-        "iload": "100",
-        "outer_l2": {
-            "dstmac": "00:00:00:00:00:03",
-            "framesPerSecond": true,
-            "framesize": 64,
-            "srcmac": "00:00:00:00:00:01"
-        },
-        "outer_l3": {
-            "dscp": 0,
-            "dstip4": "152.16.40.20",
-            "proto": "udp",
-            "srcip4": "152.16.100.20",
-            "ttl": 32
-        },
-        "outer_l4": {
-            "dstport": "2001",
-            "srcport": "1234"
-        },
-        "traffic_type": "continuous"
-    },
-    "downlink_0": {
-        "id": 2,
-        "bidir": "False",
-        "duration": 60,
-        "iload": "100",
-        "outer_l2": {
-            "dstmac": "00:00:00:00:00:04",
-            "framesPerSecond": true,
-            "framesize": 64,
-            "srcmac": "00:00:00:00:00:01"
-        },
-        "outer_l3": {
-            "count": 1024,
-            "dscp": 0,
-            "dstip4": "152.16.100.20",
-            "proto": "udp",
-            "srcip4": "152.16.40.20",
-            "ttl": 32
-        },
-        "outer_l4": {
-            "dstport": "1234",
-            "srcport": "2001"
-        },
-        "traffic_type": "continuous"
-    }
-}
diff --git a/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency.yaml b/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency.yaml
index a475173f2..6ba1553ad 100644
--- a/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency.yaml
+++ b/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency.yaml
@@ -33,6 +33,7 @@ traffic_profile:
 
 uplink_0:
       ipv4:
+        id: 1
         outer_l2:
             framesize:
                 64B: "{{get(imix, 'imix.uplink.64B', '0') }}"
@@ -58,6 +59,7 @@ uplink_0:
             count: "{{get(flow, 'flow.count', '1') }}"
 downlink_0:
       ipv4:
+        id: 2
         outer_l2:
             framesize:
                 64B: "{{get(imix, 'imix.downlink.64B', '0') }}"
@@ -74,6 +76,9 @@ downlink_0:
             proto: "udp"
             srcip4: "{{get(flow, 'flow.dst_ip_0', '1.1.1.1-1.15.255.255') }}"
             dstip4: "{{get(flow, 'flow.src_ip_0', '90.90.1.1-90.105.255.255') }}"
+            {% if flow.flow.public_ip_0 is defined %}
+            dstip4: "{{get(flow, 'flow.public_ip_0', '90.90.1.1-90.105.255.255') }}"
+            {% endif %}
             count: "{{get(flow, 'flow.count', '1') }}"
             ttl: 32
             dscp: 0
@@ -83,6 +88,7 @@ downlink_0:
             count: "{{get(flow, 'flow.count', '1') }}"
 uplink_1:
       ipv4:
+        id: 3
         outer_l2:
             framesize:
                 64B: "{{get(imix, 'imix.uplink.64B', '0') }}"
@@ -97,17 +103,18 @@ uplink_1:
 
         outer_l3v4:
             proto: "udp"
-            srcip4: "{{get(flow, 'flow.src_ip1', '1.1.1.1-1.15.255.255') }}"
-            dstip4: "{{get(flow, 'flow.dst_ip1', '90.90.1.1-90.105.255.255') }}"
+            srcip4: "{{get(flow, 'flow.src_ip_1', '1.1.1.1-1.15.255.255') }}"
+            dstip4: "{{get(flow, 'flow.dst_ip_1', '90.90.1.1-90.105.255.255') }}"
             count: "{{get(flow, 'flow.count', '1') }}"
             ttl: 32
             dscp: 0
         outer_l4:
-            srcport: "{{get(flow, 'flow.src_port1', '1234') }}"
-            dstport: "{{get(flow, 'flow.dst_port1', '2001') }}"
+            srcport: "{{get(flow, 'flow.src_port_1', '1234') }}"
+            dstport: "{{get(flow, 'flow.dst_port_1', '2001') }}"
             count: "{{get(flow, 'flow.count', '1') }}"
 downlink_1:
       ipv4:
+        id: 4
         outer_l2:
             framesize:
                 64B: "{{get(imix, 'imix.downlink.64B', '0') }}"
@@ -124,10 +131,13 @@ downlink_1:
             proto: "udp"
             srcip4: "{{get(flow, 'flow.dst_ip_1', '1.1.1.1-1.15.255.255') }}"
             dstip4: "{{get(flow, 'flow.src_ip_1', '90.90.1.1-90.105.255.255') }}"
+            {% if flow.public_ip_1 is defined %}
+            dstip4: "{{get(flow, 'flow.public_ip_1', '90.90.1.1-90.105.255.255') }}"
+            {% endif %}
             count: "{{get(flow, 'flow.count', '1') }}"
             ttl: 32
             dscp: 0
         outer_l4:
-            srcport: "{{get(flow, 'flow.dst_port1', '1234') }}"
-            dstport: "{{get(flow, 'flow.src_port1', '2001') }}"
+            srcport: "{{get(flow, 'flow.dst_port_1', '1234') }}"
+            dstport: "{{get(flow, 'flow.src_port_1', '2001') }}"
             count: "{{get(flow, 'flow.count', '1') }}"
diff --git a/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency_vpe.yaml b/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency_vpe.yaml
index 5cce5941e..4d73b8ffe 100644
--- a/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency_vpe.yaml
+++ b/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency_vpe.yaml
@@ -46,6 +46,7 @@ traffic_profile:
 
 uplink_0:
       ipv4:
+        id: 1
         outer_l2:
             framesize:
                 64B: "{{ get(imix, 'imix.uplink.imix_small', '0') }}"
@@ -79,6 +80,7 @@ uplink_0:
             dstport: "{{get(flow, 'flow.dst_port_0', '0') }}"
             count: "{{get(flow, 'flow.count', '1') }}"
 downlink_0:
+      id: 2
       ipv4:
         outer_l2:
             framesize:
@@ -103,6 +105,7 @@ downlink_0:
             dstport: "{{get(flow, 'flow.src_port_0', '0') }}"
             count: "{{get(flow, 'flow.count', '1') }}"
 uplink_1:
+      id: 3
       ipv4:
         outer_l2:
             framesize:
@@ -126,16 +129,17 @@ uplink_1:
 
         outer_l3v4:
             proto: "tcp"
-            srcip4: "{{get(flow, 'flow.srcip1', '192.168.0.0-192.168.255.255') }}"
-            dstip4: "{{get(flow, 'flow.dstip1', '192.16.0.0-192.16.0.31') }}"
+            srcip4: "{{get(flow, 'flow.srcip_1', '192.168.0.0-192.168.255.255') }}"
+            dstip4: "{{get(flow, 'flow.dstip_1', '192.16.0.0-192.16.0.31') }}"
             ttl: 32
             dscp: 32
 
         outer_l4:
-            srcport: "{{get(flow, 'flow.src_port1', '0') }}"
-            dstport: "{{get(flow, 'flow.dst_port1', '0') }}"
+            srcport: "{{get(flow, 'flow.src_port_1', '0') }}"
+            dstport: "{{get(flow, 'flow.dst_port_1', '0') }}"
             count: "{{get(flow, 'flow.count', '1') }}"
 downlink_1:
+      id: 4
       ipv4:
         outer_l2:
             framesize:
@@ -149,13 +153,13 @@ downlink_1:
 
         outer_l3v4:
             proto: "tcp"
-            srcip4: "{{get(flow, 'flow.dst_ip1', '192.16.0.0-192.16.0.31') }}"
-            dstip4: "{{get(flow, 'flow.src_ip1', '192.168.0.0-192.168.255.255') }}"
+            srcip4: "{{get(flow, 'flow.dst_ip_1', '192.16.0.0-192.16.0.31') }}"
+            dstip4: "{{get(flow, 'flow.src_ip_1', '192.168.0.0-192.168.255.255') }}"
             count: "{{get(flow, 'flow.count', '1') }}"
             ttl: 32
             dscp: 32
 
         outer_l4:
-            srcport: "{{get(flow, 'flow.dst_port1', '0') }}"
-            dstport: "{{get(flow, 'flow.src_port1', '0') }}"
+            srcport: "{{get(flow, 'flow.dst_port_1', '0') }}"
+            dstport: "{{get(flow, 'flow.src_port_1', '0') }}"
             count: "{{get(flow, 'flow.count', '1') }}"