X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ice_validator%2Ftests%2Ftest_get_file_only_reference_local_files.py;h=e8488486caa752bd1cb1a4ec0c4ea7ca1b497efc;hb=0c4e64d87728b89aa9cd4d41d738f5bfe64ceee3;hp=a419585f9c588446c8066c247b04196eef54a357;hpb=60d5ad7d00eadd6395eca186e6fa76a43df3c6cf;p=vvp%2Fvalidation-scripts.git

diff --git a/ice_validator/tests/test_get_file_only_reference_local_files.py b/ice_validator/tests/test_get_file_only_reference_local_files.py
index a419585..e848848 100644
--- a/ice_validator/tests/test_get_file_only_reference_local_files.py
+++ b/ice_validator/tests/test_get_file_only_reference_local_files.py
@@ -1,5 +1,5 @@
 # -*- coding: utf8 -*-
-# ============LICENSE_START=======================================================
+# ============LICENSE_START====================================================
 # org.onap.vvp/validation-scripts
 # ===================================================================
 # Copyright © 2017 AT&T Intellectual Property. All rights reserved.
@@ -35,10 +35,12 @@
 #
 # ============LICENSE_END============================================
 #
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 #
-
+"""test get_file
+"""
 import re
+from os import listdir
+from os import path
 from os import sep
 
 import pytest
@@ -47,14 +49,19 @@ from tests import cached_yaml as yaml
 from .helpers import validates
 from .utils.nested_iterables import find_all_get_file_in_yml
 
+VERSION = "1.0.0"
 
-@validates('R-99646')
-def test_get_file_only_reference_local_files(yaml_file):
-    '''
+# pylint: disable=invalid-name
+
+
+@validates("R-41888")
+@pytest.mark.base
+def test_get_file_no_url_retrieval(yaml_file):
+    """
     Make sure that all references to get_file only try to access local files
     and only assume a flat directory structure
-    '''
-    is_url = re.compile(r'(?:http|https|file|ftp|ftps)://.+')
+    """
+    is_url = re.compile(r"(?:http|https|file|ftp|ftps)://.+")
 
     with open(yaml_file) as fh:
         yml = yaml.load(fh)
@@ -74,4 +81,39 @@ def test_get_file_only_reference_local_files(yaml_file):
             invalid_files.append(get_file)
             continue
 
-    assert not set(invalid_files)
+    assert not set(invalid_files), "External get_file references detected {}".format(
+        invalid_files
+    )
+
+
+@validates("R-76718")
+@pytest.mark.base
+def test_get_file_only_reference_local_files(yaml_file):
+    """
+    Make sure that all references to get_file only try to access local files
+    and only assume a flat directory structure
+    """
+    is_url = re.compile(r"(?:http|https|file|ftp|ftps)://.+")
+    base_dir, filename = path.split(yaml_file)
+
+    with open(yaml_file) as fh:
+        yml = yaml.load(fh)
+
+    # skip if parameters are not defined
+    if "resources" not in yml:
+        pytest.skip("No resources specified in the heat template")
+
+    get_files = find_all_get_file_in_yml(yml["resources"])
+
+    invalid_files = []
+    for get_file in get_files:
+        if is_url.match(get_file):
+            pytest.skip("external get_file detected")
+            continue
+        if get_file not in listdir(base_dir):
+            invalid_files.append(get_file)
+            continue
+
+    assert not set(invalid_files), "Non-local files detected in get_file {}".format(
+        invalid_files
+    )