fix externalId

Cumulocity-IoT · Nov 27, 2024 · 1d3b432 · 1d3b432
1 parent ea443f6
commit 1d3b432
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/simulators/extras/ExportProfileData.py b/simulators/extras/ExportProfileData.py
@@ -5,7 +5,6 @@
 
 # Global variables and constants
 logTimeFormat = "%Y%m%d%H%M%S_%f"
-C8Y_PROFILE_GROUP = 'c8y_EventBasedSimulatorProfile'
 C8Y_OEE_SIMULATOR_DEVICES_GROUP = "c8y_EventBasedSimulator"
 DATA_TYPE, DEVICE_ID_LIST, CREATE_FROM, CREATE_TO, LOG_LEVEL, c8y, PASSWORD, TEST_FLAG = ArgumentsAndCredentialsHandler.HandleExportArguments()
 C8Y_HEADERS, MEASUREMENTS_HEADERS = ArgumentsAndCredentialsHandler.SetupHeadersForAPIRequest(tenant_id=c8y.tenant_id, username= c8y.username, password=PASSWORD)

diff --git a/simulators/extras/ImportData.py b/simulators/extras/ImportData.py
@@ -11,7 +11,7 @@
 timeFormat = "%Y-%m-%dT%H:%M:%S.%fZ"
 logTimeFormat = "%Y%m%d%H%M%S_%f"
 file_log_level = logging.DEBUG
-C8Y_PROFILE_GROUP = 'c8y_EventBasedSimulatorProfile'
+C8Y_OEE_SIMULATOR_DEVICES_GROUP = 'c8y_EventBasedSimulator'
 json_filename_list_to_import, console_log_level, c8y, password, verifySslCertificate, TEST_FLAG, strict_mode = ArgumentsAndCredentialsHandler.HandleImportArguments()
 C8Y_HEADERS, MEASUREMENTS_HEADERS = ArgumentsAndCredentialsHandler.SetupHeadersForAPIRequest(tenant_id=c8y.tenant_id, username= c8y.username, password=password)
 ####################################################
@@ -37,12 +37,12 @@
 
 
 def GetDeviceIdByExternalId(external_id):
-    consoleLogger.info(f'Searching for device with ext ID {external_id}')
+    consoleLogger.info(f'Searching for device with ext ID {C8Y_OEE_SIMULATOR_DEVICES_GROUP}/{external_id}')
     encoded_external_id = EncodeUrl(external_id)
-    response = session.get(f'{c8y.base_url}/identity/externalIds/{C8Y_PROFILE_GROUP}/{encoded_external_id}', headers=C8Y_HEADERS)
+    response = session.get(f'{c8y.base_url}/identity/externalIds/{C8Y_OEE_SIMULATOR_DEVICES_GROUP}/{encoded_external_id}', headers=C8Y_HEADERS)
     if response.ok:
         device_id = response.json()['managedObject']['id']
-        consoleLogger.info(f'Device({device_id}) has been found by its external id "{C8Y_PROFILE_GROUP}/{external_id}".')
+        consoleLogger.info(f'Device({device_id}) has been found by its external id "{C8Y_OEE_SIMULATOR_DEVICES_GROUP}/{external_id}".')
         return device_id
     consoleLogger.warning(response.json())
     if strict_mode: