Use explicit manual sequester to avoid auto sequestering under normal… (

#346) * Replace master with promary in comments * Use explicit manual sequester to avoid auto sequestering under normal operation. * Use safe_load instead of load * Fix yaml version Co-authored-by: Anurag Porripireddi <[email protected]>
faucetsdn · Oct 19, 2021 · e340a60 · e340a60
1 parent 9f0464c
commit e340a60
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 13 deletions.
diff --git a/forch/port_state_manager.py b/forch/port_state_manager.py
@@ -52,7 +52,7 @@ class PortStateMachine:
             PortBehavior.Behavior: {
                 PortBehavior.Behavior.cleared: OPERATIONAL,
                 PortBehavior.Behavior.deauthenticated: UNAUTHENTICATED,
-                PortBehavior.Behavior.sequestered: SEQUESTERED
+                PortBehavior.Behavior.manual_sequestered: SEQUESTERED
             }
         },
     }
@@ -377,7 +377,7 @@ def _handle_scheduled_sequstering(self, mac):
             del self._scheduled_sequester_timer[mac]
         self._logger.info('Handle scheduled sequester for device %s.', mac)
         if mac in self._state_machines:
-            self._state_machines[mac].handle_port_behavior(PortBehavior.sequestered)
+            self._state_machines[mac].handle_port_behavior(PortBehavior.manual_sequestered)
 
     def _handle_sequestering_timeout(self, mac):
         if mac in self._sequester_timer:

diff --git a/forch/proto/shared_constants_pb2.py b/forch/proto/shared_constants_pb2.py
diff --git a/proto/shared_constants.proto b/proto/shared_constants.proto
@@ -201,6 +201,9 @@ message PortBehavior {
 
     // deauthenticated
     deauthenticated = 6;
+
+    // Manual sequestered
+    manual_sequestered = 7;
   }
 
   enum PortState {

diff --git a/public/protos.hash b/public/protos.hash
@@ -13,6 +13,6 @@ de40904bfd80b5063478058caecc1ffa0ee6ebe3  proto/forch_configuration.proto
 83e8f50c6a8b53bc2c65d98c5b0f2fe45ad6adbc  proto/network_metric_state.proto
 db4d1bf4d1b4ac1a575853833ecbd9571d784203  proto/path_node.proto
 255a8c039f0487faa2632df22efff854285c6297  proto/process_state.proto
-36ab66f7c688822694a9abb0fb1588e6f5bd0f3f  proto/shared_constants.proto
+0f632f51f6e314c991b0738f5d51ab1c24994d92  proto/shared_constants.proto
 f2907589bfb18d4b1622b9d658899c11b56d3b86  proto/switch_state.proto
 989e22bfd0863f9171eebc728658c6926ce420ef  proto/system_state.proto
diff --git a/public/protos.html b/public/protos.html
@@ -5988,6 +5988,12 @@ <h3 id="PortBehavior.Behavior">PortBehavior.Behavior</h3>
                 <td><p>deauthenticated</p></td>
               </tr>
 
+              <tr>
+                <td>manual_sequestered</td>
+                <td>7</td>
+                <td><p>Manual sequestered</p></td>
+              </tr>
+
           </tbody>
         </table>