[VVP] Removing unnecessary trademark lines

[vvp/validation-scripts.git] / ice_validator / tests / test_fixed_ips_include_vm_type_network_role.py

diff --git a/ice_validator/tests/test_fixed_ips_include_vm_type_network_role.py b/ice_validator/tests/test_fixed_ips_include_vm_type_network_role.py
index 53f6453..e0e6b31 100644 (file)
--- a/ice_validator/tests/test_fixed_ips_include_vm_type_network_role.py
+++ b/ice_validator/tests/test_fixed_ips_include_vm_type_network_role.py
@@ -2,7 +2,7 @@
 # ============LICENSE_START=======================================================
 # org.onap.vvp/validation-scripts
 # ===================================================================
-# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
+# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
@@ -35,29 +35,32 @@
 #
 # ============LICENSE_END============================================
 #
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 #
-from .helpers import validates
 
 import pytest
-import yaml
+from tests import cached_yaml as yaml
+
+from .helpers import validates
 from .utils.ports import get_invalid_ip_addresses
 
 
-@validates('R-40971',
-           'R-27818',
-           'R-29765',
-           'R-85235',
-           'R-78380',
-           'R-23503',
-           'R-71577',
-           'R-04697')
+@validates(
+    "R-40971",
+    "R-27818",
+    "R-29765",
+    "R-85235",
+    "R-78380",
+    "R-23503",
+    "R-71577",
+    "R-04697",
+    "R-34037",
+)
 def test_fixed_ips_include_vm_type_network_role(heat_template):
-    '''
+    """
     Check that all fixed_ips ip addresses include the {vm_type} of the
     nova server it is associated to and also contains the {network_role}
     of the network it is associated with
-    '''
+    """
     with open(heat_template) as fh:
         yml = yaml.load(fh)
 
@@ -65,7 +68,14 @@ def test_fixed_ips_include_vm_type_network_role(heat_template):
     if "resources" not in yml:
         pytest.skip("No resources specified in the heat template")
 
-    invalid_ip_addresses = get_invalid_ip_addresses(yml['resources'],
-                                                    "fixed_ips")
+    if "parameters" not in yml:
+        pytest.skip("No parameters specified in the heat template")
+
+    invalid_ip_addresses = get_invalid_ip_addresses(
+        yml["resources"], "fixed_ips", yml["parameters"]
+    )
 
-    assert not set(invalid_ip_addresses)
+    msg = "The following fixed_ips are declared incorrectly: {}".format(
+        ", ".join(invalid_ip_addresses)
+    )
+    assert not set(invalid_ip_addresses), msg