Drop SiteInformation.sponsor (OSG_SPONSOR) (SOFTWARE-3471)

Author: matyasselmeci

config/40-siteinfo.ini

@@ -19,9 +19,3 @@ host_name = UNAVAILABLE
 ; 
 ; YOU WILL NEED TO CHANGE THIS
 resource = UNAVAILABLE
-
-; Set "sponsor" to the sponsor(s) for your cluster.
-; If your cluster has multiple sponsors, separate them with commas
-; and specify the percentages using this format: "osg:10, atlas:45, cms:45".
-;
-;sponsor =

osg_configure/configure_modules/siteinformation.py

@@ -33,11 +33,6 @@ def __init__(self, *args, **kwargs):
                             configfile.Option(name='host_name',
                                               required=MANDATORY_ON_CE,
                                               mapping='OSG_HOSTNAME'),
-                        'sponsor':
-                            configfile.Option(name='sponsor',
-                                              required=OPTIONAL,
-                                              default_value='',
-                                              mapping='OSG_SPONSOR'),
                         'resource':
                             configfile.Option(name='resource',
                                               required=MANDATORY,
@@ -74,6 +69,7 @@ def parse_configuration(self, configuration):
                              "latitude",
                              "longitude",
                              "site_policy",
+                             "sponsor",
                          ])
         self.log('SiteInformation.parse_configuration completed')
 
@@ -112,51 +108,9 @@ def check_attributes(self, attributes):
                          section=self.config_section,
                          level=logging.WARNING)
 
-        sponsor = self.opt_val("sponsor")
-        if not utilities.blank(sponsor):
-            attributes_ok &= self.check_sponsor(sponsor)
-
         self.log('SiteInformation.check_attributes completed')
         return attributes_ok
 
-    def check_sponsor(self, sponsor):
-        attributes_ok = True
-        percentage = 0
-        for vo in re.split(r'\s*,?\s*', sponsor):
-            vo_split = vo.split(':')
-            if len(vo_split) == 1:
-                percentage += 100
-            elif len(vo_split) == 2:
-                vo_percentage = vo_split[1]
-                try:
-                    percentage += int(vo_percentage)
-                except ValueError:
-                    self.log("VO percentage (%s) in sponsor field (%s) not an integer"
-                             % (vo_percentage, vo),
-                             section=self.config_section,
-                             option='sponsor',
-                             level=logging.ERROR,
-                             exception=True)
-                    attributes_ok = False
-            else:
-                self.log("VO sponsor field is not formated correctly: %s" % vo,
-                         section=self.config_section,
-                         option='sponsor',
-                         level=logging.ERROR)
-                self.log("Sponsors should be given as sponsor:percentage "
-                         "separated by a space or comma")
-                attributes_ok = False
-
-        if percentage != 100:
-            self.log("VO percentages in sponsor field do not add up to 100, got %s"
-                     % percentage,
-                     section=self.config_section,
-                     option='sponsor',
-                     level=logging.ERROR)
-            attributes_ok = False
-
-        return attributes_ok
-
     def module_name(self):
         """Return a string with the name of the module"""
         return "SiteInformation"

tests/test_siteattributes.py

@@ -53,7 +53,6 @@ def testParsing1(self):
         variables = {'OSG_GROUP': 'OSG-ITB',
                      'OSG_HOSTNAME': 'example.com',
                      'OSG_SITE_NAME': 'MY_SITE',
-                     'OSG_SPONSOR': 'osg:100',
                     }
         for var in variables:
             self.assertTrue(var in attributes,
@@ -82,7 +81,6 @@ def testParsing2(self):
         variables = {'OSG_GROUP': 'OSG',
                      'OSG_HOSTNAME': 'example.com',
                      'OSG_SITE_NAME': 'MY_SITE',
-                     'OSG_SPONSOR': 'osg:50 usatlas:50',
                     }
         for var in variables:
             self.assertTrue(var in attributes,
@@ -111,7 +109,6 @@ def testParsing3(self):
         variables = {'OSG_GROUP': 'OSG',
                      'OSG_HOSTNAME': 'example.com',
                      'OSG_SITE_NAME': 'MY_SITE',
-                     'OSG_SPONSOR': 'osg:50 usatlas:50',
                     }
         for var in variables:
             self.assertTrue(var in attributes,
@@ -175,48 +172,6 @@ def testInvalidHostname(self):
         self.assertFalse(settings.check_attributes(attributes),
                          "Invalid hostname ignored")
 
-    def testInvalidSponsor1(self):
-        """
-        Test the check_attributes where the sponsor percentages
-        add up to more than 100
-        """
-
-        config_file = get_test_config("siteattributes/" \
-                                      "invalid_sponsor1.ini")
-        configuration = configparser.SafeConfigParser()
-        configuration.read(config_file)
-
-        settings = siteinformation.SiteInformation(logger=global_logger)
-        try:
-            settings.parse_configuration(configuration)
-        except Exception as e:
-            self.fail("Received exception while parsing configuration: %s" % e)
-
-        attributes = settings.get_attributes()
-        self.assertFalse(settings.check_attributes(attributes),
-                         "Invalid sponsor ignored")
-
-    def testInvalidSponsor2(self):
-        """
-        Test the check_attributes where the sponsor percentages
-        add up to less than 100
-        """
-
-        config_file = get_test_config("siteattributes/" \
-                                      "invalid_sponsor2.ini")
-        configuration = configparser.SafeConfigParser()
-        configuration.read(config_file)
-
-        settings = siteinformation.SiteInformation(logger=global_logger)
-        try:
-            settings.parse_configuration(configuration)
-        except Exception as e:
-            self.fail("Received exception while parsing configuration: %s" % e)
-
-        attributes = settings.get_attributes()
-        self.assertFalse(settings.check_attributes(attributes),
-                         "Invalid sponsor ignored")
-
     def testValidSettings(self):
         """
         Test the check_attributes function to see if it oks good attributes