Add ResourceCatalog.format_value() for getting just the value of OSG_ResourceCatalog

Author: matyasselmeci

osg_configure/modules/resourcecatalog.py

@@ -136,7 +136,6 @@ def as_attributes(self):
         return attributes
 
 
-
 class ResourceCatalog(object):
     """Class for building an OSG_ResourceCatalog attribute in condor-ce configs for the ce-collector"""
 
@@ -148,7 +147,7 @@ def add_rcentry(self, rcentry):
 
         return self
 
-    def compose_text(self):
+    def format_value(self) -> str:
         """Return the OSG_ResourceCatalog classad attribute made of all the entries in this object"""
         if not self.entries:
             catalog = '{}'
@@ -164,5 +163,8 @@ def compose_text(self):
             catalog = ('{ \\\n'
                        + ', \\\n'.join(entry_texts)
                        + ' \\\n}')
+        return catalog
 
+    def compose_text(self):
+        catalog = self.format_value()
         return 'OSG_ResourceCatalog = ' + catalog

osg_configure/modules/subcluster.py

@@ -228,6 +228,9 @@ class ResourceCatalog:  # forward declaration for type checking
     def compose_text(self) -> str:
         pass
 
+    def format_value(self) -> str:
+        pass
+
 
 def resource_catalog_from_config(config: ConfigParser, default_allowed_vos: List[str] = None) -> ResourceCatalog:
     """