diff options
Diffstat (limited to 'catalog-be/src/main/resources/scripts/sdcBePy/tosca/models')
| -rw-r--r-- | catalog-be/src/main/resources/scripts/sdcBePy/tosca/models/normativeToUpdateList.py | 24 | ||||
| -rw-r--r-- | catalog-be/src/main/resources/scripts/sdcBePy/tosca/models/normativeTypesList.py | 24 |
2 files changed, 44 insertions, 4 deletions
diff --git a/catalog-be/src/main/resources/scripts/sdcBePy/tosca/models/normativeToUpdateList.py b/catalog-be/src/main/resources/scripts/sdcBePy/tosca/models/normativeToUpdateList.py index a2830185d5..2d243d80ab 100644 --- a/catalog-be/src/main/resources/scripts/sdcBePy/tosca/models/normativeToUpdateList.py +++ b/catalog-be/src/main/resources/scripts/sdcBePy/tosca/models/normativeToUpdateList.py @@ -27,13 +27,20 @@ def get_heat_and_normative_to_update_list(types, base_file_location): ] -def get_nfv_onap_sol_to_update_list(types, base_file_location): +def get_onap_sol_to_update_list(types, base_file_location): return [ - get_nfv(types, base_file_location), get_onap(types, base_file_location), get_sol(types, base_file_location) ] +def get_nfv_to_update_list(types, base_file_location): + return [ + get_nfv(types, base_file_location), + get_nfv_2_7_1(types, base_file_location), + get_nfv_3_3_1(types, base_file_location), + get_nfv_4_1_1(types, base_file_location), + ] + def get_heat(types, base_location="/"): return NormativeTypeCandidate(base_location + "heat-types/", @@ -48,7 +55,18 @@ def get_normative(types, base_location="/"): def get_nfv(types, base_location="/"): return NormativeTypeCandidate(base_location + "nfv-types/", types.get_type("nfv")) - + +def get_nfv_2_7_1(types, base_location="/"): + return NormativeTypeCandidate(base_location + "nfv-types/2.7.1/", + types.get_type("nfv_2_7_1")) + +def get_nfv_3_3_1(types, base_location="/"): + return NormativeTypeCandidate(base_location + "nfv-types/3.3.1/", + types.get_type("nfv_3_3_1")) + +def get_nfv_4_1_1(types, base_location="/"): + return NormativeTypeCandidate(base_location + "nfv-types/4.1.1/", + types.get_type("nfv_4_1_1")) def get_onap(types, base_location="/"): return NormativeTypeCandidate(base_location + "onap-types/", diff --git a/catalog-be/src/main/resources/scripts/sdcBePy/tosca/models/normativeTypesList.py b/catalog-be/src/main/resources/scripts/sdcBePy/tosca/models/normativeTypesList.py index 46b8d9b5bc..12a4491b96 100644 --- a/catalog-be/src/main/resources/scripts/sdcBePy/tosca/models/normativeTypesList.py +++ b/catalog-be/src/main/resources/scripts/sdcBePy/tosca/models/normativeTypesList.py @@ -6,6 +6,9 @@ def get_normative_type_candidate_list(base_file_location): get_normative(base_file_location), get_heat(base_file_location), get_nfv(base_file_location), + get_nfv_2_7_1(base_file_location), + get_nfv_3_3_1(base_file_location), + get_nfv_4_1_1(base_file_location), get_onap(base_file_location), get_sol(base_file_location) ] @@ -110,7 +113,26 @@ def get_nfv(base_file_location="/"): "PonUni", "OltNni", "OntNni"]) - + +def get_nfv_2_7_1(base_file_location="/"): + return NormativeTypeCandidate(base_file_location + "nfv-types/2.7.1/", + ["vduCompute", + "vduVirtualFileStorage", + "vnfExtCp", + "vduCp", + "vipCp"]) + +def get_nfv_3_3_1(base_file_location="/"): + return NormativeTypeCandidate(base_file_location + "nfv-types/3.3.1/", + ["vduVirtualBlockStorage", + "VNF"]) + +def get_nfv_4_1_1(base_file_location="/"): + return NormativeTypeCandidate(base_file_location + "nfv-types/4.1.1/", + ["VNF", + "osContainer", + "osContainerGroup", + "virtualCp"]) def get_onap(base_file_location="/"): return NormativeTypeCandidate(base_file_location + "onap-types/", |