openstack
/
senlin
Code Issues Proposed changes

Merge "Treat return value of sdk function call as object"

This commit is contained in:
Jenkins 2015-08-20 01:20:22 +00:00 committed by Gerrit Code Review
parent 3c5284f22f 12262ddb87
commit 140f9fa9e5
2 changed files with 30 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -85,7 +85,7 @@ class LoadBalancerDriver(base.DriverBase):
result = {}
# Create loadblancer
subnet = self.nc().subnet_get(vip['subnet'])
subnet_id = subnet['id']
subnet_id = subnet.id
lb = self.nc().loadbalancer_create(subnet_id,
vip.get('address', None),
vip['admin_state_up'])
@ -166,9 +166,9 @@ class LoadBalancerDriver(base.DriverBase):
return None
subnet_obj = self.nc().subnet_get(subnet)
net_id = subnet_obj['network_id']
net_id = subnet_obj.network_id
net = self.nc().network_get(net_id)
net_name = net['name']
net_name = net.name
if net_name not in addresses:
LOG.error(_LE('Node is not in subnet %(subnet)s'),
@ -177,7 +177,7 @@ class LoadBalancerDriver(base.DriverBase):
address = addresses[net_name]
member = self.nc().pool_member_create(pool_id, address, port,
subnet_obj['id'])
subnet_obj.id)
self._wait_for_lb_ready(lb_id)
return member.id

38
senlin/tests/unit/driver/test_lbaas_driver.py
View File

@ -109,8 +109,10 @@ class TestNeutronLBaaSDriver(base.SenlinTestCase):
lb_obj.id = 'LB_ID'
listener_obj.id = 'LISTENER_ID'
pool_obj.id = 'POOL_ID'
subnet_obj = {'name': 'subnet1', 'id': 'SUBNET_ID',
'network_id': 'NETWORK_ID'}
subnet_obj = mock.Mock()
subnet_obj.name = 'subnet1'
subnet_obj.id = 'SUBNET_ID'
subnet_obj.network_id = 'NETWORK_ID'
self.nc.loadbalancer_create.return_value = lb_obj
self.nc.listener_create.return_value = listener_obj
@ -142,8 +144,10 @@ class TestNeutronLBaaSDriver(base.SenlinTestCase):
def test_lb_create_loadbalancer_creation_failed(self):
lb_obj = mock.Mock()
lb_obj.id = 'LB_ID'
subnet_obj = {'name': 'subnet1', 'id': 'SUBNET_ID',
'network_id': 'NETWORK_ID'}
subnet_obj = mock.Mock()
subnet_obj.name = 'subnet1'
subnet_obj.id = 'SUBNET_ID'
subnet_obj.network_id = 'NETWORK_ID'
self.nc.loadbalancer_create.return_value = lb_obj
self.nc.subnet_get.return_value = subnet_obj
@ -167,8 +171,10 @@ class TestNeutronLBaaSDriver(base.SenlinTestCase):
listener_obj = mock.Mock()
lb_obj.id = 'LB_ID'
listener_obj.id = 'LISTENER_ID'
subnet_obj = {'name': 'subnet1', 'id': 'SUBNET_ID',
'network_id': 'NETWORK_ID'}
subnet_obj = mock.Mock()
subnet_obj.name = 'subnet1'
subnet_obj.id = 'SUBNET_ID'
subnet_obj.network_id = 'NETWORK_ID'
self.lb_driver._wait_for_lb_ready = mock.Mock()
self.lb_driver._wait_for_lb_ready.side_effect = [True, False]
@ -197,8 +203,10 @@ class TestNeutronLBaaSDriver(base.SenlinTestCase):
lb_obj.id = 'LB_ID'
listener_obj.id = 'LISTENER_ID'
pool_obj.id = 'POOL_ID'
subnet_obj = {'name': 'subnet1', 'id': 'SUBNET_ID',
'network_id': 'NETWORK_ID'}
subnet_obj = mock.Mock()
subnet_obj.name = 'subnet1'
subnet_obj.id = 'SUBNET_ID'
subnet_obj.network_id = 'NETWORK_ID'
self.lb_driver._wait_for_lb_ready = mock.Mock()
self.lb_driver._wait_for_lb_ready.side_effect = [True, True, False]
@ -314,9 +322,13 @@ class TestNeutronLBaaSDriver(base.SenlinTestCase):
pool_id = 'POOL_ID'
port = '80'
subnet = 'subnet1'
subnet_obj = {'name': 'subnet1', 'id': 'SUBNET_ID',
'network_id': 'NETWORK_ID'}
network_obj = {'name': 'network1', 'id': 'NETWORK_ID'}
subnet_obj = mock.Mock()
subnet_obj.name = 'subnet1'
subnet_obj.id = 'SUBNET_ID'
subnet_obj.network_id = 'NETWORK_ID'
network_obj = mock.Mock()
network_obj.name = 'network1'
network_obj.id = 'NETWORK_ID'
addresses = {'network1': 'ipaddr_net1', 'network2': 'ipaddr_net2'}
member = mock.Mock()
member.id = 'MEMBER_ID'
@ -358,7 +370,9 @@ class TestNeutronLBaaSDriver(base.SenlinTestCase):
pool_id = 'POOL_ID'
port = '80'
subnet = 'subnet1'
network_obj = {'name': 'network3', 'id': 'NETWORK_ID'}
network_obj = mock.Mock()
network_obj.name = 'network3'
network_obj.id = 'NETWORK_ID'
addresses = {'network1': 'ipaddr_net1', 'network2': 'ipaddr_net2'}
self.nc.network_get.return_value = network_obj