Redundant import scripts removed

Change-Id: I22126caf9f8e0f8bf59e5f276e6b7bcc5c336d06
Issue-ID: SDC-410
Signed-off-by: Tal Gitelman <tg851x@intl.att.com>

diff --git a/catalog-be/src/main/resources/scripts/import/tosca/importHeatTypes1.py b/catalog-be/src/main/resources/scripts/import/tosca/importHeatTypes1.py
deleted file mode 100644 (file)
index b89a94c..0000000
--- a/catalog-be/src/main/resources/scripts/import/tosca/importHeatTypes1.py
+++ /dev/null
@@ -1,97 +0,0 @@
-import pycurl
-import sys, getopt
-from StringIO import StringIO
-import json
-import copy
-from importCommon import *
-from importNormativeTypes import *
-import importCommon
-
-################################################################################################################################################
-#                                                                                                                                                                                                                                                                                     #        
-# Import all users from a given file                                                                                                                                                                                                              #
-#                                                                                                                                                                                                                                                                                         #            
-# activation :                                                                                                                                                                                                                                                            #
-#       python importUsers.py [-i <be host> | --ip=<be host>] [-p <be port> | --port=<be port> ] [-f <input file> | --ifile=<input file> ]     #
-#                                                                                                                                                                                                                                                                                         #                    
-# shortest activation (be host = localhost, be port = 8080):                                                                                                                                                              #
-#              python importUsers.py [-f <input file> | --ifile=<input file> ]                                                                                                                                    #
-#                                                                                                                                                                                                                                                                                     #        
-################################################################################################################################################
-
-def importHeatTypes1(beHost, bePort, adminUser, fileDir, updateversion):
-       
-       heatTypes = ["extCp"]
-               
-       responseCodes = [200, 201]
-               
-       if(updateversion == 'false'):
-               responseCodes = [200, 201, 409]
-               
-        results = []
-        for heatType in heatTypes:
-                result = createNormativeType(beHost, bePort, adminUser, fileDir, heatType, updateversion)
-                results.append(result)
-                if ( result[1] == None or result[1] not in responseCodes) :
-                       print "Failed creating heat type " + heatType + ". " + str(result[1])                           
-       return results  
-
-
-def main(argv):
-       print 'Number of arguments:', len(sys.argv), 'arguments.'
-
-       beHost = 'localhost' 
-       bePort = '8080'
-       adminUser = 'jh0003'
-       updateversion = 'true'
-       
-       try:
-               opts, args = getopt.getopt(argv,"i:p:u:v:h:",["ip=","port=","user=","updateversion="])
-       except getopt.GetoptError:
-               usage()
-               errorAndExit(2, 'Invalid input')
-                
-       for opt, arg in opts:
-       #print opt, arg
-               if opt == '-h':
-                       usage()                        
-                       sys.exit(3)
-               elif opt in ("-i", "--ip"):
-                       beHost = arg
-               elif opt in ("-p", "--port"):
-                       bePort = arg
-               elif opt in ("-u", "--user"):
-                       adminUser = arg
-               elif opt in ("-v", "--updateversion"):
-                       if (arg.lower() == "false" or arg.lower() == "no"):
-                               updateversion = 'false'
-
-       print 'be host =',beHost,', be port =', bePort,', user =', adminUser
-       
-       if ( beHost == None ):
-               usage()
-               sys.exit(3)
-
-       results = importHeatTypes(beHost, bePort, adminUser, "../../../import/tosca/heat-types/", updateversion)
-
-       print "-----------------------------"
-       for result in results:
-               print "{0:20} | {1:6}".format(result[0], result[1])
-       print "-----------------------------"
-       
-       responseCodes = [200, 201]
-       
-       if(updateversion == 'false'):
-               responseCodes = [200, 201, 409]
-       
-       failedNormatives = filter(lambda x: x[1] == None or x[1] not in responseCodes, results)
-       if (len(failedNormatives) > 0):
-               errorAndExit(1, None)
-       else:
-               errorAndExit(0, None)
-
-
-if __name__ == "__main__":
-        main(sys.argv[1:])
-
-

diff --git a/catalog-be/src/main/resources/scripts/import/tosca/importNormativeAll1.py b/catalog-be/src/main/resources/scripts/import/tosca/importNormativeAll1.py
deleted file mode 100644 (file)
index f564fc5..0000000
--- a/catalog-be/src/main/resources/scripts/import/tosca/importNormativeAll1.py
+++ /dev/null
@@ -1,118 +0,0 @@
-import pycurl
-import sys, getopt, os
-from StringIO import StringIO
-import json
-import copy
-import time
-#from importNormativeElements import createNormativeElement
-from importNormativeElements import * 
-from importNormativeTypes import importNormativeTypes
-from importHeatTypes1 import importHeatTypes1
-from importNormativeCapabilities import importNormativeCapabilities
-from importCategoryTypes import importCategories
-from importNormativeInterfaceLifecycleTypes import importNormativeInterfaceLifecycleType
-from importDataTypes import importDataTypes
-from importGroupTypes import importGroupTypes
-from importPolicyTypes import importPolicyTypes
-from importCommon import *
-import importCommon
-
-#################################################################################################################################################################################################
-#                                                                                                                                                                                                                                                                                                                                                                                      #       
-# Import all users from a given file                                                                                                                                                                                                                                                                                                                   #
-#                                                                                                                                                                                                                                                                                                                                                                                              #               
-# activation :                                                                                                                                                                                                                                                                                                                                                                 #
-#       python importNormativeAll.py [-i <be host> | --ip=<be host>] [-p <be port> | --port=<be port> ] [-u <user userId> | --user=<user userId> ] [-d <true|false> | --debug=<true|false>]    #
-#                                                                       [-v <true|false> | --updateversion=<true|false>]                                                                                                                                                                                                                       #
-#                                                                                                                                                                                                                                                                                                                                                                                              #                       
-# shortest activation (be host = localhost, be port = 8080, user = jh0003):                                                                                                                                                                                                                                    #       #                                                                                                                                                                                                                                                                                                                                                                                       #
-#              python importNormativeAll.py                                                                                                                                                                                                                                                                                                            #
-#                                                                                                                                                                                                                                                                                                                                                                                      #       
-#################################################################################################################################################################################################
-
-def usage():
-       print sys.argv[0], '[-i <be host> | --ip=<be host>] [-p <be port> | --port=<be port> ] [-u <user userId> | --user=<user userId> ] [-d <true|false> | --debug=<true|false>] [-v <true|false> | --updateversion=<true|false>]'
-
-def handleResults(results, updateversion):
-       printFrameLine()
-       for result in results:
-               printNameAndReturnCode(result[0], result[1])
-       printFrameLine()
-       
-       responseCodes = [200, 201]
-       
-       if(updateversion == 'false'):
-               responseCodes = [200, 201, 409]
-       
-       failedResults = filter(lambda x: x[1] == None or x[1] not in responseCodes, results)
-       if (len(failedResults) > 0):
-               errorAndExit(1, None)
-
-def main(argv):
-       print 'Number of arguments:', len(sys.argv), 'arguments.'
-
-       beHost = 'localhost' 
-       bePort = '8080'
-       adminUser = 'jh0003'
-       debugf = None
-       updateversion = 'true'
-       importCommon.debugFlag = False 
-
-       try:
-               opts, args = getopt.getopt(argv,"i:p:u:d:v:h",["ip=","port=","user=","debug=","updateversion="])
-       except getopt.GetoptError:
-               usage()
-               errorAndExit(2, 'Invalid input')
-       
-       for opt, arg in opts:
-       #print opt, arg
-               if opt == '-h':
-                       usage()                        
-                       sys.exit(3)
-               elif opt in ("-i", "--ip"):
-                       beHost = arg
-               elif opt in ("-p", "--port"):
-                       bePort = arg
-               elif opt in ("-u", "--user"):
-                       adminUser = arg
-               elif opt in ("-d", "--debug"):
-                       print arg
-                       debugf = bool(arg.lower() == "true" or arg.lower() == "yes")
-               elif opt in ("-v", "--updateversion"):
-                       print arg
-                       if (arg.lower() == "false" or arg.lower() == "no"):
-                               updateversion = 'false'                 
-
-       print 'be host =',beHost,', be port =', bePort,', user =', adminUser, ', debug =', debugf, ', updateversion =', updateversion
-
-       if (debugf != None):
-               print 'set debug mode to ' + str(debugf)
-               importCommon.debugFlag = debugf
-       
-       if ( beHost == None ):
-               usage()
-               sys.exit(3)
-
-       print sys.argv[0]
-       pathdir = os.path.dirname(os.path.realpath(sys.argv[0]))      
-       debug("path dir =" + pathdir)
-
-       baseFileLocation = pathdir + "/../../../import/tosca/"
-
-       fileLocation = baseFileLocation + "data-types/"
-       importDataTypes(beHost, bePort, adminUser, False, fileLocation)
-
-       print 'sleep until data type cache is updated'
-       time.sleep( 1 )
-       
-       fileLocation = baseFileLocation + "heat-types/"
-       resultsHeat = importHeatTypes1(beHost, bePort, adminUser, fileLocation, updateversion)
-       handleResults(resultsHeat, updateversion)
-  
-
-
-       errorAndExit(0, None)   
-
-if __name__ == "__main__":
-        main(sys.argv[1:])
-