Drop Storage.se_available (OSG_STORAGE_ELEMENT) (SOFTWARE-3011)

matyasselmeci · matyasselmeci · commit b8f7164fe36a · 2021-02-24T11:55:01.000-06:00
diff --git a/README.md b/README.md
@@ -170,7 +170,6 @@ This section is contained in `/etc/osg/config.d/10-storage.ini` which is provide
 
 | Option           | Values Accepted | Explanation                                                                                                                                                                                                    |
 |------------------|-----------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| **se_available** | `True`, `False` | This indicates whether there is an associated SE available.                                                                                                                                                    |
 | **grid_dir**     | String          | This setting should point to the directory which holds the files from the OSG worker node package. See note                                                                                                    |
 | **app_dir**      | String          | This setting should point to the directory which contains the VO specific applications. See note                                                                                                               |
 | data_dir         | String          | This setting should point to a directory that can be used to store and stage data in and out of the cluster. See note                                                                                          |
diff --git a/config/10-storage.ini b/config/10-storage.ini
@@ -10,10 +10,6 @@
 ; Please refer to the OSG release documentation for an in-depth explanation
 ; of the various storage models and the requirements for them
 
-; If you have a SE available for your cluster and wish to make it available 
-; to incoming jobs, set se_available to True, otherwise set it to False
-se_available = FALSE
-
 ; The grid_dir setting should point to the directory which holds the files
 ; from the OSG worker node package, it should be visible on all of the computer
 ; nodes (read access is required, worker nodes don't need to be able to write) 
diff --git a/osg_configure/configure_modules/storage.py b/osg_configure/configure_modules/storage.py
@@ -21,12 +21,7 @@ def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.logger = logging.getLogger(__name__)
         self.log('StorageConfiguration.__init__ started')
-        self.options = {'se_available':
-                            configfile.Option(name='se_available',
-                                              opt_type=bool,
-                                              default_value=False,
-                                              mapping='OSG_STORAGE_ELEMENT'),
-                        'grid_dir':
+        self.options = {'grid_dir':
                             configfile.Option(name='grid_dir',
                                               default_value='/etc/osg/wn-client',
                                               required=configfile.Option.OPTIONAL,
@@ -84,6 +79,7 @@ def parse_configuration(self, configuration):
 
         self.get_options(configuration, ignore_options=[
             "default_se",
+            "se_available",
         ])
         self.log('StorageConfiguration.parse_configuration completed')
 
diff --git a/scripts/osg-configure b/scripts/osg-configure
@@ -30,7 +30,6 @@ DEFAULT_JOB_ENVIRONMENT_ATTRIBUTES = ['OSG_SITE_NAME',
                                       'OSG_APP',
                                       'OSG_DATA',
                                       'OSG_WN_TMP',
-                                      'OSG_STORAGE_ELEMENT',
                                       'OSG_SITE_READ',
                                       'OSG_SITE_WRITE',
                                       'OSG_SQUID_LOCATION',
diff --git a/tests/configs/config-ce-condor.d/10-storage.ini b/tests/configs/config-ce-condor.d/10-storage.ini
@@ -10,10 +10,6 @@
 ; Please refer to the OSG release documentation for an indepth explanation 
 ; of the various storage models and the requirements for them
 
-; If you have a SE available for your cluster and wish to make it available 
-; to incoming jobs, set se_available to True, otherwise set it to False
-se_available = FALSE
-
 ; The grid_dir setting should point to the directory which holds the files
 ; from the OSG worker node package, it should be visible on all of the computer
 ; nodes (read access is required, worker nodes don't need to be able to write) 
diff --git a/tests/configs/config-ce-lsf.d/10-storage.ini b/tests/configs/config-ce-lsf.d/10-storage.ini
@@ -10,10 +10,6 @@
 ; Please refer to the OSG release documentation for an indepth explanation 
 ; of the various storage models and the requirements for them
 
-; If you have a SE available for your cluster and wish to make it available 
-; to incoming jobs, set se_available to True, otherwise set it to False
-se_available = FALSE
-
 ; The grid_dir setting should point to the directory which holds the files
 ; from the OSG worker node package, it should be visible on all of the computer
 ; nodes (read access is required, worker nodes don't need to be able to write) 
diff --git a/tests/configs/config-ce-pbs.d/10-storage.ini b/tests/configs/config-ce-pbs.d/10-storage.ini
@@ -10,10 +10,6 @@
 ; Please refer to the OSG release documentation for an indepth explanation 
 ; of the various storage models and the requirements for them
 
-; If you have a SE available for your cluster and wish to make it available 
-; to incoming jobs, set se_available to True, otherwise set it to False
-se_available = FALSE
-
 ; The grid_dir setting should point to the directory which holds the files
 ; from the OSG worker node package, it should be visible on all of the computer
 ; nodes (read access is required, worker nodes don't need to be able to write) 
diff --git a/tests/configs/config-ce-sge.d/10-storage.ini b/tests/configs/config-ce-sge.d/10-storage.ini
@@ -10,10 +10,6 @@
 ; Please refer to the OSG release documentation for an indepth explanation 
 ; of the various storage models and the requirements for them
 
-; If you have a SE available for your cluster and wish to make it available 
-; to incoming jobs, set se_available to True, otherwise set it to False
-se_available = FALSE
-
 ; The grid_dir setting should point to the directory which holds the files
 ; from the OSG worker node package, it should be visible on all of the computer
 ; nodes (read access is required, worker nodes don't need to be able to write) 
diff --git a/tests/configs/config-nonce.d/10-storage.ini b/tests/configs/config-nonce.d/10-storage.ini
@@ -10,10 +10,6 @@
 ; Please refer to the OSG release documentation for an indepth explanation 
 ; of the various storage models and the requirements for them
 
-; If you have a SE available for your cluster and wish to make it available 
-; to incoming jobs, set se_available to True, otherwise set it to False
-se_available = FALSE
-
 ; The grid_dir setting should point to the directory which holds the files
 ; from the OSG worker node package, it should be visible on all of the computer
 ; nodes (read access is required, worker nodes don't need to be able to write) 
diff --git a/tests/configs/storage/oasis.ini b/tests/configs/storage/oasis.ini
@@ -2,7 +2,6 @@
 enabled = True
 
 [Storage]
-se_available = False
 grid_dir = /etc
 app_dir = /cvmfs/oasis.opensciencegrid.org
 data_dir = UNAVAILABLE
diff --git a/tests/configs/storage/storage1.ini b/tests/configs/storage/storage1.ini
@@ -2,7 +2,6 @@
 enabled = True
 
 [Storage]
-se_available = True
 grid_dir = /tmp
 app_dir = /tmp
 data_dir = /var
diff --git a/tests/configs/storage/storage2.ini b/tests/configs/storage/storage2.ini
@@ -2,7 +2,6 @@
 enabled = True
 
 [Storage]
-se_available = False
 grid_dir = /usr
 app_dir = /tmp
 data_dir = /usr/bin
diff --git a/tests/configs/storage/storage3.ini b/tests/configs/storage/storage3.ini
@@ -2,7 +2,6 @@
 enabled = True
 
 [Storage]
-se_available = False
 grid_dir = /etc
 app_dir = /tmp
 data_dir = UNAVAILABLE
diff --git a/tests/test_storage.py b/tests/test_storage.py
@@ -48,8 +48,7 @@ def testParsing1(self):
             self.fail("Received exception while parsing configuration: %s" % e)
 
         attributes = settings.get_attributes()
-        variables = {'OSG_STORAGE_ELEMENT': 'True',
-                     'OSG_GRID': '/tmp',
+        variables = {'OSG_GRID': '/tmp',
                      'OSG_APP': '/tmp',
                      'OSG_DATA': '/var',
                      'OSG_WN_TMP': '/usr',
@@ -90,8 +89,7 @@ def testParsing2(self):
             self.fail("Received exception while parsing configuration: %s" % e)
 
         attributes = settings.get_attributes()
-        variables = {'OSG_STORAGE_ELEMENT': 'False',
-                     'OSG_GRID': '/usr',
+        variables = {'OSG_GRID': '/usr',
                      'OSG_APP': '/tmp',
                      'OSG_DATA': '/usr/bin',
                      'OSG_WN_TMP': '/usr/sbin',
@@ -132,8 +130,7 @@ def testParsing3(self):
             self.fail("Received exception while parsing configuration: %s" % e)
 
         attributes = settings.get_attributes()
-        variables = {'OSG_STORAGE_ELEMENT': 'False',
-                     'OSG_GRID': '/etc',
+        variables = {'OSG_GRID': '/etc',
                      'OSG_APP': '/tmp',
                      'OSG_DATA': 'UNAVAILABLE',
                      'OSG_SITE_READ': '/var',
@@ -173,8 +170,7 @@ def testOASISConfig(self):
             self.fail("Received exception while parsing configuration: %s" % e)
 
         attributes = settings.get_attributes()
-        variables = {'OSG_STORAGE_ELEMENT': 'False',
-                     'OSG_GRID': '/etc',
+        variables = {'OSG_GRID': '/etc',
                      'OSG_APP': '/cvmfs/oasis.opensciencegrid.org',
                      'OSG_DATA': 'UNAVAILABLE',
                      'OSG_SITE_READ': '/var',
@@ -188,27 +184,6 @@ def testOASISConfig(self):
                              "expected %s" % (var, attributes[var], variables[var]))
             self.assertTrue(settings.check_attributes(attributes))
 
-    def testMissingAttribute(self):
-        """
-        Test the check_attributes function
-        """
-
-
-        # StorageConfiguration is not enabled on non-ce installs
-        if not utilities.ce_installed():
-            return
-        mandatory = ['se_available']
-        for option in mandatory:
-            config_file = get_test_config("storage/storage1.ini")
-            configuration = configparser.SafeConfigParser()
-            configuration.read(config_file)
-            configuration.remove_option('Storage', option)
-
-            settings = storage.StorageConfiguration(logger=global_logger)
-            self.assertRaises(exceptions.SettingError,
-                              settings.parse_configuration,
-                              configuration)
-
 
 if __name__ == '__main__':
     console = logging.StreamHandler()
