浏览代码

HPCC-14684 ConfigMgr - Add alias attribute to Cluster section in Topology

	- Add alias attribute field in ConfigMgr

Signed-off-by: Gleb Aronsky <gleb.aronsky@lexisnexis.com>
Gleb Aronsky 9 年之前
父节点
当前提交
d3d5f8cd22
共有 3 个文件被更改,包括 4 次插入0 次删除
  1. 2 0
      deployment/deploy/XMLTags.h
  2. 1 0
      deployment/deployutils/deployutils.cpp
  3. 1 0
      esp/services/WsDeploy/WsDeployService.cpp

+ 2 - 0
deployment/deploy/XMLTags.h

@@ -92,6 +92,7 @@
 #define XML_TAG_LOCALCONFFILE          "LocalConfFile"
 #define XML_TAG_LOCALENVCONFFILE       "LocalEnvConfFile"
 
+#define XML_ATTR_ALIAS                 "@alias"
 #define XML_ATTR_AGENTPORT             "@agentPort"
 #define XML_ATTR_ATTRIB                "@attrib"
 #define XML_ATTR_ATTRSERVER            "@attrServer"
@@ -244,6 +245,7 @@
 #define UI_FIELD_ATTR_VALUE             "@Value"
 #define UI_FIELD_ATTR_DEFAULTVALUE      "@DefaultValue"
 
+#define TAG_ALIAS                       "alias"
 #define TAG_SUBNET                      "subnet"
 #define TAG_MASK                        "mask"
 #define TAG_TRACE                       "trace"

+ 1 - 0
deployment/deployutils/deployutils.cpp

@@ -2141,6 +2141,7 @@ bool generateHeaderForTopology(const IPropertyTree* pEnv, StringBuffer& sbDefn,
   addTopologyType(jsStrBuf, pEnv, XML_TAG_ROXIECLUSTER,  TAG_PROCESS, "", 0, 1, XML_TAG_SOFTWARE"/RoxieCluster", 4);
   addTopologyType(jsStrBuf, pEnv, XML_TAG_CLUSTER,  TAG_NAME, "", 0, 1, "", 1);
   addTopologyType(jsStrBuf, pEnv, XML_TAG_CLUSTER,  TAG_PREFIX, "", 0, 1, "", 1);
+  addTopologyType(jsStrBuf, pEnv, XML_TAG_CLUSTER,  TAG_ALIAS, "", 0, 1, "", 1);
   jsStrBuf.append("compTabs['Topology'][compTabs['Topology'].length]= 'Topology';");
   jsStrBuf.append("var colIndex = new Array();");
   jsStrBuf.appendf("colIndex['nameTopology']=%d;", index++);

+ 1 - 0
esp/services/WsDeploy/WsDeployService.cpp

@@ -4981,6 +4981,7 @@ bool CWsDeployFileInfo::handleTopology(IEspContext &context, IEspHandleTopologyR
     {
       pNode->addProp(XML_ATTR_NAME, "");
       pNode->addProp(XML_ATTR_PREFIX, "");
+      pNode->addProp(XML_ATTR_ALIAS, "");
     }
 
     IPropertyTree* pTopology = pEnvRoot->queryPropTree(buf.str());