Merge "Don't try to store protocol=None in OVSDB" into stable/train

networking_ovn/octavia/ovn_driver.py

@@ -954,7 +954,7 @@ class OvnProviderHelper(object):
                         break
 
         # If protocol set make sure its lowercase
-        protocol = protocol.lower() if protocol else None
+        protocol = protocol.lower() if protocol else []
         # In case port is not found for the vip_address we will see an
         # exception when port['id'] is accessed.
         external_ids = {

networking_ovn/tests/unit/octavia/test_ovn_driver.py

@@ -944,7 +944,7 @@ class TestOvnProviderHelper(TestOvnOctaviaBase):
                 ovn_const.LB_EXT_IDS_VIP_PORT_ID_KEY: mock.ANY,
                 'enabled': 'False'},
             name=mock.ANY,
-            protocol=None,
+            protocol=[],
             selection_fields=['ip_src', 'ip_dst', 'tp_src', 'tp_dst'])
 
     @mock.patch('networking_ovn.octavia.ovn_driver.get_network_driver')
@@ -963,7 +963,7 @@ class TestOvnProviderHelper(TestOvnOctaviaBase):
                 ovn_const.LB_EXT_IDS_VIP_PORT_ID_KEY: mock.ANY,
                 'enabled': 'True'},
             name=mock.ANY,
-            protocol=None,
+            protocol=[],
             selection_fields=['ip_src', 'ip_dst', 'tp_src', 'tp_dst'])
 
     @mock.patch('networking_ovn.octavia.ovn_driver.get_network_driver')
@@ -984,7 +984,7 @@ class TestOvnProviderHelper(TestOvnOctaviaBase):
                 ovn_const.LB_EXT_IDS_VIP_PORT_ID_KEY: mock.ANY,
                 'enabled': 'True'},
             name=mock.ANY,
-            protocol=None)
+            protocol=[])
 
     @mock.patch('networking_ovn.octavia.ovn_driver.get_network_driver')
     def test_lb_create_selection_fields_not_supported_algo(self, net_dr):
@@ -1005,7 +1005,7 @@ class TestOvnProviderHelper(TestOvnOctaviaBase):
                 ovn_const.LB_EXT_IDS_VIP_PORT_ID_KEY: mock.ANY,
                 'enabled': 'True'},
             name=mock.ANY,
-            protocol=None,
+            protocol=[],
             selection_fields=['ip_src', 'ip_dst', 'tp_src', 'tp_dst'])
 
     @mock.patch('networking_ovn.octavia.ovn_driver.get_network_driver')