[VVP] ports.py check port type

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

diff --git a/ice_validator/tests/utils/volumes.py b/ice_validator/tests/utils/volumes.py
index 03ac611..7b5d512 100644 (file)
--- a/ice_validator/tests/utils/volumes.py
+++ b/ice_validator/tests/utils/volumes.py
@@ -1,12 +1,12 @@
 # -*- coding: utf8 -*-
-# ============LICENSE_START=======================================================
+# ============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”);
+# 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
 #
@@ -35,23 +35,27 @@
 #
 # ============LICENSE_END============================================
 #
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 #
 
-import yaml
+"""volume resources
+"""
+
 from os import path
+from tests import cached_yaml as yaml
+
+VERSION = "1.0.0"
 
 
 def get_volume_resources(heat_template):
-    '''
+    """
     get the resources from the volume template
     Note: Returns an empty dict if there is no
     volume template or for any other error
-    '''
+    """
     basename = path.splitext(heat_template)[0]
 
-    for ext in ['.yaml', '.yml']:
-        volume_template = basename + '_volume' + ext
+    for ext in [".yaml", ".yml"]:
+        volume_template = basename + "_volume" + ext
         if path.isfile(volume_template):
             break
     else:
@@ -60,13 +64,13 @@ def get_volume_resources(heat_template):
     try:
         with open(volume_template) as fh:
             yml = yaml.load(fh)
-    except Exception as e:
-        print(e)
+    except yaml.YAMLError as e:
+        print(e)  # pylint: disable=superfluous-parens
         return {}
 
-    if 'outputs' not in yml:
+    if "outputs" not in yml:
         return {}
-    if 'resources' not in yml:
+    if "resources" not in yml:
         return {}
 
-    return yml['resources']
+    return yml["resources"]