HPCC-18287 Rename ESPenum RoxieControlCmd to RoxieControlCmdType

A 'unknown type' error is shown inside /WsSCM/RoxieControlCmd?form
because the existing code uses the same name for both ESPenum
RoxieControlCmd and ESPmethod RoxieControlCmd.

Signed-off-by: wangkx <kevin.wang@lexisnexis.com>

ecl/eclcmd/roxie/ecl-roxie.cpp

@@ -190,7 +190,7 @@ public:
         Owned<IClientRoxieControlCmdRequest> req = client->createRoxieControlCmdRequest();
         req->setWait(optMsToWait);
         req->setProcessCluster(optProcess);
-        req->setCommand(attach ? CRoxieControlCmd_ATTACH : CRoxieControlCmd_DETACH);
+        req->setCommand(attach ? CRoxieControlCmdType_ATTACH : CRoxieControlCmdType_DETACH);
 
         Owned<IClientRoxieControlCmdResponse> resp = client->RoxieControlCmd(req);
         int ret = outputMultiExceptionsEx(resp->getExceptions());
@@ -299,11 +299,11 @@ public:
         req->setWait(optMsToWait);
         req->setProcessCluster(optProcess);
         if (!reload)
-            req->setCommand(CRoxieControlCmd_STATE);
+            req->setCommand(CRoxieControlCmdType_STATE);
         else if (optRetry)
-            req->setCommand(CRoxieControlCmd_RELOAD_RETRY);
+            req->setCommand(CRoxieControlCmdType_RELOAD_RETRY);
         else
-            req->setCommand(CRoxieControlCmd_RELOAD);
+            req->setCommand(CRoxieControlCmdType_RELOAD);
 
         Owned<IClientRoxieControlCmdResponse> resp = client->RoxieControlCmd(req);
         int ret = outputMultiExceptionsEx(resp->getExceptions());

esp/scm/ws_smc.ecm

@@ -308,7 +308,7 @@ BrowseResourcesResponse
     ESParray<ESPstruct HPCCResourceRepository> HPCCResourceRepositories;
 };
 
-ESPenum RoxieControlCmd : string
+ESPenum RoxieControlCmdType : string
 {
     ATTACH("Attach"),
     DETACH("Detach"),
@@ -320,7 +320,7 @@ ESPenum RoxieControlCmd : string
 ESPrequest RoxieControlCmdRequest
 {
     string ProcessCluster;
-    ESPenum RoxieControlCmd Command("Attach");
+    ESPenum RoxieControlCmdType Command;
     int Wait;
 };
 

esp/services/ws_smc/ws_smcService.cpp

@@ -2125,15 +2125,15 @@ inline const char *controlCmdMessage(int cmd)
 {
     switch (cmd)
     {
-    case CRoxieControlCmd_ATTACH:
+    case CRoxieControlCmdType_ATTACH:
         return "<control:unlockDali/>";
-    case CRoxieControlCmd_DETACH:
+    case CRoxieControlCmdType_DETACH:
         return "<control:lockDali/>";
-    case CRoxieControlCmd_RELOAD:
+    case CRoxieControlCmdType_RELOAD:
         return "<control:reload/>";
-    case CRoxieControlCmd_RELOAD_RETRY:
+    case CRoxieControlCmdType_RELOAD_RETRY:
         return "<control:reload forceRetry='1' />";
-    case CRoxieControlCmd_STATE:
+    case CRoxieControlCmdType_STATE:
         return "<control:state/>";
     default:
         throw MakeStringException(ECLWATCH_MISSING_PARAMS, "Unknown Roxie Control Command.");