Merge "Removed deprecated mdns config"

designate/conf/mdns.py

@@ -18,7 +18,7 @@ from oslo_config import cfg
 DEFAULT_MDNS_PORT = 5354
 
 MDNS_GROUP = cfg.OptGroup(
-    name='service:mdns', title="Configuration for mDNS Service"
+    name='service:mdns', title='Configuration for mDNS Service'
 )
 
 MDNS_OPTS = [
@@ -33,12 +33,6 @@ MDNS_OPTS = [
                help='mDNS TCP Backlog'),
     cfg.FloatOpt('tcp_recv_timeout', default=0.5,
                  help='mDNS TCP Receive Timeout'),
-    cfg.IntOpt('all_tcp', help='Send all traffic over TCP',
-               default=None,
-               deprecated_for_removal=True,
-               deprecated_reason='This parameter should now be configured in'
-                                 'service:worker instead',
-               deprecated_since='Zed'),
     cfg.BoolOpt('query_enforce_tsig', default=False,
                 help='Enforce all incoming queries (including AXFR) are TSIG '
                      'signed'),
@@ -46,14 +40,6 @@ MDNS_OPTS = [
                help='The storage driver to use'),
     cfg.IntOpt('max_message_size', default=65535,
                help='Maximum message size to emit'),
-    cfg.StrOpt('topic', default='mdns',
-               help='RPC topic name for mdns'),
-    cfg.IntOpt('xfr_timeout', help="Timeout in seconds for XFR's.",
-               default=None,
-               deprecated_for_removal=True,
-               deprecated_reason='This parameter should now be configured in'
-                                 'service:worker instead',
-               deprecated_since='Zed'),
 ]
 
 

designate/dnsutils.py

@@ -183,10 +183,7 @@ def dnspythonrecord_to_recordset(rname, rdataset):
 
 
 def xfr_timeout():
-    if CONF['service:mdns'].xfr_timeout is not None:
-        return CONF['service:mdns'].xfr_timeout
-    else:
-        return CONF['service:worker'].xfr_timeout
+    return CONF['service:worker'].xfr_timeout
 
 
 def do_axfr(zone_name, servers, source=None):
@@ -267,10 +264,7 @@ def soa_query(zone_name, host, port=53, timeout=10):
 
 
 def use_all_tcp():
-    if CONF['service:mdns'].all_tcp is not None:
-        return CONF['service:mdns'].all_tcp
-    else:
-        return CONF['service:worker'].all_tcp
+    return CONF['service:worker'].all_tcp
 
 
 def send_dns_message(dns_message, host, port=53, timeout=10):

designate/tests/unit/test_dnsutils.py

@@ -40,7 +40,7 @@ class TestDNSUtils(oslotest.base.BaseTestCase):
 
     @mock.patch.object(dns.query, 'udp')
     def test_send_udp_dns_message(self, mock_udp):
-        CONF.set_override('all_tcp', False, 'service:mdns')
+        CONF.set_override('all_tcp', False, 'service:worker')
         dnsutils.send_dns_message('msg', '192.0.2.1', 1234, 1)
         mock_udp.assert_called_with(
             'msg', '192.0.2.1', port=1234, timeout=1
@@ -48,7 +48,7 @@ class TestDNSUtils(oslotest.base.BaseTestCase):
 
     @mock.patch.object(dns.query, 'tcp')
     def test_send_tcp_dns_message(self, mock_tcp):
-        CONF.set_override('all_tcp', True, 'service:mdns')
+        CONF.set_override('all_tcp', True, 'service:worker')
         dnsutils.send_dns_message('msg', '192.0.2.1', 1234, 1)
         mock_tcp.assert_called_with(
             'msg', '192.0.2.1', port=1234, timeout=1
@@ -57,10 +57,6 @@ class TestDNSUtils(oslotest.base.BaseTestCase):
     def test_all_tcp_default(self):
         self.assertEqual(False, dnsutils.use_all_tcp())
 
-    def test_all_tcp_using_mdns(self):
-        CONF.set_override('all_tcp', True, 'service:mdns')
-        self.assertEqual(True, dnsutils.use_all_tcp())
-
     def test_all_tcp_using_worker(self):
         CONF.set_override('all_tcp', True, 'service:worker')
         self.assertEqual(True, dnsutils.use_all_tcp())
@@ -68,10 +64,6 @@ class TestDNSUtils(oslotest.base.BaseTestCase):
     def test_xfr_default(self):
         self.assertEqual(10, dnsutils.xfr_timeout())
 
-    def test_xfr_timeout_set_using_mdns(self):
-        CONF.set_override('xfr_timeout', 30, 'service:mdns')
-        self.assertEqual(30, dnsutils.xfr_timeout())
-
     def test_xfr_timeout_set_using_worker(self):
         CONF.set_override('xfr_timeout', 40, 'service:worker')
         self.assertEqual(40, dnsutils.xfr_timeout())

releasenotes/notes/remove-deprecated-mdns-options-d720efab5ab275d6.yaml

@@ -0,0 +1,8 @@
+---
+other:
+  - |
+    Removed previously deprecated ``service:mdns`` configuration options. These are now
+    configured under ``service:worker`` instead.
+    - ``all_tcp``
+    - ``xfr_timeout``
+    - ``topic``