Merge "Fix delete_network_postcommit KeyError"

stackhpc · Oct 20, 2023 · 202177f · 202177f
2 parents 9c5d087 + c3b3b61
commit 202177f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/networking_generic_switch/generic_switch_mech.py b/networking_generic_switch/generic_switch_mech.py
@@ -80,9 +80,9 @@ def create_network_postcommit(self, context):
 
         network = context.current
         network_id = network['id']
-        provider_type = network['provider:network_type']
-        segmentation_id = network['provider:segmentation_id']
-        physnet = network['provider:physical_network']
+        provider_type = network.get('provider:network_type')
+        segmentation_id = network.get('provider:segmentation_id')
+        physnet = network.get('provider:physical_network')
 
         if provider_type == 'vlan' and segmentation_id:
             # Create vlan on all switches from this driver
@@ -165,9 +165,9 @@ def delete_network_postcommit(self, context):
         deleted.
         """
         network = context.current
-        provider_type = network['provider:network_type']
-        segmentation_id = network['provider:segmentation_id']
-        physnet = network['provider:physical_network']
+        provider_type = network.get('provider:network_type')
+        segmentation_id = network.get('provider:segmentation_id')
+        physnet = network.get('provider:physical_network')
 
         if provider_type == 'vlan' and segmentation_id:
             # Delete vlan on all switches from this driver

diff --git a/releasenotes/notes/delete_network_postcommit-more-defensive-19929702ba7f19fb.yaml b/releasenotes/notes/delete_network_postcommit-more-defensive-19929702ba7f19fb.yaml
@@ -0,0 +1,4 @@
+fixes:
+  - |
+    Instead of always assuming we have all provider network metadata, instead
+    use a getter to avoid erroring in cases where that metadata may not be needed.