Update sys auth mode from integer to string (#348)

faucetsdn · Oct 19, 2021 · 1d49d5a · 1d49d5a
1 parent e340a60
commit 1d49d5a
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/etc/test_access.out b/etc/test_access.out
@@ -50,6 +50,8 @@ Starting varz-vlan-assigned test...
 3.0
 4.0
 4.0
+auth_mode="all"
+
 200.0
 %%% port-down
 Starting dva-port-down tests
@@ -90,6 +92,8 @@ Starting varz-port-down test...
 3.0
 4.0
 0.0
+auth_mode="all"
+
 200.0
 %%% port-up
 Starting dva-port-up tests
@@ -132,6 +136,8 @@ Starting varz-port-up test...
 3.0
 4.0
 4.0
+auth_mode="all"
+
 200.0
 %%% mac-flipped
 Starting dva-mac-flipped tests
@@ -174,6 +180,8 @@ Starting varz-mac-flipped test...
 3.0
 4.0
 0.0
+auth_mode="all"
+
 200.0
 %%% negative
 Radius results 0 1 1 1
diff --git a/forch/forch_metrics.py b/forch/forch_metrics.py
@@ -115,8 +115,7 @@ def _add_vars(self):
             labels=['mac'])
 
         self._add_var(
-            'system_initialization', 'Initialization state of the system', Gauge,
-            labels=['auth_mode'])
+            'system_initialization', 'Initialization state of the system', Info)
 
     def get_metrics(self, path, params):
         """Return metric list in printable form"""

diff --git a/forch/forchestrator.py b/forch/forchestrator.py
@@ -973,8 +973,8 @@ def update_initialization_varz(self):
         if not self._metrics:
             return
 
-        sys_auth_mode = self._get_sys_auth_mode()
-        self._metrics.update_var('system_initialization', self._initialized, [sys_auth_mode])
+        sys_auth_mode = AuthMode.Mode.Name(self._get_sys_auth_mode())
+        self._metrics.update_var('system_initialization', {'auth_mode': sys_auth_mode})
 
     def cleanup(self):
         """Clean up relevant internal data in all collectors"""

diff --git a/testing/test_access b/testing/test_access
@@ -109,6 +109,7 @@ function test_forch_varz {
     grep 'device_state' <<< $metrics | grep '9a:02:57:1e:8f:01' | awk '{print $2}' | tee -a $TEST_RESULTS
     grep 'device_state' <<< $metrics | grep '9a:02:57:1e:8f:02' | awk '{print $2}' | tee -a $TEST_RESULTS
     grep 'device_state' <<< $metrics | grep '9a:02:57:1e:8f:03' | awk '{print $2}' | tee -a $TEST_RESULTS
+    grep 'system_initialization' <<< $metrics | awk -vRS="}" -vFS="{" '{print $2}' | tee -a $TEST_RESULTS
 
     grep 'static_mac_vlan' <<< $metrics | grep '9a:02:57:1e:8f:01' | awk '{print $2}' | tee -a $TEST_RESULTS
 }