[VVP] updating OS::Neutron::Port parameter tests

AAP, FIP/IP, FIP/Subnet parameters use same validation (ports.py)
REGEX moved to specific tests
Added tests for R-159016, R-717227, R-805572
Removed mapping for R-98748
Updated env file test to exclude internal AAP params

Change-Id: Iddde8ee42400b8df9be49b8c15718b451101b37b
Issue-ID: VVP-181
Signed-off-by: stark, steven <steven.stark@att.com>

15 files changed, 36 insertions, 2540 deletions

diff --git a/ice_validator/tests/fixtures/test_allowed_address_pairs_include_vm_type_network_role/fail/external_network_network_role_wrong_in_parameter.yaml b/ice_validator/tests/fixtures/test_allowed_address_pairs_include_vm_type_network_role/fail/external_network_network_role_wrong_in_parameter.yaml
deleted file mode 100644
index fccd0ae..0000000
--- a/ice_validator/tests/fixtures/test_allowed_address_pairs_include_vm_type_network_role/fail/external_network_network_role_wrong_in_parameter.yaml
+++ /dev/null
@@ -1,258 +0,0 @@
-# -*- coding: utf8 -*-
-# ============LICENSE_START=======================================================
-# org.onap.vvp/validation-scripts
-# ===================================================================
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
-# ===================================================================
-#
-# Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the "License");
-# you may not use this software except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#             http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-#
-#
-# Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
-# you may not use this documentation except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#             https://creativecommons.org/licenses/by/4.0/
-#
-# Unless required by applicable law or agreed to in writing, documentation
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# ============LICENSE_END============================================
-#
-#
----
-heat_template_version: 2015-04-30
-
-description: Heat template description
-
-parameters:
-
-  vnf_id:
-    type: string
-    description: Unique ID for this VNF instance
-
-  vf_module_id:
-    type: string
-    description: Unique ID for this VF module
-
-  vnf_name:
-    type: string
-    description: Unique name for this VNF instance
-
-  db_names:
-    type: comma_delimited_list
-    description: Names attribute for the VMs
-
-  lb_names:
-    type: comma_delimited_list
-    description: Names attribute for the VMs
-
-  lb_flavor_name:
-    type: string
-    description: flavor to be used to create this vm must be one of the following flavors
-
-  db_flavor_name:
-    type: string
-    description: flavor to be used to create this vm must be one of the following flavors
-
-  availability_zone_0:
-    type: string
-    description: availability zone to be used
-
-  exnet_net_name:
-    type: string
-    description: network name for the external network extnet
-
-  exnet_net_id:
-    type: string
-    description: network id for the external network extnet
-
-  int_intranet_net_id:
-    type: string
-    description: network id for the internal network intranet 
-
-  db_int_intranet_ip_0:
-    type: string
-    description: db_int_intranet_ip_0
-
-  db_int_intranet_v6_ip_0:
-    type: string
-    description: db_int_intranet_v6_ip_0
-
-  db_int_intranet_ips:
-    type: string
-    description: db_int_intranet_ips
-
-  db_int_intranet_v6_ips:
-    type: string
-    description: db_int_intranet_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:
-    type: string
-    description: lb_extnet_ip_0
-
-  lb_extnet_v6_ip_0:
-    type: string
-    description: lb_extnet_v6_ip_0
-
-  lb_extnet_ips:
-    type: string
-    description: lb_extnet_ips
-
-  lb_extnet_v6_ips:
-    type: string
-    description: lb_extnet_v6_ips
-
-  lb_extnet_floating_ip:
-    type: string
-    description: lb_extnet_floating_ip
-
-  lb_extnet_floating_v6_ip:  
-    type: string
-    description: lb_extnet_floating_v6_ip
-
-resources:
-
-  lb_server_0:
-    type: OS::Nova::Server
-    properties:
-      availability_zone: { get_param: availability_zone_0 }
-      name: { get_param: [lb_names, 0]  }
-      flavor: { get_param: lb_flavor_name}
-      networks:
-        - port: { get_resource: lb_0_extnet_0_port }
-        - port: { get_resource: lb_1_extnet_0_port }
-        - port: { get_resource: lb_2_extnet_0_port }
-        - port: { get_resource: lb_3_extnet_0_port }
-        - port: { get_resource: lb_4_extnet_0_port }
-        - port: { get_resource: lb_5_extnet_0_port }  
-      metadata:
-        vnf_name: { get_param: vnf_name }
-        vnf_id: { get_param: vnf_id }
-        vf_module_id: { get_param: vf_module_id }
-
-  db_server_0:
-    type: OS::Nova::Server
-    properties:
-      availability_zone: { get_param: availability_zone_0 }
-      name: { get_param: [db_names, 1]  }
-      flavor: { get_param: db_flavor_name}
-      networks:
-        - port: { get_resource: db_0_int_intranet_0_port }
-        - port: { get_resource: db_1_int_intranet_0_port }
-        - port: { get_resource: db_2_int_intranet_0_port }
-        - port: { get_resource: db_3_int_intranet_0_port }
-        - port: { get_resource: db_4_int_intranet_0_port }
-        - port: { get_resource: db_5_int_intranet_0_port }
-      metadata:
-        vnf_name: { get_param: vnf_name }
-        vnf_id: { get_param: vnf_id }
-        vf_module_id: { get_param: vf_module_id }
-
-  db_0_int_intranet_0_port:
-        type: OS::Neutron::Port
-        properties:
-          network: { get_param: int_intranet_net_id }
-          allowed_address_pairs:
-            - ip_address: { get_param: db_int_intranet_ip_0 }
-
-  db_1_int_intranet_0_port:
-        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 }
-
-  db_2_int_intranet_0_port:
-        type: OS::Neutron::Port
-        properties:
-          network: { get_param: int_intranet_net_id }
-          allowed_address_pairs:
-            - ip_address: { get_param: [db_int_intranet_ips, 0] }
-
-  db_3_int_intranet_0_port:
-        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] }
-
-  db_4_int_intranet_0_port:
-        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:
-        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:
-        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 }
-
-  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_3_extnet_0_port:
-        type: OS::Neutron::Port
-        properties:
-          network: { get_param: extnet_net_id }
-          allowed_address_pairs:
-            - ip_address: { get_param: [lb_extnet1_v6_ips, 0] }
-
-  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_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 }
diff --git a/ice_validator/tests/fixtures/test_allowed_address_pairs_include_vm_type_network_role/fail/external_network_vm_type_wrong_in_parameter.yaml b/ice_validator/tests/fixtures/test_allowed_address_pairs_include_vm_type_network_role/fail/external_network_vm_type_wrong_in_parameter.yaml
deleted file mode 100644
index 088db06..0000000
--- a/ice_validator/tests/fixtures/test_allowed_address_pairs_include_vm_type_network_role/fail/external_network_vm_type_wrong_in_parameter.yaml
+++ /dev/null
@@ -1,258 +0,0 @@
-# -*- coding: utf8 -*-
-# ============LICENSE_START=======================================================
-# org.onap.vvp/validation-scripts
-# ===================================================================
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
-# ===================================================================
-#
-# Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the "License");
-# you may not use this software except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#             http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-#
-#
-# Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
-# you may not use this documentation except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#             https://creativecommons.org/licenses/by/4.0/
-#
-# Unless required by applicable law or agreed to in writing, documentation
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# ============LICENSE_END============================================
-#
-#
----
-heat_template_version: 2015-04-30
-
-description: Heat template description
-
-parameters:
-
-  vnf_id:
-    type: string
-    description: Unique ID for this VNF instance
-
-  vf_module_id:
-    type: string
-    description: Unique ID for this VF module
-
-  vnf_name:
-    type: string
-    description: Unique name for this VNF instance
-
-  db_names:
-    type: comma_delimited_list
-    description: Names attribute for the VMs
-
-  lb_names:
-    type: comma_delimited_list
-    description: Names attribute for the VMs
-
-  lb_flavor_name:
-    type: string
-    description: flavor to be used to create this vm must be one of the following flavors
-
-  db_flavor_name:
-    type: string
-    description: flavor to be used to create this vm must be one of the following flavors
-
-  availability_zone_0:
-    type: string
-    description: availability zone to be used
-
-  exnet_net_name:
-    type: string
-    description: network name for the external network extnet
-
-  exnet_net_id:
-    type: string
-    description: network id for the external network extnet
-
-  int_intranet_net_id:
-    type: string
-    description: network id for the internal network intranet 
-
-  db_int_intranet_ip_0:
-    type: string
-    description: db_int_intranet_ip_0
-
-  db_int_intranet_v6_ip_0:
-    type: string
-    description: db_int_intranet_v6_ip_0
-
-  db_int_intranet_ips:
-    type: string
-    description: db_int_intranet_ips
-
-  db_int_intranet_v6_ips:
-    type: string
-    description: db_int_intranet_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:
-    type: string
-    description: lb_extnet_ip_0
-
-  lb_extnet_v6_ip_0:
-    type: string
-    description: lb_extnet_v6_ip_0
-
-  lb_extnet_ips:
-    type: string
-    description: lb_extnet_ips
-
-  lb_extnet_v6_ips:
-    type: string
-    description: lb_extnet_v6_ips
-
-  lb_extnet_floating_ip:
-    type: string
-    description: lb_extnet_floating_ip
-
-  lb_extnet_floating_v6_ip:
-    type: string
-    description: lb_extnet_floating_v6_ip
-
-resources:
-
-  lb_server_0:
-    type: OS::Nova::Server
-    properties:
-      availability_zone: { get_param: availability_zone_0 }
-      name: { get_param: [lb_names, 0]  }
-      flavor: { get_param: lb_flavor_name}
-      networks:
-        - port: { get_resource: lb_0_extnet_0_port }
-        - port: { get_resource: lb_1_extnet_0_port }
-        - port: { get_resource: lb_2_extnet_0_port }
-        - port: { get_resource: lb_3_extnet_0_port }
-        - port: { get_resource: lb_4_extnet_0_port }
-        - port: { get_resource: lb_5_extnet_0_port }  
-      metadata:
-        vnf_name: { get_param: vnf_name }
-        vnf_id: { get_param: vnf_id }
-        vf_module_id: { get_param: vf_module_id }
-
-  db_server_0:
-    type: OS::Nova::Server
-    properties:
-      availability_zone: { get_param: availability_zone_0 }
-      name: { get_param: [db_names, 1]  }
-      flavor: { get_param: db_flavor_name}
-      networks:
-        - port: { get_resource: db_0_int_intranet_0_port }
-        - port: { get_resource: db_1_int_intranet_0_port }
-        - port: { get_resource: db_2_int_intranet_0_port }
-        - port: { get_resource: db_3_int_intranet_0_port }
-        - port: { get_resource: db_4_int_intranet_0_port }
-        - port: { get_resource: db_5_int_intranet_0_port }
-      metadata:
-        vnf_name: { get_param: vnf_name }
-        vnf_id: { get_param: vnf_id }
-        vf_module_id: { get_param: vf_module_id }
-
-  db_0_int_intranet_0_port:
-        type: OS::Neutron::Port
-        properties:
-          network: { get_param: int_intranet_net_id }
-          allowed_address_pairs:
-            - ip_address: { get_param: db_int_intranet_ip_0 }
-
-  db_1_int_intranet_0_port:
-        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 }
-
-  db_2_int_intranet_0_port:
-        type: OS::Neutron::Port
-        properties:
-          network: { get_param: int_intranet_net_id }
-          allowed_address_pairs:
-            - ip_address: { get_param: [db_int_intranet_ips, 0] }
-
-  db_3_int_intranet_0_port:
-        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] }
-
-  db_4_int_intranet_0_port:
-        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:
-        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:
-        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: lb1_extnet_v6_ip_0 }
-
-  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_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_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_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 }
diff --git a/ice_validator/tests/fixtures/test_fixed_ips_include_vm_type_network_role/fail/internal_wrong_network_role_param.yaml b/ice_validator/tests/fixtures/test_allowed_address_pairs_include_vm_type_network_role/fail/fail.yaml
index c71ee0d..4a3093b 100644
--- a/ice_validator/tests/fixtures/test_fixed_ips_include_vm_type_network_role/fail/internal_wrong_network_role_param.yaml
+++ b/ice_validator/tests/fixtures/test_allowed_address_pairs_include_vm_type_network_role/fail/fail.yaml
@@ -87,41 +87,13 @@ parameters:
     type: string
     description: network id for the internal network intranet 
 
-  db_int_intranet_ip_0:
+  db_int_intaranet_floating_ip:
     type: string
-    description: db_int_intranet_ip_0 
+    description: db_int_intaranet_ip_0
 
-  db_int_intranet_v6_ip_0:
+  lb_extanet_floating_ip:
     type: string
-    description: db_int_intranet_v6_ip_0 
-
-  db_int_intranet_ips:
-    type: string
-    description: db_int_intranet_ips 
-
-  db_int_intranet_v6_ips:
-    type: string
-    description: db_int_intranet_v6_ips 
-
-  lb_extnet_ip_0:
-    type: string
-    description: lb_extnet_ip_0 
-
-  lb_extnet_ip_1:
-    type: string
-    description: lb_extnet_ip_1 
-
-  lb_extnet_v6_ip_0:
-    type: string
-    description: lb_extnet_v6_ip_0
-
-  lb_extnet_ips:
-    type: string
-    description: lb_extnet_ips 
-
-  lb_extnet_v6_ips:
-    type: string
-    description: lb_extnet_v6_ips 
+    description: lb_extanet_floating_ip
 
 resources:
 
@@ -132,10 +104,8 @@ resources:
       name: { get_param: [lb_names, 0]  }
       flavor: { get_param: lb_flavor_name}
       networks:
-        - port: { get_resource: lb_0_extnet_0_port }
-        - port: { get_resource: lb_1_extnet_0_port }
-        - port: { get_resource: lb_2_extnet_0_port }
-        - port: { get_resource: lb_3_extnet_0_port }  
+        - port: { get_resource: db_0_int_intranet_port_0 }
+        - port: { get_resource: lb_0_extnet_port_0 }
       metadata:
         vnf_name: { get_param: vnf_name }
         vnf_id: { get_param: vnf_id }
@@ -149,64 +119,21 @@ resources:
       flavor: { get_param: db_flavor_name}
       networks:
         - port: { get_resource: db_0_int_intranet_0_port }
-        - port: { get_resource: db_1_int_intranet_0_port }
-        - port: { get_resource: db_2_int_intranet_0_port }
       metadata:
         vnf_name: { get_param: vnf_name }
         vnf_id: { get_param: vnf_id }
         vf_module_id: { get_param: vf_module_id }
 
-  db_0_int_intranet_0_port:
-        type: OS::Neutron::Port
-        properties:
-          network: { get_param: int_intranet_net_id }
-          fixed_ips:
-            - ip_address: { get_param: db_int_intranet1_ip_0 }
-            - ip_address: { get_param: db_int_intranet_v6_ip_0 }
-
-  db_1_int_intranet_0_port:
-        type: OS::Neutron::Port
-        properties:
-          network: { get_param: int_intranet_net_id }
-          fixed_ips:
-            - ip_address: { get_param: [db_int_intranet_ips, 0] }
-            - ip_address: { get_param: [db_int_intranet_v6_ips, 0] }
-
-  db_2_int_intranet_0_port:
+  db_0_int_intranet_port_0:
         type: OS::Neutron::Port
         properties:
           network: { get_param: int_intranet_net_id }
-          fixed_ips:
-            - ip_address: { get_param: [db_int_intranet_ips, 1] }
-
-  lb_0_extnet_0_port:
-        type: OS::Neutron::Port
-        properties:
-          network: { get_param: extnet_net_name }
-          fixed_ips:
-            - ip_address: { get_param: lb_extnet_ip_0 }
-            - ip_address: { get_param: lb_extnet_v6_ip_0 }
-
-  lb_1_extnet_0_port:
-        type: OS::Neutron::Port
-        properties:
-          network: { get_param: extnet_net_id }
-          fixed_ips:
-            - ip_address: { get_param: [lb_extnet_ips, 0] }
-            - ip_address: { get_param: [lb_extnet_v6_ips, 0] }
+          allowed_address_pairs:
+            - ip_address: { get_param: db_int_intaranet_floating_ip }
 
-  lb_2_extnet_0_port:
+  lb_0_extnet_port_0:
         type: OS::Neutron::Port
         properties:
           network: { get_param: extnet_net_name }
-          fixed_ips:
-            - ip_address: { get_param: lb_extnet_ip_1 }
-            - subnet_id: { get_param: extnet_subnet_id }
-
-  lb_3_extnet_0_port:
-        type: OS::Neutron::Port
-        properties:
-          network: { get_param: extnet_net_id }
-          fixed_ips:
-            - subnet_id: { get_param: extnet_subnet_id }
-            - subnet_id: { get_param: extnet_v6_subnet_id }
+          allowed_address_pairs:
+            - ip_address: { get_param: lb_extanet_floating_ip }
diff --git a/ice_validator/tests/fixtures/test_allowed_address_pairs_include_vm_type_network_role/fail/internal_network_network_role_wrong_in_parameter.yaml b/ice_validator/tests/fixtures/test_allowed_address_pairs_include_vm_type_network_role/fail/internal_network_network_role_wrong_in_parameter.yaml
deleted file mode 100644
index e462fb5..0000000
--- a/ice_validator/tests/fixtures/test_allowed_address_pairs_include_vm_type_network_role/fail/internal_network_network_role_wrong_in_parameter.yaml
+++ /dev/null
@@ -1,258 +0,0 @@
-# -*- coding: utf8 -*-
-# ============LICENSE_START=======================================================
-# org.onap.vvp/validation-scripts
-# ===================================================================
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
-# ===================================================================
-#
-# Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the "License");
-# you may not use this software except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#             http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-#
-#
-# Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
-# you may not use this documentation except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#             https://creativecommons.org/licenses/by/4.0/
-#
-# Unless required by applicable law or agreed to in writing, documentation
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# ============LICENSE_END============================================
-#
-#
----
-heat_template_version: 2015-04-30
-
-description: Heat template description
-
-parameters:
-
-  vnf_id:
-    type: string
-    description: Unique ID for this VNF instance
-
-  vf_module_id:
-    type: string
-    description: Unique ID for this VF module
-
-  vnf_name:
-    type: string
-    description: Unique name for this VNF instance
-
-  db_names:
-    type: comma_delimited_list
-    description: Names attribute for the VMs
-
-  lb_names:
-    type: comma_delimited_list
-    description: Names attribute for the VMs
-
-  lb_flavor_name:
-    type: string
-    description: flavor to be used to create this vm must be one of the following flavors
-
-  db_flavor_name:
-    type: string
-    description: flavor to be used to create this vm must be one of the following flavors
-
-  availability_zone_0:
-    type: string
-    description: availability zone to be used
-
-  exnet_net_name:
-    type: string
-    description: network name for the external network extnet
-
-  exnet_net_id:
-    type: string
-    description: network id for the external network extnet
-
-  int_intranet_net_id:
-    type: string
-    description: network id for the internal network intranet 
-
-  db_int_intranet_ip_0:
-    type: string
-    description: db_int_intranet_ip_0
-
-  db_int_intranet_v6_ip_0:
-    type: string
-    description: db_int_intranet_v6_ip_0
-
-  db_int_intranet_ips:
-    type: string
-    description: db_int_intranet_ips
-
-  db_int_intranet_v6_ips:
-    type: string
-    description: db_int_intranet_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:
-    type: string
-    description: lb_extnet_ip_0
-
-  lb_extnet_v6_ip_0:
-    type: string
-    description: lb_extnet_v6_ip_0
-
-  lb_extnet_ips:
-    type: string
-    description: lb_extnet_ips
-
-  lb_extnet_v6_ips:
-    type: string
-    description: lb_extnet_v6_ips
-
-  lb_extnet_floating_ip:
-    type: string
-    description: lb_extnet_floating_ip
-
-  lb_extnet_floating_v6_ip:  
-    type: string
-    description: lb_extnet_floating_v6_ip
-
-resources:
-
-  lb_server_0:
-    type: OS::Nova::Server
-    properties:
-      availability_zone: { get_param: availability_zone_0 }
-      name: { get_param: [lb_names, 0]  }
-      flavor: { get_param: lb_flavor_name}
-      networks:
-        - port: { get_resource: lb_0_extnet_0_port }
-        - port: { get_resource: lb_1_extnet_0_port }
-        - port: { get_resource: lb_2_extnet_0_port }
-        - port: { get_resource: lb_3_extnet_0_port }
-        - port: { get_resource: lb_4_extnet_0_port }
-        - port: { get_resource: lb_5_extnet_0_port }  
-      metadata:
-        vnf_name: { get_param: vnf_name }
-        vnf_id: { get_param: vnf_id }
-        vf_module_id: { get_param: vf_module_id }
-
-  db_server_0:
-    type: OS::Nova::Server
-    properties:
-      availability_zone: { get_param: availability_zone_0 }
-      name: { get_param: [db_names, 1]  }
-      flavor: { get_param: db_flavor_name}
-      networks:
-        - port: { get_resource: db_0_int_intranet_0_port }
-        - port: { get_resource: db_1_int_intranet_0_port }
-        - port: { get_resource: db_2_int_intranet_0_port }
-        - port: { get_resource: db_3_int_intranet_0_port }
-        - port: { get_resource: db_4_int_intranet_0_port }
-        - port: { get_resource: db_5_int_intranet_0_port }
-      metadata:
-        vnf_name: { get_param: vnf_name }
-        vnf_id: { get_param: vnf_id }
-        vf_module_id: { get_param: vf_module_id }
-
-  db_0_int_intranet_0_port:
-        type: OS::Neutron::Port
-        properties:
-          network: { get_param: int_intranet_net_id }
-          allowed_address_pairs:
-            - ip_address: { get_param: db_int_intranet_ip_0 }
-
-  db_1_int_intranet_0_port:
-        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 }
-
-  db_2_int_intranet_0_port:
-        type: OS::Neutron::Port
-        properties:
-          network: { get_param: int_intranet_net_id }
-          allowed_address_pairs:
-            - ip_address: { get_param: [db_int_intranet_ips, 0] }
-
-  db_3_int_intranet_0_port:
-        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] }
-
-  db_4_int_intranet_0_port:
-        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:
-        type: OS::Neutron::Port
-        properties:
-          network: { get_param: int_intranet_net_id }
-          allowed_address_pairs:
-            - ip_address: { get_param: db_int_intranet1_floating_v6_ip }
-
-  lb_0_extnet_0_port:
-        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 }
-
-  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_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_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_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 }
diff --git a/ice_validator/tests/fixtures/test_allowed_address_pairs_include_vm_type_network_role/fail/internal_network_vm_type_wrong_in_parameter.yaml b/ice_validator/tests/fixtures/test_allowed_address_pairs_include_vm_type_network_role/fail/internal_network_vm_type_wrong_in_parameter.yaml
deleted file mode 100644
index dc92556..0000000
--- a/ice_validator/tests/fixtures/test_allowed_address_pairs_include_vm_type_network_role/fail/internal_network_vm_type_wrong_in_parameter.yaml
+++ /dev/null
@@ -1,258 +0,0 @@
-# -*- coding: utf8 -*-
-# ============LICENSE_START=======================================================
-# org.onap.vvp/validation-scripts
-# ===================================================================
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
-# ===================================================================
-#
-# Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the "License");
-# you may not use this software except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#             http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-#
-#
-# Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
-# you may not use this documentation except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#             https://creativecommons.org/licenses/by/4.0/
-#
-# Unless required by applicable law or agreed to in writing, documentation
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# ============LICENSE_END============================================
-#
-#
----
-heat_template_version: 2015-04-30
-
-description: Heat template description
-
-parameters:
-
-  vnf_id:
-    type: string
-    description: Unique ID for this VNF instance
-
-  vf_module_id:
-    type: string
-    description: Unique ID for this VF module
-
-  vnf_name:
-    type: string
-    description: Unique name for this VNF instance
-
-  db_names:
-    type: comma_delimited_list
-    description: Names attribute for the VMs
-
-  lb_names:
-    type: comma_delimited_list
-    description: Names attribute for the VMs
-
-  lb_flavor_name:
-    type: string
-    description: flavor to be used to create this vm must be one of the following flavors
-
-  db_flavor_name:
-    type: string
-    description: flavor to be used to create this vm must be one of the following flavors
-
-  availability_zone_0:
-    type: string
-    description: availability zone to be used
-
-  exnet_net_name:
-    type: string
-    description: network name for the external network extnet
-
-  exnet_net_id:
-    type: string
-    description: network id for the external network extnet
-
-  int_intranet_net_id:
-    type: string
-    description: network id for the internal network intranet 
-
-  db_int_intranet_ip_0:
-    type: string
-    description: db_int_intranet_ip_0
-
-  db_int_intranet_v6_ip_0:
-    type: string
-    description: db_int_intranet_v6_ip_0
-
-  db_int_intranet_ips:
-    type: string
-    description: db_int_intranet_ips
-
-  db_int_intranet_v6_ips:
-    type: string
-    description: db_int_intranet_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:
-    type: string
-    description: lb_extnet_ip_0
-
-  lb_extnet_v6_ip_0:
-    type: string
-    description: lb_extnet_v6_ip_0
-
-  lb_extnet_ips:
-    type: string
-    description: lb_extnet_ips
-
-  lb_extnet_v6_ips:
-    type: string
-    description: lb_extnet_v6_ips
-
-  lb_extnet_floating_ip:
-    type: string
-    description: lb_extnet_floating_ip
-
-  lb_extnet_floating_v6_ip:  
-    type: string
-    description: lb_extnet_floating_v6_ip
-
-resources:
-
-  lb_server_0:
-    type: OS::Nova::Server
-    properties:
-      availability_zone: { get_param: availability_zone_0 }
-      name: { get_param: [lb_names, 0]  }
-      flavor: { get_param: lb_flavor_name}
-      networks:
-        - port: { get_resource: lb_0_extnet_0_port }
-        - port: { get_resource: lb_1_extnet_0_port }
-        - port: { get_resource: lb_2_extnet_0_port }
-        - port: { get_resource: lb_3_extnet_0_port }
-        - port: { get_resource: lb_4_extnet_0_port }
-        - port: { get_resource: lb_5_extnet_0_port }  
-      metadata:
-        vnf_name: { get_param: vnf_name }
-        vnf_id: { get_param: vnf_id }
-        vf_module_id: { get_param: vf_module_id }
-
-  db_server_0:
-    type: OS::Nova::Server
-    properties:
-      availability_zone: { get_param: availability_zone_0 }
-      name: { get_param: [db_names, 1]  }
-      flavor: { get_param: db_flavor_name}
-      networks:
-        - port: { get_resource: db_0_int_intranet_0_port }
-        - port: { get_resource: db_1_int_intranet_0_port }
-        - port: { get_resource: db_2_int_intranet_0_port }
-        - port: { get_resource: db_3_int_intranet_0_port }
-        - port: { get_resource: db_4_int_intranet_0_port }
-        - port: { get_resource: db_5_int_intranet_0_port }
-      metadata:
-        vnf_name: { get_param: vnf_name }
-        vnf_id: { get_param: vnf_id }
-        vf_module_id: { get_param: vf_module_id }
-
-  db_0_int_intranet_0_port:
-        type: OS::Neutron::Port
-        properties:
-          network: { get_param: int_intranet_net_id }
-          allowed_address_pairs:
-            - ip_address: { get_param: db_int_intranet_ip_0 }
-
-  db_1_int_intranet_0_port:
-        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 }
-
-  db_2_int_intranet_0_port:
-        type: OS::Neutron::Port
-        properties:
-          network: { get_param: int_intranet_net_id }
-          allowed_address_pairs:
-            - ip_address: { get_param: [db_int_intranet_ips, 0] }
-
-  db_3_int_intranet_0_port:
-        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] }
-
-  db_4_int_intranet_0_port:
-        type: OS::Neutron::Port
-        properties:
-          network: { get_param: int_intranet_net_id }
-          allowed_address_pairs:
-            - ip_address: { get_param: db1_int_intranet_floating_ip }
-
-  db_5_int_intranet_0_port:
-        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:
-        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 }
-
-  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_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_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_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 }
diff --git a/ice_validator/tests/fixtures/test_allowed_address_pairs_include_vm_type_network_role/fail/mismatch_vm_type_exernal_nova_server.yaml b/ice_validator/tests/fixtures/test_allowed_address_pairs_include_vm_type_network_role/fail/mismatch_vm_type_exernal_nova_server.yaml
deleted file mode 100644
index 56b2440..0000000
--- a/ice_validator/tests/fixtures/test_allowed_address_pairs_include_vm_type_network_role/fail/mismatch_vm_type_exernal_nova_server.yaml
+++ /dev/null
@@ -1,258 +0,0 @@
-# -*- coding: utf8 -*-
-# ============LICENSE_START=======================================================
-# org.onap.vvp/validation-scripts
-# ===================================================================
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
-# ===================================================================
-#
-# Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the "License");
-# you may not use this software except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#             http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-#
-#
-# Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
-# you may not use this documentation except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#             https://creativecommons.org/licenses/by/4.0/
-#
-# Unless required by applicable law or agreed to in writing, documentation
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# ============LICENSE_END============================================
-#
-#
----
-heat_template_version: 2015-04-30
-
-description: Heat template description
-
-parameters:
-
-  vnf_id:
-    type: string
-    description: Unique ID for this VNF instance
-
-  vf_module_id:
-    type: string
-    description: Unique ID for this VF module
-
-  vnf_name:
-    type: string
-    description: Unique name for this VNF instance
-
-  db_names:
-    type: comma_delimited_list
-    description: Names attribute for the VMs
-
-  lb1_names:
-    type: comma_delimited_list
-    description: Names attribute for the VMs
-
-  lb1_flavor_name:
-    type: string
-    description: flavor to be used to create this vm must be one of the following flavors
-
-  db_flavor_name:
-    type: string
-    description: flavor to be used to create this vm must be one of the following flavors
-
-  availability_zone_0:
-    type: string
-    description: availability zone to be used
-
-  exnet_net_name:
-    type: string
-    description: network name for the external network extnet
-
-  exnet_net_id:
-    type: string
-    description: network id for the external network extnet
-
-  int_intranet_net_id:
-    type: string
-    description: network id for the internal network intranet 
-
-  db_int_intranet_ip_0:
-    type: string
-    description: db_int_intranet_ip_0
-
-  db_int_intranet_v6_ip_0:
-    type: string
-    description: db_int_intranet_v6_ip_0
-
-  db_int_intranet_ips:
-    type: string
-    description: db_int_intranet_ips
-
-  db_int_intranet_v6_ips:
-    type: string
-    description: db_int_intranet_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:
-    type: string
-    description: lb_extnet_ip_0
-
-  lb_extnet_v6_ip_0:
-    type: string
-    description: lb_extnet_v6_ip_0
-
-  lb_extnet_ips:
-    type: string
-    description: lb_extnet_ips
-
-  lb_extnet_v6_ips:
-    type: string
-    description: lb_extnet_v6_ips
-
-  lb_extnet_floating_ip:
-    type: string
-    description: lb_extnet_floating_ip
-
-  lb_extnet_floating_v6_ip:  
-    type: string
-    description: lb_extnet_floating_v6_ip
-
-resources:
-
-  lb1_server_0:
-    type: OS::Nova::Server
-    properties:
-      availability_zone: { get_param: availability_zone_0 }
-      name: { get_param: [lb1_names, 0]  }
-      flavor: { get_param: lb1_flavor_name}
-      networks:
-        - port: { get_resource: lb_0_extnet_0_port }
-        - port: { get_resource: lb_1_extnet_0_port }
-        - port: { get_resource: lb_2_extnet_0_port }
-        - port: { get_resource: lb_3_extnet_0_port }
-        - port: { get_resource: lb_4_extnet_0_port }
-        - port: { get_resource: lb_5_extnet_0_port }  
-      metadata:
-        vnf_name: { get_param: vnf_name }
-        vnf_id: { get_param: vnf_id }
-        vf_module_id: { get_param: vf_module_id }
-
-  db_server_0:
-    type: OS::Nova::Server
-    properties:
-      availability_zone: { get_param: availability_zone_0 }
-      name: { get_param: [db_names, 1]  }
-      flavor: { get_param: db_flavor_name}
-      networks:
-        - port: { get_resource: db_0_int_intranet_0_port }
-        - port: { get_resource: db_1_int_intranet_0_port }
-        - port: { get_resource: db_2_int_intranet_0_port }
-        - port: { get_resource: db_3_int_intranet_0_port }
-        - port: { get_resource: db_4_int_intranet_0_port }
-        - port: { get_resource: db_5_int_intranet_0_port }
-      metadata:
-        vnf_name: { get_param: vnf_name }
-        vnf_id: { get_param: vnf_id }
-        vf_module_id: { get_param: vf_module_id }
-
-  db_0_int_intranet_0_port:
-        type: OS::Neutron::Port
-        properties:
-          network: { get_param: int_intranet_net_id }
-          allowed_address_pairs:
-            - ip_address: { get_param: db_int_intranet_ip_0 }
-
-  db_1_int_intranet_0_port:
-        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 }
-
-  db_2_int_intranet_0_port:
-        type: OS::Neutron::Port
-        properties:
-          network: { get_param: int_intranet_net_id }
-          allowed_address_pairs:
-            - ip_address: { get_param: [db_int_intranet_ips, 0] }
-
-  db_3_int_intranet_0_port:
-        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] }
-
-  db_4_int_intranet_0_port:
-        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:
-        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:
-        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 }
-
-  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_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_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_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 }
diff --git a/ice_validator/tests/fixtures/test_allowed_address_pairs_include_vm_type_network_role/fail/mismatch_vm_type_internal_nova_server.yaml b/ice_validator/tests/fixtures/test_allowed_address_pairs_include_vm_type_network_role/fail/mismatch_vm_type_internal_nova_server.yaml
deleted file mode 100644
index 40724f4..0000000
--- a/ice_validator/tests/fixtures/test_allowed_address_pairs_include_vm_type_network_role/fail/mismatch_vm_type_internal_nova_server.yaml
+++ /dev/null
@@ -1,258 +0,0 @@
-# -*- coding: utf8 -*-
-# ============LICENSE_START=======================================================
-# org.onap.vvp/validation-scripts
-# ===================================================================
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
-# ===================================================================
-#
-# Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the "License");
-# you may not use this software except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#             http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-#
-#
-# Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
-# you may not use this documentation except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#             https://creativecommons.org/licenses/by/4.0/
-#
-# Unless required by applicable law or agreed to in writing, documentation
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# ============LICENSE_END============================================
-#
-#
----
-heat_template_version: 2015-04-30
-
-description: Heat template description
-
-parameters:
-
-  vnf_id:
-    type: string
-    description: Unique ID for this VNF instance
-
-  vf_module_id:
-    type: string
-    description: Unique ID for this VF module
-
-  vnf_name:
-    type: string
-    description: Unique name for this VNF instance
-
-  db1_names:
-    type: comma_delimited_list
-    description: Names attribute for the VMs
-
-  lb_names:
-    type: comma_delimited_list
-    description: Names attribute for the VMs
-
-  lb_flavor_name:
-    type: string
-    description: flavor to be used to create this vm must be one of the following flavors
-
-  db1_flavor_name:
-    type: string
-    description: flavor to be used to create this vm must be one of the following flavors
-
-  availability_zone_0:
-    type: string
-    description: availability zone to be used
-
-  exnet_net_name:
-    type: string
-    description: network name for the external network extnet
-
-  exnet_net_id:
-    type: string
-    description: network id for the external network extnet
-
-  int_intranet_net_id:
-    type: string
-    description: network id for the internal network intranet 
-
-  db_int_intranet_ip_0:
-    type: string
-    description: db_int_intranet_ip_0
-
-  db_int_intranet_v6_ip_0:
-    type: string
-    description: db_int_intranet_v6_ip_0
-
-  db_int_intranet_ips:
-    type: string
-    description: db_int_intranet_ips
-
-  db_int_intranet_v6_ips:
-    type: string
-    description: db_int_intranet_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:
-    type: string
-    description: lb_extnet_ip_0
-
-  lb_extnet_v6_ip_0:
-    type: string
-    description: lb_extnet_v6_ip_0
-
-  lb_extnet_ips:
-    type: string
-    description: lb_extnet_ips
-
-  lb_extnet_v6_ips:
-    type: string
-    description: lb_extnet_v6_ips
-
-  lb_extnet_floating_ip:
-    type: string
-    description: lb_extnet_floating_ip
-
-  lb_extnet_floating_v6_ip:  
-    type: string
-    description: lb_extnet_floating_v6_ip
-
-resources:
-
-  lb_server_0:
-    type: OS::Nova::Server
-    properties:
-      availability_zone: { get_param: availability_zone_0 }
-      name: { get_param: [lb_names, 0]  }
-      flavor: { get_param: lb_flavor_name}
-      networks:
-        - port: { get_resource: lb_0_extnet_0_port }
-        - port: { get_resource: lb_1_extnet_0_port }
-        - port: { get_resource: lb_2_extnet_0_port }
-        - port: { get_resource: lb_3_extnet_0_port }
-        - port: { get_resource: lb_4_extnet_0_port }
-        - port: { get_resource: lb_5_extnet_0_port }  
-      metadata:
-        vnf_name: { get_param: vnf_name }
-        vnf_id: { get_param: vnf_id }
-        vf_module_id: { get_param: vf_module_id }
-
-  db_server_0:
-    type: OS::Nova::Server
-    properties:
-      availability_zone: { get_param: availability_zone_0 }
-      name: { get_param: [db1_names, 1]  }
-      flavor: { get_param: db1_flavor_name}
-      networks:
-        - port: { get_resource: db_0_int_intranet_0_port }
-        - port: { get_resource: db_1_int_intranet_0_port }
-        - port: { get_resource: db_2_int_intranet_0_port }
-        - port: { get_resource: db_3_int_intranet_0_port }
-        - port: { get_resource: db_4_int_intranet_0_port }
-        - port: { get_resource: db_5_int_intranet_0_port }
-      metadata:
-        vnf_name: { get_param: vnf_name }
-        vnf_id: { get_param: vnf_id }
-        vf_module_id: { get_param: vf_module_id }
-
-  db_0_int_intranet_0_port:
-        type: OS::Neutron::Port
-        properties:
-          network: { get_param: int_intranet_net_id }
-          allowed_address_pairs:
-            - ip_address: { get_param: db_int_intranet_ip_0 }
-
-  db_1_int_intranet_0_port:
-        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 }
-
-  db_2_int_intranet_0_port:
-        type: OS::Neutron::Port
-        properties:
-          network: { get_param: int_intranet_net_id }
-          allowed_address_pairs:
-            - ip_address: { get_param: [db_int_intranet_ips, 0] }
-
-  db_3_int_intranet_0_port:
-        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] }
-
-  db_4_int_intranet_0_port:
-        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:
-        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:
-        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 }
-
-  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_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_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_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 }
diff --git a/ice_validator/tests/fixtures/test_fixed_ips_include_vm_type_network_role/fail/external_wrong_network_role_param.yaml b/ice_validator/tests/fixtures/test_fixed_ips_include_vm_type_network_role/fail/external_wrong_network_role_param.yaml
deleted file mode 100644
index 7abd9d3..0000000
--- a/ice_validator/tests/fixtures/test_fixed_ips_include_vm_type_network_role/fail/external_wrong_network_role_param.yaml
+++ /dev/null
@@ -1,212 +0,0 @@
-# -*- coding: utf8 -*-
-# ============LICENSE_START=======================================================
-# org.onap.vvp/validation-scripts
-# ===================================================================
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
-# ===================================================================
-#
-# Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the "License");
-# you may not use this software except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#             http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-#
-#
-# Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
-# you may not use this documentation except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#             https://creativecommons.org/licenses/by/4.0/
-#
-# Unless required by applicable law or agreed to in writing, documentation
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# ============LICENSE_END============================================
-#
-#
----
-heat_template_version: 2015-04-30
-
-description: Heat template description
-
-parameters:
-
-  vnf_id:
-    type: string
-    description: Unique ID for this VNF instance
-
-  vf_module_id:
-    type: string
-    description: Unique ID for this VF module
-
-  vnf_name:
-    type: string
-    description: Unique name for this VNF instance
-
-  db_names:
-    type: comma_delimited_list
-    description: Names attribute for the VMs
-
-  lb_names:
-    type: comma_delimited_list
-    description: Names attribute for the VMs
-
-  lb_flavor_name:
-    type: string
-    description: flavor to be used to create this vm must be one of the following flavors
-
-  db_flavor_name:
-    type: string
-    description: flavor to be used to create this vm must be one of the following flavors
-
-  availability_zone_0:
-    type: string
-    description: availability zone to be used
-
-  exnet_net_name:
-    type: string
-    description: network name for the external network extnet
-
-  exnet_net_id:
-    type: string
-    description: network id for the external network extnet
-
-  int_intranet_net_id:
-    type: string
-    description: network id for the internal network intranet 
-
-  db_int_intranet_ip_0:
-    type: string
-    description: db_int_intranet_ip_0 
-
-  db_int_intranet_v6_ip_0:
-    type: string
-    description: db_int_intranet_v6_ip_0 
-
-  db_int_intranet_ips:
-    type: string
-    description: db_int_intranet_ips 
-
-  db_int_intranet_v6_ips:
-    type: string
-    description: db_int_intranet_v6_ips 
-
-  lb_extnet_ip_0:
-    type: string
-    description: lb_extnet_ip_0 
-
-  lb_extnet_ip_1:
-    type: string
-    description: lb_extnet_ip_1 
-
-  lb_extnet_v6_ip_0:
-    type: string
-    description: lb_extnet_v6_ip_0
-
-  lb_extnet_ips:
-    type: string
-    description: lb_extnet_ips 
-
-  lb_extnet_v6_ips:
-    type: string
-    description: lb_extnet_v6_ips 
-
-resources:
-
-  lb_server_0:
-    type: OS::Nova::Server
-    properties:
-      availability_zone: { get_param: availability_zone_0 }
-      name: { get_param: [lb_names, 0]  }
-      flavor: { get_param: lb_flavor_name}
-      networks:
-        - port: { get_resource: lb_0_extnet_0_port }
-        - port: { get_resource: lb_1_extnet_0_port }
-        - port: { get_resource: lb_2_extnet_0_port }
-        - port: { get_resource: lb_3_extnet_0_port }  
-      metadata:
-        vnf_name: { get_param: vnf_name }
-        vnf_id: { get_param: vnf_id }
-        vf_module_id: { get_param: vf_module_id }
-
-  db_server_0:
-    type: OS::Nova::Server
-    properties:
-      availability_zone: { get_param: availability_zone_0 }
-      name: { get_param: [db_names, 1]  }
-      flavor: { get_param: db_flavor_name}
-      networks:
-        - port: { get_resource: db_0_int_intranet_0_port }
-        - port: { get_resource: db_1_int_intranet_0_port }
-        - port: { get_resource: db_2_int_intranet_0_port }
-      metadata:
-        vnf_name: { get_param: vnf_name }
-        vnf_id: { get_param: vnf_id }
-        vf_module_id: { get_param: vf_module_id }
-
-  db_0_int_intranet_0_port:
-        type: OS::Neutron::Port
-        properties:
-          network: { get_param: int_intranet_net_id }
-          fixed_ips:
-            - ip_address: { get_param: db_int_intranet_ip_0 }
-            - ip_address: { get_param: db_int_intranet_v6_ip_0 }
-
-  db_1_int_intranet_0_port:
-        type: OS::Neutron::Port
-        properties:
-          network: { get_param: int_intranet_net_id }
-          fixed_ips:
-            - ip_address: { get_param: [db_int_intranet_ips, 0] }
-            - ip_address: { get_param: [db_int_intranet_v6_ips, 0] }
-
-  db_2_int_intranet_0_port:
-        type: OS::Neutron::Port
-        properties:
-          network: { get_param: int_intranet_net_id }
-          fixed_ips:
-            - ip_address: { get_param: [db_int_intranet_ips, 1] }
-
-  lb_0_extnet_0_port:
-        type: OS::Neutron::Port
-        properties:
-          network: { get_param: extnet_net_name }
-          fixed_ips:
-            - ip_address: { get_param: lb_extnet1_ip_0 }
-            - ip_address: { get_param: lb_extnet_v6_ip_0 }
-
-  lb_1_extnet_0_port:
-        type: OS::Neutron::Port
-        properties:
-          network: { get_param: extnet_net_id }
-          fixed_ips:
-            - ip_address: { get_param: [lb_extnet_ips, 0] }
-            - ip_address: { get_param: [lb_extnet_v6_ips, 0] }
-
-  lb_2_extnet_0_port:
-        type: OS::Neutron::Port
-        properties:
-          network: { get_param: extnet_net_name }
-          fixed_ips:
-            - ip_address: { get_param: lb_extnet_ip_1 }
-            - subnet_id: { get_param: extnet_subnet_id }
-
-  lb_3_extnet_0_port:
-        type: OS::Neutron::Port
-        properties:
-          network: { get_param: extnet_net_id }
-          fixed_ips:
-            - subnet_id: { get_param: extnet_subnet_id }
-            - subnet_id: { get_param: extnet_v6_subnet_id }
diff --git a/ice_validator/tests/fixtures/test_fixed_ips_include_vm_type_network_role/fail/external_wrong_vm_type_param.yaml b/ice_validator/tests/fixtures/test_fixed_ips_include_vm_type_network_role/fail/external_wrong_vm_type_param.yaml
deleted file mode 100644
index 2ec72e6..0000000
--- a/ice_validator/tests/fixtures/test_fixed_ips_include_vm_type_network_role/fail/external_wrong_vm_type_param.yaml
+++ /dev/null
@@ -1,212 +0,0 @@
-# -*- coding: utf8 -*-
-# ============LICENSE_START=======================================================
-# org.onap.vvp/validation-scripts
-# ===================================================================
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
-# ===================================================================
-#
-# Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the "License");
-# you may not use this software except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#             http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-#
-#
-# Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
-# you may not use this documentation except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#             https://creativecommons.org/licenses/by/4.0/
-#
-# Unless required by applicable law or agreed to in writing, documentation
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# ============LICENSE_END============================================
-#
-#
----
-heat_template_version: 2015-04-30
-
-description: Heat template description
-
-parameters:
-
-  vnf_id:
-    type: string
-    description: Unique ID for this VNF instance
-
-  vf_module_id:
-    type: string
-    description: Unique ID for this VF module
-
-  vnf_name:
-    type: string
-    description: Unique name for this VNF instance
-
-  db_names:
-    type: comma_delimited_list
-    description: Names attribute for the VMs
-
-  lb_names:
-    type: comma_delimited_list
-    description: Names attribute for the VMs
-
-  lb_flavor_name:
-    type: string
-    description: flavor to be used to create this vm must be one of the following flavors
-
-  db_flavor_name:
-    type: string
-    description: flavor to be used to create this vm must be one of the following flavors
-
-  availability_zone_0:
-    type: string
-    description: availability zone to be used
-
-  exnet_net_name:
-    type: string
-    description: network name for the external network extnet
-
-  exnet_net_id:
-    type: string
-    description: network id for the external network extnet
-
-  int_intranet_net_id:
-    type: string
-    description: network id for the internal network intranet 
-
-  db_int_intranet_ip_0:
-    type: string
-    description: db_int_intranet_ip_0 
-
-  db_int_intranet_v6_ip_0:
-    type: string
-    description: db_int_intranet_v6_ip_0 
-
-  db_int_intranet_ips:
-    type: string
-    description: db_int_intranet_ips 
-
-  db_int_intranet_v6_ips:
-    type: string
-    description: db_int_intranet_v6_ips 
-
-  lb_extnet_ip_0:
-    type: string
-    description: lb_extnet_ip_0 
-
-  lb_extnet_ip_1:
-    type: string
-    description: lb_extnet_ip_1 
-
-  lb_extnet_v6_ip_0:
-    type: string
-    description: lb_extnet_v6_ip_0
-
-  lb_extnet_ips:
-    type: string
-    description: lb_extnet_ips 
-
-  lb_extnet_v6_ips:
-    type: string
-    description: lb_extnet_v6_ips 
-
-resources:
-
-  lb_server_0:
-    type: OS::Nova::Server
-    properties:
-      availability_zone: { get_param: availability_zone_0 }
-      name: { get_param: [lb_names, 0]  }
-      flavor: { get_param: lb_flavor_name}
-      networks:
-        - port: { get_resource: lb_0_extnet_0_port }
-        - port: { get_resource: lb_1_extnet_0_port }
-        - port: { get_resource: lb_2_extnet_0_port }
-        - port: { get_resource: lb_3_extnet_0_port }  
-      metadata:
-        vnf_name: { get_param: vnf_name }
-        vnf_id: { get_param: vnf_id }
-        vf_module_id: { get_param: vf_module_id }
-
-  db_server_0:
-    type: OS::Nova::Server
-    properties:
-      availability_zone: { get_param: availability_zone_0 }
-      name: { get_param: [db_names, 1]  }
-      flavor: { get_param: db_flavor_name}
-      networks:
-        - port: { get_resource: db_0_int_intranet_0_port }
-        - port: { get_resource: db_1_int_intranet_0_port }
-        - port: { get_resource: db_2_int_intranet_0_port }
-      metadata:
-        vnf_name: { get_param: vnf_name }
-        vnf_id: { get_param: vnf_id }
-        vf_module_id: { get_param: vf_module_id }
-
-  db_0_int_intranet_0_port:
-        type: OS::Neutron::Port
-        properties:
-          network: { get_param: int_intranet_net_id }
-          fixed_ips:
-            - ip_address: { get_param: db_int_intranet_ip_0 }
-            - ip_address: { get_param: db_int_intranet_v6_ip_0 }
-
-  db_1_int_intranet_0_port:
-        type: OS::Neutron::Port
-        properties:
-          network: { get_param: int_intranet_net_id }
-          fixed_ips:
-            - ip_address: { get_param: [db_int_intranet_ips, 0] }
-            - ip_address: { get_param: [db_int_intranet_v6_ips, 0] }
-
-  db_2_int_intranet_0_port:
-        type: OS::Neutron::Port
-        properties:
-          network: { get_param: int_intranet_net_id }
-          fixed_ips:
-            - ip_address: { get_param: [db_int_intranet_ips, 1] }
-
-  lb_0_extnet_0_port:
-        type: OS::Neutron::Port
-        properties:
-          network: { get_param: extnet_net_name }
-          fixed_ips:
-            - ip_address: { get_param: lb_extnet_ip_0 }
-            - ip_address: { get_param: lb_extnet_v6_ip_0 }
-
-  lb_1_extnet_0_port:
-        type: OS::Neutron::Port
-        properties:
-          network: { get_param: extnet_net_id }
-          fixed_ips:
-            - ip_address: { get_param: [lb_extnet_ips, 0] }
-            - ip_address: { get_param: [lb_extnet_v6_ips, 0] }
-
-  lb_2_extnet_0_port:
-        type: OS::Neutron::Port
-        properties:
-          network: { get_param: extnet_net_name }
-          fixed_ips:
-            - ip_address: { get_param: lb1_extnet_ip_1 }
-            - subnet_id: { get_param: extnet_subnet_id }
-
-  lb_3_extnet_0_port:
-        type: OS::Neutron::Port
-        properties:
-          network: { get_param: extnet_net_id }
-          fixed_ips:
-            - subnet_id: { get_param: extnet_subnet_id }
-            - subnet_id: { get_param: extnet_v6_subnet_id }
diff --git a/ice_validator/tests/fixtures/test_fixed_ips_include_vm_type_network_role/fail/external_mismatch_vm_type_nova_server.yaml b/ice_validator/tests/fixtures/test_fixed_ips_include_vm_type_network_role/fail/fail.yaml
index b3ed228..a361933 100644
--- a/ice_validator/tests/fixtures/test_fixed_ips_include_vm_type_network_role/fail/external_mismatch_vm_type_nova_server.yaml
+++ b/ice_validator/tests/fixtures/test_fixed_ips_include_vm_type_network_role/fail/fail.yaml
@@ -87,9 +87,9 @@ parameters:
     type: string
     description: network id for the internal network intranet 
 
-  db_int_intranet_ip_0:
+  db_int_intaranet_ip_0:
     type: string
-    description: db_int_intranet_ip_0 
+    description: db_int_intaranet_ip_0 
 
   db_int_intranet_v6_ip_0:
     type: string
@@ -103,9 +103,9 @@ parameters:
     type: string
     description: db_int_intranet_v6_ips 
 
-  lb_extnet_ip_0:
+  my_ip:
     type: string
-    description: lb_extnet_ip_0 
+    description: my_ip 
 
   lb_extnet_ip_1:
     type: string
@@ -132,10 +132,7 @@ resources:
       name: { get_param: [lb1_names, 0]  }
       flavor: { get_param: lb1_flavor_name}
       networks:
-        - port: { get_resource: lb_0_extnet_0_port }
-        - port: { get_resource: lb_1_extnet_0_port }
-        - port: { get_resource: lb_2_extnet_0_port }
-        - port: { get_resource: lb_3_extnet_0_port }  
+        - port: { get_resource: lb_0_extnet_port_0 }
       metadata:
         vnf_name: { get_param: vnf_name }
         vnf_id: { get_param: vnf_id }
@@ -148,65 +145,24 @@ resources:
       name: { get_param: [db_names, 1]  }
       flavor: { get_param: db_flavor_name}
       networks:
-        - port: { get_resource: db_0_int_intranet_0_port }
-        - port: { get_resource: db_1_int_intranet_0_port }
-        - port: { get_resource: db_2_int_intranet_0_port }
+        - port: { get_resource: db_0_int_intranet_port_0 }
       metadata:
         vnf_name: { get_param: vnf_name }
         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 }
           fixed_ips:
-            - ip_address: { get_param: db_int_intranet_ip_0 }
+            - ip_address: { get_param: db_int_intaranet_ip_0 }
             - ip_address: { get_param: db_int_intranet_v6_ip_0 }
 
-  db_1_int_intranet_0_port:
-        type: OS::Neutron::Port
-        properties:
-          network: { get_param: int_intranet_net_id }
-          fixed_ips:
-            - ip_address: { get_param: [db_int_intranet_ips, 0] }
-            - ip_address: { get_param: [db_int_intranet_v6_ips, 0] }
-
-  db_2_int_intranet_0_port:
-        type: OS::Neutron::Port
-        properties:
-          network: { get_param: int_intranet_net_id }
-          fixed_ips:
-            - ip_address: { get_param: [db_int_intranet_ips, 1] }
-
-  lb_0_extnet_0_port:
+  lb_0_extnet_port_0:
         type: OS::Neutron::Port
         properties:
           network: { get_param: extnet_net_name }
           fixed_ips:
-            - ip_address: { get_param: lb_extnet_ip_0 }
+            - ip_address: { get_param: my_ip }
             - ip_address: { get_param: lb_extnet_v6_ip_0 }
-
-  lb_1_extnet_0_port:
-        type: OS::Neutron::Port
-        properties:
-          network: { get_param: extnet_net_id }
-          fixed_ips:
-            - ip_address: { get_param: [lb_extnet_ips, 0] }
-            - ip_address: { get_param: [lb_extnet_v6_ips, 0] }
-
-  lb_2_extnet_0_port:
-        type: OS::Neutron::Port
-        properties:
-          network: { get_param: extnet_net_name }
-          fixed_ips:
-            - ip_address: { get_param: lb_extnet_ip_1 }
-            - subnet_id: { get_param: extnet_subnet_id }
-
-  lb_3_extnet_0_port:
-        type: OS::Neutron::Port
-        properties:
-          network: { get_param: extnet_net_id }
-          fixed_ips:
-            - subnet_id: { get_param: extnet_subnet_id }
-            - subnet_id: { get_param: extnet_v6_subnet_id }
diff --git a/ice_validator/tests/fixtures/test_fixed_ips_include_vm_type_network_role/fail/internal_mismatch_vm_type_nova_server.yaml b/ice_validator/tests/fixtures/test_fixed_ips_include_vm_type_network_role/fail/internal_mismatch_vm_type_nova_server.yaml
deleted file mode 100644
index 7fb9880..0000000
--- a/ice_validator/tests/fixtures/test_fixed_ips_include_vm_type_network_role/fail/internal_mismatch_vm_type_nova_server.yaml
+++ /dev/null
@@ -1,212 +0,0 @@
-# -*- coding: utf8 -*-
-# ============LICENSE_START=======================================================
-# org.onap.vvp/validation-scripts
-# ===================================================================
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
-# ===================================================================
-#
-# Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the "License");
-# you may not use this software except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#             http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-#
-#
-# Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
-# you may not use this documentation except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#             https://creativecommons.org/licenses/by/4.0/
-#
-# Unless required by applicable law or agreed to in writing, documentation
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# ============LICENSE_END============================================
-#
-#
----
-heat_template_version: 2015-04-30
-
-description: Heat template description
-
-parameters:
-
-  vnf_id:
-    type: string
-    description: Unique ID for this VNF instance
-
-  vf_module_id:
-    type: string
-    description: Unique ID for this VF module
-
-  vnf_name:
-    type: string
-    description: Unique name for this VNF instance
-
-  db1_names:
-    type: comma_delimited_list
-    description: Names attribute for the VMs
-
-  lb_names:
-    type: comma_delimited_list
-    description: Names attribute for the VMs
-
-  lb_flavor_name:
-    type: string
-    description: flavor to be used to create this vm must be one of the following flavors
-
-  db1_flavor_name:
-    type: string
-    description: flavor to be used to create this vm must be one of the following flavors
-
-  availability_zone_0:
-    type: string
-    description: availability zone to be used
-
-  exnet_net_name:
-    type: string
-    description: network name for the external network extnet
-
-  exnet_net_id:
-    type: string
-    description: network id for the external network extnet
-
-  int_intranet_net_id:
-    type: string
-    description: network id for the internal network intranet 
-
-  db_int_intranet_ip_0:
-    type: string
-    description: db_int_intranet_ip_0 
-
-  db_int_intranet_v6_ip_0:
-    type: string
-    description: db_int_intranet_v6_ip_0 
-
-  db_int_intranet_ips:
-    type: string
-    description: db_int_intranet_ips 
-
-  db_int_intranet_v6_ips:
-    type: string
-    description: db_int_intranet_v6_ips 
-
-  lb_extnet_ip_0:
-    type: string
-    description: lb_extnet_ip_0 
-
-  lb_extnet_ip_1:
-    type: string
-    description: lb_extnet_ip_1 
-
-  lb_extnet_v6_ip_0:
-    type: string
-    description: lb_extnet_v6_ip_0
-
-  lb_extnet_ips:
-    type: string
-    description: lb_extnet_ips 
-
-  lb_extnet_v6_ips:
-    type: string
-    description: lb_extnet_v6_ips 
-
-resources:
-
-  lb_server_0:
-    type: OS::Nova::Server
-    properties:
-      availability_zone: { get_param: availability_zone_0 }
-      name: { get_param: [lb_names, 0]  }
-      flavor: { get_param: lb_flavor_name}
-      networks:
-        - port: { get_resource: lb_0_extnet_0_port }
-        - port: { get_resource: lb_1_extnet_0_port }
-        - port: { get_resource: lb_2_extnet_0_port }
-        - port: { get_resource: lb_3_extnet_0_port }  
-      metadata:
-        vnf_name: { get_param: vnf_name }
-        vnf_id: { get_param: vnf_id }
-        vf_module_id: { get_param: vf_module_id }
-
-  db_server_0:
-    type: OS::Nova::Server
-    properties:
-      availability_zone: { get_param: availability_zone_0 }
-      name: { get_param: [db1_names, 1]  }
-      flavor: { get_param: db1_flavor_name}
-      networks:
-        - port: { get_resource: db_0_int_intranet_0_port }
-        - port: { get_resource: db_1_int_intranet_0_port }
-        - port: { get_resource: db_2_int_intranet_0_port }
-      metadata:
-        vnf_name: { get_param: vnf_name }
-        vnf_id: { get_param: vnf_id }
-        vf_module_id: { get_param: vf_module_id }
-
-  db_0_int_intranet_0_port:
-        type: OS::Neutron::Port
-        properties:
-          network: { get_param: int_intranet_net_id }
-          fixed_ips:
-            - ip_address: { get_param: db_int_intranet_ip_0 }
-            - ip_address: { get_param: db_int_intranet_v6_ip_0 }
-
-  db_1_int_intranet_0_port:
-        type: OS::Neutron::Port
-        properties:
-          network: { get_param: int_intranet_net_id }
-          fixed_ips:
-            - ip_address: { get_param: [db_int_intranet_ips, 0] }
-            - ip_address: { get_param: [db_int_intranet_v6_ips, 0] }
-
-  db_2_int_intranet_0_port:
-        type: OS::Neutron::Port
-        properties:
-          network: { get_param: int_intranet_net_id }
-          fixed_ips:
-            - ip_address: { get_param: [db_int_intranet_ips, 1] }
-
-  lb_0_extnet_0_port:
-        type: OS::Neutron::Port
-        properties:
-          network: { get_param: extnet_net_name }
-          fixed_ips:
-            - ip_address: { get_param: lb_extnet_ip_0 }
-            - ip_address: { get_param: lb_extnet_v6_ip_0 }
-
-  lb_1_extnet_0_port:
-        type: OS::Neutron::Port
-        properties:
-          network: { get_param: extnet_net_id }
-          fixed_ips:
-            - ip_address: { get_param: [lb_extnet_ips, 0] }
-            - ip_address: { get_param: [lb_extnet_v6_ips, 0] }
-
-  lb_2_extnet_0_port:
-        type: OS::Neutron::Port
-        properties:
-          network: { get_param: extnet_net_name }
-          fixed_ips:
-            - ip_address: { get_param: lb_extnet_ip_1 }
-            - subnet_id: { get_param: extnet_subnet_id }
-
-  lb_3_extnet_0_port:
-        type: OS::Neutron::Port
-        properties:
-          network: { get_param: extnet_net_id }
-          fixed_ips:
-            - subnet_id: { get_param: extnet_subnet_id }
-            - subnet_id: { get_param: extnet_v6_subnet_id }
diff --git a/ice_validator/tests/fixtures/test_fixed_ips_include_vm_type_network_role/fail/internal_wrong_vm_type_param.yaml b/ice_validator/tests/fixtures/test_fixed_ips_include_vm_type_network_role/fail/internal_wrong_vm_type_param.yaml
deleted file mode 100644
index 99860e8..0000000
--- a/ice_validator/tests/fixtures/test_fixed_ips_include_vm_type_network_role/fail/internal_wrong_vm_type_param.yaml
+++ /dev/null
@@ -1,212 +0,0 @@
-# -*- coding: utf8 -*-
-# ============LICENSE_START=======================================================
-# org.onap.vvp/validation-scripts
-# ===================================================================
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
-# ===================================================================
-#
-# Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the "License");
-# you may not use this software except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#             http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-#
-#
-# Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
-# you may not use this documentation except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#             https://creativecommons.org/licenses/by/4.0/
-#
-# Unless required by applicable law or agreed to in writing, documentation
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# ============LICENSE_END============================================
-#
-#
----
-heat_template_version: 2015-04-30
-
-description: Heat template description
-
-parameters:
-
-  vnf_id:
-    type: string
-    description: Unique ID for this VNF instance
-
-  vf_module_id:
-    type: string
-    description: Unique ID for this VF module
-
-  vnf_name:
-    type: string
-    description: Unique name for this VNF instance
-
-  db_names:
-    type: comma_delimited_list
-    description: Names attribute for the VMs
-
-  lb_names:
-    type: comma_delimited_list
-    description: Names attribute for the VMs
-
-  lb_flavor_name:
-    type: string
-    description: flavor to be used to create this vm must be one of the following flavors
-
-  db_flavor_name:
-    type: string
-    description: flavor to be used to create this vm must be one of the following flavors
-
-  availability_zone_0:
-    type: string
-    description: availability zone to be used
-
-  exnet_net_name:
-    type: string
-    description: network name for the external network extnet
-
-  exnet_net_id:
-    type: string
-    description: network id for the external network extnet
-
-  int_intranet_net_id:
-    type: string
-    description: network id for the internal network intranet 
-
-  db_int_intranet_ip_0:
-    type: string
-    description: db_int_intranet_ip_0 
-
-  db_int_intranet_v6_ip_0:
-    type: string
-    description: db_int_intranet_v6_ip_0 
-
-  db_int_intranet_ips:
-    type: string
-    description: db_int_intranet_ips 
-
-  db_int_intranet_v6_ips:
-    type: string
-    description: db_int_intranet_v6_ips 
-
-  lb_extnet_ip_0:
-    type: string
-    description: lb_extnet_ip_0 
-
-  lb_extnet_ip_1:
-    type: string
-    description: lb_extnet_ip_1 
-
-  lb_extnet_v6_ip_0:
-    type: string
-    description: lb_extnet_v6_ip_0
-
-  lb_extnet_ips:
-    type: string
-    description: lb_extnet_ips 
-
-  lb_extnet_v6_ips:
-    type: string
-    description: lb_extnet_v6_ips 
-
-resources:
-
-  lb_server_0:
-    type: OS::Nova::Server
-    properties:
-      availability_zone: { get_param: availability_zone_0 }
-      name: { get_param: [lb_names, 0]  }
-      flavor: { get_param: lb_flavor_name}
-      networks:
-        - port: { get_resource: lb_0_extnet_0_port }
-        - port: { get_resource: lb_1_extnet_0_port }
-        - port: { get_resource: lb_2_extnet_0_port }
-        - port: { get_resource: lb_3_extnet_0_port }  
-      metadata:
-        vnf_name: { get_param: vnf_name }
-        vnf_id: { get_param: vnf_id }
-        vf_module_id: { get_param: vf_module_id }
-
-  db_server_0:
-    type: OS::Nova::Server
-    properties:
-      availability_zone: { get_param: availability_zone_0 }
-      name: { get_param: [db_names, 1]  }
-      flavor: { get_param: db_flavor_name}
-      networks:
-        - port: { get_resource: db_0_int_intranet_0_port }
-        - port: { get_resource: db_1_int_intranet_0_port }
-        - port: { get_resource: db_2_int_intranet_0_port }
-      metadata:
-        vnf_name: { get_param: vnf_name }
-        vnf_id: { get_param: vnf_id }
-        vf_module_id: { get_param: vf_module_id }
-
-  db_0_int_intranet_0_port:
-        type: OS::Neutron::Port
-        properties:
-          network: { get_param: int_intranet_net_id }
-          fixed_ips:
-            - ip_address: { get_param: db_int_intranet_ip_0 }
-            - ip_address: { get_param: db_int_intranet_v6_ip_0 }
-
-  db_1_int_intranet_0_port:
-        type: OS::Neutron::Port
-        properties:
-          network: { get_param: int_intranet_net_id }
-          fixed_ips:
-            - ip_address: { get_param: [db1_int_intranet_ips, 0] }
-            - ip_address: { get_param: [db_int_intranet_v6_ips, 0] }
-
-  db_2_int_intranet_0_port:
-        type: OS::Neutron::Port
-        properties:
-          network: { get_param: int_intranet_net_id }
-          fixed_ips:
-            - ip_address: { get_param: [db_int_intranet_ips, 1] }
-
-  lb_0_extnet_0_port:
-        type: OS::Neutron::Port
-        properties:
-          network: { get_param: extnet_net_name }
-          fixed_ips:
-            - ip_address: { get_param: lb_extnet_ip_0 }
-            - ip_address: { get_param: lb_extnet_v6_ip_0 }
-
-  lb_1_extnet_0_port:
-        type: OS::Neutron::Port
-        properties:
-          network: { get_param: extnet_net_id }
-          fixed_ips:
-            - ip_address: { get_param: [lb_extnet_ips, 0] }
-            - ip_address: { get_param: [lb_extnet_v6_ips, 0] }
-
-  lb_2_extnet_0_port:
-        type: OS::Neutron::Port
-        properties:
-          network: { get_param: extnet_net_name }
-          fixed_ips:
-            - ip_address: { get_param: lb_extnet_ip_1 }
-            - subnet_id: { get_param: extnet_subnet_id }
-
-  lb_3_extnet_0_port:
-        type: OS::Neutron::Port
-        properties:
-          network: { get_param: extnet_net_id }
-          fixed_ips:
-            - subnet_id: { get_param: extnet_subnet_id }
-            - subnet_id: { get_param: extnet_v6_subnet_id }
diff --git a/ice_validator/tests/fixtures/test_fixed_ips_include_vm_type_network_role/pass/valid_template.yaml b/ice_validator/tests/fixtures/test_fixed_ips_include_vm_type_network_role/pass/valid_template.yaml
index 88d06f2..255392c 100644
--- a/ice_validator/tests/fixtures/test_fixed_ips_include_vm_type_network_role/pass/valid_template.yaml
+++ b/ice_validator/tests/fixtures/test_fixed_ips_include_vm_type_network_role/pass/valid_template.yaml
@@ -123,6 +123,10 @@ parameters:
     type: comma_delimited_list
     description: lb_extnet_v6_ips 
 
+  vm_type_1_network_role_a_ip_0:
+    type: string
+    description: nsadjfsa
+
 resources:
 
   lb_server_0:
@@ -210,15 +214,17 @@ resources:
           fixed_ips:
             - subnet_id: { get_param: extnet_subnet_id }
             - subnet_id: { get_param: extnet_v6_subnet_id }
+
   reserve_port_vm_type_1_network_role_a_floating_ip_0:
         type: OS::Neutron::Port
         properties:
           network: { get_param: network_role_a_net_id }
           fixed_ips:
-            - ip_address : { get_param: vm_type_1_network_role_a_floating_ip }
+            - ip_address : { get_param: vm_type_1_network_role_a_ip_0 }
+
   reserve_port_vm_type_1_network_role_a_floating_v6_ip_0:
         type: OS::Neutron::Port
         properties:
           network: { get_param: network_role_a_net_id }
           fixed_ips:
-            - ip_address : { get_param: vm_type_1_network_role_a_floating_v6_ip }
+            - ip_address : { get_param: vm_type_1_network_role_a_ip_0 }
diff --git a/ice_validator/tests/fixtures/test_neutron_port_fixed_ips_subnet/pass/pass0.yaml b/ice_validator/tests/fixtures/test_neutron_port_fixed_ips_subnet/pass/pass0.yaml
index 2a651b1..2b4e9c7 100644
--- a/ice_validator/tests/fixtures/test_neutron_port_fixed_ips_subnet/pass/pass0.yaml
+++ b/ice_validator/tests/fixtures/test_neutron_port_fixed_ips_subnet/pass/pass0.yaml
@@ -51,7 +51,7 @@ parameters:
     type: comma_delimited_list
   bialy_subnet:
     type: string
-  bialy_subnet_id:
+  int_bialy_subnet_id:
     type: string
 
 resources:
@@ -62,7 +62,7 @@ resources:
       network: { get_param: int_intranet_net_name }
       fixed_ips:
         - ip_address: { get_param: lb_1_int_intranet_floating_ip }
-          subnet: { get_param: bialy_subnet_id }
+          subnet: { get_param: int_bialy_subnet_id }
       binding:vnic_type: direct
       value_specs:
         vlan_filter: {get_param: vm_typeX_bialy_vlan_filter}
@@ -80,7 +80,7 @@ resources:
       network: { get_param: extnet_net_id }
       fixed_ips:
         - ip_address: { get_param: lb_2_extnet_floating_v6_ip }
-          subnet_id: { get_param: bialy_subnet_id }
+          subnet_id: { get_param: int_bialy_subnet_id }
       binding:vnic_type: direct
       value_specs:
         vlan_filter: {get_param: vm_typeX_bialy_vlan_filter}
diff --git a/ice_validator/tests/fixtures/test_neutron_port_fixed_ips_subnet/pass/pass0_base.yaml b/ice_validator/tests/fixtures/test_neutron_port_fixed_ips_subnet/pass/pass0_base.yaml
index 04919c3..4f92923 100644
--- a/ice_validator/tests/fixtures/test_neutron_port_fixed_ips_subnet/pass/pass0_base.yaml
+++ b/ice_validator/tests/fixtures/test_neutron_port_fixed_ips_subnet/pass/pass0_base.yaml
@@ -46,3 +46,6 @@ resources:
   vm_typeX_0_bialy_port_2:
     type: OS::Neutron::Net
 
+outputs:
+  int_bialy_subnet_id:
+    value: sanfdkl