Merge "Add extension "subnet-external-network""

neutron_tempest_plugin/api/test_subnets.py

@@ -11,6 +11,7 @@
 #    under the License.
 
 import netaddr
+from tempest.common import utils as tutils
 from tempest.lib import decorators
 
 from neutron_tempest_plugin.api import base
@@ -24,6 +25,8 @@ class SubnetsSearchCriteriaTest(base.BaseSearchCriteriaTest):
 
     @classmethod
     def resource_setup(cls):
+        if tutils.is_extension_enabled('subnet-external-network', 'network'):
+            cls.list_kwargs['router:external'] = False
         super(SubnetsSearchCriteriaTest, cls).resource_setup()
         net = cls.create_network(network_name='subnet-search-test-net')
         for name in cls.resource_names:

zuul.d/master_jobs.yaml

@@ -147,6 +147,7 @@
         neutron-conntrack-helper: true
         neutron-tag-ports-during-bulk-creation: true
         neutron-ndp-proxy: true
+        neutron-subnet-external-network: true
         br-ex-tcpdump: true
         br-int-flows: true
         # Cinder services
@@ -236,6 +237,7 @@
         q-ovn-metadata-agent: false
         # Neutron services
         neutron-local-ip-static: true
+        neutron-subnet-external-network: true
         q-agt: true
         q-dhcp: true
         q-l3: true
@@ -331,6 +333,7 @@
         q-ovn-metadata-agent: false
         # Neutron services
         neutron-local-ip: true
+        neutron-subnet-external-network: true
         q-agt: true
         q-dhcp: true
         q-l3: true