kgess-mirror/openstack-designate
1
0
Fork 0
mirror of https://opendev.org/openstack/designate.git synced 2026-01-11 20:07:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove unnecessary generate_uuid wrapper

Browse source 
Change-Id: I90bf0c9b9c6a0834c0d3abaff020422e5b0778a7
This commit is contained in:
Erik Olof Gunnar Andersson 2024-07-01 14:11:11 +02:00
parent 9048699344
commit 886bb7fb14
14 changed files with 81 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
designate/coordination.py
View file

@ -21,11 +21,11 @@ import math
from oslo_concurrency import lockutils
from oslo_log import log
from oslo_utils import uuidutils
import tenacity
import tooz.coordination
import designate.conf
from designate import utils
CONF = designate.conf.CONF
@ -61,7 +61,7 @@ class Coordination:
def start(self):
self.coordination_id = (
':'.join([CONF.host, utils.generate_uuid()]).encode()
':'.join([CONF.host, uuidutils.generate_uuid()]).encode()
)
self._started = False

4
designate/network_api/fake.py
View file

@ -16,13 +16,13 @@
from oslo_log import log as logging
from oslo_utils import uuidutils
from designate.network_api import base
from designate.utils import generate_uuid
LOG = logging.getLogger(__name__)
POOL = {generate_uuid(): '192.0.2.%s' % i for i in range(1, 254)}
POOL = {uuidutils.generate_uuid(): '192.0.2.%s' % i for i in range(1, 254)}
ALLOCATIONS = {}

4
designate/storage/sqlalchemy/alembic/versions/0bcf910ea823_add_zone_attributes.py
View file

@ -22,6 +22,7 @@ Create Date: 2022-07-29 21:36:15.117658
"""
from alembic import op
from oslo_utils import timeutils
from oslo_utils import uuidutils
import sqlalchemy as sa
from designate.storage.sqlalchemy.alembic import legacy_utils
@ -50,7 +51,8 @@ def upgrade() -> None:
zone_masters_table = op.create_table(
'zone_masters', metadata,
sa.Column('id', UUID, default=utils.generate_uuid, primary_key=True),
sa.Column('id', UUID,
default=uuidutils.generate_uuid, primary_key=True),
sa.Column('version', sa.Integer, default=1, nullable=False),
sa.Column('created_at', sa.DateTime,
default=lambda: timeutils.utcnow()),

5
designate/storage/sqlalchemy/alembic/versions/304d41c3847a_add_services.py
View file

@ -21,11 +21,11 @@ Create Date: 2022-08-01 16:41:55.139558
"""
from alembic import op
from oslo_utils import uuidutils
import sqlalchemy as sa
from designate.storage.sqlalchemy.alembic import legacy_utils
from designate.storage.sqlalchemy.types import UUID
from designate import utils
# revision identifiers, used by Alembic.
revision = '304d41c3847a'
@ -47,7 +47,8 @@ def upgrade() -> None:
op.create_table(
'service_statuses', metadata,
sa.Column('id', UUID, default=utils.generate_uuid, primary_key=True),
sa.Column('id', UUID,
default=uuidutils.generate_uuid, primary_key=True),
sa.Column('created_at', sa.DateTime),
sa.Column('updated_at', sa.DateTime),
sa.Column('service_name', sa.String(40), nullable=False),

5
designate/storage/sqlalchemy/alembic/versions/b20189fd288e_shared_zone.py
View file

@ -18,10 +18,10 @@ Create Date: 2022-09-22 20:50:03.056609
"""
from alembic import op
from oslo_utils import uuidutils
import sqlalchemy as sa
from designate.storage.sqlalchemy.types import UUID
from designate import utils
# revision identifiers, used by Alembic.
revision = 'b20189fd288e'
@ -35,7 +35,8 @@ def upgrade() -> None:
op.create_table(
'shared_zones', meta,
sa.Column('id', UUID, default=utils.generate_uuid, primary_key=True),
sa.Column('id', UUID,
default=uuidutils.generate_uuid, primary_key=True),
sa.Column('created_at', sa.DateTime),
sa.Column('updated_at', sa.DateTime),
sa.Column('zone_id', UUID, nullable=False),

17
designate/storage/sqlalchemy/alembic/versions/d04819112169_new_pools_tables.py
View file

@ -22,11 +22,11 @@ Create Date: 2022-08-01 16:20:17.440784
"""
from alembic import op
from oslo_utils import timeutils
from oslo_utils import uuidutils
import sqlalchemy as sa
from designate.storage.sqlalchemy.alembic import legacy_utils
from designate.storage.sqlalchemy.types import UUID
from designate import utils
# revision identifiers, used by Alembic.
revision = 'd04819112169'
@ -46,7 +46,8 @@ def upgrade() -> None:
op.create_table(
'pool_nameservers', metadata,
sa.Column('id', UUID, default=utils.generate_uuid, primary_key=True),
sa.Column('id', UUID,
default=uuidutils.generate_uuid, primary_key=True),
sa.Column('version', sa.Integer, default=1, nullable=False),
sa.Column('created_at', sa.DateTime,
default=lambda: timeutils.utcnow()),
@ -64,7 +65,8 @@ def upgrade() -> None:
op.create_table(
'pool_targets', metadata,
sa.Column('id', UUID, default=utils.generate_uuid, primary_key=True),
sa.Column('id', UUID,
default=uuidutils.generate_uuid, primary_key=True),
sa.Column('version', sa.Integer, default=1, nullable=False),
sa.Column('created_at', sa.DateTime,
default=lambda: timeutils.utcnow()),
@ -81,7 +83,8 @@ def upgrade() -> None:
op.create_table(
'pool_target_masters', metadata,
sa.Column('id', UUID, default=utils.generate_uuid, primary_key=True),
sa.Column('id', UUID,
default=uuidutils.generate_uuid, primary_key=True),
sa.Column('version', sa.Integer, default=1, nullable=False),
sa.Column('created_at', sa.DateTime,
default=lambda: timeutils.utcnow()),
@ -100,7 +103,8 @@ def upgrade() -> None:
op.create_table(
'pool_target_options', metadata,
sa.Column('id', UUID, default=utils.generate_uuid, primary_key=True),
sa.Column('id', UUID,
default=uuidutils.generate_uuid, primary_key=True),
sa.Column('version', sa.Integer, default=1, nullable=False),
sa.Column('created_at', sa.DateTime,
default=lambda: timeutils.utcnow()),
@ -119,7 +123,8 @@ def upgrade() -> None:
op.create_table(
'pool_also_notifies', metadata,
sa.Column('id', UUID, default=utils.generate_uuid, primary_key=True),
sa.Column('id', UUID,
default=uuidutils.generate_uuid, primary_key=True),
sa.Column('version', sa.Integer, default=1, nullable=False),
sa.Column('created_at', sa.DateTime,
default=lambda: timeutils.utcnow()),

46
designate/storage/sqlalchemy/tables.py
View file

@ -19,10 +19,10 @@ from sqlalchemy import (Table, MetaData, Column, String, Text, Integer,
from oslo_db.sqlalchemy import types
from oslo_utils import timeutils
from oslo_utils import uuidutils
import designate.conf
from designate.storage.sqlalchemy.types import UUID
from designate import utils
CONF = designate.conf.CONF
@ -57,7 +57,7 @@ def default_shard(context, id_col):
service_status = Table("service_statuses", metadata,
Column('id', UUID, default=utils.generate_uuid, primary_key=True),
Column('id', UUID, default=uuidutils.generate_uuid, primary_key=True),
Column('created_at', DateTime, default=lambda: timeutils.utcnow()),
Column('updated_at', DateTime, onupdate=lambda: timeutils.utcnow()),
@ -78,7 +78,7 @@ service_status = Table("service_statuses", metadata,
quotas = Table('quotas', metadata,
Column('id', UUID, default=utils.generate_uuid, primary_key=True),
Column('id', UUID, default=uuidutils.generate_uuid, primary_key=True),
Column('version', Integer, default=1, nullable=False),
Column('created_at', DateTime, default=lambda: timeutils.utcnow()),
Column('updated_at', DateTime, onupdate=lambda: timeutils.utcnow()),
@ -92,7 +92,7 @@ quotas = Table('quotas', metadata,
)
tlds = Table('tlds', metadata,
Column('id', UUID, default=utils.generate_uuid, primary_key=True),
Column('id', UUID, default=uuidutils.generate_uuid, primary_key=True),
Column('version', Integer, default=1, nullable=False),
Column('created_at', DateTime, default=lambda: timeutils.utcnow()),
Column('updated_at', DateTime, onupdate=lambda: timeutils.utcnow()),
@ -105,7 +105,7 @@ tlds = Table('tlds', metadata,
)
zones = Table('zones', metadata,
Column('id', UUID, default=utils.generate_uuid, primary_key=True),
Column('id', UUID, default=uuidutils.generate_uuid, primary_key=True),
Column('version', Integer, default=1, nullable=False),
Column('created_at', DateTime, default=lambda: timeutils.utcnow()),
Column('updated_at', DateTime, onupdate=lambda: timeutils.utcnow()),
@ -153,7 +153,7 @@ zones = Table('zones', metadata,
)
zone_attributes = Table('zone_attributes', metadata,
Column('id', UUID, default=utils.generate_uuid, primary_key=True),
Column('id', UUID, default=uuidutils.generate_uuid, primary_key=True),
Column('version', Integer, default=1, nullable=False),
Column('created_at', DateTime, default=lambda: timeutils.utcnow()),
Column('updated_at', DateTime, onupdate=lambda: timeutils.utcnow()),
@ -170,7 +170,7 @@ zone_attributes = Table('zone_attributes', metadata,
)
zone_masters = Table('zone_masters', metadata,
Column('id', UUID(), default=utils.generate_uuid, primary_key=True),
Column('id', UUID(), default=uuidutils.generate_uuid, primary_key=True),
Column('version', Integer(), default=1, nullable=False),
Column('created_at', DateTime, default=lambda: timeutils.utcnow()),
Column('updated_at', DateTime, onupdate=lambda: timeutils.utcnow()),
@ -188,7 +188,7 @@ zone_masters = Table('zone_masters', metadata,
shared_zones = Table(
'shared_zones', metadata,
Column('id', UUID, default=utils.generate_uuid, primary_key=True),
Column('id', UUID, default=uuidutils.generate_uuid, primary_key=True),
Column('created_at', DateTime, default=lambda: timeutils.utcnow()),
Column('updated_at', DateTime, onupdate=lambda: timeutils.utcnow()),
Column('zone_id', UUID, nullable=False),
@ -204,7 +204,7 @@ shared_zones = Table(
)
recordsets = Table('recordsets', metadata,
Column('id', UUID, default=utils.generate_uuid, primary_key=True),
Column('id', UUID, default=uuidutils.generate_uuid, primary_key=True),
Column('version', Integer, default=1, nullable=False),
Column('created_at', DateTime, default=lambda: timeutils.utcnow()),
Column('updated_at', DateTime, onupdate=lambda: timeutils.utcnow()),
@ -227,7 +227,7 @@ recordsets = Table('recordsets', metadata,
)
records = Table('records', metadata,
Column('id', UUID, default=utils.generate_uuid, primary_key=True),
Column('id', UUID, default=uuidutils.generate_uuid, primary_key=True),
Column('version', Integer, default=1, nullable=False),
Column('created_at', DateTime, default=lambda: timeutils.utcnow()),
Column('updated_at', DateTime, onupdate=lambda: timeutils.utcnow()),
@ -266,7 +266,7 @@ records = Table('records', metadata,
)
tsigkeys = Table('tsigkeys', metadata,
Column('id', UUID, default=utils.generate_uuid, primary_key=True),
Column('id', UUID, default=uuidutils.generate_uuid, primary_key=True),
Column('version', Integer, default=1, nullable=False),
Column('created_at', DateTime, default=lambda: timeutils.utcnow()),
Column('updated_at', DateTime, onupdate=lambda: timeutils.utcnow()),
@ -283,7 +283,7 @@ tsigkeys = Table('tsigkeys', metadata,
)
blacklists = Table('blacklists', metadata,
Column('id', UUID, default=utils.generate_uuid, primary_key=True),
Column('id', UUID, default=uuidutils.generate_uuid, primary_key=True),
Column('version', Integer, default=1, nullable=False),
Column('created_at', DateTime, default=lambda: timeutils.utcnow()),
Column('updated_at', DateTime, onupdate=lambda: timeutils.utcnow()),
@ -296,7 +296,7 @@ blacklists = Table('blacklists', metadata,
)
pools = Table('pools', metadata,
Column('id', UUID, default=utils.generate_uuid, primary_key=True),
Column('id', UUID, default=uuidutils.generate_uuid, primary_key=True),
Column('created_at', DateTime, default=lambda: timeutils.utcnow()),
Column('updated_at', DateTime, onupdate=lambda: timeutils.utcnow()),
Column('version', Integer, default=1, nullable=False),
@ -314,7 +314,7 @@ pools = Table('pools', metadata,
)
pool_attributes = Table('pool_attributes', metadata,
Column('id', UUID, default=utils.generate_uuid, primary_key=True),
Column('id', UUID, default=uuidutils.generate_uuid, primary_key=True),
Column('created_at', DateTime, default=lambda: timeutils.utcnow()),
Column('updated_at', DateTime, onupdate=lambda: timeutils.utcnow()),
Column('version', Integer, default=1, nullable=False),
@ -330,7 +330,7 @@ pool_attributes = Table('pool_attributes', metadata,
)
pool_ns_records = Table('pool_ns_records', metadata,
Column('id', UUID, default=utils.generate_uuid, primary_key=True),
Column('id', UUID, default=uuidutils.generate_uuid, primary_key=True),
Column('created_at', DateTime, default=lambda: timeutils.utcnow()),
Column('updated_at', DateTime, onupdate=lambda: timeutils.utcnow()),
Column('version', Integer, default=1, nullable=False),
@ -346,7 +346,7 @@ pool_ns_records = Table('pool_ns_records', metadata,
mysql_charset='utf8')
pool_nameservers = Table('pool_nameservers', metadata,
Column('id', UUID, default=utils.generate_uuid, primary_key=True),
Column('id', UUID, default=uuidutils.generate_uuid, primary_key=True),
Column('version', Integer(), default=1, nullable=False),
Column('created_at', DateTime, default=lambda: timeutils.utcnow()),
Column('updated_at', DateTime, onupdate=lambda: timeutils.utcnow()),
@ -363,7 +363,7 @@ pool_nameservers = Table('pool_nameservers', metadata,
)
pool_targets = Table('pool_targets', metadata,
Column('id', UUID, default=utils.generate_uuid, primary_key=True),
Column('id', UUID, default=uuidutils.generate_uuid, primary_key=True),
Column('version', Integer(), default=1, nullable=False),
Column('created_at', DateTime, default=lambda: timeutils.utcnow()),
Column('updated_at', DateTime, onupdate=lambda: timeutils.utcnow()),
@ -380,7 +380,7 @@ pool_targets = Table('pool_targets', metadata,
)
pool_target_masters = Table('pool_target_masters', metadata,
Column('id', UUID, default=utils.generate_uuid, primary_key=True),
Column('id', UUID, default=uuidutils.generate_uuid, primary_key=True),
Column('version', Integer(), default=1, nullable=False),
Column('created_at', DateTime, default=lambda: timeutils.utcnow()),
Column('updated_at', DateTime, onupdate=lambda: timeutils.utcnow()),
@ -399,7 +399,7 @@ pool_target_masters = Table('pool_target_masters', metadata,
)
pool_target_options = Table('pool_target_options', metadata,
Column('id', UUID, default=utils.generate_uuid, primary_key=True),
Column('id', UUID, default=uuidutils.generate_uuid, primary_key=True),
Column('version', Integer(), default=1, nullable=False),
Column('created_at', DateTime, default=lambda: timeutils.utcnow()),
Column('updated_at', DateTime, onupdate=lambda: timeutils.utcnow()),
@ -417,7 +417,7 @@ pool_target_options = Table('pool_target_options', metadata,
)
pool_also_notifies = Table('pool_also_notifies', metadata,
Column('id', UUID, default=utils.generate_uuid, primary_key=True),
Column('id', UUID, default=uuidutils.generate_uuid, primary_key=True),
Column('version', Integer(), default=1, nullable=False),
Column('created_at', DateTime, default=lambda: timeutils.utcnow()),
Column('updated_at', DateTime, onupdate=lambda: timeutils.utcnow()),
@ -434,7 +434,7 @@ pool_also_notifies = Table('pool_also_notifies', metadata,
)
zone_transfer_requests = Table('zone_transfer_requests', metadata,
Column('id', UUID, default=utils.generate_uuid, primary_key=True),
Column('id', UUID, default=uuidutils.generate_uuid, primary_key=True),
Column('version', Integer, default=1, nullable=False),
Column('created_at', DateTime, default=lambda: timeutils.utcnow()),
Column('updated_at', DateTime, onupdate=lambda: timeutils.utcnow()),
@ -456,7 +456,7 @@ zone_transfer_requests = Table('zone_transfer_requests', metadata,
)
zone_transfer_accepts = Table('zone_transfer_accepts', metadata,
Column('id', UUID, default=utils.generate_uuid, primary_key=True),
Column('id', UUID, default=uuidutils.generate_uuid, primary_key=True),
Column('version', Integer, default=1, nullable=False),
Column('created_at', DateTime, default=lambda: timeutils.utcnow()),
Column('updated_at', DateTime, onupdate=lambda: timeutils.utcnow()),
@ -480,7 +480,7 @@ zone_transfer_accepts = Table('zone_transfer_accepts', metadata,
)
zone_tasks = Table('zone_tasks', metadata,
Column('id', UUID, default=utils.generate_uuid, primary_key=True),
Column('id', UUID, default=uuidutils.generate_uuid, primary_key=True),
Column('created_at', DateTime, default=lambda: timeutils.utcnow()),
Column('updated_at', DateTime, onupdate=lambda: timeutils.utcnow()),
Column('version', Integer, default=1, nullable=False),

6
designate/tests/functional/__init__.py
View file

@ -25,6 +25,7 @@ from unittest import mock
from oslo_config import fixture as cfg_fixture
from oslo_log import log as logging
from oslo_messaging import conffixture as messaging_fixture
from oslo_utils import uuidutils
from oslotest import base
from testtools import testcase
@ -37,7 +38,6 @@ from designate import policy
from designate import storage
from designate.tests import base_fixtures
from designate.tests import resources
from designate import utils
CONF = designate.conf.CONF
@ -472,8 +472,8 @@ class TestCase(base.BaseTestCase):
def get_admin_context(self, **kwargs):
return DesignateContext.get_admin_context(
project_id=utils.generate_uuid(),
user_id=utils.generate_uuid(),
project_id=uuidutils.generate_uuid(),
user_id=uuidutils.generate_uuid(),
**kwargs)
# Fixture methods

22
designate/tests/functional/central/test_service.py
View file

@ -31,6 +31,7 @@ from oslo_log import log as logging
from oslo_messaging.notify import notifier
from oslo_messaging.rpc import dispatcher as rpc_dispatcher
from oslo_utils import timeutils
from oslo_utils import uuidutils
from oslo_versionedobjects import exception as ovo_exc
import testtools
@ -42,7 +43,6 @@ from designate.storage import sql
from designate.storage.sqlalchemy import tables
from designate.tests import base_fixtures
import designate.tests.functional
from designate import utils
from designate.worker import rpcapi as worker_api
@ -3620,7 +3620,7 @@ class CentralServiceTest(designate.tests.functional.TestCase):
# Zone Import Tests
def test_create_zone_import(self):
# Create a Zone Import
context = self.get_context(project_id=utils.generate_uuid(),
context = self.get_context(project_id=uuidutils.generate_uuid(),
roles=['member', 'reader'])
request_body = self.get_zonefile_fixture()
zone_import = self.central_service.create_zone_import(context,
@ -3635,7 +3635,7 @@ class CentralServiceTest(designate.tests.functional.TestCase):
self.wait_for_import(zone_import.id)
def test_create_zone_import_duplicate_threading(self):
context = self.get_context(project_id=utils.generate_uuid(),
context = self.get_context(project_id=uuidutils.generate_uuid(),
roles=['member', 'reader'])
request_body = self.get_zonefile_fixture()
zone_import = self.central_service.create_zone_import(context,
@ -3643,7 +3643,7 @@ class CentralServiceTest(designate.tests.functional.TestCase):
self.wait_for_import(zone_import.id)
def create_zone_import():
context = self.get_context(project_id=utils.generate_uuid(),
context = self.get_context(project_id=uuidutils.generate_uuid(),
roles=['member', 'reader'])
request_body = self.get_zonefile_fixture()
zone_import = self.central_service.create_zone_import(context,
@ -3664,7 +3664,7 @@ class CentralServiceTest(designate.tests.functional.TestCase):
self, mock_update_zone_import, mock_dnszone_from_text):
# the second set of exceptions for the create_zone
context = self.get_context(project_id=utils.generate_uuid())
context = self.get_context(project_id=uuidutils.generate_uuid())
request_body = self.get_zonefile_fixture()
values = {
'status': 'PENDING',
@ -3699,7 +3699,7 @@ class CentralServiceTest(designate.tests.functional.TestCase):
self, mock_update_zone_import, mock_create_zone):
# setup to test the create_zone exceptions from _import_zone method
context = self.get_context(project_id=utils.generate_uuid())
context = self.get_context(project_id=uuidutils.generate_uuid())
request_body = self.get_zonefile_fixture()
values = {
'status': 'PENDING',
@ -3754,7 +3754,7 @@ class CentralServiceTest(designate.tests.functional.TestCase):
)
# Create a Zone Import
context = self.get_context(project_id=utils.generate_uuid(),
context = self.get_context(project_id=uuidutils.generate_uuid(),
roles=['member', 'reader'])
request_body = self.get_zonefile_fixture()
zone_import = self.central_service.create_zone_import(context,
@ -3773,7 +3773,7 @@ class CentralServiceTest(designate.tests.functional.TestCase):
self.assertEqual('ERROR', zone_import.status)
def test_find_zone_imports(self):
context = self.get_context(project_id=utils.generate_uuid(),
context = self.get_context(project_id=uuidutils.generate_uuid(),
roles=['member', 'reader'])
# Ensure we have no zone_imports to start with.
@ -3811,7 +3811,7 @@ class CentralServiceTest(designate.tests.functional.TestCase):
def test_get_zone_import(self):
# Create a Zone Import
context = self.get_context(project_id=utils.generate_uuid(),
context = self.get_context(project_id=uuidutils.generate_uuid(),
roles=['member', 'reader'])
request_body = self.get_zonefile_fixture()
zone_import = self.central_service.create_zone_import(
@ -3830,7 +3830,7 @@ class CentralServiceTest(designate.tests.functional.TestCase):
def test_update_zone_import(self):
# Create a Zone Import
context = self.get_context(project_id=utils.generate_uuid(),
context = self.get_context(project_id=uuidutils.generate_uuid(),
roles=['member', 'reader'])
request_body = self.get_zonefile_fixture()
zone_import = self.central_service.create_zone_import(
@ -3854,7 +3854,7 @@ class CentralServiceTest(designate.tests.functional.TestCase):
def test_delete_zone_import(self):
# Create a Zone Import
context = self.get_context(project_id=utils.generate_uuid(),
context = self.get_context(project_id=uuidutils.generate_uuid(),
roles=['member', 'reader'])
request_body = self.get_zonefile_fixture()
zone_import = self.central_service.create_zone_import(

4
designate/tests/functional/test_storage.py
View file

@ -19,6 +19,7 @@ from unittest import mock
from oslo_log import log as logging
from oslo_messaging.rpc import dispatcher as rpc_dispatcher
from oslo_utils import uuidutils
import designate.conf
from designate.conf.mdns import DEFAULT_MDNS_PORT
@ -27,7 +28,6 @@ from designate import objects
from designate import storage
from designate.storage import sql
import designate.tests.functional
from designate.utils import generate_uuid
CONF = designate.conf.CONF
@ -164,7 +164,7 @@ class SqlalchemyStorageTest(designate.tests.functional.TestCase):
exceptions.MarkerNotFound,
'Marker None could not be found',
self.storage.find_pool_attributes, self.admin_context,
marker=generate_uuid(), limit=5
marker=uuidutils.generate_uuid(), limit=5
)
def test_paging_marker_invalid(self):

11
designate/tests/unit/central/test_lock_decorator.py
View file

@ -14,13 +14,13 @@ from unittest import mock
from oslo_concurrency import lockutils
from oslo_log import log as logging
from oslo_utils import uuidutils
import oslotest.base
from designate.common.decorators import lock
from designate import exceptions
from designate.objects import record
from designate.objects import zone
from designate import utils
LOG = logging.getLogger(__name__)
@ -55,7 +55,8 @@ class CentralDecoratorTests(oslotest.base.BaseTestCase):
for index in range(9):
try:
mock_get_zone(
self.service, index, zone.Zone(id=utils.generate_uuid())
self.service, index,
zone.Zone(id=uuidutils.generate_uuid())
)
except exceptions.ZoneNotFound:
pass
@ -65,7 +66,7 @@ class CentralDecoratorTests(oslotest.base.BaseTestCase):
def mock_create_zone(cls, context):
self.assertEqual({b'create-new-zone'}, cls.zone_lock_local._held)
mock_create_record(
cls, context, zone.Zone(id=utils.generate_uuid())
cls, context, zone.Zone(id=uuidutils.generate_uuid())
)
@lock.synchronized_zone()
@ -98,11 +99,11 @@ class CentralDecoratorTests(oslotest.base.BaseTestCase):
mock_create_record(
self.service, self.context,
record_obj=record.Record(zone_id=utils.generate_uuid())
record_obj=record.Record(zone_id=uuidutils.generate_uuid())
)
mock_get_zone(
self.service, self.context,
zone_obj=zone.Zone(id=utils.generate_uuid())
zone_obj=zone.Zone(id=uuidutils.generate_uuid())
)
def test_synchronized_zone_raises_exception_when_no_zone_provided(self):

4
designate/tests/unit/objects/test_zone.py
View file

@ -16,18 +16,18 @@
import unittest
from oslo_log import log as logging
from oslo_utils import uuidutils
import oslotest.base
from designate import exceptions
from designate import objects
from designate import utils
LOG = logging.getLogger(__name__)
def create_test_zone():
return objects.Zone(
id=utils.generate_uuid(),
id=uuidutils.generate_uuid(),
name='www.example.org.',
email='foo@example.com',
)

20
designate/tests/unit/producer/test_tasks.py
View file

@ -23,6 +23,7 @@ from oslo_config import cfg
from oslo_config import fixture as cfg_fixture
from oslo_log import log as logging
from oslo_utils import timeutils
from oslo_utils import uuidutils
import oslotest.base
from designate.central import rpcapi as central_api
@ -33,7 +34,6 @@ from designate import rpc
from designate.tests import base_fixtures
from designate.tests.unit import RoObject
from designate.tests.unit import RwObject
from designate.utils import generate_uuid
from designate.worker import rpcapi as worker_api
@ -87,7 +87,7 @@ class PeriodicTest(oslotest.base.BaseTestCase):
ctxt = mock.Mock()
iterer = self.task._iter_zones(ctxt)
items = [RoObject(id=generate_uuid()) for i in range(0, 5)]
items = [RoObject(id=uuidutils.generate_uuid()) for i in range(0, 5)]
central.find_zones.return_value = items
# Iterate through the items causing the "paging" to be done.
@ -150,7 +150,7 @@ class PeriodicExistsTest(oslotest.base.BaseTestCase):
))
def test_emit_exists(self):
zone = RoObject(id=generate_uuid())
zone = RoObject(id=uuidutils.generate_uuid())
with mock.patch.object(self.task, '_iter_zones') as iter_:
iter_.return_value = [zone]
@ -224,7 +224,7 @@ class PeriodicSecondaryRefreshTest(oslotest.base.BaseTestCase):
def test_transferred_at_is_none(self):
zone = RoObject(
id=generate_uuid(),
id=uuidutils.generate_uuid(),
transferred_at=None,
refresh=3600
)
@ -238,7 +238,7 @@ class PeriodicSecondaryRefreshTest(oslotest.base.BaseTestCase):
def test_refresh_zone(self):
transferred = timeutils.utcnow(True) - datetime.timedelta(minutes=62)
zone = RoObject(
id=generate_uuid(),
id=uuidutils.generate_uuid(),
transferred_at=datetime.datetime.isoformat(transferred),
refresh=3600
)
@ -253,7 +253,7 @@ class PeriodicSecondaryRefreshTest(oslotest.base.BaseTestCase):
# Dummy zone object
transferred = timeutils.utcnow(True) - datetime.timedelta(minutes=50)
zone = RoObject(
id=generate_uuid(),
id=uuidutils.generate_uuid(),
transferred_at=datetime.datetime.isoformat(transferred),
refresh=3600
)
@ -285,7 +285,7 @@ class PeriodicIncrementSerialTest(oslotest.base.BaseTestCase):
def test_increment_zone(self):
zone = RoObject(
id=generate_uuid(),
id=uuidutils.generate_uuid(),
action='CREATE',
increment_serial=True,
delayed_notify=False,
@ -299,7 +299,7 @@ class PeriodicIncrementSerialTest(oslotest.base.BaseTestCase):
def test_increment_zone_with_action_none(self):
zone = RwObject(
id=generate_uuid(),
id=uuidutils.generate_uuid(),
action='NONE',
status='ACTIVE',
increment_serial=True,
@ -317,7 +317,7 @@ class PeriodicIncrementSerialTest(oslotest.base.BaseTestCase):
def test_increment_zone_with_delayed_notify(self):
zone = RoObject(
id=generate_uuid(),
id=uuidutils.generate_uuid(),
action='CREATE',
increment_serial=True,
delayed_notify=True,
@ -331,7 +331,7 @@ class PeriodicIncrementSerialTest(oslotest.base.BaseTestCase):
def test_increment_zone_skip_deleted(self):
zone = RoObject(
id=generate_uuid(),
id=uuidutils.generate_uuid(),
action='DELETE',
increment_serial=True,
delayed_notify=False,

4
designate/utils.py
View file

@ -135,10 +135,6 @@ def deep_dict_merge(a, b):
return result
def generate_uuid():
return uuidutils.generate_uuid(dashed=True)
def validate_uuid(*check):
"""
A wrapper to ensure that API controller methods arguments are valid UUID's.