Index: shared/scripts/configuration/config.py =================================================================== diff -u -rb634bdd10b66a9b76dd6c3898b27f60bd25bcbdc -r1899d5b5afc3e481360915302d8e2d37de8b08b8 --- shared/scripts/configuration/config.py (.../config.py) (revision b634bdd10b66a9b76dd6c3898b27f60bd25bcbdc) +++ shared/scripts/configuration/config.py (.../config.py) (revision 1899d5b5afc3e481360915302d8e2d37de8b08b8) @@ -14,12 +14,17 @@ ############################################################################ import os +from pathlib import Path AUT_NAME = "denaliSquish" -COMMON_PATH = os.environ['HOME']+"/Projects" - +CONFIG_PATH = Path(os.getcwd()) +HOME_DIR_PATH = CONFIG_PATH.parent.parent.parent +INP_BUF_FILE_LOCATION = "".join([str(HOME_DIR_PATH),'/Desktop/sd-card/cloudsync/']) +CLOUD_CREDENTIALS_LOCATION = "".join([str(HOME_DIR_PATH)+'/Desktop/cloudsync/credentials']) +PEM_FILES = ['1.pem', '2.pem', '3.pem' ] + #standby mode GOODMORNING_START_TIME_SEC = 0 GOODEVENING_START_TIME_SEC = 43200 Index: shared/scripts/configuration/utility.py =================================================================== diff -u -rfa08234fe32d464f02060777ad9bdb3dff2e6255 -r1899d5b5afc3e481360915302d8e2d37de8b08b8 --- shared/scripts/configuration/utility.py (.../utility.py) (revision fa08234fe32d464f02060777ad9bdb3dff2e6255) +++ shared/scripts/configuration/utility.py (.../utility.py) (revision 1899d5b5afc3e481360915302d8e2d37de8b08b8) @@ -15,16 +15,11 @@ import csv import test import os +from configuration import config from datetime import timezone from datetime import datetime - -CLOUD_CREDENTIALS_LOCATION = '/home/denali/Desktop/cloudsync/credentials' -CLOUD_SYNC_LOG_LOCATION = '/home/denali/Desktop/sd-card/cloudsync/' - -PEM_FILES = ['1.pem', '2.pem', '3.pem' ] - def get_current_date_and_time_in_utc(date_format='%Y/%m/%d - %H:%M:%S'): @@ -43,10 +38,10 @@ pem files is created on '/home/denali/Desktop/cloudsync/credentials' """ try: - os.makedirs(CLOUD_CREDENTIALS_LOCATION, exist_ok = True) + os.makedirs(config.CLOUD_CREDENTIALS_LOCATION, exist_ok = True) test.log("Directory created successfully") - for file_handler in range(len(PEM_FILES)): - path = os.path.join(CLOUD_CREDENTIALS_LOCATION, PEM_FILES[file_handler]) + for file_handler in range(len(config.PEM_FILES)): + path = os.path.join(config.CLOUD_CREDENTIALS_LOCATION, config.PEM_FILES[file_handler]) with open(path, 'w') as file_reader: pass except OSError: @@ -61,7 +56,7 @@ """ try: current_date = get_current_date_and_time_in_utc(date_format = "%Y_%m_%d") - latest_file = CLOUD_SYNC_LOG_LOCATION+current_date+'_inp.buf' + latest_file = config.INP_BUF_FILE_LOCATION+current_date+'_inp.buf' return latest_file except: return False @@ -75,7 +70,7 @@ """ try: current_date = get_current_date_and_time_in_utc(date_format = "%Y_%m_%d") - latest_file = CLOUD_SYNC_LOG_LOCATION+current_date+'_out.buf' + latest_file = config.INP_BUF_FILE_LOCATION+current_date+'_out.buf' return latest_file except: return False