Add basic auth header

Add basic auth header for sdc-backend-init python scripts.

Issue-ID: OJSI-273
Signed-off-by: xuegao <xue.gao@intl.att.com>
Change-Id: I3559d5792509db0f65b202a731545083c7c91c96
Signed-off-by: xuegao <xue.gao@intl.att.com>

2 files changed, 14 insertions, 9 deletions

diff --git a/catalog-be/src/main/resources/scripts/sdcBePy/tosca/imports/runNormativeElement.py b/catalog-be/src/main/resources/scripts/sdcBePy/tosca/imports/runNormativeElement.py
index 1bdb1504b2..ce5eca427a 100644
--- a/catalog-be/src/main/resources/scripts/sdcBePy/tosca/imports/runNormativeElement.py
+++ b/catalog-be/src/main/resources/scripts/sdcBePy/tosca/imports/runNormativeElement.py
@@ -9,10 +9,10 @@ from sdcBePy.tosca.models.normativeElementsList import get_capability, get_data,
 
 
 def run(candidate):
-    scheme, be_host, be_port, admin_user, _, debug = get_args()
+    scheme, be_host, be_port, header, admin_user, _, debug = get_args()
     try:
         process_and_create_normative_element(candidate,
-                                             scheme, be_host, be_port, admin_user,
+                                             scheme, be_host, be_port, header, admin_user,
                                              debug=debug,
                                              exit_on_success=True)
     except AttributeError:
diff --git a/catalog-be/src/main/resources/scripts/sdcBePy/tosca/main.py b/catalog-be/src/main/resources/scripts/sdcBePy/tosca/main.py
index 565ce7efdb..78032a4e3a 100644
--- a/catalog-be/src/main/resources/scripts/sdcBePy/tosca/main.py
+++ b/catalog-be/src/main/resources/scripts/sdcBePy/tosca/main.py
@@ -11,7 +11,7 @@ from sdcBePy.common.sdcBeProxy import SdcBeProxy
 def usage():
     print(sys.argv[0],
           '[-s <scheme> | --scheme=<scheme> ] [-i <be host> | --ip=<be host>] [-p <be port> | '
-          '--port=<be port> ] [-u <user userId> | --user=<user userId> ] [-d <true|false> | '
+          '--port=<be port> ] --header=<header> ] [-u <user userId> | --user=<user userId> ] [-d <true|false> | '
           '--debug=<true|false>] [-v <true|false> | --updateVersion=<true|false>]')
 
 
@@ -28,6 +28,7 @@ def parse_param():
 
     parser.add_argument('--ip', "-i")
     parser.add_argument('--port', "-p")
+    parser.add_argument('--header')
     parser.add_argument('--adminUser', "-a")
     parser.add_argument('--https', action='store_true')
     parser.add_argument('--updateVersion', action='store_false')
@@ -36,14 +37,14 @@ def parse_param():
     args, _ = parser.parse_known_args()
 
     return [args.conf, 'https' if args.https else 'http',
-            args.ip, args.port, args.adminUser, args.updateVersion,
+            args.ip, args.port, args.header, args.adminUser, args.updateVersion,
             args.debug]
 
 
 def get_args():
     print('Number of arguments:', len(sys.argv), 'arguments.')
 
-    conf_path, scheme, be_host, be_port, admin_user, update_version, debug = parse_param()
+    conf_path, scheme, be_host, be_port, header, admin_user, update_version, debug = parse_param()
     defaults = load_be_config(conf_path)
 
     # Use defaults if param not provided by the user
@@ -54,22 +55,26 @@ def get_args():
     if admin_user is None:
         admin_user = defaults["adminUser"]
 
-    print('scheme =', scheme, ',be host =', be_host, ', be port =', be_port, ', user =', admin_user,
+    if header is None:
+        print('scheme =', scheme, ',be host =', be_host, ', be port =', be_port, ', user =', admin_user,
           ', debug =', debug, ', update_version =', update_version)
+    else:
+        print('scheme =', scheme, ',be host =', be_host, ', be port =', be_port, ', header =', header, ', user =', admin_user,
+              ', debug =', debug, ', update_version =', update_version)
 
     init_properties(defaults["retryTime"], defaults["retryAttempt"], defaults["resourceLen"])
-    return scheme, be_host, be_port, admin_user, update_version, debug
+    return scheme, be_host, be_port, header, admin_user, update_version, debug
 
 
 def parse_and_create_proxy():
-    scheme, be_host, be_port, admin_user, update_version, debug = get_args()
+    scheme, be_host, be_port, header, admin_user, update_version, debug = get_args()
 
     if debug is False:
         print('Disabling debug mode')
         logger.debugFlag = debug
 
     try:
-        sdc_be_proxy = SdcBeProxy(be_host, be_port, scheme, admin_user, debug=debug)
+        sdc_be_proxy = SdcBeProxy(be_host, be_port, header, scheme, admin_user, debug=debug)
     except AttributeError:
         usage()
         sys.exit(3)