private-> uplink and public->downlink

changing private and public to new uplink/downlink name

Change-Id: I8c3f582ba5592418a397e2500e0b998c3eed54f2
Signed-off-by: Deepak S <deepak.s@linux.intel.com>

15 files changed, 41 insertions, 35 deletions

diff --git a/samples/vnf_samples/nsut/cgnapt/cgnat.cfg b/samples/vnf_samples/nsut/cgnapt/cgnat.cfg
index 8b16f57f6..394f4ad8c 100644
--- a/samples/vnf_samples/nsut/cgnapt/cgnat.cfg
+++ b/samples/vnf_samples/nsut/cgnapt/cgnat.cfg
@@ -39,6 +39,7 @@ prv_to_pub_map = (0,1)
 [PIPELINE2]
 type =  TIMER
 core = 2
+timer_dyn_timeout = 1000000
 n_flows = 1048576
 [PIPELINE3]
 type = TXRX
@@ -71,10 +72,12 @@ key_size = 8
 hash_offset = 200;72
 ;cgnapt_debug = 2
 ;
-timer_period = 100
+timer_period = 10000
 max_clients_per_ip = 65535
-max_port_per_client = 10
-public_ip_port_range = 98103214:(1, 65535)
+max_port_per_client = 100
+public_ip_port_range = 04040000:(1, 65535)
+public_ip_port_range = 04040001:(1, 65535)
+public_ip_port_range = 04040002:(1, 65535)
 vnf_set = (3,4,5)
 pkt_type = ipv4
 cgnapt_meta_offset = 128
diff --git a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_http_ixload_1b_Requests-65000_Concurrency.yaml b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_http_ixload_1b_Requests-65000_Concurrency.yaml
index d5fda5804..6bfca0d7a 100644
--- a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_http_ixload_1b_Requests-65000_Concurrency.yaml
+++ b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_http_ixload_1b_Requests-65000_Concurrency.yaml
@@ -23,8 +23,10 @@ scenarios:
     vnf__0: vnf.yardstick
   options:
     framesize:
-      private: {64B: 100}
-      public: {64B: 100}
+      uplink: {64B: 100}
+      downlink: {64B: 100}
+     flow:
+      public_ip: ["152.16.40.10"]
     traffic_type: 4
     rfc2544:
       allowed_drop_rate: 0.0001 - 0.0001
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 0f1ddd606..a56321396 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
@@ -23,8 +23,8 @@ scenarios:
     vnf__0: vnf.yardstick
   options:
     framesize:
-      private: {64B: 100}
-      public: {64B: 100}
+      uplink: {64B: 100}
+      downlink: {64B: 100}
     flow:
       src_ip: [{'tg__0': 'xe0'}]
       dst_ip: [{'tg__0': 'xe1'}]
diff --git a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_ixia_scale_up.yaml b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_ixia_scale_up.yaml
index cd74655d5..71f6d1dc8 100644
--- a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_ixia_scale_up.yaml
+++ b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_ixia_scale_up.yaml
@@ -24,12 +24,12 @@ scenarios:
     vnf__0: vnf.yardstick
   options:
     framesize:
-      private: {64B: 100}
-      public: {64B: 100}
+      uplink: {64B: 100}
+      downlink: {64B: 100}
     flow:
       src_ip: [{'tg__0': 'xe0'}]
       dst_ip: [{'tg__0': 'xe1'}]
-      publicip: ["152.16.40.10"]
+      public_ip: ["152.16.40.10"]
       count: 1000
     traffic_type: 4
     rfc2544:
diff --git a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_trex.yaml b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_trex.yaml
index 3390cf022..042c4ddee 100644
--- a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_trex.yaml
+++ b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_trex.yaml
@@ -23,12 +23,12 @@ scenarios:
     vnf__0: vnf.yardstick
   options:
     framesize:
-      private: {64B: 100}
-      public: {64B: 100}
+      uplink: {64B: 100}
+      downlink: {64B: 100}
     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:
diff --git a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_trex_corelated_traffic.yaml b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_trex_corelated_traffic.yaml
index 424422dd2..1461c9601 100644
--- a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_trex_corelated_traffic.yaml
+++ b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_trex_corelated_traffic.yaml
@@ -24,11 +24,12 @@ scenarios:
     tg__1: trafficgen_2.yardstick
   options:
     framesize:
-      private: {64B: 100}
-      public: {64B: 100}
+      uplink: {64B: 100}
+      downlink: {64B: 100}
     flow:
       src_ip: [{'tg__0': 'xe0'}]
       dst_ip: [{'tg__1': 'xe0'}]
+      public_ip: ['152.16.40.10']
       count: 1
     traffic_type: 4
     rfc2544:
diff --git a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_trex_scale_up.yaml b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_trex_scale_up.yaml
index 3736715ac..3c5d12abb 100644
--- a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_trex_scale_up.yaml
+++ b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_trex_scale_up.yaml
@@ -24,12 +24,12 @@ scenarios:
     vnf__0: vnf.yardstick
   options:
     framesize:
-      private: {64B: 100}
-      public: {64B: 100}
+      uplink: {64B: 100}
+      downlink: {64B: 100}
     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:
diff --git a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_with_latency_ipv4_1flow_64B_trex.yaml b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_with_latency_ipv4_1flow_64B_trex.yaml
index 0fbd402ac..91a703877 100644
--- a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_with_latency_ipv4_1flow_64B_trex.yaml
+++ b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_with_latency_ipv4_1flow_64B_trex.yaml
@@ -23,12 +23,12 @@ scenarios:
     vnf__0: vnf.yardstick
   options:
     framesize:
-      private: {64B: 100}
-      public: {64B: 100}
+      uplink: {64B: 100}
+      downlink: {64B: 100}
     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:
diff --git a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_with_latency_ipv4_1flow_dynamic_cgnapt_ixia.yaml b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_with_latency_ipv4_1flow_dynamic_cgnapt_ixia.yaml
index e400b1750..c51729790 100644
--- a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_with_latency_ipv4_1flow_dynamic_cgnapt_ixia.yaml
+++ b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_with_latency_ipv4_1flow_dynamic_cgnapt_ixia.yaml
@@ -24,8 +24,8 @@ scenarios:
     tg__1: trafficgen_2.yardstick
   options:
     framesize:
-      private: {64B: 100}
-      public: {64B: 100}
+      uplink: {64B: 100}
+      downlink: {64B: 100}
     flow:
       src_ip: [{'tg__0': 'xe0'}]
       dst_ip: [{'tg__1': 'xe0'}]
diff --git a/samples/vnf_samples/nsut/cgnapt/tc_heat_external_rfc2544_ipv4_1flow_64B_trex.yaml b/samples/vnf_samples/nsut/cgnapt/tc_heat_external_rfc2544_ipv4_1flow_64B_trex.yaml
index c64bb1bcd..ba5180a82 100644
--- a/samples/vnf_samples/nsut/cgnapt/tc_heat_external_rfc2544_ipv4_1flow_64B_trex.yaml
+++ b/samples/vnf_samples/nsut/cgnapt/tc_heat_external_rfc2544_ipv4_1flow_64B_trex.yaml
@@ -23,8 +23,8 @@ scenarios:
     vnf__0: vnf.yardstick
   options:
     framesize:
-      private: {64B: 100}
-      public: {64B: 100}
+      uplink: {64B: 100}
+      downlink: {64B: 100}
     flow:
       src_ip: [{'tg__0': 'xe0'}]
       dst_ip: [{'tg__0': 'xe1'}]
diff --git a/samples/vnf_samples/nsut/cgnapt/tc_heat_rfc2544_ipv4_1flow_64B_trex.yaml b/samples/vnf_samples/nsut/cgnapt/tc_heat_rfc2544_ipv4_1flow_64B_trex.yaml
index 4f1d8579c..b38d4be6c 100644
--- a/samples/vnf_samples/nsut/cgnapt/tc_heat_rfc2544_ipv4_1flow_64B_trex.yaml
+++ b/samples/vnf_samples/nsut/cgnapt/tc_heat_rfc2544_ipv4_1flow_64B_trex.yaml
@@ -23,8 +23,8 @@ scenarios:
     vnf__0: vnf.yardstick
   options:
     framesize:
-      private: {64B: 100}
-      public: {64B: 100}
+      uplink: {64B: 100}
+      downlink: {64B: 100}
     flow:
       src_ip: [{'tg__0': 'xe0'}]
       dst_ip: [{'tg__0': 'xe1'}]
diff --git a/samples/vnf_samples/nsut/cgnapt/tc_ovs_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml b/samples/vnf_samples/nsut/cgnapt/tc_ovs_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml
index 20e362844..1d8be5f74 100644
--- a/samples/vnf_samples/nsut/cgnapt/tc_ovs_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml
+++ b/samples/vnf_samples/nsut/cgnapt/tc_ovs_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml
@@ -23,8 +23,8 @@ scenarios:
     vnf__0: vnf__0.yardstick
   options:
     framesize:
-      private: {64B: 100}
-      public: {64B: 100}
+      uplink: {64B: 100}
+      downlink: {64B: 100}
     flow:
       src_ip: [{'tg__0': 'xe0'}]
       dst_ip: [{'tg__0': 'xe1'}]
diff --git a/samples/vnf_samples/nsut/cgnapt/tc_ovs_rfc2544_ipv4_1rule_64B_trex.yaml b/samples/vnf_samples/nsut/cgnapt/tc_ovs_rfc2544_ipv4_1rule_64B_trex.yaml
index 66c818680..52becd3c6 100644
--- a/samples/vnf_samples/nsut/cgnapt/tc_ovs_rfc2544_ipv4_1rule_64B_trex.yaml
+++ b/samples/vnf_samples/nsut/cgnapt/tc_ovs_rfc2544_ipv4_1rule_64B_trex.yaml
@@ -23,8 +23,8 @@ scenarios:
     vnf__0: vnf__0.yardstick
   options:
     framesize:
-      private: {64B: 100}
-      public: {64B: 100}
+      uplink: {64B: 100}
+      downlink: {64B: 100}
     flow:
       src_ip: [{'tg__0': 'xe0'}]
       dst_ip: [{'tg__0': 'xe1'}]
diff --git a/samples/vnf_samples/nsut/cgnapt/tc_sriov_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml b/samples/vnf_samples/nsut/cgnapt/tc_sriov_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml
index 46ff8478b..f0d996d51 100644
--- a/samples/vnf_samples/nsut/cgnapt/tc_sriov_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml
+++ b/samples/vnf_samples/nsut/cgnapt/tc_sriov_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml
@@ -23,8 +23,8 @@ scenarios:
     vnf__0: vnf.yardstick
   options:
     framesize:
-      private: {64B: 100}
-      public: {64B: 100}
+      uplink: {64B: 100}
+      downlink: {64B: 100}
     flow:
       src_ip: [{'tg__0': 'xe0'}]
       dst_ip: [{'tg__0': 'xe1'}]
diff --git a/samples/vnf_samples/nsut/cgnapt/tc_sriov_rfc2544_ipv4_1rule_64B_trex.yaml b/samples/vnf_samples/nsut/cgnapt/tc_sriov_rfc2544_ipv4_1rule_64B_trex.yaml
index 7561a1089..ec517bbef 100644
--- a/samples/vnf_samples/nsut/cgnapt/tc_sriov_rfc2544_ipv4_1rule_64B_trex.yaml
+++ b/samples/vnf_samples/nsut/cgnapt/tc_sriov_rfc2544_ipv4_1rule_64B_trex.yaml
@@ -23,8 +23,8 @@ scenarios:
     vnf__0: vnf.yardstick
   options:
     framesize:
-      private: {64B: 100}
-      public: {64B: 100}
+      uplink: {64B: 100}
+      downlink: {64B: 100}
     flow:
       src_ip: [{'tg__0': 'xe0'}]
       dst_ip: [{'tg__0': 'xe1'}]