openstack
/
designate
Code Issues Proposed changes

Fix mdns deprecation warning and minor improvements 

- Fix deprecation warning.
- Fix minor code warnings.

Change-Id: I7bab00649ca7c797d0fd6b2c6b518cd9af1e0544
This commit is contained in:
Erik Olof Gunnar Andersson 2023-02-08 00:14:01 -08:00
parent d958a72064
commit df005ba695
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
designate/mdns/handler.py
View File

@ -151,7 +151,7 @@ class RequestHandler(object):
# According to RFC we should query the server that sent the NOTIFY
resolver.nameservers = [notify_addr]
soa_answer = resolver.query(zone.name, 'SOA')
soa_answer = resolver.resolve(zone.name, 'SOA')
soa_serial = soa_answer[0].serial
if soa_serial == zone.serial:
@ -303,6 +303,7 @@ class RequestHandler(object):
"""Handle a DNS QUERY request for a record"""
context = request.environ['context']
response = dns.message.make_response(request)
q_rrset = None
try:
q_rrset = request.question[0]
@ -371,7 +372,7 @@ class RequestHandler(object):
yield response
def _create_axfr_renderer(self, request):
# Build up a dummy response, we're stealing it's logic for building
# Build up a dummy response, we're stealing its logic for building
# the Flags.
response = dns.message.make_response(request)
response.flags |= dns.flags.AA

4
designate/tests/test_mdns/test_handler.py
View File

@ -142,7 +142,7 @@ class MdnsRequestHandlerTest(MdnsTestCase):
dns.rdataclass.IN, msg)
return answer
@mock.patch.object(dns.resolver.Resolver, 'query')
@mock.patch.object(dns.resolver.Resolver, 'resolve')
def test_dispatch_opcode_notify_different_serial(self, func):
# DNS packet with NOTIFY opcode
payload = "c38021000001000000000000076578616d706c6503636f6d0000060001"
@ -179,7 +179,7 @@ class MdnsRequestHandlerTest(MdnsTestCase):
self.assertEqual(expected_response, binascii.b2a_hex(response))
@mock.patch.object(dns.resolver.Resolver, 'query')
@mock.patch.object(dns.resolver.Resolver, 'resolve')
def test_dispatch_opcode_notify_same_serial(self, func):
# DNS packet with NOTIFY opcode
payload = "c38021000001000000000000076578616d706c6503636f6d0000060001"

4
designate/tests/unit/mdns/test_handler.py
View File

@ -54,7 +54,7 @@ class MdnsHandleTest(oslotest.base.BaseTestCase):
self.assertIsInstance(self.handler.worker_api,
worker_rpcapi.WorkerAPI)
@mock.patch.object(dns.resolver.Resolver, 'query')
@mock.patch.object(dns.resolver.Resolver, 'resolve')
def test_notify(self, mock_query):
self.storage.find_zone.return_value = objects.Zone(
id='e2bed4dc-9d01-11e4-89d3-123b93f75cba',
@ -82,7 +82,7 @@ class MdnsHandleTest(oslotest.base.BaseTestCase):
self.stdlog.logger.output
)
@mock.patch.object(dns.resolver.Resolver, 'query')
@mock.patch.object(dns.resolver.Resolver, 'resolve')
def test_notify_same_serial(self, mock_query):
self.storage.find_zone.return_value = objects.Zone(
id='e2bed4dc-9d01-11e4-89d3-123b93f75cba',