Drop SiteInformation.contact (OSG_CONTACT_NAME) (SOFTWARE-3471)

Author: matyasselmeci

config/40-siteinfo.ini

@@ -30,11 +30,6 @@ resource = UNAVAILABLE
 ; is such a URL).
 ;site_policy = UNAVAILABLE
 
-; Set "contact" to the name of the admin/technical contact for the cluster.
-; 
-; YOU WILL NEED TO CHANGE THIS
-contact = UNAVAILABLE
-
 ; Set "city" to the city that the cluster is located in.
 ; 
 ; YOU WILL NEED TO CHANGE THIS

osg_configure/configure_modules/siteinformation.py

@@ -43,10 +43,6 @@ def __init__(self, *args, **kwargs):
                                               required=OPTIONAL,
                                               default_value='',
                                               mapping='OSG_SITE_INFO'),
-                        'contact':
-                            configfile.Option(name='contact',
-                                              required=MANDATORY_ON_CE,
-                                              mapping='OSG_CONTACT_NAME'),
                         'city':
                             configfile.Option(name='city',
                                               required=MANDATORY_ON_CE,
@@ -94,6 +90,7 @@ def parse_configuration(self, configuration):
 
         self.get_options(configuration,
                          ignore_options=[
+                             "contact",
                              "email",
                          ])
         self.log('SiteInformation.parse_configuration completed')

tests/test_siteattributes.py

@@ -55,7 +55,6 @@ def testParsing1(self):
                      'OSG_SITE_NAME': 'MY_SITE',
                      'OSG_SPONSOR': 'osg:100',
                      'OSG_SITE_INFO': 'http://example/com/policy.html',
-                     'OSG_CONTACT_NAME': 'Admin Name',
                      'OSG_SITE_CITY': 'Chicago',
                      'OSG_SITE_COUNTRY': 'US',
                      'OSG_SITE_LONGITUDE': '84.23',
@@ -89,7 +88,6 @@ def testParsing2(self):
                      'OSG_SITE_NAME': 'MY_SITE',
                      'OSG_SPONSOR': 'osg:50 usatlas:50',
                      'OSG_SITE_INFO': 'http://example/com/policy.html',
-                     'OSG_CONTACT_NAME': 'Admin Name',
                      'OSG_SITE_CITY': 'Chicago',
                      'OSG_SITE_COUNTRY': 'US',
                      'OSG_SITE_LONGITUDE': '-84.23',
@@ -123,7 +121,6 @@ def testParsing3(self):
                      'OSG_SITE_NAME': 'MY_SITE',
                      'OSG_SPONSOR': 'osg:50 usatlas:50',
                      'OSG_SITE_INFO': 'http://example/com/policy.html',
-                     'OSG_CONTACT_NAME': 'Admin Name',
                      'OSG_SITE_CITY': 'Chicago',
                      'OSG_SITE_COUNTRY': 'US',
                      'OSG_SITE_LONGITUDE': '-84.23',
@@ -156,7 +153,6 @@ def testMissingAttribute(self):
         mandatory_on_all = ['group']
         # ^ TODO OSG 3.5: add "resource" to this list
         mandatory_on_ce = ['host_name',
-                           'contact',
                            'city',
                            'country',
                            'longitude',