openstack/charm-neutron-api
Code Issues Proposed changes

Update amulet tests for internal-dns

Browse Source 
Upate amulet tests to check for internal-dns ml2 enablement.
This change enables ml2-internal-dns for all supported
deployments (>= mitaka) and validates the config and relation
data.

Change-Id: I40f269b6648bfbdbf8fb77dc8cb713f8c1376ed7
Depends-On: I4b136fbe8056f4c3e4813ce97fb632c01ce14c5e
Implements: blueprint internal-dns
This commit is contained in:
Billy Olsen 2017-07-05 15:38:54 -07:00
parent 242b18a05a
commit fcf78c6e03
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tests/basic_deployment.py
View File

@ -174,6 +174,11 @@ class NeutronAPIBasicDeployment(OpenStackAmuletDeployment):
neutron_api_config['enable-sriov'] = True
neutron_api_config['supported-pci-vendor-devs'] = '8086:1515'
if self._get_openstack_release() >= self.trusty_mitaka:
neutron_api_config['enable-ml2-dns'] = True
# openstack.example. is the default but be explicit for the test
neutron_api_config['dns-domain'] = 'openstack.example.'
keystone_config = {'admin-password': 'openstack',
'admin-token': 'ubuntutesting'}
nova_cc_config = {'network-manager': 'Neutron'}
@ -393,6 +398,12 @@ class NeutronAPIBasicDeployment(OpenStackAmuletDeployment):
'service_tenant': 'services',
'service_username': 'neutron',
}
if self._get_openstack_release() >= self.trusty_mitaka:
expected.update({
'dns-domain': 'openstack.example.',
})
ret = u.validate_relation_data(unit, relation, expected)
if ret:
message = u.relation_error(
@ -409,6 +420,7 @@ class NeutronAPIBasicDeployment(OpenStackAmuletDeployment):
expected = {
'private-address': u.valid_ip,
}
ret = u.validate_relation_data(unit, relation, expected)
if ret:
message = u.relation_error('neutron-api neutron-plugin-api', ret)
@ -481,6 +493,11 @@ class NeutronAPIBasicDeployment(OpenStackAmuletDeployment):
},
}
if self._get_openstack_release() >= self.trusty_mitaka:
expected['DEFAULT'].update({
'dns_domain': 'openstack.example.'
})
auth_uri = '{}://{}:{}'.format(
rel_napi_ks['service_protocol'],
rel_napi_ks['service_host'],
@ -632,6 +649,11 @@ class NeutronAPIBasicDeployment(OpenStackAmuletDeployment):
'supported_pci_vendor_devs': '8086:1515',
})
if self._get_openstack_release() >= self.trusty_mitaka:
expected['ml2'].update({
'extension_drivers': 'dns',
})
for section, pairs in expected.iteritems():
ret = u.validate_config_data(unit, conf, section, pairs)
if ret: