Do not fetch LSF properties when not using LSF

python/res/enkf/config_keys.py

@@ -91,6 +91,7 @@ class ConfigKeys:
     LSF_RESOURCE_KEY = _lsf_resource_key()
     LSF_QUEUE_NAME_KEY = _lsf_queue_key()
     LSF_SERVER_KEY   = _lsf_server_key()
+    LSF_KEY          = 'LSF'
     UPDATE_LOG_PATH  = _update_log_path()
     STORE_SEED       = _store_seed()
     LOAD_SEED        = _load_seed()

python/res/enkf/queue_config.py

@@ -65,18 +65,33 @@ def queue_system(self):
         """The queue system in use, e.g. LSF or LOCAL"""
         return self._queue_system()
 
+    @property
+    def job_script(self):
+        return self._get_job_script()
+
     @property
     def driver(self):
         return self._queue_driver(self.queue_system).setParent(self)
 
+    def _assert_lsf(self, key='driver'):
+        sys = self.queue_system
+        if sys != ConfigKeys.LSF_KEY:
+            fmt = 'Cannot fetch LSF {key}, current queue is {system}'
+            raise ValueError(fmt.format(key=key,
+                                        system=self.queue_system))
+
     @property
-    def job_script(self):
-        return self._get_job_script()
+    def _lsf_driver(self):
+        self._assert_lsf()
+        driver = self._queue_driver(ConfigKeys.LSF_KEY)
+        return driver.setParent(self)
 
     @property
     def lsf_resource(self):
-        return self.driver.get_option(ConfigKeys.LSF_RESOURCE_KEY)
+        self._assert_lsf(key=ConfigKeys.LSF_RESOURCE_KEY)
+        return self._lsf_driver.get_option(ConfigKeys.LSF_RESOURCE_KEY)
 
     @property
     def lsf_server(self):
-        return self.driver.get_option(ConfigKeys.LSF_SERVER_KEY)
+        self._assert_lsf(key=ConfigKeys.LSF_SERVER_KEY)
+        return self._lsf_driver.get_option(ConfigKeys.LSF_SERVER_KEY)