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

1 files changed, 12 insertions, 1 deletions

diff --git a/catalog-be/src/main/resources/scripts/sdcBePy/tosca/upgrade/runUpgradeNormative.py b/catalog-be/src/main/resources/scripts/sdcBePy/tosca/upgrade/runUpgradeNormative.py
index 4b0d0cc8a2..a4305ec352 100644
--- a/catalog-be/src/main/resources/scripts/sdcBePy/tosca/upgrade/runUpgradeNormative.py
+++ b/catalog-be/src/main/resources/scripts/sdcBePy/tosca/upgrade/runUpgradeNormative.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
 from sdcBePy.tosca.imports.runNormativeType import run
-from sdcBePy.tosca.models.normativeToUpdateList import get_heat, get_normative, get_nfv, get_onap, get_sol
+from sdcBePy.tosca.models.normativeToUpdateList import get_heat, get_normative, get_nfv, get_2_7_1, get_nfv_3_3_1, get_nfv_4_1_1, get_onap, get_sol
 from sdcBePy.tosca.models.normativeTypesList import get_heat1707, get_heat1702_3537, get_heat_version
 from sdcBePy.tosca.upgrade.run import get_all_types
 
@@ -21,7 +21,18 @@ def run_upgrade_normative():
 def run_upgrade_nfv():
     normative_candidate = get_nfv(all_types)
     run(normative_candidate)
+    
+def run_upgrade_nfv_2_7_1():
+    normative_candidate = get_nfv_2_7_1(all_types)
+    run(normative_candidate)
+
+def run_upgrade_nfv_3_3_1():
+    normative_candidate = get_nfv_3_3_1(all_types)
+    run(normative_candidate)
 
+def run_upgrade_nfv_4_1_1():
+    normative_candidate = get_nfv_4_1_1(all_types)
+    run(normative_candidate)
 
 def run_upgrade_onap():
     normative_candidate = get_onap(all_types)