diff options
| author |   Ross Brattain <ross.b.brattain@intel.com> | 2017-09-20 02:54:09 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-09-20 02:54:09 +0000 |
| commit | 15c9412c5a260a6bff2c015ed61af7042b905a20 (patch) | |
| tree | 85e35837cb52fe9d989c83d2555095c40303f6cc /samples/vnf_samples/nsut/prox/tc_prox_heat_context_acl-4.yaml | |
| parent | 9a8de3b337c45da22706cac29bc31cda9cf63fa9 (diff) | |
| parent | 2f91af47b61f90230708e5c64c6b1b434484b976 (diff) | |
Merge "prox testcases: private -> uplink,public -> downlink, vnf_0, tg_0"
Diffstat (limited to 'samples/vnf_samples/nsut/prox/tc_prox_heat_context_acl-4.yaml')
| -rw-r--r-- | samples/vnf_samples/nsut/prox/tc_prox_heat_context_acl-4.yaml | 23 |
1 files changed, 9 insertions, 14 deletions
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 9ede5a060..125d463aa 100644 --- 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 @@ -22,8 +22,8 @@ scenarios: topology: prox-tg-topology-4.yaml nodes: - tg__0: trafficgen_1.yardstick - vnf__0: vnf.yardstick + tg__0: tg_0.yardstick + vnf__0: vnf_0.yardstick options: vnf__0: @@ -47,7 +47,7 @@ scenarios: context: name: yardstick - image: yardstick-image-prox-dpdk1702 + image: yardstick-samplevnfs user: ubuntu flavor: name: yardstick-dpdk-flavor @@ -64,38 +64,33 @@ context: 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: downlink allowed_address_pairs: - ip_address: '0.0.0.0/0' - xe1: + downlink_0: cidr: '10.0.3.0/24' - vld_id: uplink allowed_address_pairs: - ip_address: '0.0.0.0/0' - xe2: + uplink_1: cidr: '10.0.4.0/24' - vld_id: downlink allowed_address_pairs: - ip_address: '0.0.0.0/0' - xe3: + downlink_1: cidr: '10.0.5.0/24' - vld_id: uplink allowed_address_pairs: - ip_address: '0.0.0.0/0' |