Merge "Allow 200 as a response from /v2/zone/recordsets"
diff --git a/designate_tempest_plugin/tests/api/v2/recordset_wildcard_data.json b/designate_tempest_plugin/tests/api/v2/recordset_wildcard_data.json
new file mode 100644
index 0000000..dedf414
--- /dev/null
+++ b/designate_tempest_plugin/tests/api/v2/recordset_wildcard_data.json
@@ -0,0 +1,53 @@
+{
+ "A at APEX": {
+ "name": "*",
+ "type": "A",
+ "records": ["192.0.2.1", "192.0.2.2", "192.0.2.3"]
+ },
+ "A under APEX": {
+ "name": "*.sub",
+ "type": "A",
+ "records": ["192.0.2.1", "192.0.2.2", "192.0.2.3"]
+ },
+ "AAAA at APEX": {
+ "name": "*",
+ "type": "AAAA",
+ "records": ["2001:db8::1", "2001:db8::1", "2001:db8::"]
+ },
+ "AAAA under APEX": {
+ "name": "*.sub",
+ "type": "AAAA",
+ "records": ["2001:db8::1", "2001:db8::1", "2001:db8::"]
+ },
+ "MX at APEX": {
+ "name": "*",
+ "type": "MX",
+ "records": ["10 mail1.example.org.",
+ "20 mail2.example.org."]
+ },
+ "MX under APEX": {
+ "name": "*.sub",
+ "type": "MX",
+ "records": ["10 mail.example.org."]
+ },
+ "SPF at APEX": {
+ "name": "*",
+ "type": "SPF",
+ "records": ["v=spf1; a -all"]
+ },
+ "SPF under APEX": {
+ "name": "*.sub",
+ "type": "SPF",
+ "records": ["v=spf1; a -all"]
+ },
+ "TXT at APEX": {
+ "name": "*",
+ "type": "TXT",
+ "records": ["Can you read me?"]
+ },
+ "TXT under APEX": {
+ "name": "*.sub",
+ "type": "TXT",
+ "records": ["Can you read me?"]
+ }
+}
diff --git a/designate_tempest_plugin/tests/api/v2/test_quotas.py b/designate_tempest_plugin/tests/api/v2/test_quotas.py
index 9411270..bd865bb 100644
--- a/designate_tempest_plugin/tests/api/v2/test_quotas.py
+++ b/designate_tempest_plugin/tests/api/v2/test_quotas.py
@@ -75,7 +75,7 @@
LOG.info("Ensuring the response has all quota types")
self.assertExpected(quotas, body, [])
- @decorators.idempotent_id('76d24c87-1b39-4e19-947c-c08e1380dc61')
+ @decorators.idempotent_id('9b09b3e2-7e88-4569-bce3-9be2f7ac70c3')
def test_update_quotas_other_project(self):
project_id = self.quotas_client.tenant_id
diff --git a/designate_tempest_plugin/tests/api/v2/test_recordset.py b/designate_tempest_plugin/tests/api/v2/test_recordset.py
index 6d318d0..d686d94 100644
--- a/designate_tempest_plugin/tests/api/v2/test_recordset.py
+++ b/designate_tempest_plugin/tests/api/v2/test_recordset.py
@@ -91,6 +91,28 @@
LOG.info('Ensure we respond with PENDING')
self.assertEqual('PENDING', body['status'])
+ @decorators.idempotent_id('69f002e5-6511-43d3-abae-7abdd45ae03e')
+ @ddt.file_data("recordset_wildcard_data.json")
+ def test_create_wildcard_recordset(self, name, type, records):
+ if name is not None:
+ recordset_name = name + "." + self.zone['name']
+
+ else:
+ recordset_name = "*." + self.zone['name']
+
+ recordset_data = {
+ 'name': recordset_name,
+ 'type': type,
+ 'records': records,
+ }
+
+ LOG.info('Create a Recordset')
+ resp, body = self.client.create_recordset(
+ self.zone['id'], recordset_data)
+
+ LOG.info('Ensure we respond with PENDING')
+ self.assertEqual('PENDING', body['status'])
+
@decorators.idempotent_id('5964f730-5546-46e6-9105-5030e9c492b2')
def test_list_recordsets(self):
recordset_data = data_utils.rand_recordset_data(
@@ -187,7 +209,7 @@
cls.client = cls.os.recordset_client
cls.zone_client = cls.os.zones_client
- @decorators.idempotent_id('631d74fd-6909-4684-a61b-5c4d2f92c3e7')
+ @decorators.idempotent_id('98c94f8c-217a-4056-b996-b1f856d0753e')
@ddt.file_data("recordset_data_invalid.json")
def test_create_recordset_invalid(self, name, type, records):
if name is not None:
diff --git a/designate_tempest_plugin/tests/scenario/v2/test_zones.py b/designate_tempest_plugin/tests/scenario/v2/test_zones.py
index c98a551..ccbfc6c 100644
--- a/designate_tempest_plugin/tests/scenario/v2/test_zones.py
+++ b/designate_tempest_plugin/tests/scenario/v2/test_zones.py
@@ -87,6 +87,7 @@
waiters.wait_for_zone_404(self.client, zone['id'])
@test.attr(type='slow')
+ @decorators.skip_because(bug='1623576')
@decorators.idempotent_id('ad8d1f5b-da66-46a0-bbee-14dc84a5d791')
@config.skip_unless_config('dns', 'nameservers')
def test_zone_create_propagates_to_nameservers(self):
@@ -98,6 +99,7 @@
waiters.wait_for_query(self.query_client, zone['name'], "SOA")
@test.attr(type='slow')
+ @decorators.skip_because(bug='1623576')
@decorators.idempotent_id('d13d3095-c78f-4aae-8fe3-a74ccc335c84')
@config.skip_unless_config('dns', 'nameservers')
def test_zone_delete_propagates_to_nameservers(self):