[SDC-29] catalog 1707 rebase commit.

Change-Id: I43c3dc5cf44abf5da817649bc738938a3e8388c1
Signed-off-by: Michael Lando <ml636r@att.com>

1 files changed, 4 insertions, 14 deletions

diff --git a/catalog-be/src/main/resources/scripts/import/tosca/upgradeNormative.py b/catalog-be/src/main/resources/scripts/import/tosca/upgradeNormative.py
index e6bb620692..488d4d739d 100644
--- a/catalog-be/src/main/resources/scripts/import/tosca/upgradeNormative.py
+++ b/catalog-be/src/main/resources/scripts/import/tosca/upgradeNormative.py
@@ -5,11 +5,9 @@ import json
 import copy
 import time
 from importCategoryTypes import importCategories
-from importHeatTypes import importHeatTypes
-from importNormativeCapabilities import importNormativeCapabilities
+from upgradeHeatTypes1707 import upgradeHeatTypes1707
 from importDataTypes import importDataTypes
-from importGroupTypes import importGroupTypes
-from importPolicyTypes import importPolicyTypes
+
 from importCommon import *
 import importCommon
 
@@ -46,7 +44,7 @@ def main(argv):
 	bePort = '8080'
 	adminUser = 'jh0003'
 	debugf = None
-	updateversion = 'false'
+	updateversion = 'true'
 	importCommon.debugFlag = False 
 
 	try:
@@ -94,17 +92,9 @@ def main(argv):
 
 	print 'sleep until data type cache is updated'
 	time.sleep( 70 )
-	fileLocation = baseFileLocation + "capability-types/"
-	importNormativeCapabilities(beHost, bePort, adminUser, False, fileLocation)
-  
-	fileLocation = baseFileLocation + "group-types/"
-	importGroupTypes(beHost, bePort, adminUser, False, fileLocation)
-
-	fileLocation = baseFileLocation + "policy-types/"
-	importPolicyTypes(beHost, bePort, adminUser, False, fileLocation)
 
 	fileLocation = baseFileLocation + "heat-types/"
-	resultsHeat = importHeatTypes(beHost, bePort, adminUser, fileLocation, updateversion)
+	resultsHeat = upgradeHeatTypes1707(beHost, bePort, adminUser, fileLocation, updateversion)
 	handleResults(resultsHeat, 'false')
 
 	errorAndExit(0, None)