diff options
| author |   Lianhao Lu <lianhao.lu@intel.com> | 2018-07-27 13:28:48 +0800 |
|---|---|---|
| committer | Lianhao Lu <lianhao.lu@intel.com> | 2018-08-02 10:01:09 +0800 |
| commit | 89649fc1d5fa2cfa73c04d53d6ff5e0a46cf2e1f (patch) | |
| tree | b88a28d15a6cc1a6278887982ce8828c67f95f63 /vnfsdk_pkgtools | |
| parent | 979471fd238cba6847c7e16400c3d8fdb4cc9711 (diff) | |
Make aria dependency optional
Since cloudify has announced the retirement of aria, we need to add
opnfv-toscaparser as our default backend. However, since they have
conflicting dependencies, we need to make aria dependency optional.
Change-Id: I22bb5f7411162828226d4290fd00dfd91d49efa3
Issue-ID: VNFSDK-292
Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
Diffstat (limited to 'vnfsdk_pkgtools')
| -rw-r--r-- | vnfsdk_pkgtools/cli/__main__.py | 3 | ||||
| -rw-r--r-- | vnfsdk_pkgtools/validator/aria_validator.py | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/vnfsdk_pkgtools/cli/__main__.py b/vnfsdk_pkgtools/cli/__main__.py index 88776de..7cb4e54 100644 --- a/vnfsdk_pkgtools/cli/__main__.py +++ b/vnfsdk_pkgtools/cli/__main__.py @@ -18,7 +18,6 @@ from vnfsdk_pkgtools.packager import csar import sys import logging import argparse -from aria import install_aria_extensions import os import shutil import tempfile @@ -53,8 +52,6 @@ def parse_args(args_list): """ CLI entry point """ - install_aria_extensions() - parser = argparse.ArgumentParser(description='VNF SDK CSAR manipulation tool') subparsers = parser.add_subparsers(help='csar-create') diff --git a/vnfsdk_pkgtools/validator/aria_validator.py b/vnfsdk_pkgtools/validator/aria_validator.py index b4b947c..e84d017 100644 --- a/vnfsdk_pkgtools/validator/aria_validator.py +++ b/vnfsdk_pkgtools/validator/aria_validator.py @@ -15,6 +15,7 @@ import os +from aria import install_aria_extensions from aria.parser.loading import UriLocation from aria.parser.consumption import ( ConsumptionContext, @@ -29,6 +30,10 @@ from vnfsdk_pkgtools import validator class AriaValidator(validator.ValidatorBase): + def __init__(self): + super(AriaValidator, self).__init__() + install_aria_extensions() + def validate(self, reader): context = ConsumptionContext() service_template_path = os.path.join(reader.destination, |