From: hewei-cmss <hewei@cmss.chinamobile.com>
Date: Tue, 7 May 2019 12:53:57 +0000 (+0800)
Subject: modify fetch vnf pkg aritfacts
X-Git-Tag: 1.3.1~8
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=dab16781d36319a849e3cac6fa003aa61682b6b9;p=vfc%2Fnfvo%2Fcatalog.git

modify fetch vnf pkg aritfacts

Close file and add exception

Issue-ID: VFC-1377

Change-Id: I0f60bb6a268069fd5db4367cd0b45bc7b116eeb2
Signed-off-by: hewei-cmss <hewei@cmss.chinamobile.com>
---

diff --git a/catalog/packages/biz/vnf_pkg_artifacts.py b/catalog/packages/biz/vnf_pkg_artifacts.py
index d8a77488..bb79624b 100644
--- a/catalog/packages/biz/vnf_pkg_artifacts.py
+++ b/catalog/packages/biz/vnf_pkg_artifacts.py
@@ -36,5 +36,8 @@ class FetchVnfPkgArtifact(object):
             artifact_path = fileutil.get_artifact_path(vnf_extract_path, artifactPath)
             if not artifact_path:
                 raise ArtifactNotFoundException("Couldn't artifact %s" % artifactPath)
-        file_content = open(artifact_path, 'rb').read()
+            with open(artifact_path, 'rb') as f:
+                file_content = f.read()
+        else:
+            raise ArtifactNotFoundException("NF Package format is not csar or zip")
         return file_content