From ed64b5edff15e702493df21aa3230b81593e6133 Mon Sep 17 00:00:00 2001 From: Michael Lando Date: Fri, 9 Jun 2017 03:19:04 +0300 Subject: [SDC-29] catalog 1707 rebase commit. Change-Id: I43c3dc5cf44abf5da817649bc738938a3e8388c1 Signed-off-by: Michael Lando --- .../import/tosca/upgradeNormativeVersion.py | 42 ++-------------------- 1 file changed, 3 insertions(+), 39 deletions(-) (limited to 'catalog-be/src/main/resources/scripts/import/tosca/upgradeNormativeVersion.py') diff --git a/catalog-be/src/main/resources/scripts/import/tosca/upgradeNormativeVersion.py b/catalog-be/src/main/resources/scripts/import/tosca/upgradeNormativeVersion.py index 0f70174173..8f8e0491ae 100644 --- a/catalog-be/src/main/resources/scripts/import/tosca/upgradeNormativeVersion.py +++ b/catalog-be/src/main/resources/scripts/import/tosca/upgradeNormativeVersion.py @@ -83,56 +83,20 @@ def main(argv): ########################################################################## - #---------------------------------for release 1610---------------------- # + #---------------------------------for release 1702---------------------- # ########################################################################## - fileLocation = baseFileLocation + "normative-types/" - result = createNormativeType(beHost, bePort, adminUser, fileLocation, "compute", updateversion) - results.append(result) - - fileLocation = baseFileLocation + "normative-types/" - result = createNormativeType(beHost, bePort, adminUser, fileLocation, "network", updateversion) - results.append(result) - - fileLocation = baseFileLocation + "heat-types/" - result = createNormativeType(beHost, bePort, adminUser, fileLocation, "abstractSubstitute", updateversion) - results.append(result) - - fileLocation = baseFileLocation + "heat-types/" - result = createNormativeType(beHost, bePort, adminUser, fileLocation, "contrailAbstractSubstitute", updateversion) - results.append(result) - - fileLocation = baseFileLocation + "heat-types/" - result = createNormativeType(beHost, bePort, adminUser, fileLocation, "contrailNetworkRules", updateversion) - results.append(result) - fileLocation = baseFileLocation + "heat-types/" - result = createNormativeType(beHost, bePort, adminUser, fileLocation, "novaServer", updateversion) + result = createNormativeType(beHost, bePort, adminUser, fileLocation, "contrailV2VirtualMachineInterface", updateversion) results.append(result) - + fileLocation = baseFileLocation + "heat-types/" result = createNormativeType(beHost, bePort, adminUser, fileLocation, "neutronPort", updateversion) results.append(result) - fileLocation = baseFileLocation + "heat-types/" - result = createNormativeType(beHost, bePort, adminUser, fileLocation, "contrailVirtualNetwork", updateversion) - results.append(result) - fileLocation = baseFileLocation + "heat-types/" - result = createNormativeType(beHost, bePort, adminUser, fileLocation, "neutronNet", updateversion) - results.append(result) - fileLocation = baseFileLocation + "heat-types/" - result = createNormativeType(beHost, bePort, adminUser, fileLocation, "vl", updateversion) - results.append(result) - - fileLocation = baseFileLocation + "heat-types/" - result = createNormativeType(beHost, bePort, adminUser, fileLocation, "contrailV2VirtualNetwork", updateversion) - results.append(result) - fileLocation = baseFileLocation + "heat-types/" - result = createNormativeType(beHost, bePort, adminUser, fileLocation, "securityRules", updateversion) - results.append(result) handleResults(results, 'false') -- cgit 1.2.3-korg