Merge "Fix duplicate Idempotent ID's"
diff --git a/designate_tempest_plugin/clients.py b/designate_tempest_plugin/clients.py
index d85d343..5a8136c 100644
--- a/designate_tempest_plugin/clients.py
+++ b/designate_tempest_plugin/clients.py
@@ -13,9 +13,7 @@
# under the License.
from tempest import clients
from tempest import config
-from tempest.lib.auth import KeystoneAuthProvider
-from tempest.lib.auth import KeystoneV2AuthProvider
-from tempest.lib.auth import KeystoneV3AuthProvider
+from tempest.lib import auth
from designate_tempest_plugin.services.dns.v1.json.domains_client import \
DomainsClient
@@ -158,7 +156,7 @@
return KeystoneV2UnauthedProvider
-class BaseUnauthedProvider(KeystoneAuthProvider):
+class BaseUnauthedProvider(auth.KeystoneAuthProvider):
def _decorate_request(self, filters, method, url, headers=None, body=None,
auth_data=None):
@@ -173,13 +171,15 @@
return url, headers, body
-class KeystoneV2UnauthedProvider(KeystoneV2AuthProvider, BaseUnauthedProvider):
+class KeystoneV2UnauthedProvider(auth.KeystoneV2AuthProvider,
+ BaseUnauthedProvider):
def _decorate_request(self, *args, **kwargs):
return BaseUnauthedProvider._decorate_request(self, *args, **kwargs)
-class KeystoneV3UnauthedProvider(KeystoneV3AuthProvider, BaseUnauthedProvider):
+class KeystoneV3UnauthedProvider(auth.KeystoneV3AuthProvider,
+ BaseUnauthedProvider):
def _decorate_request(self, *args, **kwargs):
return BaseUnauthedProvider._decorate_request(self, *args, **kwargs)
diff --git a/designate_tempest_plugin/services/dns/admin/json/quotas_client.py b/designate_tempest_plugin/services/dns/admin/json/quotas_client.py
index 08b1790..fb233d2 100644
--- a/designate_tempest_plugin/services/dns/admin/json/quotas_client.py
+++ b/designate_tempest_plugin/services/dns/admin/json/quotas_client.py
@@ -11,13 +11,10 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
-from oslo_log import log as logging
from designate_tempest_plugin import data_utils as dns_data_utils
from designate_tempest_plugin.services.dns.admin.json import base
-LOG = logging.getLogger(__name__)
-
class QuotasClient(base.DnsClientAdminBase):
diff --git a/designate_tempest_plugin/services/dns/json/base.py b/designate_tempest_plugin/services/dns/json/base.py
index 19dbe45..6c5f1d2 100644
--- a/designate_tempest_plugin/services/dns/json/base.py
+++ b/designate_tempest_plugin/services/dns/json/base.py
@@ -20,7 +20,7 @@
from six.moves.urllib import parse as urllib
import six
-from designate_tempest_plugin.common.models import ZoneFile
+from designate_tempest_plugin.common import models
LOG = logging.getLogger(__name__)
@@ -66,7 +66,7 @@
if 'application/json' in resp['content-type']:
return json.loads(object_str)
elif 'text/dns' in resp['content-type']:
- return ZoneFile.from_text(object_str)
+ return models.ZoneFile.from_text(object_str)
else:
raise lib_exc.InvalidContentType()
diff --git a/designate_tempest_plugin/services/dns/v2/json/quotas_client.py b/designate_tempest_plugin/services/dns/v2/json/quotas_client.py
index 3522a1d..df2cdee 100644
--- a/designate_tempest_plugin/services/dns/v2/json/quotas_client.py
+++ b/designate_tempest_plugin/services/dns/v2/json/quotas_client.py
@@ -11,13 +11,10 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
-from oslo_log import log as logging
from designate_tempest_plugin import data_utils as dns_data_utils
from designate_tempest_plugin.services.dns.v2.json import base
-LOG = logging.getLogger(__name__)
-
class QuotasClient(base.DnsClientV2Base):
diff --git a/designate_tempest_plugin/tests/api/v2/test_unauthed.py b/designate_tempest_plugin/tests/api/v2/test_unauthed.py
index e788a3b..b48cfd7 100644
--- a/designate_tempest_plugin/tests/api/v2/test_unauthed.py
+++ b/designate_tempest_plugin/tests/api/v2/test_unauthed.py
@@ -17,7 +17,7 @@
import ddt
from designate_tempest_plugin.tests import base
-from designate_tempest_plugin.clients import ManagerV2Unauthed
+from designate_tempest_plugin import clients
LOG = logging.getLogger(__name__)
@@ -25,7 +25,7 @@
@ddt.ddt
class TestDnsUnauthed(base.BaseDnsV2Test):
- client_manager = ManagerV2Unauthed
+ client_manager = clients.ManagerV2Unauthed
credentials = ["primary"]
@classmethod
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):