From ae0cdbea1100a09d0c46191dd7e5d8d5eec8d484 Mon Sep 17 00:00:00 2001 From: Ross Brattain Date: Tue, 12 Sep 2017 09:57:38 -0700 Subject: NSB: count from 0, vnf_0, tg_9, private->uplink, public->downlink Also rename private to uplink, public to downlink for scale-out template we need to count from 0 so we can use range() without +1/-1 errors vnf_0, vnf_1 tg_0, tg_1 also fix Ixia defaults Change-Id: I6aecfbb95f99af20f012a9df19c19be77d1b5b77 Signed-off-by: Ross Brattain Signed-off-by: Edward MacGillivray --- .../nsut/prox/tc_prox_heat_context_acl-4.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'samples/vnf_samples/nsut/prox/tc_prox_heat_context_acl-4.yaml') 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 5ed96736c..9ede5a060 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,18 +22,18 @@ scenarios: topology: prox-tg-topology-4.yaml nodes: - tg__1: trafficgen_1.yardstick - vnf__1: vnf.yardstick + tg__0: trafficgen_1.yardstick + vnf__0: vnf.yardstick options: - vnf__1: + vnf__0: prox_path: /root/dppd-PROX-v037/build/prox prox_config: "configs/handle_acl-4.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-4.cfg" prox_args: @@ -77,25 +77,25 @@ context: external_network: "yardstick-public" xe0: cidr: '10.0.2.0/24' - vld_id: public + vld_id: downlink allowed_address_pairs: - ip_address: '0.0.0.0/0' xe1: cidr: '10.0.3.0/24' - vld_id: private + vld_id: uplink allowed_address_pairs: - ip_address: '0.0.0.0/0' xe2: cidr: '10.0.4.0/24' - vld_id: public + vld_id: downlink allowed_address_pairs: - ip_address: '0.0.0.0/0' xe3: cidr: '10.0.5.0/24' - vld_id: private + vld_id: uplink allowed_address_pairs: - ip_address: '0.0.0.0/0' -- cgit 1.2.3-korg