commit 64a452481d443d3cb3efbd9a209f12ddb542d3e4
from: mischa <mischa@rx.high5.nl>
date: Tue Jul 05 17:21:20 2022 UTC

prepare for Azure account credentials (akadmin)

commit - 25d4ba1f73eda0965b7102453393ae9d985f5c0c
commit + 64a452481d443d3cb3efbd9a209f12ddb542d3e4
blob - 64dacdb21da07d098b61debdc29e1e3663da1447
blob + 5cf185fb118d21ce89cd1fa1a5698cd7d73932df
--- push.py
+++ push.py
@@ -28,7 +28,7 @@ import configparser
 import argparse
 
 # Parse all arguments
-parser = argparse.ArgumentParser(description="Push JSON config to AlkiraAPI")
+parser = argparse.ArgumentParser(description="Push JSON files to AlkiraAPI configured in a cnf config file")
 parser.add_argument("-t", "--tenant", type=str, default='alkira.cnf', help="location of alikira.cnf (default: alkira.cnf)")
 parser.add_argument("-f", "--folder", type=str, default='config', help="location of the JSON connector files (default: config)")
 parser.add_argument("-c", "--config", type=str, default='connectors.cnf', help="location of the connector config (default: config/connectors.cnf)")
@@ -67,7 +67,7 @@ ALKIRA_TENANT = alkira.get('alkira', 'ALKIRA_TENANT')
 ALKIRA_USERNAME = alkira.get('alkira', 'ALKIRA_USERNAME')
 ALKIRA_PASSWORD = alkira.get('alkira', 'ALKIRA_PASSWORD')
 ALKIRA_BASE_URI = f'https://{ALKIRA_TENANT}/api'
-SERVICE_USERNAME = alkira.get('services', 'SERVICE_USERNAME')
+AWS_SERVICE_USERNAME = alkira.get('services', 'AWS_SERVICE_USERNAME')
 SERVICE_PASSWORD = alkira.get('services', 'SERVICE_PASSWORD')
 CIDR_NAME = alkira.get('globalcidr', 'CIDR_NAME')
 CIDR_DESCR = alkira.get('globalcidr', 'CIDR_DESCR')
@@ -166,7 +166,7 @@ def alkira_service(session, connector_name):
 	fwcredential = f'fwcredential-{time.time()}'
 	body = {
 		"credentials": {
-			"userName": SERVICE_USERNAME,
+			"userName": AWS_SERVICE_USERNAME,
 			"password": SERVICE_PASSWORD
 		},
 		"name": fwcredential