Merge "Fix required extensions for the subnet's service type API tests"
diff --git a/neutron_tempest_plugin/scenario/test_dns_integration.py b/neutron_tempest_plugin/scenario/test_dns_integration.py
index 5c590eb..79c0993 100644
--- a/neutron_tempest_plugin/scenario/test_dns_integration.py
+++ b/neutron_tempest_plugin/scenario/test_dns_integration.py
@@ -199,3 +199,56 @@
self.client.delete_port(port['id'])
self._verify_dns_records(addr_v6, name, record_type='AAAA',
found=False)
+
+
+class DNSIntegrationDomainPerProjectTests(BaseDNSIntegrationTests):
+
+ credentials = ['primary', 'admin']
+
+ required_extensions = ['subnet-dns-publish-fixed-ip',
+ 'dns-integration-domain-keywords']
+
+ @classmethod
+ def resource_setup(cls):
+ super(BaseDNSIntegrationTests, cls).resource_setup()
+
+ name = data_utils.rand_name('test-domain')
+ zone_name = "%s.%s.%s.zone." % (cls.client.user_id,
+ cls.client.tenant_id,
+ name)
+ dns_domain_template = "<user_id>.<project_id>.%s.zone." % name
+
+ _, cls.zone = cls.dns_client.create_zone(name=zone_name)
+ cls.addClassResourceCleanup(cls.dns_client.delete_zone,
+ cls.zone['id'], ignore_errors=lib_exc.NotFound)
+ dns_waiters.wait_for_zone_status(
+ cls.dns_client, cls.zone['id'], 'ACTIVE')
+
+ cls.network = cls.create_network(dns_domain=dns_domain_template)
+ cls.subnet = cls.create_subnet(cls.network,
+ dns_publish_fixed_ip=True)
+ cls.subnet_v6 = cls.create_subnet(cls.network,
+ ip_version=6,
+ dns_publish_fixed_ip=True)
+ cls.router = cls.create_router_by_client()
+ cls.create_router_interface(cls.router['id'], cls.subnet['id'])
+ cls.keypair = cls.create_keypair()
+
+ @decorators.idempotent_id('43a67509-3161-4125-8f2c-0d4a67599721')
+ def test_port_with_dns_name(self):
+ name = data_utils.rand_name('port-test')
+ port = self.create_port(self.network,
+ dns_name=name)
+ addr = port['fixed_ips'][0]['ip_address']
+ self._verify_dns_records(addr, name)
+ self.client.delete_port(port['id'])
+ self._verify_dns_records(addr, name, found=False)
+
+ @decorators.idempotent_id('ac89db9b-5ca4-43bd-85ba-40fbeb47e208')
+ def test_fip_admin_delete(self):
+ name = data_utils.rand_name('fip-test')
+ fip = self._create_floatingip_with_dns(name)
+ addr = fip['floating_ip_address']
+ self._verify_dns_records(addr, name)
+ self.delete_floatingip(fip, client=self.admin_client)
+ self._verify_dns_records(addr, name, found=False)
diff --git a/zuul.d/master_jobs.yaml b/zuul.d/master_jobs.yaml
index 5f8d08f..063eb02 100644
--- a/zuul.d/master_jobs.yaml
+++ b/zuul.d/master_jobs.yaml
@@ -17,6 +17,7 @@
- dhcp_agent_scheduler
- dns-domain-ports
- dns-integration
+ - dns-integration-domain-keywords
- empty-string-filtering
- expose-port-forwarding-in-fip
- expose-l3-conntrack-helper
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 936bd11..969f80a 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -7,6 +7,7 @@
- neutron-tempest-plugin-scenario-openvswitch
- neutron-tempest-plugin-scenario-openvswitch-iptables_hybrid
- neutron-tempest-plugin-scenario-ovn
+ - neutron-tempest-plugin-designate-scenario
gate:
jobs:
- neutron-tempest-plugin-api
@@ -19,10 +20,6 @@
experimental:
jobs:
- neutron-tempest-plugin-dvr-multinode-scenario
- # TODO(slaweq): move it back to the check queue when bug
- # https://bugs.launchpad.net/neutron/+bug/1891309
- # will be fixed
- - neutron-tempest-plugin-designate-scenario
- project-template:
@@ -50,6 +47,7 @@
- neutron-tempest-plugin-scenario-linuxbridge-rocky
- neutron-tempest-plugin-scenario-openvswitch-rocky
- neutron-tempest-plugin-scenario-openvswitch-iptables_hybrid-rocky
+ - neutron-tempest-plugin-designate-scenario-rocky
gate:
jobs:
- neutron-tempest-plugin-api-rocky
@@ -58,10 +56,6 @@
experimental:
jobs:
- neutron-tempest-plugin-dvr-multinode-scenario-rocky
- # TODO(slaweq): move it back to the check queue when bug
- # https://bugs.launchpad.net/neutron/+bug/1891309
- # will be fixed
- - neutron-tempest-plugin-designate-scenario-rocky
- project-template:
@@ -72,6 +66,7 @@
- neutron-tempest-plugin-scenario-linuxbridge-stein
- neutron-tempest-plugin-scenario-openvswitch-stein
- neutron-tempest-plugin-scenario-openvswitch-iptables_hybrid-stein
+ - neutron-tempest-plugin-designate-scenario-stein
gate:
jobs:
- neutron-tempest-plugin-api-stein
@@ -80,10 +75,6 @@
experimental:
jobs:
- neutron-tempest-plugin-dvr-multinode-scenario-stein
- # TODO(slaweq): move it back to the check queue when bug
- # https://bugs.launchpad.net/neutron/+bug/1891309
- # will be fixed
- - neutron-tempest-plugin-designate-scenario-stein
- project-template:
@@ -94,6 +85,7 @@
- neutron-tempest-plugin-scenario-linuxbridge-train
- neutron-tempest-plugin-scenario-openvswitch-train
- neutron-tempest-plugin-scenario-openvswitch-iptables_hybrid-train
+ - neutron-tempest-plugin-designate-scenario-train
gate:
jobs:
- neutron-tempest-plugin-api-train
@@ -102,10 +94,6 @@
experimental:
jobs:
- neutron-tempest-plugin-dvr-multinode-scenario-train
- # TODO(slaweq): move it back to the check queue when bug
- # https://bugs.launchpad.net/neutron/+bug/1891309
- # will be fixed
- - neutron-tempest-plugin-designate-scenario-train
- project-template:
@@ -117,6 +105,7 @@
- neutron-tempest-plugin-scenario-openvswitch-ussuri
- neutron-tempest-plugin-scenario-openvswitch-iptables_hybrid-ussuri
- neutron-tempest-plugin-scenario-ovn-ussuri
+ - neutron-tempest-plugin-designate-scenario-ussuri
gate:
jobs:
- neutron-tempest-plugin-api-ussuri
@@ -125,10 +114,6 @@
experimental:
jobs:
- neutron-tempest-plugin-dvr-multinode-scenario-ussuri
- # TODO(slaweq): move it back to the check queue when bug
- # https://bugs.launchpad.net/neutron/+bug/1891309
- # will be fixed
- - neutron-tempest-plugin-designate-scenario-ussuri
- project-template:
@@ -140,6 +125,7 @@
- neutron-tempest-plugin-scenario-openvswitch-victoria
- neutron-tempest-plugin-scenario-openvswitch-iptables_hybrid-victoria
- neutron-tempest-plugin-scenario-ovn-victoria
+ - neutron-tempest-plugin-designate-scenario-victoria
gate:
jobs:
- neutron-tempest-plugin-api-victoria
@@ -148,10 +134,6 @@
experimental:
jobs:
- neutron-tempest-plugin-dvr-multinode-scenario-victoria
- # TODO(slaweq): move it back to the check queue when bug
- # https://bugs.launchpad.net/neutron/+bug/1891309
- # will be fixed
- - neutron-tempest-plugin-designate-scenario-victoria
- project-template:
@@ -163,6 +145,7 @@
- neutron-tempest-plugin-scenario-openvswitch-wallaby
- neutron-tempest-plugin-scenario-openvswitch-iptables_hybrid-wallaby
- neutron-tempest-plugin-scenario-ovn-wallaby
+ - neutron-tempest-plugin-designate-scenario-wallaby
gate:
jobs:
- neutron-tempest-plugin-api-wallaby
@@ -171,10 +154,6 @@
experimental:
jobs:
- neutron-tempest-plugin-dvr-multinode-scenario-wallaby
- # TODO(slaweq): move it back to the check queue when bug
- # https://bugs.launchpad.net/neutron/+bug/1891309
- # will be fixed
- - neutron-tempest-plugin-designate-scenario-wallaby
- project: