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>

5 files changed, 2 insertions, 219 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"
-    }
-}