prox testcases: private -> uplink,public -> downlink, vnf_0, tg_0

[yardstick.git] / samples / vnf_samples / nsut / prox / tc_prox_heat_context_acl-2.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 5310a5c..b235173 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
@@ -22,18 +22,18 @@ scenarios:
   topology: prox-tg-topology-2.yaml
 
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
+    tg__0: tg_0.yardstick
+    vnf__0: vnf_0.yardstick
 
   options:
-    vnf__1:
+    vnf__0:
       prox_path: /root/dppd-PROX-v037/build/prox
       prox_config: "configs/handle_acl-2.cfg"
       prox_args:
         "-t": ""
       prox_files: "configs/acl_rules-2.lua"
 
-    tg__1:
+    tg__0:
       prox_path: /root/dppd-PROX-v037/build/prox
       prox_config: "configs/gen_acl-2.cfg"
       prox_args:
@@ -47,44 +47,42 @@ scenarios:
 
 context:
   name: yardstick
-  image: yardstick-image-prox-dpdk1702
+  image: yardstick-samplevnfs
   user: ubuntu
-  flavor:
-    name: yardstick-dpdk-flavor
-    vcpus: 3
-    ram: 20480
-    disk: 4
-    extra_specs:
-      hw:cpu_sockets: 1
-      hw:cpu_cores: 3
-      hw:cpu_threads: 1
+  flavor: yardstick-dpdk-flavor
+#  flavor:
+#    name: yardstick-dpdk-flavor
+#    vcpus: 10
+#    ram: 20480
+#    disk: 6
+#    extra_specs:
+#      hw:cpu_sockets: 1
+#      hw:cpu_cores: 10
+#      hw:cpu_threads: 1
 #      hw:mem_page_size: large
   placement_groups:
     pgrp1:
       policy: "availability"
 
   servers:
-    vnf:
+    vnf_0:
       floating_ip: true
       placement: "pgrp1"
-    trafficgen_1:
+    tg_0:
       floating_ip: true
       placement: "pgrp1"
 
   networks:
     mgmt:
       cidr: '10.0.1.0/24'
-      external_network: "yardstick-public"
-    xe0:
+    uplink_0:
       cidr: '10.0.2.0/24'
-      vld_id: public
-      allowed_address_pairs:
-        - ip_address:
-            '0.0.0.0/0'
-    xe1:
+      gateway_ip: 'null'
+      port_security_enabled: False
+      enable_dhcp: 'false'
+    downlink_0:
       cidr: '10.0.3.0/24'
-      vld_id: private
-      allowed_address_pairs:
-        - ip_address:
-            '0.0.0.0/0'
+      gateway_ip: 'null'
+      port_security_enabled: False
+      enable_dhcp: 'false'