openstack
/
charm-ceph-radosgw
Code Issues Proposed changes

Network space aware address for cluster relation 

Use the get_relation_ip function for selecting addresses for the
cluster relationship. Including overrides for the admin, internal,
and public config settings or extra bindings.

Partial-Bug: #1687439

Change-Id: Ie1280cd2068b97075f1257c2ca95042dc2aa689f
This commit is contained in:
David Ames 2017-05-05 10:15:04 -07:00
parent a4ef73475d
commit fd401d5b95
2 changed files with 20 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hooks/hooks.py
View File

@ -25,7 +25,6 @@ from charmhelpers.core.hookenv import (
relation_ids,
related_units,
config,
unit_get,
open_port,
relation_set,
log,
@ -43,8 +42,7 @@ from charmhelpers.fetch import (
from charmhelpers.payload.execd import execd_preinstall
from charmhelpers.core.host import cmp_pkgrevno
from charmhelpers.contrib.network.ip import (
get_address_in_network,
get_ipv6_addr,
get_relation_ip,
get_iface_for_address,
get_netmask_for_address,
is_ipv6,
@ -175,7 +173,7 @@ def mon_relation(rid=None, unit=None):
@hooks.hook('gateway-relation-joined')
def gateway_relation():
relation_set(hostname=unit_get('private-address'),
relation_set(hostname=get_relation_ip('gateway-relation'),
port=config('port'))
@ -235,17 +233,15 @@ def cluster_joined(rid=None):
settings = {}
for addr_type in ADDRESS_TYPES:
address = get_address_in_network(
config('os-{}-network'.format(addr_type))
)
address = get_relation_ip(
addr_type,
cidr_network=config('os-{}-network'.format(addr_type)))
if address:
settings['{}-address'.format(addr_type)] = address
if config('prefer-ipv6'):
private_addr = get_ipv6_addr(exc_list=[config('vip')])[0]
settings['private-address'] = private_addr
settings['private-address'] = get_relation_ip('cluster')
relation_set(relation_id=rid, **settings)
relation_set(relation_id=rid, relation_settings=settings)
@hooks.hook('cluster-relation-changed')

31
unit_tests/test_hooks.py
View File

@ -50,9 +50,9 @@ TO_PATCH = [
'status_set',
'subprocess',
'sys',
'unit_get',
'get_hacluster_config',
'update_dns_ha_resource_params',
'get_relation_ip',
]
@ -125,9 +125,9 @@ class CephRadosGWTests(CharmTestCase):
self.assertTrue(mock_send_request_if_needed.called)
def test_gateway_relation(self):
self.unit_get.return_value = 'myserver'
self.get_relation_ip.return_value = '10.0.0.1'
ceph_hooks.gateway_relation()
self.relation_set.assert_called_with(hostname='myserver', port=80)
self.relation_set.assert_called_with(hostname='10.0.0.1', port=80)
def test_start(self):
ceph_hooks.start()
@ -166,7 +166,6 @@ class CephRadosGWTests(CharmTestCase):
_config.side_effect = self.test_config.get
self.test_config.set('region', 'region1')
self.test_config.set('operator-roles', 'admin')
self.unit_get.return_value = 'myserv'
ceph_hooks.identity_joined(relid='rid')
self.relation_set.assert_called_with(
service='swift',
@ -218,17 +217,11 @@ class CephRadosGWTests(CharmTestCase):
self.assertEquals(ceph_hooks.canonical_url({}, PUBLIC),
'http://[%s]' % ipv6_addr)
@patch.object(ceph_hooks, 'get_address_in_network')
def test_cluster_joined(self, mock_get_addr):
addrs = {'10.0.0.0/24': '10.0.0.1',
'10.0.1.0/24': '10.0.1.1',
'10.0.2.0/24': '10.0.2.1'}
def fake_get_address_in_network(network):
return addrs.get(network)
mock_get_addr.side_effect = fake_get_address_in_network
def test_cluster_joined(self):
self.get_relation_ip.side_effect = ['10.0.0.1',
'10.0.1.1',
'10.0.2.1',
'10.0.3.1']
self.test_config.set('os-public-network', '10.0.0.0/24')
self.test_config.set('os-admin-network', '10.0.1.0/24')
self.test_config.set('os-internal-network', '10.0.2.0/24')
@ -236,9 +229,11 @@ class CephRadosGWTests(CharmTestCase):
ceph_hooks.cluster_joined()
self.relation_set.assert_has_calls(
[call(relation_id=None,
**{'admin-address': '10.0.1.1',
'internal-address': '10.0.2.1',
'public-address': '10.0.0.1'})])
relation_settings={
'admin-address': '10.0.0.1',
'public-address': '10.0.2.1',
'internal-address': '10.0.1.1',
'private-address': '10.0.3.1'})])
def test_cluster_changed(self):
_id_joined = self.patch('identity_joined')