HPCC-16183 Output slave port and slaves per node in configgen

deployment/configgen/main.cpp

@@ -727,9 +727,16 @@ int processRequest(const char* in_cfgname, const char* out_dirname, const char*
             if (multiInstances)
               processName.clear().append(pInst->queryName());
 
-            out.appendf("%s,%s,%s,%s,%s%c%s,%s\n", processName.str(), 
-              pComponent->queryProp("@name"), netAddr.str(), port.str(), 
-              STANDARD_OUTDIR, PATHSEPCHAR, pComponent->queryProp("@name"), pComponent->queryProp("@logDir"));
+            if (!strcmp(processName.str(), "ThorSlaveProcess"))
+            {
+               out.appendf("%s,%s,%s,%s,%s,%s%c%s,%s\n", processName.str(),
+                 pComponent->queryProp("@name"), netAddr.str(),pInst->queryProp("@slaveport"), pInst->queryProp("@slavesPerNode"),
+                 STANDARD_OUTDIR, PATHSEPCHAR, pComponent->queryProp("@name"), pComponent->queryProp("@logDir"));
+            }
+            else
+               out.appendf("%s,%s,%s,%s,%s%c%s,%s\n", processName.str(),
+                 pComponent->queryProp("@name"), netAddr.str(), port.str(),
+                 STANDARD_OUTDIR, PATHSEPCHAR, pComponent->queryProp("@name"), pComponent->queryProp("@logDir"));
           }
         }
         else 

deployment/deploy/deploy.cpp

@@ -1163,6 +1163,8 @@ IPropertyTree* getInstances(const IPropertyTree* pEnvRoot, const char* compName,
       const char* build   = pComponent->queryProp("@build");
       const char* buildSet= pComponent->queryProp("@buildSet");
       const char* masterPort = pComponent->queryProp("@masterport");
+      const char* slavePort = pComponent->queryProp("@slaveport");
+      const char* slavesPerNode = pComponent->queryProp("@slavesPerNode");
       const char* logDir = NULL;
 
       /* If one of these components found isn't also declared in topology, skip it. */
@@ -1227,6 +1229,11 @@ IPropertyTree* getInstances(const IPropertyTree* pEnvRoot, const char* compName,
                 pInstance->addProp("@computer", computer);
                 pInstance->addProp("@netAddress", netAddr);
                 pInstance->addProp("@masterport", masterPort);
+                if(!strcmp(pInst->queryName(), "ThorSlaveProcess"))
+                {
+                  pInstance->addProp("@slaveport", slavePort);
+                  pInstance->addProp("@slavesPerNode", slavesPerNode);
+                }
               }
             }
           }