[VVP] udpating scripts for casablanca 2

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

diff --git a/ice_validator/tests/test_network_format.py b/ice_validator/tests/test_network_format.py
index 28144d3..7fb343a 100644 (file)
--- a/ice_validator/tests/test_network_format.py
+++ b/ice_validator/tests/test_network_format.py
@@ -2,11 +2,11 @@
 # ============LICENSE_START=======================================================
 # org.onap.vvp/validation-scripts
 # ===================================================================
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright © 2018 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”);
+# 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
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# 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
 #
@@ -39,10 +39,14 @@
 #
 
 import pytest
-import yaml
-from .utils.network_roles import get_network_role_from_port
+from tests import cached_yaml as yaml
 
+from .helpers import validates
+from .utils.network_roles import get_network_role_from_port, \
+    property_uses_get_resource
 
+
+@validates('R-62983', 'R-86182')
 def test_network_format(heat_template):
     '''
     Make sure all network properties use the allowed naming
@@ -61,6 +65,8 @@ def test_network_format(heat_template):
             continue
         if "properties" not in v:
             continue
+        if property_uses_get_resource(v, "network"):
+            continue
         if v.get("type") != "OS::Neutron::Port":
             continue
         if not get_network_role_from_port(v):