HPCC-8777 - Allow ecl packagemap delete and activate to work properly

Signed-off-by: Stuart Ort <stuart.ort@lexisnexis.com>

ecl/ecl-package/ecl-package.cpp

@@ -96,6 +96,9 @@ public:
             usage();
             return false;
         }
+        if (optProcess.isEmpty())
+            optProcess.set("*");
+
         return true;
     }
     virtual int processCMD()
@@ -105,6 +108,7 @@ public:
         Owned<IClientActivatePackageRequest> request = packageProcessClient->createActivatePackageRequest();
         request->setTarget(optTarget);
         request->setPackageMap(optPackageMap);
+        request->setProcess(optProcess);
 
         Owned<IClientActivatePackageResponse> resp = packageProcessClient->ActivatePackage(request);
         if (resp->getExceptions().ordinality())
@@ -130,6 +134,7 @@ private:
 
     StringAttr optTarget;
     StringAttr optPackageMap;
+    StringAttr optProcess;
 };
 
 class EclCmdPackageDeActivate : public EclCmdCommon
@@ -183,6 +188,9 @@ public:
             usage();
             return false;
         }
+        if (optProcess.isEmpty())
+            optProcess.set("*");
+
         return true;
     }
     virtual int processCMD()
@@ -192,6 +200,7 @@ public:
         Owned<IClientDeActivatePackageRequest> request = packageProcessClient->createDeActivatePackageRequest();
         request->setTarget(optTarget);
         request->setPackageMap(optPackageMap);
+        request->setProcess(optProcess);
 
         Owned<IClientDeActivatePackageResponse> resp = packageProcessClient->DeActivatePackage(request);
         if (resp->getExceptions().ordinality())
@@ -216,6 +225,7 @@ private:
 
     StringAttr optTarget;
     StringAttr optPackageMap;
+    StringAttr optProcess;
 };
 
 class EclCmdPackageList : public EclCmdCommon
@@ -430,6 +440,9 @@ public:
             usage();
             return false;
         }
+
+        if (optProcess.isEmpty())
+            optProcess.set("*");
         return true;
     }
     virtual int processCMD()
@@ -441,6 +454,7 @@ public:
         Owned<IClientDeletePackageRequest> request = packageProcessClient->createDeletePackageRequest();
         request->setTarget(optTarget);
         request->setPackageMap(optPackageMap);
+        request->setProcess(optProcess);
 
         Owned<IClientDeletePackageResponse> resp = packageProcessClient->DeletePackage(request);
         if (resp->getExceptions().ordinality())
@@ -458,13 +472,14 @@ public:
                     "ecl packagemap delete <target> <packagemap>\n"
                     " Options:\n"
                     "   <target>               name of the target to use \n"
-                    "   <packagemap>           name of the package map to delete",
+                    "   <packagemap>           name of the package map to delete\n",
                     stdout);
         EclCmdCommon::usage();
     }
 private:
     StringAttr optPackageMap;
     StringAttr optTarget;
+    StringAttr optProcess;
 };
 
 class EclCmdPackageAdd : public EclCmdCommon
@@ -567,7 +582,7 @@ public:
                     " Options:\n"
                     "   -O, --overwrite             overwrite existing information\n"
                     "   -A, --activate              activate the package information\n"
-                    "   --daliip=<ip>               ip of the remote dali to use for logical file lookups"
+                    "   --daliip=<ip>               ip of the remote dali to use for logical file lookups\n"
 // NOT-YET          "  --packageprocessname         if not set use this package process name for all clusters"
                     "   <target>                    name of target to use when adding package map information\n"
                     "   <filename>                  name of file containing package map information\n",

esp/scm/ws_packageprocess.ecm

@@ -40,6 +40,7 @@ ESPrequest DeletePackageRequest
 {
     string Target;
     string PackageMap;
+    string Process;
 };
 
 ESPresponse [exceptions_inline] DeletePackageResponse
@@ -51,6 +52,7 @@ ESPrequest ActivatePackageRequest
 {
     string Target;
     string PackageMap;
+    string Process;
 };
 
 ESPresponse [exceptions_inline] ActivatePackageResponse
@@ -62,6 +64,7 @@ ESPrequest DeActivatePackageRequest
 {
     string Target;
     string PackageMap;
+    string Process;
 };
 
 ESPresponse [exceptions_inline] DeActivatePackageResponse

esp/services/ws_packageprocess/ws_packageprocessService.cpp

@@ -179,6 +179,14 @@ void makePackageActive(IPropertyTree *pkgSetRegistry, IPropertyTree *pkgSetTree,
     pkgSetTree->setPropBool("@active", true);
 }
 
+const char *buildPkgSetId(StringBuffer &pkgSetId, const char *processName)
+{
+    pkgSetId.appendf("default_%s", processName);
+    pkgSetId.replace('*', '#');
+    pkgSetId.replace('?', '~');
+    return pkgSetId.str();
+}
+
 //////////////////////////////////////////////////////////
 
 void addPackageMapInfo(IPropertyTree *pkgSetRegistry, const char *target, const char *packageMapName, const char *packageSetName, const char *lookupDaliIp, IPropertyTree *packageInfo, bool active, bool overWrite, IUserDescriptor* userdesc)
@@ -358,7 +366,7 @@ void getPkgInfo(const char *target, const char *process, StringBuffer &info)
     toXML(tree, info);
 }
 
-bool deletePkgInfo(const char *packageMap, const char *target)
+bool deletePkgInfo(const char *packageMap, const char *target, const char *process)
 {
     Owned<IRemoteConnection> pkgSet = querySDS().connect("/PackageSets/", myProcessSession(), RTM_LOCK_WRITE, SDS_LOCK_TIMEOUT);
     if (!pkgSet)
@@ -366,10 +374,12 @@ bool deletePkgInfo(const char *packageMap, const char *target)
 
     IPropertyTree* packageSets = pkgSet->queryRoot();
 
-    VStringBuffer pkgSet_xpath("PackageSet[@id='%s']", target);
+    StringBuffer pkgSetId;
+    buildPkgSetId(pkgSetId, process);
+    VStringBuffer pkgSet_xpath("PackageSet[@id='%s'][@process='%s']", pkgSetId.str(), process);
     IPropertyTree *pkgSetRegistry = packageSets->queryPropTree(pkgSet_xpath.str());
     if (!pkgSetRegistry)
-        throw MakeStringException(PKG_TARGET_NOT_DEFINED, "No package sets defined for %s", target);
+        throw MakeStringException(PKG_TARGET_NOT_DEFINED, "No package sets defined for %s", process);
 
     StringBuffer lcName(packageMap);
     lcName.toLowerCase();
@@ -397,7 +407,7 @@ bool deletePkgInfo(const char *packageMap, const char *target)
     return true;
 }
 
-void activatePackageMapInfo(const char *target, const char *packageMap, bool activate)
+void activatePackageMapInfo(const char *target, const char *packageMap, const char *process, bool activate)
 {
     if (!target || !*target)
         throw MakeStringException(PKG_TARGET_NOT_DEFINED, "No target defined");
@@ -408,13 +418,15 @@ void activatePackageMapInfo(const char *target, const char *packageMap, bool act
 
     StringBuffer lcName(target);
     lcName.toLowerCase();
-    VStringBuffer xpath("PackageSet[@id=\"%s\"]", lcName.str());
 
     IPropertyTree *root = globalLock->queryRoot();
     if (!root)
-        throw MakeStringException(PKG_ACTIVATE_NOT_FOUND, "Unable to retrieve PackageSet information for %s", lcName.str());
+        throw MakeStringException(PKG_ACTIVATE_NOT_FOUND, "Unable to retrieve PackageSet information");
 
-    IPropertyTree *pkgSetTree = root->queryPropTree(xpath);
+    StringBuffer pkgSetId;
+    buildPkgSetId(pkgSetId, process);
+    VStringBuffer pkgSet_xpath("PackageSet[@id='%s'][@process='%s']", pkgSetId.str(), process);
+    IPropertyTree *pkgSetTree = root->queryPropTree(pkgSet_xpath.str());
     if (pkgSetTree)
     {
         if (packageMap && *packageMap)
@@ -450,9 +462,8 @@ bool CWsPackageProcessEx::onAddPackage(IEspContext &context, IEspAddPackageReque
         userdesc->set(user, password);
     }
 
-    VStringBuffer pkgSetId("default_%s", processName.get());
-    pkgSetId.replace('*', '#');
-    pkgSetId.replace('?', '~');
+    StringBuffer pkgSetId;
+    buildPkgSetId(pkgSetId, processName.get());
 
     Owned<IPropertyTree> packageTree = createPTreeFromXMLString(info.str());
     Owned<IPropertyTree> pkgSetRegistry = getPkgSetRegistry(pkgSetId.str(), processName.get(), false);
@@ -468,7 +479,11 @@ bool CWsPackageProcessEx::onDeletePackage(IEspContext &context, IEspDeletePackag
 {
     resp.updateStatus().setCode(0);
     StringAttr pkgMap(req.getPackageMap());
-    bool ret = deletePkgInfo(pkgMap.get(), req.getTarget());
+    StringAttr processName(req.getProcess());
+    if (processName.length()==0)
+        processName.set("*");
+
+    bool ret = deletePkgInfo(pkgMap.get(), req.getTarget(), processName.get());
     StringBuffer msg;
     (ret) ? msg.append("Successfully ") : msg.append("Unsuccessfully ");
     msg.append("deleted ").append(pkgMap.get()).append(" from ").append(req.getTarget());
@@ -480,20 +495,14 @@ bool CWsPackageProcessEx::onDeletePackage(IEspContext &context, IEspDeletePackag
 bool CWsPackageProcessEx::onActivatePackage(IEspContext &context, IEspActivatePackageRequest &req, IEspActivatePackageResponse &resp)
 {
     resp.updateStatus().setCode(0);
-    StringBuffer target(req.getTarget());
-    StringBuffer pkgMapName(req.getPackageMap());
-
-    activatePackageMapInfo(target.str(), pkgMapName.str(), true);
+    activatePackageMapInfo(req.getTarget(), req.getPackageMap(), req.getProcess(), true);
     return true;
 }
 
 bool CWsPackageProcessEx::onDeActivatePackage(IEspContext &context, IEspDeActivatePackageRequest &req, IEspDeActivatePackageResponse &resp)
 {
     resp.updateStatus().setCode(0);
-    StringBuffer target(req.getTarget());
-    StringBuffer pkgMapName(req.getPackageMap());
-
-    activatePackageMapInfo(target.str(), pkgMapName.str(), false);
+    activatePackageMapInfo(req.getTarget(), req.getPackageMap(), req.getProcess(), false);
     return true;
 }