Change Struct Object Instance NodeId to type string

azoitl · Apr 19, 2024 · c2929bc · c2929bc
1 parent a93cc39
commit c2929bc
Show file tree

Hide file tree

Showing 2 changed files with 69 additions and 2 deletions.
diff --git a/src/com/opc_ua/opcua_objectstruct_helper.cpp b/src/com/opc_ua/opcua_objectstruct_helper.cpp
@@ -19,6 +19,7 @@
 #include "struct_action_info.h"
 #include "../../core/cominfra/basecommfb.h"
 #include "opcua_local_handler.h"
+#include "../../core/utils/parameterParser.h"
 #include <sstream>
 
 using namespace forte::com_infra;
@@ -249,7 +250,9 @@ std::shared_ptr<CActionInfo> COPC_UA_ObjectStruct_Helper::getCreateObjectActionI
   std::string typeBrowsePath(getStructBrowsePath(smStructTypesBrowsePath, paIsPublisher));
   CSinglyLinkedList<CActionInfo::CNodePairInfo*>& nodePairs = actionInfo->getNodePairInfo();
   nodePairs.pushBack(new CActionInfo::CNodePairInfo(nullptr, typeBrowsePath));
-  nodePairs.pushBack(new CActionInfo::CNodePairInfo(nullptr, paBrowsePath));
+  UA_NodeId *nodeId = createStringNodeIdFromBrowsepath(paBrowsePath);
+  mOpcuaObjectNamespaceIndex = nodeId->namespaceIndex;
+  nodePairs.pushBack(new CActionInfo::CNodePairInfo(nodeId, paBrowsePath));
   return actionInfo;
 }
 
@@ -269,7 +272,8 @@ forte::com_infra::EComResponse COPC_UA_ObjectStruct_Helper::initializeMemberActi
 
     std::shared_ptr<CActionInfo> actionInfo = std::make_shared<CStructMemberActionInfo>(*this, mLayer, paActionInfo.getAction(), paActionInfo.getEndpoint());
     CIEC_ANY* memberVariable = structType.getMember(i);
-    actionInfo->getNodePairInfo().pushBack(new CActionInfo::CNodePairInfo(nullptr, memberBrowsePath));
+    UA_NodeId *nodeId = createStringNodeIdFromBrowsepath(memberBrowsePath);
+    actionInfo->getNodePairInfo().pushBack(new CActionInfo::CNodePairInfo(nodeId, memberBrowsePath));
     if(UA_STATUSCODE_GOOD != localHandler->initializeActionForObjectStruct(actionInfo, *memberVariable)) {
       DEVLOG_ERROR("[OPC UA OBJECT STRUCT HELPER]: Error occured in FB %s while initializing Struct member %s\n", mLayer.getCommFB()->getInstanceName(),
       CStringDictionary::getInstance().get(structMemberNames[i]));
@@ -307,6 +311,48 @@ void COPC_UA_ObjectStruct_Helper::checkOPCUANamespace() {
   }
 }
 
+UA_NodeId *COPC_UA_ObjectStruct_Helper::createStringNodeIdFromBrowsepath(const std::string &paBrowsePath) {
+  UA_NodeId *resultNodeId = UA_NodeId_new();
+  UA_NodeId_init(resultNodeId);
+  resultNodeId->namespaceIndex = getNamespaceIndexFromBrowsepath(paBrowsePath);
+  resultNodeId->identifierType = UA_NODEIDTYPE_STRING;
+  resultNodeId->identifier.string = UA_String_fromChars(removeNamespaceIndicesFromBrowsePath(paBrowsePath).c_str());
+  return resultNodeId;
+}
+
+UA_UInt16 COPC_UA_ObjectStruct_Helper::getNamespaceIndexFromBrowsepath(const std::string &paBrowsePath) {
+  CParameterParser mainParser(paBrowsePath.c_str(), '/');
+  size_t parsingResult = mainParser.parseParameters();
+  if(parsingResult > 0) {
+    size_t elementNameIndex = strcmp("", mainParser[parsingResult-1]) != 0 ? parsingResult-1 : parsingResult-2;
+    std::string objectName(mainParser[elementNameIndex]);
+    CParameterParser nsIndexParser(objectName.c_str(), ':');
+    parsingResult = nsIndexParser.parseParameters();
+    if(parsingResult > 1) {
+      return static_cast<UA_UInt16>(forte::core::util::strtoul(nsIndexParser[0], nullptr, 10));
+    }
+  } else {
+    DEVLOG_ERROR("[OPC UA HELPER]: Error while parsing FB browse path %s\n", paBrowsePath);
+  }
+  return COPC_UA_Local_Handler::scmDefaultBrowsenameNameSpace;
+}
+
+std::string COPC_UA_ObjectStruct_Helper::removeNamespaceIndicesFromBrowsePath(const std::string &paBrowsePath) {
+  std::stringstream ss;
+  CParameterParser mainParser(paBrowsePath.c_str(), '/');
+  size_t mainParserLength = mainParser.parseParameters();
+  for(size_t i = 0; i < mainParserLength; i++) {
+    std::string nodePair(mainParser[i]);
+    if(!nodePair.empty()) {
+      CParameterParser nsIndexParser(nodePair.c_str(), ':');
+      size_t parserLength = nsIndexParser.parseParameters();
+      size_t browsePathIndex = parserLength > 1 ? 1 : 0;
+      ss << '/' << nsIndexParser[browsePathIndex];
+    }
+  }
+  return ss.str();
+}
+
 std::string COPC_UA_ObjectStruct_Helper::getStructBrowsePath(const std::string &paPathPrefix, bool paIsPublisher) {
   std::string structTypeName(getStructTypeName(paIsPublisher));
   if(structTypeName.empty()) {

diff --git a/src/com/opc_ua/opcua_objectstruct_helper.h b/src/com/opc_ua/opcua_objectstruct_helper.h
@@ -220,4 +220,25 @@ class COPC_UA_ObjectStruct_Helper {
     bool defineOPCUAStructTypeNode(UA_Server *paServer, UA_NodeId &paNodeId, const std::string &paStructTypeName);
 
     bool addOPCUAStructTypeComponent(UA_Server *paServer, UA_NodeId &paParentNodeId, CIEC_ANY *paStructMember, const std::string &paStructMemberName);
+
+    /**
+     * Creates NodeId of type string from the given browsepath
+     * @param paBrowsePath The browsepath of the Object Struct
+     * @return The NodeId of type string 
+    */
+    static UA_NodeId *createStringNodeIdFromBrowsepath(const std::string& paBrowsePath);
+
+    /**
+     * Returns the namespace index of the Object Struct Instance from the given browsepath
+     * @param paBrowsePath The browsepath of the Object Struct
+     * @return The namespace index of the Object Struct
+    */
+    static UA_UInt16 getNamespaceIndexFromBrowsepath(const std::string& paBrowsePath);
+
+    /**
+     * Removes any present namespace indices from the browsepath.
+     * @param paBrowsePath The browsepath of the Object Struct
+     * @return The browsepath without any namespace indices
+    */
+    static std::string removeNamespaceIndicesFromBrowsePath(const std::string& paBrowsePath);
 };