Merge "This patch removes the usage of DDT module from test_unauthed.py"
diff --git a/designate_tempest_plugin/tests/api/v2/test_unauthed.py b/designate_tempest_plugin/tests/api/v2/test_unauthed.py
index aaf8043..b151a04 100644
--- a/designate_tempest_plugin/tests/api/v2/test_unauthed.py
+++ b/designate_tempest_plugin/tests/api/v2/test_unauthed.py
@@ -14,7 +14,6 @@
from oslo_log import log as logging
from tempest.lib import decorators
from tempest.lib import exceptions as lib_exc
-import ddt
from designate_tempest_plugin.tests import base
from designate_tempest_plugin import clients
@@ -22,7 +21,6 @@
LOG = logging.getLogger(__name__)
-@ddt.ddt
class TestDnsUnauthed(base.BaseDnsV2Test):
client_manager = clients.ManagerV2Unauthed
@@ -43,10 +41,154 @@
cls.pool_client = cls.os_primary.pool_client
cls.blacklists_client = cls.os_primary.blacklists_client
- @decorators.idempotent_id('0f7a6d20-f6f3-4937-8fe6-7a9851227d98')
- @ddt.file_data('unauthed_data.json')
- def test_unauthed(self, client, method, args=None):
+ def _test_unauthed(self, client, method, args=None):
client = getattr(self, client)
method = getattr(client, method)
args = args or []
self.assertRaises(lib_exc.Unauthorized, method, *args)
+
+ @decorators.idempotent_id('b18827ac-de92-11ed-8334-201e8823901f')
+ def test_list_zones(self):
+ self._test_unauthed('zones_client', 'list_zones')
+
+ @decorators.idempotent_id('f60c32ce-de92-11ed-8334-201e8823901f')
+ def test_show_zone(self):
+ self._test_unauthed(
+ 'zones_client', 'show_zone',
+ ["6ef3b7f2-df39-43ef-9f37-ce2bc424ab90"])
+
+ @decorators.idempotent_id('56e899c0-de93-11ed-8334-201e8823901f')
+ def test_create_zone(self):
+ self._test_unauthed(
+ 'zones_client', 'create_zone',
+ ["6ef3b7f2-df39-43ef-9f37-ce2bc424ab90"])
+
+ @decorators.idempotent_id('5765af6e-de93-11ed-8334-201e8823901f')
+ def test_update_zone(self):
+ self._test_unauthed(
+ 'zones_client', 'update_zone',
+ ["6ef3b7f2-df39-43ef-9f37-ce2bc424ab90"])
+
+ @decorators.idempotent_id('57b5cef4-de93-11ed-8334-201e8823901f')
+ def test_delete_zone(self):
+ self._test_unauthed(
+ 'zones_client', 'delete_zone',
+ ["6ef3b7f2-df39-43ef-9f37-ce2bc424ab90"])
+
+ @decorators.idempotent_id('05099b62-de94-11ed-8334-201e8823901f')
+ def test_list_recordsets(self):
+ self._test_unauthed(
+ 'recordset_client', 'list_recordset',
+ ["6ef3b7f2-df39-43ef-9f37-ce2bc424ab90"])
+
+ @decorators.idempotent_id('0573ca32-de94-11ed-8334-201e8823901f')
+ def test_show_recordset(self):
+ self._test_unauthed(
+ 'recordset_client', 'show_recordset',
+ ["6ef3b7f2-df39-43ef-9f37-ce2bc424ab90",
+ "6ef3b7f2-df39-43ef-9f37-ce2bc424ab90"])
+
+ @decorators.idempotent_id('05c0236e-de94-11ed-8334-201e8823901f')
+ def test_create_recordset(self):
+ self._test_unauthed(
+ 'recordset_client', 'create_recordset',
+ ["6ef3b7f2-df39-43ef-9f37-ce2bc424ab90",
+ "6ef3b7f2-df39-43ef-9f37-ce2bc424ab90"])
+
+ @decorators.idempotent_id('0600f628-de94-11ed-8334-201e8823901f')
+ def test_update_recordset(self):
+ self._test_unauthed(
+ 'recordset_client', 'update_recordset',
+ ["6ef3b7f2-df39-43ef-9f37-ce2bc424ab90",
+ "6ef3b7f2-df39-43ef-9f37-ce2bc424ab90", {}])
+
+ @decorators.idempotent_id('063c95b6-de94-11ed-8334-201e8823901f')
+ def test_delete_recordset(self):
+ self._test_unauthed(
+ 'recordset_client', 'delete_recordset',
+ ["6ef3b7f2-df39-43ef-9f37-ce2bc424ab90",
+ "6ef3b7f2-df39-43ef-9f37-ce2bc424ab90"])
+
+ @decorators.idempotent_id('ee9dae6c-de94-11ed-8334-201e8823901f')
+ def test_list_tlds(self):
+ self._test_unauthed('tld_client', 'list_tlds')
+
+ @decorators.idempotent_id('eef1e5f4-de94-11ed-8334-201e8823901f')
+ def test_show_tld(self):
+ self._test_unauthed(
+ 'tld_client', 'show_tld',
+ ["6ef3b7f2-df39-43ef-9f37-ce2bc424ab90"])
+
+ @decorators.idempotent_id('ef3ae024-de94-11ed-8334-201e8823901f')
+ def test_create_tld(self):
+ self._test_unauthed(
+ 'tld_client', 'create_tld',
+ ["6ef3b7f2-df39-43ef-9f37-ce2bc424ab90"])
+
+ @decorators.idempotent_id('ef7cfda6-de94-11ed-8334-201e8823901f')
+ def test_update_tld(self):
+ self._test_unauthed(
+ 'tld_client', 'update_tld',
+ ["6ef3b7f2-df39-43ef-9f37-ce2bc424ab90"])
+
+ @decorators.idempotent_id('efb982e4-de94-11ed-8334-201e8823901f')
+ def test_delete_tld(self):
+ self._test_unauthed(
+ 'tld_client', 'delete_tld',
+ ["6ef3b7f2-df39-43ef-9f37-ce2bc424ab90"])
+
+ @decorators.idempotent_id('654e7596-de95-11ed-8334-201e8823901f')
+ def test_list_blacklists(self):
+ self._test_unauthed('blacklists_client', 'list_blacklists')
+
+ @decorators.idempotent_id('658ea9cc-de95-11ed-8334-201e8823901f')
+ def test_show_blacklist(self):
+ self._test_unauthed(
+ 'blacklists_client', 'show_blacklist',
+ ["6ef3b7f2-df39-43ef-9f37-ce2bc424ab90"])
+
+ @decorators.idempotent_id('65cbc2ee-de95-11ed-8334-201e8823901f')
+ def test_create_blacklist(self):
+ self._test_unauthed(
+ 'blacklists_client', 'create_blacklist',
+ ["6ef3b7f2-df39-43ef-9f37-ce2bc424ab90"])
+
+ @decorators.idempotent_id('66032676-de95-11ed-8334-201e8823901f')
+ def test_update_blacklist(self):
+ self._test_unauthed(
+ 'blacklists_client', 'update_blacklist',
+ ["6ef3b7f2-df39-43ef-9f37-ce2bc424ab90"])
+
+ @decorators.idempotent_id('66321184-de95-11ed-8334-201e8823901f')
+ def test_delete_blacklist(self):
+ self._test_unauthed(
+ 'blacklists_client', 'delete_blacklist',
+ ["6ef3b7f2-df39-43ef-9f37-ce2bc424ab90"])
+
+ @decorators.idempotent_id('c7048d66-de95-11ed-8334-201e8823901f')
+ def test_list_pools(self):
+ self._test_unauthed('pool_client', 'list_pools')
+
+ @decorators.idempotent_id('c74581cc-de95-11ed-8334-201e8823901f')
+ def test_show_pool(self):
+ self._test_unauthed(
+ 'pool_client', 'show_pool',
+ ["6ef3b7f2-df39-43ef-9f37-ce2bc424ab90"])
+
+ @decorators.idempotent_id('c77d62f4-de95-11ed-8334-201e8823901f')
+ def test_create_pool(self):
+ self._test_unauthed(
+ 'pool_client', 'create_pool',
+ ["6ef3b7f2-df39-43ef-9f37-ce2bc424ab90"])
+
+ @decorators.idempotent_id('c7ada040-de95-11ed-8334-201e8823901f')
+ def test_update_pool(self):
+ self._test_unauthed(
+ 'pool_client', 'update_pool',
+ ["6ef3b7f2-df39-43ef-9f37-ce2bc424ab90"])
+
+ @decorators.idempotent_id('c7e07682-de95-11ed-8334-201e8823901f')
+ def test_delete_pool(self):
+ self._test_unauthed(
+ 'pool_client', 'delete_pool',
+ ["6ef3b7f2-df39-43ef-9f37-ce2bc424ab90"])
diff --git a/designate_tempest_plugin/tests/api/v2/unauthed_data.json b/designate_tempest_plugin/tests/api/v2/unauthed_data.json
deleted file mode 100644
index c4faf80..0000000
--- a/designate_tempest_plugin/tests/api/v2/unauthed_data.json
+++ /dev/null
@@ -1,127 +0,0 @@
-{
- "list_zones": {
- "client": "zones_client",
- "method": "list_zones"
- },
- "show_zone": {
- "client": "zones_client",
- "method": "show_zone",
- "args": ["6ef3b7f2-df39-43ef-9f37-ce2bc424ab90"]
- },
- "create_zone": {
- "client": "zones_client",
- "method": "create_zone",
- "args": ["6ef3b7f2-df39-43ef-9f37-ce2bc424ab90"]
- },
- "update_zone": {
- "client": "zones_client",
- "method": "update_zone",
- "args": ["6ef3b7f2-df39-43ef-9f37-ce2bc424ab90"]
- },
- "delete_zone": {
- "client": "zones_client",
- "method": "delete_zone",
- "args": ["6ef3b7f2-df39-43ef-9f37-ce2bc424ab90"]
- },
-
- "list_recordsets": {
- "client": "recordset_client",
- "method": "list_recordset",
- "args": ["6ef3b7f2-df39-43ef-9f37-ce2bc424ab90"]
- },
- "show_recordset": {
- "client": "recordset_client",
- "method": "show_recordset",
- "args": ["6ef3b7f2-df39-43ef-9f37-ce2bc424ab90", "6ef3b7f2-df39-43ef-9f37-ce2bc424ab90"]
- },
- "create_recordset": {
- "client": "recordset_client",
- "method": "create_recordset",
- "args": ["6ef3b7f2-df39-43ef-9f37-ce2bc424ab90", "6ef3b7f2-df39-43ef-9f37-ce2bc424ab90"]
- },
- "update_recordset": {
- "client": "recordset_client",
- "method": "update_recordset",
- "args": ["6ef3b7f2-df39-43ef-9f37-ce2bc424ab90", "6ef3b7f2-df39-43ef-9f37-ce2bc424ab90", {}]
- },
- "delete_recordset": {
- "client": "recordset_client",
- "method": "delete_recordset",
- "args": ["6ef3b7f2-df39-43ef-9f37-ce2bc424ab90", "6ef3b7f2-df39-43ef-9f37-ce2bc424ab90"]
- },
-
- "list_tlds": {
- "client": "tld_client",
- "method": "list_tlds"
- },
- "show_tld": {
- "client": "tld_client",
- "method": "show_tld",
- "args": ["6ef3b7f2-df39-43ef-9f37-ce2bc424ab90"]
- },
- "create_tld": {
- "client": "tld_client",
- "method": "create_tld",
- "args": ["6ef3b7f2-df39-43ef-9f37-ce2bc424ab90"]
- },
- "update_tld": {
- "client": "tld_client",
- "method": "update_tld",
- "args": ["6ef3b7f2-df39-43ef-9f37-ce2bc424ab90"]
- },
- "delete_tld": {
- "client": "tld_client",
- "method": "delete_tld",
- "args": ["6ef3b7f2-df39-43ef-9f37-ce2bc424ab90"]
- },
-
- "list_blacklists": {
- "client": "blacklists_client",
- "method": "list_blacklists"
- },
- "show_blacklist": {
- "client": "blacklists_client",
- "method": "show_blacklist",
- "args": ["6ef3b7f2-df39-43ef-9f37-ce2bc424ab90"]
- },
- "create_blacklist": {
- "client": "blacklists_client",
- "method": "create_blacklist",
- "args": ["6ef3b7f2-df39-43ef-9f37-ce2bc424ab90"]
- },
- "update_blacklist": {
- "client": "blacklists_client",
- "method": "update_blacklist",
- "args": ["6ef3b7f2-df39-43ef-9f37-ce2bc424ab90"]
- },
- "delete_blacklist": {
- "client": "blacklists_client",
- "method": "delete_blacklist",
- "args": ["6ef3b7f2-df39-43ef-9f37-ce2bc424ab90"]
- },
-
- "list_pools": {
- "client": "pool_client",
- "method": "list_pools"
- },
- "show_pool": {
- "client": "pool_client",
- "method": "show_pool",
- "args": ["6ef3b7f2-df39-43ef-9f37-ce2bc424ab90"]
- },
- "create_pool": {
- "client": "pool_client",
- "method": "create_pool",
- "args": ["6ef3b7f2-df39-43ef-9f37-ce2bc424ab90"]
- },
- "update_pool": {
- "client": "pool_client",
- "method": "update_pool",
- "args": ["6ef3b7f2-df39-43ef-9f37-ce2bc424ab90"]
- },
- "delete_pool": {
- "client": "pool_client",
- "method": "delete_pool",
- "args": ["6ef3b7f2-df39-43ef-9f37-ce2bc424ab90"]
- }
-}