Merge pull request #5907 from DIRACGridBot/cherry-pick-2-4f26922c1-integration

chrisburr · web-flow · commit 3476d79c6c2e · 2022-02-25T16:05:53.000+01:00
[sweep:integration] fix: fixed parsing of tags
diff --git a/src/DIRAC/WorkloadManagementSystem/Client/Matcher.py b/src/DIRAC/WorkloadManagementSystem/Client/Matcher.py
@@ -184,11 +184,11 @@ def _processResourceDescription(self, resourceDescription):
         if resourceDescription.get("Tag"):
             tags = resourceDescription["Tag"]
             resourceDict["Tag"] = (
-                tags if isinstance(tags, list) else list({tag.strip("\"'") for tag in tags.strip("[]").split(",")})
+                tags if isinstance(tags, list) else list({tag.strip("\"' ") for tag in tags.strip("[]").split(",")})
             )
             if "RequiredTag" in resourceDescription:
                 requiredTagsList = (
-                    resourceDescription["RequiredTag"].split(",")
+                    list({tag.strip("\"' ") for tag in resourceDescription["RequiredTag"].strip("[]").split(",")})
                     if isinstance(resourceDescription["RequiredTag"], str)
                     else resourceDescription["RequiredTag"]
                 )

Original file line number	Diff line number	Diff line change
`@@ -184,11 +184,11 @@ def _processResourceDescription(self, resourceDescription):`
`184`	`184`	`if resourceDescription.get("Tag"):`
`185`	`185`	`tags = resourceDescription["Tag"]`
`186`	`186`	`resourceDict["Tag"] = (`
`187`		`- tags if isinstance(tags, list) else list({tag.strip("\"'") for tag in tags.strip("[]").split(",")})`
	`187`	`+ tags if isinstance(tags, list) else list({tag.strip("\"' ") for tag in tags.strip("[]").split(",")})`
`188`	`188`	`)`
`189`	`189`	`if "RequiredTag" in resourceDescription:`
`190`	`190`	`requiredTagsList = (`
`191`		`- resourceDescription["RequiredTag"].split(",")`
	`191`	`+ list({tag.strip("\"' ") for tag in resourceDescription["RequiredTag"].strip("[]").split(",")})`
`192`	`192`	`if isinstance(resourceDescription["RequiredTag"], str)`
`193`	`193`	`else resourceDescription["RequiredTag"]`
`194`	`194`	`)`