diff options
author | MichaelMorris <michael.morris@est.tech> | 2021-02-05 16:18:52 +0000 |
---|---|---|
committer | Christophe Closset <christophe.closset@intl.att.com> | 2021-02-21 07:55:36 +0000 |
commit | 8cc03e2c78639be5500ab50f3ebaaf7d64404775 (patch) | |
tree | 1c4d82ba477c4de058f8817b717deaa2f3f4e877 /catalog-be/src/main/resources/scripts/sdcBePy/tosca/imports/runNormativeType.py | |
parent | 751ac4b93e575c56e29cdbbcf95e0aa899d914a2 (diff) |
Update node and data types for SOL001 3.3.1 + CNF enhancements
Types in 2.7.1 folder are types valid for v3.3.1 that have not changed from v2.7.1
Types in 4.1.1 folder are the CNF enhancements which it is assumed will be in v4.1.1
Includes some changes in functionality to support:
1. Deployment of both existing (2.5.1) versions of types and new versions of types through sdc-BE-init
2. Selection of the correct node type definition version at onboarding of an ETSI SOL004 VNF/CNF csar,
based on the declared version supported in the csar (i.e. when a 3.3.1 csar is imported, the node type
definitions valid for 3.3.1 are used (rather than current logic which always selects the latest version)
Signed-off-by: MichaelMorris <michael.morris@est.tech>
Issue-ID: SDC-3470
Change-Id: Iff835d230b173b9d44349caa6b0b11d783e8f8d3
Diffstat (limited to 'catalog-be/src/main/resources/scripts/sdcBePy/tosca/imports/runNormativeType.py')
-rw-r--r-- | catalog-be/src/main/resources/scripts/sdcBePy/tosca/imports/runNormativeType.py | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/catalog-be/src/main/resources/scripts/sdcBePy/tosca/imports/runNormativeType.py b/catalog-be/src/main/resources/scripts/sdcBePy/tosca/imports/runNormativeType.py index ee4e05b21a..4e9a14932f 100644 --- a/catalog-be/src/main/resources/scripts/sdcBePy/tosca/imports/runNormativeType.py +++ b/catalog-be/src/main/resources/scripts/sdcBePy/tosca/imports/runNormativeType.py @@ -4,7 +4,7 @@ import sys from sdcBePy.common.normative.toscaTypes import process_and_create_normative_types from sdcBePy.tosca.main import get_args, usage -from sdcBePy.tosca.models.normativeTypesList import get_normative, get_heat, get_nfv, get_onap, get_sol +from sdcBePy.tosca.models.normativeTypesList import get_normative, get_heat, get_nfv, get_nfv_2_7_1, get_nfv_3_3_1, get_nfv_4_1_1, get_onap, get_sol def run(candidate, exit_on_success=True): @@ -37,6 +37,17 @@ def run_import_nfv(): nfv_candidate = get_nfv() run(nfv_candidate) +def run_import_nfv_2_7_1(): + nfv_candidate = get_nfv_3_3_1() + run(nfv_candidate) + +def run_import_nfv_3_3_1(): + nfv_candidate = get_nfv_3_3_1() + run(nfv_candidate) + +def run_import_nfv_4_1_1(): + nfv_candidate = get_nfv_3_3_1() + run(nfv_candidate) def run_import_onap(): onap_candidate = get_onap() |