Merge pull request #2169 from brianhlin/SOFTWARE-4919.fix-multiple-tags

Fix tag list in generated XML (SOFTWARE-4919)
opensciencegrid · Dec 1, 2021 · 77e9ff4 · 77e9ff4
2 parents 7b3417e + b62470b
commit 77e9ff4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/schema/rgsummary.xsd b/src/schema/rgsummary.xsd
@@ -88,7 +88,7 @@
                           <xsd:element name="Tags">
                             <xsd:complexType>
                               <xsd:sequence>
-                                <xsd:element minOccurs="0" name="Tag" type="xsd:string" />
+                                <xsd:element minOccurs="0" maxOccurs="unbounded" name="Tag" type="xsd:string" />
                               </xsd:sequence>
                             </xsd:complexType>
                           </xsd:element>

diff --git a/src/webapp/topology.py b/src/webapp/topology.py
@@ -145,8 +145,8 @@ def _expand_services(self, services: Dict) -> List[OrderedDict]:
             svc.move_to_end("ID", last=False)
         return services_list
 
-    def _expand_tags(self, tags: List) -> List[Dict]:
-        return [ {"Tag": tag} for tag in tags ]
+    def _expand_tags(self, tags: List) -> Dict[str, list]:
+        return {"Tag": tags}
 
     @staticmethod
     def _expand_voownership(voownership: Dict) -> OrderedDict: