Merge "NSB test: remove vld_id it is not needed"

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: