summaryrefslogtreecommitdiffstats
path: root/samples/vnf_samples
diff options
context:
space:
mode:
authorRoss Brattain <ross.b.brattain@intel.com>2017-08-27 13:39:25 -0700
committerRoss Brattain <ross.b.brattain@intel.com>2017-09-18 01:28:28 -0700
commit473fc755673fec80ad15b55e423b53333a74f164 (patch)
tree166502120734eb46d7ad780954e1a9f0dc739af4 /samples/vnf_samples
parentf8457bdfaa283ec9e5359b69b0fdb684689782d6 (diff)
NSB test: remove vld_id it is not needed
we get vld_id from the topology, we don't need it in Heat context Change-Id: I42c2309dda919e5b2026065dda851555df76ba57 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
Diffstat (limited to 'samples/vnf_samples')
-rw-r--r--samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex.yaml2
-rw-r--r--samples/vnf_samples/nsut/acl/tc_heat_trex_external_rfc2544_ipv4_1rule_1flow_64B_packetsize.yaml2
-rw-r--r--samples/vnf_samples/nsut/cgnapt/tc_heat_external_rfc2544_ipv4_1flow_64B_trex.yaml2
-rw-r--r--samples/vnf_samples/nsut/cgnapt/tc_heat_rfc2544_ipv4_1flow_64B_trex.yaml2
-rw-r--r--samples/vnf_samples/nsut/ping/tc_external_ping_heat_context.yaml2
-rw-r--r--samples/vnf_samples/nsut/ping/tc_ping_heat_context.yaml2
-rw-r--r--samples/vnf_samples/nsut/vfw/tc_heat_external_rfc2544_ipv4_1rule_1flow_64B_trex.yaml2
-rw-r--r--samples/vnf_samples/nsut/vfw/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex.yaml2
8 files changed, 0 insertions, 16 deletions
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 3c92e877f..f39d1be9e 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
@@ -67,7 +67,6 @@ context:
cidr: '10.0.1.0/24'
xe0:
cidr: '10.0.2.0/24'
- vld_id: public_1
gateway_ip: 'null'
# port_security_enabled: False
allowed_address_pairs:
@@ -75,7 +74,6 @@ context:
'0.0.0.0/0'
xe1:
cidr: '10.0.3.0/24'
- vld_id: private_1
gateway_ip: 'null'
# port_security_enabled: False
allowed_address_pairs:
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 06bea4ec5..982c0371d 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
@@ -68,14 +68,12 @@ contexts:
cidr: '10.0.1.0/24'
xe0:
cidr: '10.0.2.0/24'
- vld_id: public_1
gateway_ip: 'null'
provider: true
physical_network: phystenant1
port_security_enabled: False
xe1:
cidr: '10.0.3.0/24'
- vld_id: private_1
gateway_ip: 'null'
provider: true
physical_network: phystenant2
diff --git a/samples/vnf_samples/nsut/cgnapt/tc_heat_external_rfc2544_ipv4_1flow_64B_trex.yaml b/samples/vnf_samples/nsut/cgnapt/tc_heat_external_rfc2544_ipv4_1flow_64B_trex.yaml
index 0ad7898a1..c62e89f40 100644
--- a/samples/vnf_samples/nsut/cgnapt/tc_heat_external_rfc2544_ipv4_1flow_64B_trex.yaml
+++ b/samples/vnf_samples/nsut/cgnapt/tc_heat_external_rfc2544_ipv4_1flow_64B_trex.yaml
@@ -66,14 +66,12 @@ contexts:
cidr: '10.0.1.0/24'
xe0:
cidr: '10.0.2.0/24'
- vld_id: public_1
gateway_ip: 'null'
provider: true
physical_network: phystenant1
port_security_enabled: False
xe1:
cidr: '10.0.3.0/24'
- vld_id: private_1
gateway_ip: 'null'
provider: true
physical_network: phystenant2
diff --git a/samples/vnf_samples/nsut/cgnapt/tc_heat_rfc2544_ipv4_1flow_64B_trex.yaml b/samples/vnf_samples/nsut/cgnapt/tc_heat_rfc2544_ipv4_1flow_64B_trex.yaml
index 516c727de..8e8424891 100644
--- a/samples/vnf_samples/nsut/cgnapt/tc_heat_rfc2544_ipv4_1flow_64B_trex.yaml
+++ b/samples/vnf_samples/nsut/cgnapt/tc_heat_rfc2544_ipv4_1flow_64B_trex.yaml
@@ -66,7 +66,6 @@ context:
cidr: '10.0.1.0/24'
xe0:
cidr: '10.0.2.0/24'
- vld_id: public_1
gateway_ip: 'null'
# port_security_enabled: False
allowed_address_pairs:
@@ -74,7 +73,6 @@ context:
'0.0.0.0/0'
xe1:
cidr: '10.0.3.0/24'
- vld_id: private_1
gateway_ip: 'null'
# port_security_enabled: False
allowed_address_pairs:
diff --git a/samples/vnf_samples/nsut/ping/tc_external_ping_heat_context.yaml b/samples/vnf_samples/nsut/ping/tc_external_ping_heat_context.yaml
index 8826f539e..c5a52f27e 100644
--- a/samples/vnf_samples/nsut/ping/tc_external_ping_heat_context.yaml
+++ b/samples/vnf_samples/nsut/ping/tc_external_ping_heat_context.yaml
@@ -50,11 +50,9 @@ contexts:
external_network: "yardstick-public"
xe0:
cidr: '10.0.2.0/24'
- vld_id: public
xe1:
cidr: '10.0.3.0/24'
- vld_id: private
- name: baremetal
type: Node
diff --git a/samples/vnf_samples/nsut/ping/tc_ping_heat_context.yaml b/samples/vnf_samples/nsut/ping/tc_ping_heat_context.yaml
index d6f096b55..e6bf44311 100644
--- a/samples/vnf_samples/nsut/ping/tc_ping_heat_context.yaml
+++ b/samples/vnf_samples/nsut/ping/tc_ping_heat_context.yaml
@@ -53,9 +53,7 @@ context:
external_network: "yardstick-public"
xe0:
cidr: '10.0.2.0/24'
- vld_id: public
xe1:
cidr: '10.0.3.0/24'
- vld_id: private
diff --git a/samples/vnf_samples/nsut/vfw/tc_heat_external_rfc2544_ipv4_1rule_1flow_64B_trex.yaml b/samples/vnf_samples/nsut/vfw/tc_heat_external_rfc2544_ipv4_1rule_1flow_64B_trex.yaml
index 3e323d9c9..cab0b9a14 100644
--- a/samples/vnf_samples/nsut/vfw/tc_heat_external_rfc2544_ipv4_1rule_1flow_64B_trex.yaml
+++ b/samples/vnf_samples/nsut/vfw/tc_heat_external_rfc2544_ipv4_1rule_1flow_64B_trex.yaml
@@ -67,14 +67,12 @@ contexts:
cidr: '10.0.1.0/24'
xe0:
cidr: '10.0.2.0/24'
- vld_id: public_1
gateway_ip: 'null'
provider: true
physical_network: phystenant1
port_security_enabled: False
xe1:
cidr: '10.0.3.0/24'
- vld_id: private_1
gateway_ip: 'null'
provider: true
physical_network: phystenant2
diff --git a/samples/vnf_samples/nsut/vfw/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex.yaml b/samples/vnf_samples/nsut/vfw/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex.yaml
index 82e89a2a4..13fb850ab 100644
--- a/samples/vnf_samples/nsut/vfw/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex.yaml
+++ b/samples/vnf_samples/nsut/vfw/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex.yaml
@@ -67,7 +67,6 @@ context:
cidr: '10.0.1.0/24'
xe0:
cidr: '10.0.2.0/24'
- vld_id: public_1
gateway_ip: 'null'
# port_security_enabled: False
allowed_address_pairs:
@@ -75,7 +74,6 @@ context:
'0.0.0.0/0'
xe1:
cidr: '10.0.3.0/24'
- vld_id: private_1
gateway_ip: 'null'
# port_security_enabled: False
allowed_address_pairs: