From fefa3e408f77289594e47edc878d1bee61fca90b Mon Sep 17 00:00:00 2001 From: "Gitelman, Tal (tg851x)" Date: Tue, 20 Mar 2018 01:04:54 +0200 Subject: Normative alignemet Change-Id: I6115e20fe95662153903873d19439bc7cf0c2ff1 Issue-ID: SDC-1104 Signed-off-by: Gitelman, Tal (tg851x) --- .../scripts/import/tosca/importONAPNormativeAll.py | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'catalog-be/src/main/resources/scripts/import/tosca/importONAPNormativeAll.py') diff --git a/catalog-be/src/main/resources/scripts/import/tosca/importONAPNormativeAll.py b/catalog-be/src/main/resources/scripts/import/tosca/importONAPNormativeAll.py index eb55bf84bc..6144d69104 100644 --- a/catalog-be/src/main/resources/scripts/import/tosca/importONAPNormativeAll.py +++ b/catalog-be/src/main/resources/scripts/import/tosca/importONAPNormativeAll.py @@ -8,7 +8,9 @@ import time from importNormativeElements import * from importNormativeTypes import importNormativeTypes from importHeatTypes import importHeatTypes +from importNfvTypes import importNfvTypes from importOnapTypes import importOnapTypes +from importSolTypes import importSolTypes from importNormativeCapabilities import importNormativeCapabilities from importCategoryTypes import importCategories from importNormativeInterfaceLifecycleTypes import importNormativeInterfaceLifecycleType @@ -125,11 +127,19 @@ def main(argv): fileLocation = baseFileLocation + "heat-types/" resultsHeat = importHeatTypes(scheme, beHost, bePort, adminUser, fileLocation, updateversion) handleResults(resultsHeat, updateversion) - + + fileLocation = baseFileLocation + "nfv-types/" + resultsHeat = importNfvTypes(scheme, beHost, bePort, adminUser, fileLocation, updateversion) + handleResults(resultsHeat, updateversion) + fileLocation = baseFileLocation + "onap-types/" resultsHeat = importOnapTypes(scheme, beHost, bePort, adminUser, fileLocation, updateversion) handleResults(resultsHeat, updateversion) - + + fileLocation = baseFileLocation + "sol-types/" + resultsHeat = importSolTypes(scheme, beHost, bePort, adminUser, fileLocation, updateversion) + handleResults(resultsHeat, updateversion) + fileLocation = baseFileLocation + "group-types/" importGroupTypes(scheme, beHost, bePort, adminUser, False, fileLocation) @@ -139,5 +149,5 @@ def main(argv): errorAndExit(0, None) if __name__ == "__main__": - main(sys.argv[1:]) + main(sys.argv[1:]) -- cgit 1.2.3-korg