BugFix: Fix to pod filename ext and prox path

As per defect:
- the "context:" stanza of every tc_prox_baremetal*.yaml"
 file has an incorrect pathname for the config file

-  tc_prox_baremetal_binsearch.yaml and
tc_prox_baremetal_ramp.yaml refer to
"prox-baremetal.yml", which idoes not exist

- incorrect prox bin path

Resolution:
- Unify the pod file name and path for all BM tests
- Prox bin path changed to "/opt/nsb_bin/prox"

Change-Id: I16b25189104ad5585ddc1c2c0dd71b3c4c2aecd3
Signed-off-by: Abhijit Sinha <abhijit.sinha@intel.com>

diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_acl-2.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_acl-2.yaml
index fe91f3d..6972d40 100644 (file)
--- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_acl-2.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_acl-2.yaml
@@ -35,7 +35,7 @@ scenarios:
 
   options:
     vnf__0:
-      prox_path: /root/dppd-PROX-v037/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/handle_acl-2.cfg"
       prox_args:
         "-t": ""
@@ -43,7 +43,7 @@ scenarios:
         "configs/acl_rules-2.lua": ""
 
     tg__0:
-      prox_path: /root/dppd-PROX-v037/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/gen_acl-2.cfg"
       prox_args:
         "-e": ""
@@ -58,4 +58,4 @@ context:
   type: Node
   name: yardstick
   nfvi_type: baremetal
-  file: /etc/prox-baremetal-2.yml
+  file: prox-baremetal-2.yaml

diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_acl-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_acl-4.yaml
index e908dd9..d85a483 100644 (file)
--- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_acl-4.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_acl-4.yaml
@@ -35,7 +35,7 @@ scenarios:
 
   options:
     vnf__0:
-      prox_path: /root/dppd-PROX-v037/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/handle_acl-4.cfg"
       prox_args:
         "-t": ""
@@ -43,7 +43,7 @@ scenarios:
         "configs/acl_rules-2.lua": ""
 
     tg__0:
-      prox_path: /root/dppd-PROX-v037/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/gen_acl-4.cfg"
       prox_args:
         "-e": ""
@@ -58,4 +58,4 @@ context:
   type: Node
   name: yardstick
   nfvi_type: baremetal
-  file: /etc/prox-baremetal-4.yml
+  file: prox-baremetal-4.yaml

diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_binsearch.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_binsearch.yaml
index 4cc3836..b801923 100644 (file)
--- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_binsearch.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_binsearch.yaml
@@ -27,13 +27,13 @@ scenarios:
 
   options:
     vnf__0:
-      prox_path: /root/dppd-PROX-v035/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/handle_none-2.cfg"
       prox_args:
         "-t": ""
 
     tg__0:
-      prox_path: /root/dppd-PROX-v035/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/gen_all-2.cfg"
       prox_args:
         "-e": ""
@@ -48,4 +48,4 @@ context:
   type: Node
   name: yardstick
   nfvi_type: baremetal
-  file: prox-baremetal.yml
+  file: prox-baremetal-2.yaml

diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_bng-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_bng-4.yaml
index 272d4e0..dd1fc1a 100644 (file)
--- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_bng-4.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_bng-4.yaml
@@ -27,7 +27,7 @@ scenarios:
 
   options:
     vnf__0:
-      prox_path: /root/dppd-PROX-v037/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/handle_bng-4.cfg"
       prox_args:
         "-t": ""
@@ -36,7 +36,7 @@ scenarios:
         "configs/ipv4.lua" : ""
 
     tg__0:
-      prox_path: /root/dppd-PROX-v037/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/gen_bng-4.cfg"
       prox_args:
         "-e": ""
@@ -51,5 +51,5 @@ context:
   type: Node
   name: yardstick
   nfvi_type: baremetal
-  file: /etc/yardstick/nodes/prox-baremetal-4.yml
+  file: prox-baremetal-4.yaml
 

diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_bng_qos-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_bng_qos-4.yaml
index b1ccacc..dd04271 100644 (file)
--- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_bng_qos-4.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_bng_qos-4.yaml
@@ -27,7 +27,7 @@ scenarios:
 
   options:
     vnf__0:
-      prox_path: /root/dppd-PROX-v037/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/handle_bng_qos-4.cfg"
       prox_args:
         "-t": ""
@@ -37,7 +37,7 @@ scenarios:
         "configs/dscp.lua" : ""
 
     tg__0:
-      prox_path: /root/dppd-PROX-v037/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/gen_bng_qos-4.cfg"
       prox_args:
         "-e": ""
@@ -52,5 +52,5 @@ context:
   type: Node
   name: yardstick
   nfvi_type: baremetal
-  file: /etc/yardstick/nodes/prox-baremetal-4.yml
+  file: prox-baremetal-4.yaml
 

diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_buffering-1.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_buffering-1.yaml
index 7b28a92..6a019bf 100644 (file)
--- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_buffering-1.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_buffering-1.yaml
@@ -27,13 +27,13 @@ scenarios:
 
   options:
     vnf__0:
-      prox_path: /root/dppd-PROX-v037/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/handle_buffering-1.cfg"
       prox_args:
         "-t": ""
 
     tg__0:
-      prox_path: /root/dppd-PROX-v037/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/gen_buffering-1.cfg"
       prox_args:
         "-e": ""
@@ -48,4 +48,4 @@ context:
   type: Node
   name: yardstick
   nfvi_type: baremetal
-  file: /etc/yardstick/nodes/prox-baremetal-1.yml
+  file: prox-baremetal-1.yaml

diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd-2.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd-2.yaml
index 49a079a..857c5ed 100644 (file)
--- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd-2.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd-2.yaml
@@ -27,13 +27,13 @@ scenarios:
 
   options:
     vnf__0:
-      prox_path: /root/dppd-PROX-v037/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/handle_l2fwd-2.cfg"
       prox_args:
         "-t": ""
 
     tg__0:
-      prox_path: /root/dppd-PROX-v037/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/gen_l2fwd-2.cfg"
       prox_args:
         "-e": ""
@@ -48,4 +48,4 @@ context:
   type: Node
   name: yardstick
   nfvi_type: baremetal
-  file: /etc/yardstick/nodes/prox-baremetal-2.yml
+  file: prox-baremetal-2.yaml

diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd-4.yaml
index 901c022..31f5a3c 100644 (file)
--- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd-4.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd-4.yaml
@@ -27,13 +27,13 @@ scenarios:
 
   options:
     vnf__0:
-      prox_path: /root/dppd-PROX-v037/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/handle_l2fwd-4.cfg"
       prox_args:
         "-t": ""
 
     tg__0:
-      prox_path: /root/dppd-PROX-v037/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/gen_l2fwd-4.cfg"
       prox_args:
         "-e": ""
@@ -48,4 +48,4 @@ context:
   type: Node
   name: yardstick
   nfvi_type: baremetal
-  file: /etc/yardstick/nodes/prox-baremetal-4.yml
+  file: prox-baremetal-4.yaml

diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd_multiflow-2.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd_multiflow-2.yaml
index 0626c07..32fbfa0 100644 (file)
--- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd_multiflow-2.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd_multiflow-2.yaml
@@ -27,13 +27,13 @@ scenarios:
 
   options:
     vnf__0:
-      prox_path: /root/dppd-PROX-v037/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/handle_l2fwd_multiflow-2.cfg"
       prox_args:
         "-t": ""
 
     tg__0:
-      prox_path: /root/dppd-PROX-v037/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/gen_l2fwd_multiflow-2.cfg"
       prox_args:
         "-e": ""
@@ -48,4 +48,4 @@ context:
   type: Node
   name: yardstick
   nfvi_type: baremetal
-  file: /etc/prox-baremetal-2.yml
+  file: prox-baremetal-2.yaml

diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd_multiflow-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd_multiflow-4.yaml
index c429a44..206a3ff 100644 (file)
--- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd_multiflow-4.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd_multiflow-4.yaml
@@ -27,13 +27,13 @@ scenarios:
 
   options:
     vnf__0:
-      prox_path: /root/dppd-PROX-v037/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/handle_l2fwd_multiflow-4.cfg"
       prox_args:
         "-t": ""
 
     tg__0:
-      prox_path: /root/dppd-PROX-v037/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/gen_l2fwd_multiflow-4.cfg"
       prox_args:
         "-e": ""
@@ -48,4 +48,4 @@ context:
   type: Node
   name: yardstick
   nfvi_type: baremetal
-  file: /etc/prox-baremetal-4.yml
+  file: prox-baremetal-4.yaml

diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd_pktTouch-2.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd_pktTouch-2.yaml
index 100e3c5..1f46959 100644 (file)
--- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd_pktTouch-2.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd_pktTouch-2.yaml
@@ -27,13 +27,13 @@ scenarios:
 
   options:
     vnf__0:
-      prox_path: /root/dppd-PROX-v037/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/handle_l2fwd_pktTouch-2.cfg"
       prox_args:
         "-t": ""
 
     tg__0:
-      prox_path: /root/dppd-PROX-v037/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/gen_l2fwd_pktTouch-2.cfg"
       prox_args:
         "-e": ""
@@ -48,4 +48,4 @@ context:
   type: Node
   name: yardstick
   nfvi_type: baremetal
-  file: /etc/yardstick/nodes/prox-baremetal-2.yml
+  file: prox-baremetal-2.yaml

diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd_pktTouch-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd_pktTouch-4.yaml
index 5bc2287..94f0997 100644 (file)
--- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd_pktTouch-4.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd_pktTouch-4.yaml
@@ -27,13 +27,13 @@ scenarios:
 
   options:
     vnf__0:
-      prox_path: /root/dppd-PROX-v037/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/handle_l2fwd_pktTouch-4.cfg"
       prox_args:
         "-t": ""
 
     tg__0:
-      prox_path: /root/dppd-PROX-v037/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/gen_l2fwd_pktTouch-4.cfg"
       prox_args:
         "-e": ""
@@ -48,4 +48,4 @@ context:
   type: Node
   name: yardstick
   nfvi_type: baremetal
-  file: /etc/yardstick/nodes/prox-baremetal-4.yml
+  file: prox-baremetal-4.yaml

diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l3fwd-2.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l3fwd-2.yaml
index 51079db..eb194de 100644 (file)
--- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l3fwd-2.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l3fwd-2.yaml
@@ -27,7 +27,7 @@ scenarios:
 
   options:
     vnf__0:
-      prox_path: /root/dppd-PROX-v037/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/handle_l3fwd-2.cfg"
       prox_args:
         "-t": ""
@@ -35,7 +35,7 @@ scenarios:
         "configs/ipv4.lua" : ""
 
     tg__0:
-      prox_path: /root/dppd-PROX-v037/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/gen_l3fwd-2.cfg"
       prox_args:
         "-e": ""
@@ -50,4 +50,4 @@ context:
   type: Node
   name: yardstick
   nfvi_type: baremetal
-  file: /etc/yardstick/nodes/prox-baremetal-2.yml
+  file: prox-baremetal-2.yaml

diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l3fwd-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l3fwd-4.yaml
index c0819df..2f8acce 100644 (file)
--- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l3fwd-4.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l3fwd-4.yaml
@@ -27,7 +27,7 @@ scenarios:
 
   options:
     vnf__0:
-      prox_path: /root/dppd-PROX-v037/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/handle_l3fwd-4.cfg"
       prox_args:
         "-t": ""
@@ -35,7 +35,7 @@ scenarios:
         "configs/ipv4.lua" : ""
 
     tg__0:
-      prox_path: /root/dppd-PROX-v037/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/gen_l3fwd-4.cfg"
       prox_args:
         "-e": ""
@@ -50,4 +50,4 @@ context:
   type: Node
   name: yardstick
   nfvi_type: baremetal
-  file: /etc/yardstick/nodes/prox-baremetal-4.yml
+  file: prox-baremetal-4.yaml

diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_lb-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_lb-4.yaml
index 49e2efa..5a02f4a 100644 (file)
--- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_lb-4.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_lb-4.yaml
@@ -32,7 +32,7 @@ scenarios:
 
   options:
     vnf__0:
-      prox_path: /root/dppd-PROX-v037/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/handle_lb-4.cfg"
       prox_args:
         "-t": ""
@@ -40,7 +40,7 @@ scenarios:
         "configs/tuples.lua": ""
 
     tg__0:
-      prox_path: /root/dppd-PROX-v037/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/gen_lb-4.cfg"
       prox_args:
         "-e": ""
@@ -55,4 +55,4 @@ context:
   type: Node
   name: yardstick
   nfvi_type: baremetal
-  file: /etc/prox-baremetal-4.yml
+  file: prox-baremetal-4.yaml

diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_mpls_tagging-2.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_mpls_tagging-2.yaml
index 2994ee3..fa8ab97 100644 (file)
--- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_mpls_tagging-2.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_mpls_tagging-2.yaml
@@ -27,13 +27,13 @@ scenarios:
 
   options:
     vnf__0:
-      prox_path: /root/dppd-PROX-v037/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/handle_mpls_tag_untag-2.cfg"
       prox_args:
         "-t": ""
 
     tg__0:
-      prox_path: /root/dppd-PROX-v037/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/gen_mpls_tag_untag-2.cfg"
       prox_args:
         "-e": ""
@@ -48,4 +48,4 @@ context:
   type: Node
   name: yardstick
   nfvi_type: baremetal
-  file: /etc/yardstick/nodes/prox-baremetal-2.yml
+  file: prox-baremetal-2.yaml

diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_mpls_tagging-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_mpls_tagging-4.yaml
index 6ed8aed..ab91553 100644 (file)
--- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_mpls_tagging-4.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_mpls_tagging-4.yaml
@@ -27,13 +27,13 @@ scenarios:
 
   options:
     vnf__0:
-      prox_path: /root/dppd-PROX-v037/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/handle_mpls_tag_untag-4.cfg"
       prox_args:
         "-t": ""
 
     tg__0:
-      prox_path: /root/dppd-PROX-v037/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/gen_mpls_tag_untag-4.cfg"
       prox_args:
         "-e": ""
@@ -48,4 +48,4 @@ context:
   type: Node
   name: yardstick
   nfvi_type: baremetal
-  file: /etc/yardstick/nodes/prox-baremetal-4.yml
+  file: prox-baremetal-4.yaml

diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_ramp.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_ramp.yaml
index fc28b92..6d96c3e 100644 (file)
--- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_ramp.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_ramp.yaml
@@ -27,13 +27,13 @@ scenarios:
 
   options:
     vnf__0:
-      prox_path: /root/dppd-PROX-v035/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/handle_none-2.cfg"
       prox_args:
         "-t": ""
 
     tg__0:
-      prox_path: /root/dppd-PROX-v035/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/gen_all-2.cfg"
       prox_args:
         "-e": ""
@@ -49,4 +49,4 @@ context:
   type: Node
   name: yardstick
   nfvi_type: baremetal
-  file: prox-baremetal.yml
+  file: prox-baremetal-2.yaml

diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_vpe-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_vpe-4.yaml
index cc06798..295f019 100644 (file)
--- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_vpe-4.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_vpe-4.yaml
@@ -27,7 +27,7 @@ scenarios:
 
   options:
     vnf__0:
-      prox_path: /root/dppd-PROX-v037/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/handle_vpe-4.cfg"
       prox_args:
         "-t": ""
@@ -40,7 +40,7 @@ scenarios:
       prox_generate_parameter: True
 
     tg__0:
-      prox_path: /root/dppd-PROX-v037/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/gen_vpe-4.cfg"
       prox_args:
         "-e": ""
@@ -55,5 +55,5 @@ context:
   type: Node
   name: yardstick
   nfvi_type: baremetal
-  file: /etc/yardstick/nodes/prox-baremetal-4.yml
+  file: prox-baremetal-4.yaml
 

diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_acl-2.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_acl-2.yaml
index 38e8fe6..e870163 100644 (file)
--- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_acl-2.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_acl-2.yaml
@@ -35,7 +35,7 @@ scenarios:
 
   options:
     vnf__0:
-      prox_path: /root/dppd-PROX-v037.1/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/handle_acl-2.cfg"
       prox_args:
         "-t": ""
@@ -43,7 +43,7 @@ scenarios:
         "configs/acl_rules-2.lua" : ""
 
     tg__0:
-      prox_path: /root/dppd-PROX-v037.1/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/gen_acl-2.cfg"
       prox_args:
         "-e": ""

diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_acl-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_acl-4.yaml
index 364b0f2..ece618f 100644 (file)
--- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_acl-4.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_acl-4.yaml
@@ -35,14 +35,14 @@ scenarios:
 
   options:
     vnf__0:
-      prox_path: /root/dppd-PROX-v037/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/handle_acl-4.cfg"
       prox_args:
         "-t": ""
       prox_files: "configs/acl_rules-2.lua"
 
     tg__0:
-      prox_path: /root/dppd-PROX-v037/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/gen_acl-4.cfg"
       prox_args:
         "-e": ""

diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_bng-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_bng-4.yaml
index cbb3fd7..67ad5e2 100644 (file)
--- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_bng-4.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_bng-4.yaml
@@ -27,7 +27,7 @@ scenarios:
 
   options:
     vnf__0:
-      prox_path: /root/dppd-PROX-v037.1/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/handle_bng-4.cfg"
       prox_args:
         "-t": ""
@@ -36,7 +36,7 @@ scenarios:
         "configs/ipv4.lua" : ""
 
     tg__0:
-      prox_path: /root/dppd-PROX-v037.1/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/gen_bng-4.cfg"
       prox_args:
         "-e": ""

diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_bng_qos-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_bng_qos-4.yaml
index 25d5092..0578bf5 100644 (file)
--- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_bng_qos-4.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_bng_qos-4.yaml
@@ -27,7 +27,7 @@ scenarios:
 
   options:
     vnf__0:
-      prox_path: /root/dppd-PROX-v037.1/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/handle_bng_qos-4.cfg"
       prox_args:
         "-t": ""
@@ -37,7 +37,7 @@ scenarios:
         "configs/dscp.lua" : ""
 
     tg__0:
-      prox_path: /root/dppd-PROX-v037.1/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/gen_bng_qos-4.cfg"
       prox_args:
         "-e": ""

diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_buffering-1.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_buffering-1.yaml
index b73250e..31b872d 100644 (file)
--- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_buffering-1.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_buffering-1.yaml
@@ -27,13 +27,13 @@ scenarios:
 
   options:
     vnf__0:
-      prox_path: /root/dppd-PROX-v037/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/handle_buffering-1.cfg"
       prox_args:
         "-t": ""
 
     tg__0:
-      prox_path: /root/dppd-PROX-v037/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/gen_buffering-1.cfg"
       prox_args:
         "-e": ""

diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd-2-l3fwd-2.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd-2-l3fwd-2.yaml
index 4964f6f..a42ca70 100644 (file)
--- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd-2-l3fwd-2.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd-2-l3fwd-2.yaml
@@ -27,13 +27,13 @@ scenarios:
 
   options:
     vnf__0:
-      prox_path: /root/dppd-PROX-v037/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/handle_l2fwd-2.cfg"
       prox_args:
         "-t": ""
 
     tg__0:
-      prox_path: /root/dppd-PROX-v037/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/gen_l2fwd-2.cfg"
       prox_args:
         "-e": ""
@@ -56,7 +56,7 @@ scenarios:
 
   options:
     vnf__0:
-      prox_path: /root/dppd-PROX-v037.1/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/handle_l3fwd-2.cfg"
       prox_args:
         "-t": ""
@@ -64,7 +64,7 @@ scenarios:
         "configs/ipv4.lua" : ""
 
     tg__0:
-      prox_path: /root/dppd-PROX-v037.1/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/gen_l3fwd-2.cfg"
       prox_args:
         "-e": ""

diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd-2.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd-2.yaml
index 5213277..68218f3 100644 (file)
--- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd-2.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd-2.yaml
@@ -27,13 +27,13 @@ scenarios:
 
   options:
     vnf__0:
-      prox_path: /root/dppd-PROX-v037/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/handle_l2fwd-2.cfg"
       prox_args:
         "-t": ""
 
     tg__0:
-      prox_path: /root/dppd-PROX-v037/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/gen_l2fwd-2.cfg"
       prox_args:
         "-e": ""

diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd-4-l3fwd-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd-4-l3fwd-4.yaml
index 6cdeda5..4ea0b2e 100644 (file)
--- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd-4-l3fwd-4.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd-4-l3fwd-4.yaml
@@ -27,7 +27,7 @@ scenarios:
 
   options:
     vnf__0:
-      prox_path: /root/dppd-PROX-v037.1/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/handle_l3fwd-4.cfg"
       prox_args:
         "-t": ""
@@ -35,7 +35,7 @@ scenarios:
         "configs/ipv4.lua" : ""
 
     tg__0:
-      prox_path: /root/dppd-PROX-v037.1/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/gen_l3fwd-4.cfg"
       prox_args:
         "-e": ""
@@ -57,13 +57,13 @@ scenarios:
 
   options:
     vnf__0:
-      prox_path: /root/dppd-PROX-v037/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/handle_l2fwd-4.cfg"
       prox_args:
         "-t": ""
 
     tg__0:
-      prox_path: /root/dppd-PROX-v037/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/gen_l2fwd-4.cfg"
       prox_args:
         "-e": ""

diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd-4.yaml
index dff3663..a0bc7ef 100644 (file)
--- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd-4.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd-4.yaml
@@ -27,13 +27,13 @@ scenarios:
 
   options:
     vnf__0:
-      prox_path: /root/dppd-PROX-v037/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/handle_l2fwd-4.cfg"
       prox_args:
         "-t": ""
 
     tg__0:
-      prox_path: /root/dppd-PROX-v037/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/gen_l2fwd-4.cfg"
       prox_args:
         "-e": ""

diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd_multiflow-2.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd_multiflow-2.yaml
index 66c1c8e..776ddf1 100644 (file)
--- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd_multiflow-2.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd_multiflow-2.yaml
@@ -27,13 +27,13 @@ scenarios:
 
   options:
     vnf__0:
-      prox_path: /root/dppd-PROX-v037.1/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/handle_l2fwd_multiflow-2.cfg"
       prox_args:
         "-t": ""
 
     tg__0:
-      prox_path: /root/dppd-PROX-v037.1/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/gen_l2fwd_multiflow-2.cfg"
       prox_args:
         "-e": ""

diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd_multiflow-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd_multiflow-4.yaml
index 9b1dc19..321b173 100644 (file)
--- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd_multiflow-4.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd_multiflow-4.yaml
@@ -27,13 +27,13 @@ scenarios:
 
   options:
     vnf__0:
-      prox_path: /root/dppd-PROX-v037.1/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/handle_l2fwd_multiflow-4.cfg"
       prox_args:
         "-t": ""
 
     tg__0:
-      prox_path: /root/dppd-PROX-v037.1/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/gen_l2fwd_multiflow-4.cfg"
       prox_args:
         "-e": ""

diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd_pktTouch-2.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd_pktTouch-2.yaml
index 3dedb3f..db140d3 100644 (file)
--- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd_pktTouch-2.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd_pktTouch-2.yaml
@@ -27,13 +27,13 @@ scenarios:
 
   options:
     vnf__0:
-      prox_path: /root/dppd-PROX-v037/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/handle_l2fwd_pktTouch-2.cfg"
       prox_args:
         "-t": ""
 
     tg__0:
-      prox_path: /root/dppd-PROX-v037/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/gen_l2fwd_pktTouch-2.cfg"
       prox_args:
         "-e": ""

diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd_pktTouch-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd_pktTouch-4.yaml
index 3452a24..05723ca 100644 (file)
--- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd_pktTouch-4.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd_pktTouch-4.yaml
@@ -27,13 +27,13 @@ scenarios:
 
   options:
     vnf__0:
-      prox_path: /root/dppd-PROX-v037/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/handle_l2fwd_pktTouch-4.cfg"
       prox_args:
         "-t": ""
 
     tg__0:
-      prox_path: /root/dppd-PROX-v037/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/gen_l2fwd_pktTouch-4.cfg"
       prox_args:
         "-e": ""

diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l3fwd-2.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l3fwd-2.yaml
index a326f15..d82bfb2 100644 (file)
--- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l3fwd-2.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l3fwd-2.yaml
@@ -27,7 +27,7 @@ scenarios:
 
   options:
     vnf__0:
-      prox_path: /root/dppd-PROX-v037.1/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/handle_l3fwd-2.cfg"
       prox_args:
         "-t": ""
@@ -35,7 +35,7 @@ scenarios:
         "configs/ipv4.lua" : ""
 
     tg__0:
-      prox_path: /root/dppd-PROX-v037.1/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/gen_l3fwd-2.cfg"
       prox_args:
         "-e": ""

diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l3fwd-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l3fwd-4.yaml
index df933a9..d4b2be0 100644 (file)
--- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l3fwd-4.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l3fwd-4.yaml
@@ -27,7 +27,7 @@ scenarios:
 
   options:
     vnf__0:
-      prox_path: /root/dppd-PROX-v037.1/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/handle_l3fwd-4.cfg"
       prox_args:
         "-t": ""
@@ -35,7 +35,7 @@ scenarios:
         "configs/ipv4.lua" : ""
 
     tg__0:
-      prox_path: /root/dppd-PROX-v037.1/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/gen_l3fwd-4.cfg"
       prox_args:
         "-e": ""

diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_lb-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_lb-4.yaml
index ccc917d..736f1c4 100644 (file)
--- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_lb-4.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_lb-4.yaml
@@ -27,7 +27,7 @@ scenarios:
 
   options:
     vnf__0:
-      prox_path: /root/dppd-PROX-v037.1/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/handle_lb-4.cfg"
       prox_args:
         "-t": ""
@@ -35,7 +35,7 @@ scenarios:
         "configs/tuples.lua": ""
 
     tg__0:
-      prox_path: /root/dppd-PROX-v037.1/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/gen_lb-4.cfg"
       prox_args:
         "-e": ""

diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_mpls_tagging-2.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_mpls_tagging-2.yaml
index cdde138..e5e94ad 100644 (file)
--- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_mpls_tagging-2.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_mpls_tagging-2.yaml
@@ -27,13 +27,13 @@ scenarios:
 
   options:
     vnf__0:
-      prox_path: /root/dppd-PROX-v037/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/handle_mpls_tag_untag-2.cfg"
       prox_args:
         "-t": ""
 
     tg__0:
-      prox_path: /root/dppd-PROX-v037/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/gen_mpls_tag_untag-2.cfg"
       prox_args:
         "-e": ""

diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_mpls_tagging-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_mpls_tagging-4.yaml
index 7f3b7a1..d9cc4bc 100644 (file)
--- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_mpls_tagging-4.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_mpls_tagging-4.yaml
@@ -27,13 +27,13 @@ scenarios:
 
   options:
     vnf__0:
-      prox_path: /root/dppd-PROX-v037/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/handle_mpls_tag_untag-4.cfg"
       prox_args:
         "-t": ""
 
     tg__0:
-      prox_path: /root/dppd-PROX-v037/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/gen_mpls_tag_untag-4.cfg"
       prox_args:
         "-e": ""

diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_vpe-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_vpe-4.yaml
index 85a03e3..4e2e70b 100644 (file)
--- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_vpe-4.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_vpe-4.yaml
@@ -27,7 +27,7 @@ scenarios:
 
   options:
     vnf__0:
-      prox_path: /root/dppd-PROX-v037.1/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/handle_vpe-4.cfg"
       prox_args:
         "-t": ""
@@ -40,7 +40,7 @@ scenarios:
       prox_generate_parameter: True
 
     tg__0:
-      prox_path: /root/dppd-PROX-v037.1/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/gen_vpe-4.cfg"
       prox_args:
         "-e": ""