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/acl/acl-tg-topology-3node.yaml | 30 +++++++++++----------- samples/vnf_samples/nsut/acl/acl-tg-topology.yaml | 20 +++++++-------- .../nsut/acl/acl_vnf_topology_ixia.yaml | 20 +++++++-------- .../nsut/acl/acl_vnf_topology_ixload.yaml | 20 +++++++-------- samples/vnf_samples/nsut/acl/ixia_traffic.cfg | 4 +-- ..._http_ixload_1b_Requests-65000_Concurrency.yaml | 10 ++++---- ...aremetal_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml | 10 ++++---- ...al_rfc2544_ipv4_1rule_1flow_64B_packetsize.yaml | 10 ++++---- ...aremetal_rfc2544_ipv4_1rule_1flow_64B_trex.yaml | 10 ++++---- ...pv4_1rule_1flow_64B_trex_corelated_traffic.yaml | 10 ++++---- ...rfc2544_ipv4_1rule_1flow_64B_trex_scale_up.yaml | 10 ++++---- ...rfc2544_ipv4_worstcaserules_1flow_64B_trex.yaml | 10 ++++---- ...544_with_latency_ipv4_1rule_1flow_64B_trex.yaml | 10 ++++---- .../tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex.yaml | 10 ++++---- ...al_rfc2544_ipv4_1rule_1flow_64B_packetsize.yaml | 10 ++++---- 15 files changed, 97 insertions(+), 97 deletions(-) (limited to 'samples/vnf_samples/nsut/acl') diff --git a/samples/vnf_samples/nsut/acl/acl-tg-topology-3node.yaml b/samples/vnf_samples/nsut/acl/acl-tg-topology-3node.yaml index 36cb2e88b..b51f3eb04 100644 --- a/samples/vnf_samples/nsut/acl/acl-tg-topology-3node.yaml +++ b/samples/vnf_samples/nsut/acl/acl-tg-topology-3node.yaml @@ -20,43 +20,43 @@ nsd:nsd-catalog: description: 3tg-topology constituent-vnfd: - member-vnf-index: '1' - vnfd-id-ref: tg__1 + vnfd-id-ref: tg__0 VNF model: ../../vnf_descriptors/tg_rfc2544_tpl.yaml #VNF type - member-vnf-index: '2' - vnfd-id-ref: vnf__1 + vnfd-id-ref: vnf__0 VNF model: ../../vnf_descriptors/acl_vnf.yaml #VNF type - member-vnf-index: '3' - vnfd-id-ref: tg__2 + vnfd-id-ref: tg__1 VNF model: ../../vnf_descriptors/udp_replay_vnf.yaml #VNF type vld: - - id: private_1 - name: tg__1 to vnf__1 link 1 + - id: uplink_0 + name: tg__0 to vnf__0 link 1 type: ELAN vnfd-connection-point-ref: - member-vnf-index-ref: '1' vnfd-connection-point-ref: xe0 - vnfd-id-ref: tg__1 + vnfd-id-ref: tg__0 - member-vnf-index-ref: '2' vnfd-connection-point-ref: xe0 - vnfd-id-ref: vnf__1 - - id: private_2 - name: tg__1 to vnf__1 link 2 + vnfd-id-ref: vnf__0 + - id: uplink_1 + name: tg__0 to vnf__0 link 2 type: ELAN vnfd-connection-point-ref: - member-vnf-index-ref: '1' vnfd-connection-point-ref: xe1 - vnfd-id-ref: tg__1 + vnfd-id-ref: tg__0 - member-vnf-index-ref: '1' vnfd-connection-point-ref: xe1 - vnfd-id-ref: tg__1 - - id: public_1 - name: vnf__1 to tg__2 link 2 + vnfd-id-ref: tg__0 + - id: downlink_0 + name: vnf__0 to tg__1 link 2 type: ELAN vnfd-connection-point-ref: - member-vnf-index-ref: '2' vnfd-connection-point-ref: xe1 - vnfd-id-ref: vnf__1 + vnfd-id-ref: vnf__0 - member-vnf-index-ref: '3' vnfd-connection-point-ref: xe0 - vnfd-id-ref: tg__2 + vnfd-id-ref: tg__1 diff --git a/samples/vnf_samples/nsut/acl/acl-tg-topology.yaml b/samples/vnf_samples/nsut/acl/acl-tg-topology.yaml index 9bc3e8559..00666092f 100644 --- a/samples/vnf_samples/nsut/acl/acl-tg-topology.yaml +++ b/samples/vnf_samples/nsut/acl/acl-tg-topology.yaml @@ -20,31 +20,31 @@ nsd:nsd-catalog: description: 3tg-topology constituent-vnfd: - member-vnf-index: '1' - vnfd-id-ref: tg__1 + vnfd-id-ref: tg__0 VNF model: ../../vnf_descriptors/tg_rfc2544_tpl.yaml #VNF type - member-vnf-index: '2' - vnfd-id-ref: vnf__1 + vnfd-id-ref: vnf__0 VNF model: ../../vnf_descriptors/acl_vnf.yaml #VNF type vld: - - id: private_1 - name: tg__1 to vnf__1 link 1 + - id: uplink_0 + name: tg__0 to vnf__0 link 1 type: ELAN vnfd-connection-point-ref: - member-vnf-index-ref: '1' vnfd-connection-point-ref: xe0 - vnfd-id-ref: tg__1 + vnfd-id-ref: tg__0 - member-vnf-index-ref: '2' vnfd-connection-point-ref: xe0 - vnfd-id-ref: vnf__1 + vnfd-id-ref: vnf__0 - - id: public_1 - name: vnf__1 to tg__1 link 2 + - id: downlink_0 + name: vnf__0 to tg__0 link 2 type: ELAN vnfd-connection-point-ref: - member-vnf-index-ref: '2' vnfd-connection-point-ref: xe1 - vnfd-id-ref: vnf__1 + vnfd-id-ref: vnf__0 - member-vnf-index-ref: '1' vnfd-connection-point-ref: xe1 - vnfd-id-ref: tg__1 + vnfd-id-ref: tg__0 diff --git a/samples/vnf_samples/nsut/acl/acl_vnf_topology_ixia.yaml b/samples/vnf_samples/nsut/acl/acl_vnf_topology_ixia.yaml index 606d557e9..e6932acbd 100644 --- a/samples/vnf_samples/nsut/acl/acl_vnf_topology_ixia.yaml +++ b/samples/vnf_samples/nsut/acl/acl_vnf_topology_ixia.yaml @@ -20,31 +20,31 @@ nsd:nsd-catalog: description: scenario with VACL,L3fwd and VNF constituent-vnfd: - member-vnf-index: '1' - vnfd-id-ref: tg__1 + vnfd-id-ref: tg__0 VNF model: ../../vnf_descriptors/ixia_rfc2544_tpl.yaml - member-vnf-index: '2' - vnfd-id-ref: vnf__1 + vnfd-id-ref: vnf__0 VNF model: ../../vnf_descriptors/acl_vnf.yaml vld: - - id: private_1 - name: tg__1 to vnf__1 link 1 + - id: uplink_0 + name: tg__0 to vnf__0 link 1 type: ELAN vnfd-connection-point-ref: - member-vnf-index-ref: '1' vnfd-connection-point-ref: xe0 - vnfd-id-ref: tg__1 #TREX + vnfd-id-ref: tg__0 #TREX - member-vnf-index-ref: '2' vnfd-connection-point-ref: xe0 - vnfd-id-ref: vnf__1 #VNF + vnfd-id-ref: vnf__0 #VNF - - id: public_1 - name: vnf__1 to tg__1 link 2 + - id: downlink_0 + name: vnf__0 to tg__0 link 2 type: ELAN vnfd-connection-point-ref: - member-vnf-index-ref: '2' vnfd-connection-point-ref: xe1 - vnfd-id-ref: vnf__1 #L3fwd + vnfd-id-ref: vnf__0 #L3fwd - member-vnf-index-ref: '1' vnfd-connection-point-ref: xe1 - vnfd-id-ref: tg__1 #VACL VNF + vnfd-id-ref: tg__0 #VACL VNF diff --git a/samples/vnf_samples/nsut/acl/acl_vnf_topology_ixload.yaml b/samples/vnf_samples/nsut/acl/acl_vnf_topology_ixload.yaml index 2fc173aed..97a316625 100644 --- a/samples/vnf_samples/nsut/acl/acl_vnf_topology_ixload.yaml +++ b/samples/vnf_samples/nsut/acl/acl_vnf_topology_ixload.yaml @@ -20,31 +20,31 @@ nsd:nsd-catalog: description: scenario with HTTP and vACL VNF constituent-vnfd: - member-vnf-index: '1' - vnfd-id-ref: tg__1 + vnfd-id-ref: tg__0 VNF model: ../../vnf_descriptors/tg_ixload.yaml - member-vnf-index: '2' - vnfd-id-ref: vnf__1 + vnfd-id-ref: vnf__0 VNF model: ../../vnf_descriptors/acl_vnf.yaml vld: - - id: private_1 - name: tg__1 to vnf__1 link 1 + - id: uplink_0 + name: tg__0 to vnf__0 link 1 type: ELAN vnfd-connection-point-ref: - member-vnf-index-ref: '1' vnfd-connection-point-ref: xe0 - vnfd-id-ref: tg__1 # HTTP Client + vnfd-id-ref: tg__0 # HTTP Client - member-vnf-index-ref: '2' vnfd-connection-point-ref: xe0 - vnfd-id-ref: vnf__1 # VNF + vnfd-id-ref: vnf__0 # VNF - - id: public_1 - name: vnf__1 to tg__1 link 2 + - id: downlink_0 + name: vnf__0 to tg__0 link 2 type: ELAN vnfd-connection-point-ref: - member-vnf-index-ref: '2' vnfd-connection-point-ref: xe1 - vnfd-id-ref: vnf__1 # HTTP Server + vnfd-id-ref: vnf__0 # HTTP Server - member-vnf-index-ref: '1' vnfd-connection-point-ref: xe1 - vnfd-id-ref: tg__1 # VACL VNF + vnfd-id-ref: tg__0 # VACL VNF diff --git a/samples/vnf_samples/nsut/acl/ixia_traffic.cfg b/samples/vnf_samples/nsut/acl/ixia_traffic.cfg index f749865c5..3f7e33471 100644 --- a/samples/vnf_samples/nsut/acl/ixia_traffic.cfg +++ b/samples/vnf_samples/nsut/acl/ixia_traffic.cfg @@ -1,5 +1,5 @@ { - "private_1": { + "uplink_0": { "id": 1, "bidir": "False", "duration": 60, @@ -23,7 +23,7 @@ }, "traffic_type": "continuous" }, - "public_1": { + "downlink_0": { "id": 2, "bidir": "False", "duration": 60, diff --git a/samples/vnf_samples/nsut/acl/tc_baremetal_http_ixload_1b_Requests-65000_Concurrency.yaml b/samples/vnf_samples/nsut/acl/tc_baremetal_http_ixload_1b_Requests-65000_Concurrency.yaml index 1220cae73..31ee32b7b 100644 --- a/samples/vnf_samples/nsut/acl/tc_baremetal_http_ixload_1b_Requests-65000_Concurrency.yaml +++ b/samples/vnf_samples/nsut/acl/tc_baremetal_http_ixload_1b_Requests-65000_Concurrency.yaml @@ -19,18 +19,18 @@ scenarios: traffic_profile: "../../traffic_profiles/http_tests/HTTP_1b-requests_65000_concurrency.yaml" topology: acl_vnf_topology_ixload.yaml nodes: - tg__1: trafficgen_1.yardstick - vnf__1: vnf.yardstick + tg__0: trafficgen_1.yardstick + vnf__0: vnf.yardstick options: framesize: private: {64B: 100} public: {64B: 100} flow: - src_ip: [{'tg__1': 'xe0'}] - dst_ip: [{'tg__1': 'xe1'}] + src_ip: [{'tg__0': 'xe0'}] + dst_ip: [{'tg__0': 'xe1'}] count: 1 traffic_type: 4 - vnf__1: + vnf__0: rules: acl_1rule.yaml vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1} nfvi_enable: True diff --git a/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml b/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml index 7359c6257..2da7d6675 100644 --- a/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml +++ b/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml @@ -19,20 +19,20 @@ scenarios: traffic_profile: "../../traffic_profiles/ixia_ipv4_latency.yaml" topology: acl_vnf_topology_ixia.yaml nodes: - tg__1: trafficgen_1.yardstick - vnf__1: vnf.yardstick + tg__0: trafficgen_1.yardstick + vnf__0: vnf.yardstick options: framesize: private: {64B: 100} public: {64B: 100} flow: - src_ip: [{'tg__1': 'xe0'}] - dst_ip: [{'tg__1': 'xe1'}] + src_ip: [{'tg__0': 'xe0'}] + dst_ip: [{'tg__0': 'xe1'}] count: 1 traffic_type: 4 rfc2544: allowed_drop_rate: 0.0001 - 0.0001 - vnf__1: + vnf__0: rules: acl_1rule.yaml vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1} nfvi_enable: True diff --git a/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_packetsize.yaml b/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_packetsize.yaml index 2503add5e..088ef5474 100644 --- a/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_packetsize.yaml +++ b/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_packetsize.yaml @@ -19,20 +19,20 @@ scenarios: traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml topology: acl-tg-topology.yaml nodes: - tg__1: trafficgen_1.yardstick - vnf__1: vnf.yardstick + tg__0: trafficgen_1.yardstick + vnf__0: vnf.yardstick options: framesize: private: {64B: 100} public: {64B: 100} flow: - src_ip: [{'tg__1': 'xe0'}] - dst_ip: [{'tg__1': 'xe1'}] + src_ip: [{'tg__0': 'xe0'}] + dst_ip: [{'tg__0': 'xe1'}] count: 1 traffic_type: 4 rfc2544: allowed_drop_rate: 0.0001 - 0.0001 - vnf__1: + vnf__0: rules: acl_1rule.yaml vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1} nfvi_enable: True diff --git a/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex.yaml b/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex.yaml index eb0dcb63d..3e1345a17 100644 --- a/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex.yaml +++ b/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex.yaml @@ -19,20 +19,20 @@ scenarios: traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml topology: acl-tg-topology.yaml nodes: - tg__1: trafficgen_1.yardstick - vnf__1: vnf.yardstick + tg__0: trafficgen_1.yardstick + vnf__0: vnf.yardstick options: framesize: private: {64B: 100} public: {64B: 100} flow: - src_ip: [{'tg__1': 'xe0'}] - dst_ip: [{'tg__1': 'xe1'}] + src_ip: [{'tg__0': 'xe0'}] + dst_ip: [{'tg__0': 'xe1'}] count: 1 traffic_type: 4 rfc2544: allowed_drop_rate: 0.0001 - 0.0001 - vnf__1: + vnf__0: rules: acl_1rule.yaml vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1} nfvi_enable: True diff --git a/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex_corelated_traffic.yaml b/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex_corelated_traffic.yaml index 1261aa0c8..9753812ac 100644 --- a/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex_corelated_traffic.yaml +++ b/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex_corelated_traffic.yaml @@ -19,22 +19,22 @@ scenarios: traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml topology: acl-tg-topology-3node.yaml nodes: - tg__1: trafficgen_1.yardstick - vnf__1: vnf.yardstick - tg__2: trafficgen_2.yardstick + tg__0: trafficgen_1.yardstick + vnf__0: vnf.yardstick + tg__1: trafficgen_2.yardstick options: framesize: private: {64B: 100} public: {64B: 100} flow: - src_ip: [{'tg__1': 'xe0'}] + src_ip: [{'tg__0': 'xe0'}] dst_ip: [{'tg__1': 'xe1'}] count: 1 traffic_type: 4 rfc2544: allowed_drop_rate: 0.0001 - 0.0001 correlated_traffic: true - vnf__1: + vnf__0: rules: acl_1rule.yaml vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1} nfvi_enable: True diff --git a/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex_scale_up.yaml b/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex_scale_up.yaml index ce9ada745..5bd0f175b 100644 --- a/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex_scale_up.yaml +++ b/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex_scale_up.yaml @@ -20,20 +20,20 @@ scenarios: traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml topology: acl-tg-topology.yaml nodes: - tg__1: trafficgen_1.yardstick - vnf__1: vnf.yardstick + tg__0: trafficgen_1.yardstick + vnf__0: vnf.yardstick options: framesize: private: {64B: 100} public: {64B: 100} flow: - src_ip: [{'tg__1': 'xe0'}] - dst_ip: [{'tg__1': 'xe1'}] + src_ip: [{'tg__0': 'xe0'}] + dst_ip: [{'tg__0': 'xe1'}] count: 1 traffic_type: 4 rfc2544: allowed_drop_rate: 0.0001 - 0.0001 - vnf__1: + vnf__0: rules: acl_1rule.yaml vnf_config: {lb_config: 'HW', lb_count: 1, worker_config: '1C/1T', worker_threads: {{worker_thread}}} nfvi_enable: True diff --git a/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_worstcaserules_1flow_64B_trex.yaml b/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_worstcaserules_1flow_64B_trex.yaml index eb0dcb63d..3e1345a17 100644 --- a/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_worstcaserules_1flow_64B_trex.yaml +++ b/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_worstcaserules_1flow_64B_trex.yaml @@ -19,20 +19,20 @@ scenarios: traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml topology: acl-tg-topology.yaml nodes: - tg__1: trafficgen_1.yardstick - vnf__1: vnf.yardstick + tg__0: trafficgen_1.yardstick + vnf__0: vnf.yardstick options: framesize: private: {64B: 100} public: {64B: 100} flow: - src_ip: [{'tg__1': 'xe0'}] - dst_ip: [{'tg__1': 'xe1'}] + src_ip: [{'tg__0': 'xe0'}] + dst_ip: [{'tg__0': 'xe1'}] count: 1 traffic_type: 4 rfc2544: allowed_drop_rate: 0.0001 - 0.0001 - vnf__1: + vnf__0: rules: acl_1rule.yaml vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1} nfvi_enable: True diff --git a/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_with_latency_ipv4_1rule_1flow_64B_trex.yaml b/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_with_latency_ipv4_1rule_1flow_64B_trex.yaml index e06ab8f2d..1cf37ca26 100644 --- a/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_with_latency_ipv4_1rule_1flow_64B_trex.yaml +++ b/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_with_latency_ipv4_1rule_1flow_64B_trex.yaml @@ -19,20 +19,20 @@ scenarios: traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml topology: acl-tg-topology.yaml nodes: - tg__1: trafficgen_1.yardstick - vnf__1: vnf.yardstick + tg__0: trafficgen_1.yardstick + vnf__0: vnf.yardstick options: framesize: private: {64B: 100} public: {64B: 100} flow: - src_ip: [{'tg__1': 'xe0'}] - dst_ip: [{'tg__1': 'xe1'}] + src_ip: [{'tg__0': 'xe0'}] + dst_ip: [{'tg__0': 'xe1'}] count: 1 traffic_type: 4 rfc2544: allowed_drop_rate: 0.0001 - 0.0001 - vnf__1: + vnf__0: rules: acl_1rule.yaml vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1} nfvi_enable: True diff --git a/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex.yaml b/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex.yaml index f39d1be9e..c335c263a 100644 --- a/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex.yaml +++ b/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex.yaml @@ -19,20 +19,20 @@ scenarios: traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml topology: acl-tg-topology.yaml nodes: - tg__1: trafficgen_1.yardstick - vnf__1: vnf.yardstick + tg__0: trafficgen_1.yardstick + vnf__0: vnf.yardstick options: framesize: private: {64B: 100} public: {64B: 100} flow: - src_ip: [{'tg__1': 'xe0'}] - dst_ip: [{'tg__1': 'xe1'}] + src_ip: [{'tg__0': 'xe0'}] + dst_ip: [{'tg__0': 'xe1'}] count: 1 traffic_type: 4 rfc2544: allowed_drop_rate: 0.0001 - 0.0001 - vnf__1: + vnf__0: rules: acl_1rule.yaml vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1} runner: diff --git a/samples/vnf_samples/nsut/acl/tc_heat_trex_external_rfc2544_ipv4_1rule_1flow_64B_packetsize.yaml b/samples/vnf_samples/nsut/acl/tc_heat_trex_external_rfc2544_ipv4_1rule_1flow_64B_packetsize.yaml index 982c0371d..f0869ecf8 100644 --- a/samples/vnf_samples/nsut/acl/tc_heat_trex_external_rfc2544_ipv4_1rule_1flow_64B_packetsize.yaml +++ b/samples/vnf_samples/nsut/acl/tc_heat_trex_external_rfc2544_ipv4_1rule_1flow_64B_packetsize.yaml @@ -19,20 +19,20 @@ scenarios: traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml topology: acl-tg-topology.yaml nodes: - tg__1: trafficgen_1.baremetal - vnf__1: vnf.yardstick + tg__0: trafficgen_1.baremetal + vnf__0: vnf.yardstick options: framesize: private: {64B: 100} public: {64B: 100} flow: - src_ip: [{'tg__1': 'xe0'}] - dst_ip: [{'tg__1': 'xe1'}] + src_ip: [{'tg__0': 'xe0'}] + dst_ip: [{'tg__0': 'xe1'}] count: 1 traffic_type: 4 rfc2544: allowed_drop_rate: 0.0001 - 0.0001 - vnf__1: + vnf__0: rules: acl_1rule.yaml vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1} nfvi_enable: True -- cgit 1.2.3-korg