Merge AcademySoftwareFoundation#911 DEFAULT_FACILITY

splhack · Feb 9, 2021 · a92b13a · a92b13a
1 parent 8a9e7ae
commit a92b13a
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/rqd/rqd/rqconstants.py b/rqd/rqd/rqconstants.py
@@ -196,7 +196,6 @@
             RQD_TAGS = config.get(__section, "RQD_TAGS")
         if config.has_option(__section, "DEFAULT_FACILITY"):
             DEFAULT_FACILITY = config.get(__section, "DEFAULT_FACILITY")
-            FACILITY = DEFAULT_FACILITY
         if config.has_option(__section, "LAUNCH_FRAME_USER_GID"):
             LAUNCH_FRAME_USER_GID = config.getint(__section, "LAUNCH_FRAME_USER_GID")
 except Exception as e:

diff --git a/rqd/rqd/rqmachine.py b/rqd/rqd/rqmachine.py
@@ -415,7 +415,7 @@ def __initMachineStats(self, pathCpuInfo=None):
         """Updates static machine information during initialization"""
         self.__renderHost.name = self.getHostname()
         self.__renderHost.boot_time = self.getBootTime()
-        self.__renderHost.facility = rqd.rqconstants.FACILITY
+        self.__renderHost.facility = rqd.rqconstants.DEFAULT_FACILITY
         self.__renderHost.attributes['SP_OS'] = rqd.rqconstants.SP_OS
 
         self.updateMachineStats()

diff --git a/rqd/tests/rqconstants_tests.py b/rqd/tests/rqconstants_tests.py
@@ -123,7 +123,7 @@ def makeRqMachine(self):
 """,
     )
     def test_facility(self):
-        self.assertEqual(rqd.rqconstants.FACILITY, "test_facility")
+        self.assertEqual(rqd.rqconstants.DEFAULT_FACILITY, "test_facility")
 
         machine = self.makeRqMachine()
         self.assertEqual(machine.renderHost.facility, "test_facility")