Merge pull request #104 from upalatucci/stp-enabled-form

OCPBUGS-36238: STP enabled by default
nmstate · Jul 3, 2024 · b2ea8c8 · b2ea8c8
2 parents e8e378e + 0826821
commit b2ea8c8
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/src/utils/components/PolicyForm/PolicyForm.tsx b/src/utils/components/PolicyForm/PolicyForm.tsx
@@ -49,7 +49,14 @@ const PolicyForm: FC<PolicyFormProps> = ({ policy, setPolicy, createForm = false
         type: InterfaceType.LINUX_BRIDGE,
         name: `interface-${draftPolicy.spec.desiredState.interfaces.length}`,
         state: 'up',
-      });
+        bridge: {
+          options: {
+            stp: {
+              enabled: false,
+            },
+          },
+        },
+      } as NodeNetworkConfigurationInterface);
     });
   };
 

diff --git a/src/utils/components/PolicyForm/PolicyInterface.tsx b/src/utils/components/PolicyForm/PolicyInterface.tsx
@@ -69,7 +69,7 @@ const PolicyInterface: FC<PolicyInterfaceProps> = ({
 
       if (newType === InterfaceType.LINUX_BRIDGE) {
         delete draftInterface['link-aggregation'];
-        draftInterface.bridge = { port: [], options: {} };
+        draftInterface.bridge = { port: [], options: { stp: { enabled: false } } };
       }
 
       if (newType === InterfaceType.BOND) {
@@ -363,7 +363,7 @@ const PolicyInterface: FC<PolicyInterfaceProps> = ({
               </Text>
             }
             id={`policy-interface-stp-${id}`}
-            isChecked={policyInterface?.bridge?.options?.stp?.enabled}
+            isChecked={policyInterface?.bridge?.options?.stp?.enabled !== false}
             onChange={(_, newValue) => onSTPChange(newValue)}
             isDisabled={isInterfaceCreated}
           />

diff --git a/src/views/policies/new/NewPolicy.tsx b/src/views/policies/new/NewPolicy.tsx
@@ -40,6 +40,13 @@ const initialPolicy: V1NodeNetworkConfigurationPolicy = {
           name: 'br0',
           type: InterfaceType.LINUX_BRIDGE,
           state: NETWORK_STATES.Up,
+          bridge: {
+            options: {
+              stp: {
+                enabled: false,
+              },
+            },
+          },
         } as NodeNetworkConfigurationInterface,
       ],
     },