Merge ~gnuoy/ubuntu/+source/ovn-octavia-provider:stable/victoria into ~ubuntu-openstack-dev/ubuntu/+source/ovn-octavia-provider:stable/victoria

[Liam Young]

Add patch for LP: 1896603

[Corey Bryant (corey.bryant)]

Thanks Liam! Merged. I did refresh the patch with the results of a straight 'git cherry-pick' so that we could pick up the commit message and other details.

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 2e153db..f7f03bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
-ovn-octavia-provider (0.3.0-0ubuntu1.1) UNRELEASED; urgency=medium
+ovn-octavia-provider (0.3.0-0ubuntu1.3) groovy; urgency=medium
 
+  [ Corey Bryant ]
   * d/gbp.conf: Create stable/victoria branch.
 
- -- Corey Bryant <[e-mail]>  Tue, 27 Oct 2020 09:39:16 -0400
+  [ Liam Young ]
+  * d/p/fix-ovn-listeners.patch: Correctly process allowed_cidrs option
+    when creating listeners. LP: #1896603
+
+ -- Liam Young <[e-mail]>  Wed, 27 Jan 2021 14:16:45 +0000
 
 ovn-octavia-provider (0.3.0-0ubuntu1) groovy; urgency=medium
 
diff --git a/debian/files b/debian/files
new file mode 100644
index 0000000..da22be1
--- /dev/null
+++ b/debian/files
@@ -0,0 +1 @@
+ovn-octavia-provider_0.3.0-0ubuntu1.3_source.buildinfo net optional
diff --git a/debian/patches/fix-ovn-listeners.patch b/debian/patches/fix-ovn-listeners.patch
new file mode 100644
index 0000000..222b25c
--- /dev/null
+++ b/debian/patches/fix-ovn-listeners.patch
@@ -0,0 +1,48 @@
+--- a/ovn_octavia_provider/driver.py
++++ b/ovn_octavia_provider/driver.py
+@@ -58,6 +58,16 @@
+                 user_fault_string=msg,
+                 operator_fault_string=msg)
+ 
++    def _check_for_allowed_cidrs(self, allowed_cidrs):
++        # TODO(haleyb): add support for this
++        if isinstance(allowed_cidrs, o_datamodels.UnsetType):
++            allowed_cidrs = []
++        if allowed_cidrs:
++            msg = _('OVN provider does not support allowed_cidrs option')
++            raise driver_exceptions.UnsupportedOptionError(
++                user_fault_string=msg,
++                operator_fault_string=msg)
++
+     def loadbalancer_create(self, loadbalancer):
+         admin_state_up = loadbalancer.admin_state_up
+         if isinstance(admin_state_up, o_datamodels.UnsetType):
+@@ -138,12 +148,8 @@
+ 
+     def listener_create(self, listener):
+         self._check_for_supported_protocols(listener.protocol)
+-        # TODO(haleyb): add support for this
+-        if not isinstance(listener.allowed_cidrs, o_datamodels.UnsetType):
+-            msg = _('OVN provider does not support allowed_cidrs option')
+-            raise driver_exceptions.UnsupportedOptionError(
+-                user_fault_string=msg,
+-                operator_fault_string=msg)
++        self._check_for_allowed_cidrs(listener.allowed_cidrs)
++
+         admin_state_up = listener.admin_state_up
+         if isinstance(admin_state_up, o_datamodels.UnsetType):
+             admin_state_up = True
+@@ -167,12 +173,7 @@
+         self._ovn_helper.add_request(request)
+ 
+     def listener_update(self, old_listener, new_listener):
+-        # TODO(haleyb): add support for this
+-        if not isinstance(new_listener.allowed_cidrs, o_datamodels.UnsetType):
+-            msg = _('OVN provider does not support allowed_cidrs option')
+-            raise driver_exceptions.UnsupportedOptionError(
+-                user_fault_string=msg,
+-                operator_fault_string=msg)
++        self._check_for_allowed_cidrs(new_listener.allowed_cidrs)
+ 
+         request_info = {'id': new_listener.listener_id,
+                         'loadbalancer_id': old_listener.loadbalancer_id,
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..06f04b1
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix-ovn-listeners.patch