Slight change in config file

FIWARE · Oct 11, 2024 · e9c0398 · e9c0398
1 parent 8042a95
commit e9c0398
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 26 deletions.
diff --git a/docker/build-ubi/04.install-fastdds.sh b/docker/build-ubi/04.install-fastdds.sh
@@ -28,7 +28,6 @@ yum -y --nogpgcheck install https://dl.fedoraproject.org/pub/fedora/linux/releas
 # Fast-DDS
 mkdir /opt/Fast-DDS
 
-
 #
 # foonathan_memory_vendor
 #

diff --git a/scripts/configFile.sh b/scripts/configFile.sh
@@ -21,34 +21,40 @@
 # iot_support at tid dot es
 
 echo '{'
-echo '  "ddsmodule": {'
-echo '    "domain": 0,'
-echo '    "allowlist": {'
-echo '      "name": "*"'
-echo '    },'
-echo '    "blocklist": {'
-echo '      "name": "add_blocked_topics_list_here"'
-echo '    },'
-echo '    "topics": {'
-echo '      "name": "*",'
-echo '      "qos": {'
-echo '        "durability": "TRANSIENT_LOCAL",'
-echo '        "history-depth": 5'
-echo '      }'
-echo '    },'
-echo '    "enabler": {'
-echo '    },'
-echo '    "specs": {'
-echo '      "threads": 12,'
-echo '      "logging": {'
-echo '        "stdout": false,'
-echo '        "verbosity": "info"'
+echo '  "dds": {'
+echo '    "ddsmodule": {'
+echo '      "dds": {'
+echo '        "domain": 0,'
+echo '        "allowlist": ['
+echo '          {'
+echo '            "name": "*"'
+echo '          }'
+echo '        ],'
+echo '        "blocklist": ['
+echo '          {'
+echo '            "name": "add_blocked_topics_list_here"'
+echo '          }'
+echo '        ]'
+echo '      },'
+echo '      "topics": {'
+echo '        "name": "*",'
+echo '        "qos": {'
+echo '          "durability": "TRANSIENT_LOCAL",'
+echo '          "history-depth": 10'
+echo '        }'
+echo '      },'
+echo '      "ddsenabler": null,'
+echo '      "specs": {'
+echo '        "threads": 12,'
+echo '        "logging": {'
+echo '          "stdout": false,'
+echo '          "verbosity": "info"'
+echo '        }'
 echo '      }'
 echo '    },'
 echo '    "ngsild": {'
 echo '      "topics": {'
 
-
 while [ $# != 0 ]
 do
   items=$1

diff --git a/src/lib/orionld/dds/ddsConfigTopicToAttribute.cpp b/src/lib/orionld/dds/ddsConfigTopicToAttribute.cpp
@@ -56,7 +56,7 @@ char* ddsConfigTopicToAttribute(const char* topic, char** entityIdPP, char** ent
   if (ddsConfigTree == NULL)
     return NULL;  // No error - it's OK to not have a DDS Config File
 
-  const char*    path[4] = { "ddsmodule", "ngsild", "topics", NULL };
+  const char*    path[4] = { "dds", "ngsild", "topics", NULL };
   static KjNode* topicsP = kjNavigate(ddsConfigTree, path, NULL, NULL);
   KjNode*        topicP  = kjLookup(topicsP, topic);
 

diff --git a/src/lib/orionld/dds/ddsInit.cpp b/src/lib/orionld/dds/ddsInit.cpp
@@ -106,7 +106,7 @@ int ddsInit(Kjson* kjP, DdsOperationMode _ddsOpMode)
     extern KjNode* ddsConfigTree;
     kjTreeLog2(ddsConfigTree, "DDS Config", StDdsConfig);
     KT_T(StDdsConfig, "Topics:");
-    const char*  path[4] = { "ddsmodule", "ngsild", "topics", NULL };
+    const char*  path[4] = { "dds", "ngsild", "topics", NULL };
     KjNode*      topics  = kjNavigate(ddsConfigTree, path , NULL, NULL);
 
     if (topics != NULL)
-Original file line number
+Diff line change
@@ Expand Up @@
     # Fast-DDS
     mkdir /opt/Fast-DDS
     #
     # foonathan_memory_vendor
     #
@@ Expand Down @@