Fixed a bug in ftClient about cli params

FIWARE · Oct 14, 2024 · 16902e8 · 16902e8
1 parent e9c0398
commit 16902e8
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 21 deletions.
diff --git a/test/functionalTest/cases/0000_cli/bool_option_with_value.test b/test/functionalTest/cases/0000_cli/bool_option_with_value.test
@@ -114,13 +114,12 @@ Usage: orionld  [option '-U' (extended usage)]
                 [option '-cSubCounters' <number of subscription counter updates before flush from sub-cache to DB (0: never, 1: always)>]
                 [option '-distributed' (turn on distributed operation)]
                 [option '-brokerId' <identity of this broker instance for registrations - for the Via header>]
+                [option '-subordinateEndpoint' <endpoint URL for reception of notificatiopns from subordinate subscriptions (distributed subscriptions)>]
+                [option '-pageSize' <default page size (no of entities, subscriptions, registrations)>]
                 [option '-dds' (turn on DDS support)]
                 [option '-ddsSubsTopics' <topics to subscribe to on DDS>]
                 [option '-ddsTopicType' <DDS topic type>]
-                [option '-configFile' <DDS configuration file>]
-                [option '-ddsEnablerConfigFile' <DDS Enabler configuration file>]
-                [option '-subordinateEndpoint' <endpoint URL for reception of notificatiopns from subordinate subscriptions (distributed subscriptions)>]
-                [option '-pageSize' <default page size (no of entities, subscriptions, registrations)>]
+                [option '-configFile' <Path to configuration file>]
                 [option '-duc' <URL to default user context>]
 
 --TEARDOWN--
diff --git a/test/functionalTest/cases/0000_cli/command_line_options.test b/test/functionalTest/cases/0000_cli/command_line_options.test
@@ -103,13 +103,12 @@ Usage: orionld  [option '-U' (extended usage)]
                 [option '-cSubCounters' <number of subscription counter updates before flush from sub-cache to DB (0: never, 1: always)>]
                 [option '-distributed' (turn on distributed operation)]
                 [option '-brokerId' <identity of this broker instance for registrations - for the Via header>]
+                [option '-subordinateEndpoint' <endpoint URL for reception of notificatiopns from subordinate subscriptions (distributed subscriptions)>]
+                [option '-pageSize' <default page size (no of entities, subscriptions, registrations)>]
                 [option '-dds' (turn on DDS support)]
                 [option '-ddsSubsTopics' <topics to subscribe to on DDS>]
                 [option '-ddsTopicType' <DDS topic type>]
-                [option '-configFile' <DDS configuration file>]
-                [option '-ddsEnablerConfigFile' <DDS Enabler configuration file>]
-                [option '-subordinateEndpoint' <endpoint URL for reception of notificatiopns from subordinate subscriptions (distributed subscriptions)>]
-                [option '-pageSize' <default page size (no of entities, subscriptions, registrations)>]
+                [option '-configFile' <Path to configuration file>]
                 [option '-duc' <URL to default user context>]
 
 --TEARDOWN--
diff --git a/test/functionalTest/cases/0000_dds/dds_notifications.test b/test/functionalTest/cases/0000_dds/dds_notifications.test
@@ -24,9 +24,9 @@
 the test client publishes on DDS, the broker receives DDS notifications and creates/updates the corresponding NGSI-LD entities
 
 --SHELL-INIT--
-$REPO_HOME/scripts/configFile.sh "P1,Camera,urn:ngsi-ld:camera:cam1,shutterSpeed" "P2,Arm,urn:ngsi-ld:arm:arm1,armReach" > /tmp/ddsConfig
+$REPO_HOME/scripts/configFile.sh "P1,Camera,urn:ngsi-ld:camera:cam1,shutterSpeed" "P2,Arm,urn:ngsi-ld:arm:arm1,armReach" > $HOME/.orionld
 dbInit CB
-orionldStart CB -mongocOnly -dds  -configFile /tmp/ddsConfig
+orionldStart CB -mongocOnly -dds
 ftClientStart -t 0-5000
 
 --SHELL--

diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_ftClient_normal_notifications.test b/test/functionalTest/cases/0000_ngsild/ngsild_ftClient_normal_notifications.test
@@ -26,6 +26,9 @@ Test of orionld version service, with branch name
 --SHELL-INIT--
 dbInit CB
 orionldStart CB -mongocOnly
+$REPO_HOME/scripts/configFile.sh > ~/.ftClient
+chmod 777 ~/.ftClient
+
 ftClientStart -v -t 200
 mkdir -p /tmp/orion/logs/ftClient2
 ftClientStart -v -t 200 --port $FT2_PORT --logDir $FT2_LOG_DIR

diff --git a/test/functionalTest/ftClient/ftClient.cpp b/test/functionalTest/ftClient/ftClient.cpp
@@ -252,17 +252,6 @@ int main(int argC, char* argV[])
   const char* progName = "ftClient";
   char        configFilePath[256];
 
-  // Config file
-  if (configFile == NULL)
-  {
-    char* home = getenv("HOME");
-    if (home != NULL)
-    {
-      snprintf(configFilePath, sizeof(configFilePath) - 1, "%s/.ftClient", home);
-      configFile = configFilePath;
-    }
-  }
-
   ks = kargsInit(progName, kargs, "FTCLIENT");
   if (ks != KargsOk)
   {
@@ -277,6 +266,20 @@ int main(int argC, char* argV[])
     exit(1);
   }
 
+  // Config file
+  if (configFile == NULL)
+  {
+    char* home = getenv("HOME");
+    if (home != NULL)
+    {
+      snprintf(configFilePath, sizeof(configFilePath) - 1, "%s/.ftClient", home);
+      configFile = configFilePath;
+    }
+  }
+
+  if (configFile != NULL)
+    configFile = strdup(configFile);
+
   int kt = ktInit(progName, logDir, logToScreen, logLevel, traceLevels, kaBuiltinVerbose, kaBuiltinDebug, fixme);
 
   if (kt != 0)