Drop SiteInformation.email (OSG_CONTACT_EMAIL) (SOFTWARE-3471)

Author: matyasselmeci

config/40-siteinfo.ini

@@ -35,11 +35,6 @@ resource = UNAVAILABLE
 ; YOU WILL NEED TO CHANGE THIS
 contact = UNAVAILABLE
 
-; Set "email" to the email address of the admin/technical contact for the cluster.
-; 
-; YOU WILL NEED TO CHANGE THIS
-email = UNAVAILABLE
-
 ; Set "city" to the city that the cluster is located in.
 ; 
 ; YOU WILL NEED TO CHANGE THIS

osg_configure/configure_modules/siteinformation.py

@@ -47,10 +47,6 @@ def __init__(self, *args, **kwargs):
                             configfile.Option(name='contact',
                                               required=MANDATORY_ON_CE,
                                               mapping='OSG_CONTACT_NAME'),
-                        'email':
-                            configfile.Option(name='email',
-                                              required=MANDATORY_ON_CE,
-                                              mapping='OSG_CONTACT_EMAIL'),
                         'city':
                             configfile.Option(name='city',
                                               required=MANDATORY_ON_CE,
@@ -96,7 +92,10 @@ def parse_configuration(self, configuration):
             self.log('SiteInformation.parse_configuration completed')
             return
 
-        self.get_options(configuration)
+        self.get_options(configuration,
+                         ignore_options=[
+                             "email",
+                         ])
         self.log('SiteInformation.parse_configuration completed')
 
     # pylint: disable-msg=W0613
@@ -152,16 +151,6 @@ def check_attributes(self, attributes):
                      level=logging.ERROR)
             attributes_ok = False
 
-        email = self.opt_val("email")
-        # make sure the email address has the correct format
-        if not utilities.blank(email) and not validation.valid_email(email):
-            self.log("Invalid email address in site information: %s" %
-                     email,
-                     section=self.config_section,
-                     option='email',
-                     level=logging.ERROR)
-            attributes_ok = False
-
         sponsor = self.opt_val("sponsor")
         if not utilities.blank(sponsor):
             attributes_ok &= self.check_sponsor(sponsor)

tests/test_siteattributes.py

@@ -56,7 +56,6 @@ def testParsing1(self):
                      'OSG_SPONSOR': 'osg:100',
                      'OSG_SITE_INFO': 'http://example/com/policy.html',
                      'OSG_CONTACT_NAME': 'Admin Name',
-                     'OSG_CONTACT_EMAIL': '[email protected]',
                      'OSG_SITE_CITY': 'Chicago',
                      'OSG_SITE_COUNTRY': 'US',
                      'OSG_SITE_LONGITUDE': '84.23',
@@ -91,7 +90,6 @@ def testParsing2(self):
                      'OSG_SPONSOR': 'osg:50 usatlas:50',
                      'OSG_SITE_INFO': 'http://example/com/policy.html',
                      'OSG_CONTACT_NAME': 'Admin Name',
-                     'OSG_CONTACT_EMAIL': '[email protected]',
                      'OSG_SITE_CITY': 'Chicago',
                      'OSG_SITE_COUNTRY': 'US',
                      'OSG_SITE_LONGITUDE': '-84.23',
@@ -126,7 +124,6 @@ def testParsing3(self):
                      'OSG_SPONSOR': 'osg:50 usatlas:50',
                      'OSG_SITE_INFO': 'http://example/com/policy.html',
                      'OSG_CONTACT_NAME': 'Admin Name',
-                     'OSG_CONTACT_EMAIL': '[email protected]',
                      'OSG_SITE_CITY': 'Chicago',
                      'OSG_SITE_COUNTRY': 'US',
                      'OSG_SITE_LONGITUDE': '-84.23',
@@ -160,7 +157,6 @@ def testMissingAttribute(self):
         # ^ TODO OSG 3.5: add "resource" to this list
         mandatory_on_ce = ['host_name',
                            'contact',
-                           'email',
                            'city',
                            'country',
                            'longitude',
@@ -267,26 +263,6 @@ def testInvalidHostname(self):
         self.assertFalse(settings.check_attributes(attributes),
                          "Invalid hostname ignored")
 
-    def testInvalidEmail(self):
-        """
-        Test the check_attributes with invalid email
-        """
-
-        config_file = get_test_config("siteattributes/" \
-                                      "invalid_email.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 email ignored")
-
     def testInvalidSponsor1(self):
         """
         Test the check_attributes where the sponsor percentages