openstack
/
designate
Code Issues Proposed changes

Fix _find_masters + unit tests 

Change-Id: Icf968e51d86683c2ca92f10261e0d22f1cbde0a3
This commit is contained in:
Graham Hayes 2016-03-11 17:57:06 +00:00
parent ee594c13b1
commit 00c90a3208
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
designate/storage/impl_sqlalchemy/__init__.py
View File

@ -553,7 +553,7 @@ class SQLAlchemyStorage(sqlalchemy_base.SQLAlchemy, storage_base.Storage):
marker=None, limit=None, sort_key=None,
sort_dir=None):
return self._find(context, tables.zone_attributes,
return self._find(context, tables.zone_masters,
objects.ZoneMaster, objects.ZoneMasterList,
exceptions.ZoneMasterNotFound, criterion, one,
marker, limit, sort_key, sort_dir)

2
designate/tests/test_api/test_v2/test_zones.py
View File

@ -558,7 +558,7 @@ class ApiV2ZonesTest(ApiV2TestCase):
# Create a zone
fixture = self.get_zone_fixture('SECONDARY', 0)
fixture['email'] = cfg.CONF['service:central'].managed_resource_email
fixture['attributes'] = [{"key": "master", "value": "10.0.0.10"}]
fixture['masters'] = [{"host": "10.0.0.10", "port": 53}]
# Create a zone
zone = self.create_zone(**fixture)

6
designate/tests/test_central/test_service.py
View File

@ -1291,7 +1291,7 @@ class CentralServiceTest(CentralTestCase):
# Create a zone
fixture = self.get_zone_fixture('SECONDARY', 0)
fixture['email'] = cfg.CONF['service:central'].managed_resource_email
fixture['attributes'] = [{"key": "master", "value": "10.0.0.10"}]
fixture['masters'] = [{"host": "10.0.0.10", "port": 53}]
# Create a zone
secondary = self.create_zone(**fixture)
@ -1308,7 +1308,7 @@ class CentralServiceTest(CentralTestCase):
# Create a zone
fixture = self.get_zone_fixture('SECONDARY', 0)
fixture['email'] = cfg.CONF['service:central'].managed_resource_email
fixture['attributes'] = [{"key": "master", "value": "10.0.0.10"}]
fixture['masters'] = [{"host": "10.0.0.10", "port": 53}]
# Create a zone
secondary = self.create_zone(**fixture)
@ -1325,7 +1325,7 @@ class CentralServiceTest(CentralTestCase):
# Create a zone
fixture = self.get_zone_fixture('SECONDARY', 0)
fixture['email'] = cfg.CONF['service:central'].managed_resource_email
fixture['attributes'] = [{"key": "master", "value": "10.0.0.10"}]
fixture['masters'] = [{"host": "10.0.0.10", "port": 53}]
fixture['serial'] = 10
# Create a zone