Drop SiteInformation.site_policy (OSG_SITE_INFO) (SOFTWARE-3471)

Author: matyasselmeci

config/40-siteinfo.ini

@@ -25,7 +25,3 @@ resource = UNAVAILABLE
 ; and specify the percentages using this format: "osg:10, atlas:45, cms:45".
 ;
 ;sponsor =
-
-; Set "site_policy" to a URL that lists your site's usage policy (if there
-; is such a URL).
-;site_policy = UNAVAILABLE

osg_configure/configure_modules/siteinformation.py

@@ -38,11 +38,6 @@ def __init__(self, *args, **kwargs):
                                               required=OPTIONAL,
                                               default_value='',
                                               mapping='OSG_SPONSOR'),
-                        'site_policy':
-                            configfile.Option(name='site_policy',
-                                              required=OPTIONAL,
-                                              default_value='',
-                                              mapping='OSG_SITE_INFO'),
                         'resource':
                             configfile.Option(name='resource',
                                               required=MANDATORY,
@@ -78,6 +73,7 @@ def parse_configuration(self, configuration):
                              "email",
                              "latitude",
                              "longitude",
+                             "site_policy",
                          ])
         self.log('SiteInformation.parse_configuration completed')
 

tests/test_siteattributes.py

@@ -54,7 +54,6 @@ def testParsing1(self):
                      'OSG_HOSTNAME': 'example.com',
                      'OSG_SITE_NAME': 'MY_SITE',
                      'OSG_SPONSOR': 'osg:100',
-                     'OSG_SITE_INFO': 'http://example/com/policy.html',
                     }
         for var in variables:
             self.assertTrue(var in attributes,
@@ -84,7 +83,6 @@ def testParsing2(self):
                      'OSG_HOSTNAME': 'example.com',
                      'OSG_SITE_NAME': 'MY_SITE',
                      'OSG_SPONSOR': 'osg:50 usatlas:50',
-                     'OSG_SITE_INFO': 'http://example/com/policy.html',
                     }
         for var in variables:
             self.assertTrue(var in attributes,
@@ -114,7 +112,6 @@ def testParsing3(self):
                      'OSG_HOSTNAME': 'example.com',
                      'OSG_SITE_NAME': 'MY_SITE',
                      'OSG_SPONSOR': 'osg:50 usatlas:50',
-                     'OSG_SITE_INFO': 'http://example/com/policy.html',
                     }
         for var in variables:
             self.assertTrue(var in attributes,