diff options
Diffstat (limited to 'vnfsdk_pkgtools/vnfreq')
| -rw-r--r-- | vnfsdk_pkgtools/vnfreq/__init__.py | 3 | ||||
| -rw-r--r-- | vnfsdk_pkgtools/vnfreq/pkg_reqs.py | 10 |
2 files changed, 4 insertions, 9 deletions
diff --git a/vnfsdk_pkgtools/vnfreq/__init__.py b/vnfsdk_pkgtools/vnfreq/__init__.py index 4c27495..70e3294 100644 --- a/vnfsdk_pkgtools/vnfreq/__init__.py +++ b/vnfsdk_pkgtools/vnfreq/__init__.py @@ -20,9 +20,9 @@ import prettytable import six from stevedore import driver - NS = "vnfsdk.pkgtools.vnfreq" + def get_vnfreq_tester(name): """Get vnf requirement tester. @@ -87,4 +87,3 @@ class TesterBase(object): self.err = self._do_check(reader, tosca) except Exception as e: self.err = e - diff --git a/vnfsdk_pkgtools/vnfreq/pkg_reqs.py b/vnfsdk_pkgtools/vnfreq/pkg_reqs.py index 4744eac..cf880e4 100644 --- a/vnfsdk_pkgtools/vnfreq/pkg_reqs.py +++ b/vnfsdk_pkgtools/vnfreq/pkg_reqs.py @@ -13,14 +13,11 @@ # under the License. # -import abc import os import six -from stevedore import driver from vnfsdk_pkgtools.packager import toscameta -from vnfsdk_pkgtools.validator import toscaparser_validator as tv from vnfsdk_pkgtools import vnfreq @@ -90,7 +87,7 @@ class R26881(vnfreq.TesterBase): if file and \ os.path.isfile(os.path.join(entry_path, file)) or \ os.path.isfile(os.path.join(reader.destination, file)): - valid_artifacts.append(file) + valid_artifacts.append(file) if not valid_artifacts: raise vnfreq.VnfRequirementError("No valid binaries or images for VNF instantion found") return 0 @@ -111,9 +108,8 @@ class R35851(vnfreq.TesterBase): for node in getattr(tosca.tosca, 'nodetemplates', []): if tosca.is_type(node, 'tosca.nodes.nfv.VduCp') or \ tosca.is_type(node, 'tosca.nodes.nfv.VnfVirtualLink'): - found = True - break + found = True + break if not found: raise vnfreq.VnfRequirementError("No basic network or application connectivity found") return 0 - |