openstack
/
octavia
Code Issues Proposed changes

Update nova_driver to use amp_network 

Updates transform method to use amp_network id instead of name

Change-Id: I0a04b93d66b87d92adaa80bf5ec9953c5fc10b97
This commit is contained in:
ptoohill1 2015-04-28 21:17:02 -05:00
parent 424c320b01
commit 7cd76047e6
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
octavia/compute/drivers/nova_driver.py
View File

@ -123,8 +123,7 @@ class VirtualMachineManager(compute_base.ComputeBase):
raise exceptions.ComputeGetException() raise exceptions.ComputeGetException()
return self._translate_amphora(amphora) return self._translate_amphora(amphora)
@staticmethod def _translate_amphora(self, nova_response):
def _translate_amphora(nova_response):
'''Convert a nova virtual machine into an amphora object. '''Convert a nova virtual machine into an amphora object.
:param nova_response: JSON response from nova :param nova_response: JSON response from nova
@ -132,12 +131,12 @@ class VirtualMachineManager(compute_base.ComputeBase):
''' '''
# Extract information from nova response to populate desired amphora # Extract information from nova response to populate desired amphora
# fields # fields
lb_network_ip = None
for network_name in nova_response.addresses: lb_network_ip = nova_response.addresses[
if network_name == CONF.networking.lb_network_name: self._nova_client.networks.get(
lb_network_ip = ( CONF.controller_worker.amp_network).label
nova_response.addresses[network_name][0]['addr']) ][0]['addr']
response = models.Amphora( response = models.Amphora(
compute_id=nova_response.id, compute_id=nova_response.id,
status=nova_response.status, status=nova_response.status,

8
octavia/tests/unit/compute/drivers/test_nova_driver.py
View File

@ -32,7 +32,7 @@ CONF = cfg.CONF
class TestNovaClient(base.TestCase): class TestNovaClient(base.TestCase):
def setUp(self): def setUp(self):
net_name = uuidutils.generate_uuid() net_name = "lb-mgmt-net"
CONF.set_override(group='networking', name='lb_network_name', CONF.set_override(group='networking', name='lb_network_name',
override=net_name) override=net_name)
CONF.set_override(group='keystone_authtoken', name='auth_version', CONF.set_override(group='keystone_authtoken', name='auth_version',
@ -48,8 +48,14 @@ class TestNovaClient(base.TestCase):
self.nova_response.status = 'ACTIVE' self.nova_response.status = 'ACTIVE'
self.nova_response.addresses = {net_name: [{'addr': '10.0.0.1'}]} self.nova_response.addresses = {net_name: [{'addr': '10.0.0.1'}]}
self.nova_network = mock.Mock()
self.nova_network.label = net_name
self.manager = nova_common.VirtualMachineManager() self.manager = nova_common.VirtualMachineManager()
self.manager.manager = mock.MagicMock() self.manager.manager = mock.MagicMock()
self.manager._nova_client = mock.MagicMock()
self.manager._nova_client.networks.get.return_value = self.nova_network
self.manager.manager.get.return_value = self.nova_response self.manager.manager.get.return_value = self.nova_response
self.manager.manager.create.return_value = self.nova_response self.manager.manager.create.return_value = self.nova_response