Update the python scripts to prioritize arguments over environment va…

…riables (#302)

[#301] Update the python scripts to prioritize arguments over environment variables

Signed-off-by: Antonia Avramova <antonia.avramova@bosch.io>

quickstart/hono_commands.py

@@ -105,8 +105,8 @@ def on_sendable(self, event):
 # Parse command line args
 options, reminder = getopt.getopt(sys.argv[2:], 't:d:', ["img=", "id="])
 opts_dict = dict(options)
-tenant_id = os.environ.get("TENANT") or opts_dict['-t']
-device_id = os.environ.get("DEVICE_ID") or opts_dict['-d']
+tenant_id = opts_dict.get('-t') or os.environ["TENANT"]
+device_id = opts_dict.get('-d') or os.environ["DEVICE_ID"]
 command = sys.argv[1]
 if command == CLI_OPT_RUN_CMD:
     container_img_ref = opts_dict['--img']

quickstart/hono_commands_fb.py

@@ -162,9 +162,9 @@ def on_connection_closed(self, event):
 # Parse command line args
 options, reminder = getopt.getopt(sys.argv[2:], 't:d:h:')
 opts_dict = dict(options)
-tenant_id = os.environ.get("TENANT") or opts_dict['-t']
-device_id = os.environ.get("DEVICE_ID") or opts_dict['-d']
-host = os.environ.get("HOST") or opts_dict['-h']
+tenant_id = opts_dict.get('-t') or os.environ["TENANT"]
+device_id = opts_dict.get('-d') or os.environ["DEVICE_ID"]
+host = opts_dict.get('-h') or os.environ["HOST"]
 command = sys.argv[1]
 if command == CLI_OPT_BACKUP_CMD:
     action = "backup"

quickstart/hono_commands_fu.py

@@ -141,8 +141,8 @@ def on_connection_closed(self, event):
 # Parse command line args
 options, reminder = getopt.getopt(sys.argv[1:], 't:d:')
 opts_dict = dict(options)
-tenant_id = os.environ.get("TENANT") or opts_dict['-t']
-device_id = os.environ.get("DEVICE_ID") or opts_dict['-d']
+tenant_id = opts_dict.get('-t') or os.environ["TENANT"]
+device_id = opts_dict.get('-d') or os.environ["DEVICE_ID"]
 
 # AMQP global configurations
 uri = 'amqps://hono.eclipseprojects.io:15671'

quickstart/hono_commands_sb.py

@@ -220,9 +220,9 @@ def on_connection_closed(self, event):
 # Parse command line args
 options, reminder = getopt.getopt(sys.argv[1:], 't:d:p:')
 opts_dict = dict(options)
-tenant_id = opts_dict['-t'] or os.environ.get("TENANT")
-device_id = opts_dict['-d'] or os.environ.get("DEVICE_ID")
-new_password = opts_dict['-p'] or os.environ.get("PASSWORD")
+tenant_id = opts_dict.get('-t') or os.environ["TENANT"]
+device_id = opts_dict.get('-d') or os.environ["DEVICE_ID"]
+new_password = opts_dict.get('-p') or os.environ["PASSWORD"]
 
 hono_ep = 'https://hono.eclipseprojects.io:28443'
 

quickstart/hono_commands_sm.py

@@ -215,8 +215,8 @@ def run(self):
 # Parse command line args
 options, reminder = getopt.getopt(sys.argv[1:], 't:d:')
 opts_dict = dict(options)
-tenant_id = os.environ.get("TENANT") or opts_dict['-t']
-device_id = os.environ.get("DEVICE_ID") or opts_dict['-d']
+tenant_id = opts_dict.get('-t') or os.environ["TENANT"]
+device_id = opts_dict.get('-d') or os.environ["DEVICE_ID"]
 
 # AMQP global configurations
 uri = 'amqps://hono.eclipseprojects.io:15671'

quickstart/hono_commands_su.py

@@ -116,8 +116,8 @@ def on_sendable(self, event):
 # Parse command line args
 options, reminder = getopt.getopt(sys.argv[1:], 't:d:')
 opts_dict = dict(options)
-tenant_id = os.environ.get("TENANT") or opts_dict['-t']
-device_id = os.environ.get("DEVICE_ID") or opts_dict['-d']
+tenant_id = opts_dict.get('-t') or os.environ["TENANT"]
+device_id = opts_dict.get('-d') or os.environ["DEVICE_ID"]
 
 
 # AMQP global configurations

quickstart/hono_events.py

@@ -41,7 +41,7 @@ def on_message(self, event):
 
 # Parse command line args
 options, reminder = getopt.getopt(sys.argv[1:], 't:')
-tenant_id = os.environ.get("TENANT") or dict(options)['-t']
+tenant_id = dict(options).get('-t') or os.environ["TENANT"]
 
 uri = 'amqps://hono.eclipseprojects.io:15671'
 address = 'event/{}'.format(tenant_id)