X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ice_validator%2Ftests%2Ffixtures%2Ftest_allowed_address_pairs_include_vm_type_network_role%2Fpass%2Fpass.yaml;fp=ice_validator%2Ftests%2Ffixtures%2Ftest_allowed_address_pairs_include_vm_type_network_role%2Fpass%2Fneutron%2Fvalid_template.yaml;h=d7cbd549682066df70d61cc251b24e6905343059;hb=9c7ab065e6477c035ffc6addf384abcef2e9588a;hp=58444b39ee7f7e544ff2a51319f205dbd91c5e36;hpb=dd0d480978570b4222206bc04edd271c39b88b44;p=vvp%2Fvalidation-scripts.git

diff --git a/ice_validator/tests/fixtures/test_allowed_address_pairs_include_vm_type_network_role/pass/neutron/valid_template.yaml b/ice_validator/tests/fixtures/test_allowed_address_pairs_include_vm_type_network_role/pass/pass.yaml
similarity index 72%
rename from ice_validator/tests/fixtures/test_allowed_address_pairs_include_vm_type_network_role/pass/neutron/valid_template.yaml
rename to ice_validator/tests/fixtures/test_allowed_address_pairs_include_vm_type_network_role/pass/pass.yaml
index 58444b3..d7cbd54 100644
--- a/ice_validator/tests/fixtures/test_allowed_address_pairs_include_vm_type_network_role/pass/neutron/valid_template.yaml
+++ b/ice_validator/tests/fixtures/test_allowed_address_pairs_include_vm_type_network_role/pass/pass.yaml
@@ -87,37 +87,33 @@ parameters:
     type: string
     description: network id for the internal network intranet 
 
-  db_int_intranet_ip_0:
+  db_int_intranet_floating_ip:
     type: string
-    description: db_int_intranet_ip_0
+    description: db_int_intranet_floating_ip
 
-  db_int_intranet_v6_ip_0:
+  db_int_intranet_floating_v6_ip:
     type: string
-    description: db_int_intranet_v6_ip_0
+    description: db_int_intranet_floating_v6_ip
 
-  db_int_intranet_ips:
+  db_int_intranet_floating_ips:
     type: comma_delimited_list
-    description: db_int_intranet_ips
+    description: db_int_intranet_floating_ips
 
-  db_int_intranet_v6_ips:
+  db_int_intranet_floating_v6_ips:
     type: comma_delimited_list
-    description: db_int_intranet_v6_ips
+    description: db_int_intranet_floating_v6_ips
 
   db_int_intranet_floating_ip:
     type: string
     description: db_int_intranet_floating_ip
 
-  db_int_intranet_floating_v6_ip:
-    type: string
-    description: db_int_intranet_floating_v6_ip
-
-  lb_extnet_ip_0:
+  lb_extnet_floating_ip:
     type: string
-    description: lb_extnet_ip_0
+    description: lb_extnet_floating_ip
 
-  lb_extnet_v6_ip_0:
+  lb_extnet_floating_v6_ip:
     type: string
-    description: lb_extnet_v6_ip_0
+    description: lb_extnet_floating_v6_ip
 
   lb_extnet_ips:
     type: comma_delimited_list
@@ -131,9 +127,9 @@ parameters:
     type: string
     description: lb_extnet_floating_ip
 
-  lb_extnet_floating_v6_ip:
+  cidr:
     type: string
-    description: lb_extnet_floating_v6_ip
+    description: nafskldnaklsdf
 
 resources:
 
@@ -150,6 +146,7 @@ resources:
         - port: { get_resource: lb_3_extnet_0_port }
         - port: { get_resource: lb_4_extnet_0_port }
         - port: { get_resource: lb_5_extnet_0_port }  
+        - port: { get_resource: lb_6_extnet_0_port }  
       metadata:
         vnf_name: { get_param: vnf_name }
         vnf_id: { get_param: vnf_id }
@@ -173,86 +170,104 @@ resources:
         vnf_id: { get_param: vnf_id }
         vf_module_id: { get_param: vf_module_id }
 
-  db_0_int_intranet_0_port:
+  db_0_int_intranet_port_0:
         type: OS::Neutron::Port
         properties:
           network: { get_param: int_intranet_net_id }
           allowed_address_pairs:
-            - ip_address: { get_param: db_int_intranet_ip_0 }
+            - ip_address: { get_param: db_int_intranet_floating_ip }
 
-  db_1_int_intranet_0_port:
+  db_0_int_intranet_port_1:
         type: OS::Neutron::Port
         properties:
           network: { get_param: int_intranet_net_id }
           allowed_address_pairs:
-            - ip_address: { get_param: db_int_intranet_v6_ip_0 }
+            - ip_address: { get_param: db_int_intranet_floating_v6_ip }
 
-  db_2_int_intranet_0_port:
+  db_0_int_intranet_port_2:
         type: OS::Neutron::Port
         properties:
           network: { get_param: int_intranet_net_id }
           allowed_address_pairs:
-            - ip_address: { get_param: [db_int_intranet_ips, 0] }
+            - ip_address: { get_param: [db_int_intranet_floating_ips, 0] }
 
-  db_3_int_intranet_0_port:
+  db_0_int_intranet_port_3:
         type: OS::Neutron::Port
         properties:
           network: { get_param: int_intranet_net_id }
           allowed_address_pairs:
-            - ip_address: { get_param: [db_int_intranet_v6_ips, 0] }
+            - ip_address: { get_param: [db_int_intranet_floating_v6_ips, 0] }
 
-  db_4_int_intranet_0_port:
+  db_0_int_intranet_port_4:
         type: OS::Neutron::Port
         properties:
           network: { get_param: int_intranet_net_id }
           allowed_address_pairs:
             - ip_address: { get_param: db_int_intranet_floating_ip }
 
-  db_5_int_intranet_0_port:
+  db_0_int_intranet_port_5:
         type: OS::Neutron::Port
         properties:
           network: { get_param: int_intranet_net_id }
           allowed_address_pairs:
             - ip_address: { get_param: db_int_intranet_floating_v6_ip }
 
-  lb_0_extnet_0_port:
+  lb_0_extnet_port_0:
         type: OS::Neutron::Port
         properties:
           network: { get_param: extnet_net_name }
           allowed_address_pairs:
-            - ip_address: { get_param: lb_extnet_ip_0 }
-
-  lb_1_extnet_0_port:
-        type: OS::Neutron::Port
-        properties:
-          network: { get_param: extnet_net_id }
-          allowed_address_pairs:
-            - ip_address: { get_param: lb_extnet_v6_ip_0 }
+            - ip_address: { get_param: lb_extnet_floating_ip }
 
-  lb_2_extnet_0_port:
-        type: OS::Neutron::Port
-        properties:
-          network: { get_param: extnet_net_name }
-          allowed_address_pairs:
-            - ip_address: { get_param: [lb_extnet_ips, 0] }
+  lb_0_extnet_port_1:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_param: extnet_net_id }
+      allowed_address_pairs:
+        - ip_address: { get_param: lb_extnet_floating_v6_ip }
 
-  lb_3_extnet_0_port:
-        type: OS::Neutron::Port
-        properties:
-          network: { get_param: extnet_net_id }
-          allowed_address_pairs:
-            - ip_address: { get_param: [lb_extnet_v6_ips, 0] }
+  lb_0_extnet_port_2:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_param: extnet_net_name }
+      allowed_address_pairs:
+        - ip_address: { get_param: [lb_extnet_ips, 0] }
+    metadata:
+      aap_exempt:
+        - lb_extnet_ips
+
+  lb_0_extnet_port_3:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_param: extnet_net_id }
+      allowed_address_pairs:
+        - ip_address: { get_param: [lb_extnet_v6_ips, 0] }
+    metadata:
+      aap_exempt:
+        - lb_extnet_v6_ips
+
+  lb_0_extnet_port_4:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_param: extnet_net_name }
+      allowed_address_pairs:
+        - ip_address: { get_param: lb_extnet_floating_ip }
 
-  lb_4_extnet_0_port:
-        type: OS::Neutron::Port
-        properties:
-          network: { get_param: extnet_net_name }
-          allowed_address_pairs:
-            - ip_address: { get_param: lb_extnet_floating_ip }
+  lb_0_extnet_port_5:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_param: extnet_net_id }
+      allowed_address_pairs:
+        - ip_address: { get_param: lb_extnet_floating_v6_ip }
 
-  lb_5_extnet_0_port:
-        type: OS::Neutron::Port
-        properties:
-          network: { get_param: extnet_net_id }
-          allowed_address_pairs:
-            - ip_address: { get_param: lb_extnet_floating_v6_ip }
+  lb_0_extnet_port_6:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_param: extnet_net_id }
+      allowed_address_pairs:
+        ip_address:
+          str_replace:
+            template: $IPADDR$CIDR
+            params: 
+              $CIDR: { get_param: cidr }
+              $IPADDR: { get_param: lb_extnet_floating_v6_ip }