Merge pull request #549 from rackerlabs/neutron-l3-agent-fixes

fix: Neutron L3 Agent fixes

components/neutron/aio-values.yaml

@@ -52,7 +52,7 @@ conf:
         type_drivers: "vlan,local,understack_vxlan"
   neutron:
     DEFAULT:
-      service_plugins: "l3_understack,segments,port_forwarding"
+      service_plugins: "l3_understack,segments"
       # we don't want HA L3 routers. It's a Python value so we need to quote it in YAML.
       l3_ha: "False"
       # we aren't using availability zones so having calls attempt to add things to

python/neutron-understack/neutron_understack/l3_service_plugin.py

@@ -3,6 +3,7 @@
 
 from neutron.services.l3_router.l3_router_plugin import L3RouterPlugin
 from neutron_lib.context import Context
+from neutron_lib.db import resource_extend
 
 LOG = logging.getLogger(__name__)
 
@@ -24,15 +25,15 @@ def print_post_commit_data(method: str, data: dict) -> None:
     pprint(data)
 
 
+@resource_extend.has_resource_extenders
 class UnderStackL3ServicePlugin(L3RouterPlugin):
-    def __init__(self):
-        """Understack L3 plugin.
+    """Understack L3 plugin.
 
-        L3 plugin to deal with Understack infrastructure.
-        """
-        super().__init__()
+    L3 plugin to deal with Understack infrastructure.
+    """
 
-    def get_plugin_type(self):
+    @classmethod
+    def get_plugin_type(cls):
         return "L3_ROUTER_NAT"
 
     def get_plugin_description(self):