Merge "Shared Zones - new scenario test cases"
diff --git a/designate_tempest_plugin/services/dns/query/query_client.py b/designate_tempest_plugin/services/dns/query/query_client.py
index a9e9723..95fcb61 100644
--- a/designate_tempest_plugin/services/dns/query/query_client.py
+++ b/designate_tempest_plugin/services/dns/query/query_client.py
@@ -15,6 +15,7 @@
import dns.exception
import dns.query
from tempest import config
+from oslo_utils import netutils
CONF = config.CONF
@@ -78,7 +79,7 @@
@classmethod
def from_str(self, nameserver):
- if ':' in nameserver:
- ip, port = nameserver.rsplit(':', 1)
- return Nameserver(ip, int(port))
+ ip, port = netutils.parse_host_port(nameserver)
+ if port:
+ return Nameserver(ip, port)
return Nameserver(nameserver)
diff --git a/designate_tempest_plugin/tests/scenario/v2/test_recordsets.py b/designate_tempest_plugin/tests/scenario/v2/test_recordsets.py
index c830c25..42cdafa 100644
--- a/designate_tempest_plugin/tests/scenario/v2/test_recordsets.py
+++ b/designate_tempest_plugin/tests/scenario/v2/test_recordsets.py
@@ -107,10 +107,12 @@
LOG.info('Ensure we respond with PENDING')
self.assertEqual('PENDING', recordset['status'])
- LOG.info('Wait until the recordset is active')
+ LOG.info('Wait until the recordset is active and propagated')
waiters.wait_for_recordset_status(self.recordset_client,
self.zone['id'], recordset['id'],
'ACTIVE')
+ waiters.wait_for_query(
+ self.query_client, recordset_data['name'], type)
LOG.info('Delete the recordset')
body = self.recordset_client.delete_recordset(
@@ -120,10 +122,13 @@
self.assertEqual('DELETE', body['action'])
self.assertEqual('PENDING', body['status'])
- LOG.info('Ensure successful deletion of Recordset')
+ LOG.info('Ensure successful deletion of Recordset from:'
+ ' Designate and Backends')
self.assertRaises(lib_exc.NotFound,
lambda: self.recordset_client.show_recordset(
self.zone['id'], recordset['id']))
+ waiters.wait_for_query(
+ self.query_client, recordset_data['name'], type, found=False)
@testtools.skipUnless(
config.CONF.dns.nameservers,