openstack/magnum
Code Issues Proposed changes

Support multi DNS server

Browse Source 
Using comma delimited ipv4 address list to specify multi dns server
"8.8.8.8,114.114.114.114".

Task: 29465
Story: 2004994

Change-Id: I031247b0cc2ae417f18b2a5b9b3832e78ed9dafd
This commit is contained in:
huang.xiangdong 2019-02-19 11:10:55 +08:00 committed by Feilong Wang
parent fb82777983
commit 3cb6226ff0
16 changed files with 98 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/drivers/dcos_centos_v1/templates/dcoscluster.yaml
View File

@ -67,7 +67,7 @@ parameters:
default: 10.0.0.0/24
dns_nameserver:
type: string
type: comma_delimited_list
description: address of a dns nameserver reachable in your environment
http_proxy:

2
contrib/drivers/k8s_opensuse_v1/templates/kubecluster.yaml
View File

@ -31,7 +31,7 @@ parameters:
description: flavor to use when booting the server for minions
dns_nameserver:
type: string
type: comma_delimited_list
description: address of a DNS nameserver reachable in your environment
default: 8.8.8.8

2
magnum/api/controllers/v1/cluster_template.py
View File

@ -61,7 +61,7 @@ class ClusterTemplate(base.APIBase):
master_flavor_id = wtypes.StringType(min_length=1, max_length=255)
"""The flavor of the master node for this ClusterTemplate"""
dns_nameserver = wtypes.IPv4AddressType()
dns_nameserver = types.dns_list
"""The DNS nameserver address"""
keypair_id = wsme.wsattr(wtypes.StringType(min_length=1, max_length=255),

13
magnum/api/controllers/v1/types.py
View File

@ -14,6 +14,7 @@
# under the License.
import inspect
import six
from oslo_utils import strutils
from oslo_utils import uuidutils
@ -25,6 +26,17 @@ from magnum.common import utils
from magnum.i18n import _
class DNSListType(wtypes.UserType):
"""A comman delimited dns nameserver list"""
basetype = six.string_types
name = "dnslist"
@staticmethod
def validate(value):
return utils.validate_dns(value)
class MacAddressType(wtypes.UserType):
"""A simple MAC address type."""
@ -129,6 +141,7 @@ class MultiType(wtypes.UserType):
% {'type': self.types, 'value': type(value)})
dns_list = DNSListType()
macaddress = MacAddressType()
uuid = UuidType()
name = NameType()

6
magnum/common/exception.py
View File

@ -220,6 +220,12 @@ class InvalidMAC(Invalid):
message = _("Expected a MAC address but received %(mac)s.")
class InvalidDNS(Invalid):
message = _(
"Expected a single dns address or comma separated dns list, "
"but received %(dns)s.")
class ConfigInvalid(Invalid):
message = _("Invalid configuration file. %(error_msg)s")

19
magnum/common/utils.py
View File

@ -25,6 +25,7 @@ import re
import shutil
import tempfile
import netaddr
from oslo_concurrency import processutils
from oslo_log import log as logging
from oslo_utils import netutils
@ -115,6 +116,24 @@ def validate_and_normalize_mac(address):
return address.lower()
def validate_dns(dns_list):
"""Validate a string is a single dns address or comma separated dns list
:param dns_list: dns_list to be validated
:returns: original dns_list.
:raise: InvalidDNS if dns format is invalid
"""
dns_nameservers = dns_list.split(',')
try:
for dns in dns_nameservers:
netaddr.IPAddress(dns, version=4, flags=netaddr.INET_PTON)
except netaddr.AddrFormatError:
raise exception.InvalidDNS(dns=dns_list)
else:
return dns_list
@contextlib.contextmanager
def tempdir(**kwargs):
tempfile.tempdir = CONF.tempdir

5
magnum/drivers/common/templates/network.yaml
View File

@ -23,7 +23,7 @@ parameters:
default: ""
dns_nameserver:
type: string
type: comma_delimited_list
description: address of a dns nameserver reachable in your environment
external_network:
@ -41,8 +41,7 @@ resources:
properties:
cidr: {get_param: private_network_cidr}
network: {get_resource: private_network}
dns_nameservers:
- {get_param: dns_nameserver}
dns_nameservers: {get_param: dns_nameserver}
extrouter:
type: Magnum::Optional::Neutron::Router

2
magnum/drivers/k8s_coreos_v1/templates/kubecluster.yaml
View File

@ -59,7 +59,7 @@ parameters:
admin user password for the Grafana monitoring interface
dns_nameserver:
type: string
type: comma_delimited_list
description: address of a DNS nameserver reachable in your environment
default: 8.8.8.8

2
magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml
View File

@ -54,7 +54,7 @@ parameters:
admin user password for the Grafana monitoring interface
dns_nameserver:
type: string
type: comma_delimited_list
description: address of a DNS nameserver reachable in your environment
default: 8.8.8.8

2
magnum/drivers/k8s_fedora_ironic_v1/templates/kubecluster.yaml
View File

@ -58,7 +58,7 @@ parameters:
admin user password for the Grafana monitoring interface
dns_nameserver:
type: string
type: comma_delimited_list
description: address of a dns nameserver reachable in your environment
default: 8.8.8.8

2
magnum/drivers/mesos_ubuntu_v1/templates/mesoscluster.yaml
View File

@ -44,7 +44,7 @@ parameters:
description: flavor to use when booting the slave server
dns_nameserver:
type: string
type: comma_delimited_list
description: address of a dns nameserver reachable in your environment
default: 8.8.8.8

2
magnum/drivers/swarm_fedora_atomic_v1/templates/cluster.yaml
View File

@ -62,7 +62,7 @@ parameters:
description: flavor to use when booting the swarm node
dns_nameserver:
type: string
type: comma_delimited_list
description: address of a dns nameserver reachable in your environment
default: 8.8.8.8

2
magnum/drivers/swarm_fedora_atomic_v2/templates/swarmcluster.yaml
View File

@ -57,7 +57,7 @@ parameters:
description: flavor to use when booting the swarm node
dns_nameserver:
type: string
type: comma_delimited_list
description: address of a dns nameserver reachable in your environment
default: 8.8.8.8

26
magnum/tests/unit/api/controllers/v1/test_cluster_template.py
View File

@ -775,7 +775,7 @@ class TestPost(api_base.FunctionalTest):
mock_image_data.return_value = {'name': 'mock_name',
'os_distro': 'fedora-atomic'}
for k, v in cluster_template_config_dict.items():
cfg.CONF.set_override(k, v, 'cluster_template')
cfg.CONF.set_override(k, v, 'cluster_template')
with mock.patch.object(
self.dbapi, 'create_cluster_template',
wraps=self.dbapi.create_cluster_template) as cc_mock:
@ -1115,6 +1115,30 @@ class TestPost(api_base.FunctionalTest):
self.assertRaises(AppError, self.post_json, '/clustertemplates',
bdict)
@mock.patch('magnum.api.attr_validator.validate_image')
@mock.patch('oslo_utils.timeutils.utcnow')
def test_create_cluster_template_with_multi_dns(self, mock_utcnow,
mock_image_data):
bdict = apiutils.cluster_template_post_data(
dns_nameserver="8.8.8.8,114.114.114.114")
test_time = datetime.datetime(2000, 1, 1, 0, 0)
mock_utcnow.return_value = test_time
mock_image_data.return_value = {'name': 'mock_name',
'os_distro': 'fedora-atomic'}
response = self.post_json('/clustertemplates', bdict)
self.assertEqual(201, response.status_int)
# Check location header
self.assertIsNotNone(response.location)
expected_location = '/v1/clustertemplates/%s' % bdict['uuid']
self.assertEqual(expected_location,
urlparse.urlparse(response.location).path)
self.assertEqual(bdict['uuid'], response.json['uuid'])
self.assertNotIn('updated_at', response.json.keys)
return_created_at = timeutils.parse_isotime(
response.json['created_at']).replace(tzinfo=None)
self.assertEqual(test_time, return_created_at)
class TestDelete(api_base.FunctionalTest):

18
magnum/tests/unit/api/controllers/v1/test_types.py
View File

@ -26,6 +26,24 @@ from magnum.common import utils
from magnum.tests.unit.api import base
class TestDNSListType(base.FunctionalTest):
def test_valid_single_dns(self):
test_dns = "8.8.8.8"
with mock.patch.object(utils, 'validate_dns') as m_mock:
types.DNSListType.validate(test_dns)
m_mock.assert_called_once_with(test_dns)
def test_valid_multi_dns(self):
test_dns = "8.8.8.8,114.114.114.114"
with mock.patch.object(utils, 'validate_dns') as m_mock:
types.DNSListType.validate(test_dns)
m_mock.assert_called_once_with(test_dns)
def test_invalid_single_dns(self):
self.assertRaises(exception.InvalidDNS,
types.DNSListType.validate, 'invalid-dns')
class TestMacAddressType(base.FunctionalTest):
def test_valid_mac_addr(self):

6
releasenotes/notes/support-multi-dns-server-0528be20f0e6aa62.yaml Normal file
View File

@ -0,0 +1,6 @@
---
features:
- Support multi DNS server when creating template.
User can use a comma delimited ipv4 address list
to specify multi dns server, for example
"8.8.8.8,114.114.114.114"