openstack/senlin
Code Issues Proposed changes

Merge "Faithful dump nova server addresses property"

Browse Source
This commit is contained in:
Jenkins 2016-08-28 13:17:40 +00:00 committed by Gerrit Code Review
commit 66937b6302
5 changed files with 38 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
doc/source/user/scenarios/autoscaling_ceilometer.rst
View File

@ -99,7 +99,12 @@ from the following command, you will find the IP address for the specific node:
| | +-----------+--------------------------------------+ |
| | | addresses | { | |
| | | | "private": [ | |
| | | | "10.0.0.9" | |
| | | | { | |
| | | | "OS-EXT-IPS-MAC:mac-addr": ... | |
| | | | "OS-EXT-IPS:type": "fixed", | |
| | | | "addr": "10.0.0.9", | |
| | | | "version": 4 | |
| | | | } | |
| | | | ] | |
| | | | } | |
| | | flavor | 1 | |

2
senlin/drivers/openstack/lbaas.py
View File

@ -272,7 +272,7 @@ class LoadBalancerDriver(base.DriverBase):
return None
# Use the first IP address if more than one are found in target network
address = addresses[net_name][0]
address = addresses[net_name][0]['addr']
try:
# FIXME(Yanyan Hu): Currently, Neutron lbaasv2 service can not
# handle concurrent lb member operations well: new member creation

9
senlin/profiles/os/nova/server.py
View File

@ -739,14 +739,7 @@ class ServerProfile(base.Profile):
details[key] = val if val else '-'
# process network addresses
details['addresses'] = {}
for net in server_data['addresses']:
addresses = []
for addr in server_data['addresses'][net]:
# Ignore IPv6 address
if addr['version'] == 4:
addresses.append(addr['addr'])
details['addresses'][net] = addresses
details['addresses'] = copy.deepcopy(server_data['addresses'])
# process security groups
sgroups = []

20
senlin/tests/unit/drivers/test_lbaas_driver.py
View File

@ -443,8 +443,8 @@ class TestNeutronLBaaSDriver(base.SenlinTestCase):
node_detail = {
'name': 'node-01',
'addresses': {
'network1': ['ipaddr_net1'],
'network2': ['ipaddr_net2']
'network1': [{'addr': 'ipaddr_net1'}],
'network2': [{'addr': 'ipaddr_net2'}]
}
}
node.get_details.return_value = node_detail
@ -500,8 +500,8 @@ class TestNeutronLBaaSDriver(base.SenlinTestCase):
node_detail = {
'name': 'node-01',
'addresses': {
'network1': ['ipaddr_net1'],
'network2': ['ipaddr_net2']
'network1': [{'addr': 'ipaddr_net1'}],
'network2': [{'addr': 'ipaddr_net2'}]
}
}
node.get_details.return_value = node_detail
@ -531,8 +531,8 @@ class TestNeutronLBaaSDriver(base.SenlinTestCase):
node_detail = {
'name': 'node-01',
'addresses': {
'network1': ['ipaddr_net1'],
'network2': ['ipaddr_net2']
'network1': [{'addr': 'ipaddr_net1'}],
'network2': [{'addr': 'ipaddr_net2'}]
}
}
node.get_details.return_value = node_detail
@ -561,8 +561,8 @@ class TestNeutronLBaaSDriver(base.SenlinTestCase):
node_detail = {
'name': 'node-01',
'addresses': {
'network1': ['ipaddr_net1'],
'network2': ['ipaddr_net2']
'network1': [{'addr': 'ipaddr_net1'}],
'network2': [{'addr': 'ipaddr_net2'}]
}
}
node.get_details.return_value = node_detail
@ -589,8 +589,8 @@ class TestNeutronLBaaSDriver(base.SenlinTestCase):
node_detail = {
'name': 'node-01',
'addresses': {
'network1': ['ipaddr_net1'],
'network2': ['ipaddr_net2']
'network1': [{'addr': 'ipaddr_net1'}],
'network2': [{'addr': 'ipaddr_net2'}]
}
}
node.get_details.return_value = node_detail

23
senlin/tests/unit/profiles/test_nova_server.py
View File

@ -1203,7 +1203,14 @@ class TestNovaServerProfile(base.SenlinTestCase):
'metadata': {},
'name': 'FAKE_NAME',
'os-extended-volumes:volumes_attached': [],
'addresses': {'private': ['10.0.0.3']},
'addresses': {
'private': [{
'OS-EXT-IPS-MAC:mac_addr': 'fa:16:3e:5e:00:81',
'version': 4,
'addr': '10.0.0.3',
'OS-EXT-IPS:type': 'fixed'
}]
},
'progress': 0,
'security_groups': 'default',
'updated': 'UPDATE_TIMESTAMP',
@ -1287,8 +1294,18 @@ class TestNovaServerProfile(base.SenlinTestCase):
'id': 'FAKE_ID',
'image': 'FAKE_IMAGE',
'addresses': {
'private': ['10.0.0.3', '192.168.43.3'],
'public': ['172.16.5.3']},
'private': [{
'version': 4,
'addr': '10.0.0.3',
}, {
'version': 4,
'addr': '192.168.43.3'
}],
'public': [{
'version': 4,
'addr': '172.16.5.3',
}]
},
'security_groups': ['default', 'webserver'],
}
self.assertEqual(expected, res)