openstack
/
neutron-lbaas
Code Issues Proposed changes

Add openstack tenant id to back-end server call 

This patch adds LB tenant id to the back-end server rest call.
Unit tests updated as well.

Change-Id: I0307e39ef203161b5dcb0fbde1245132a19f20f4
Closes-Bug: 1634866
This commit is contained in:
Evgeny Fedoruk 2016-10-20 01:17:33 -07:00
parent 1f8e9de591
commit ae37c67dcc
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
neutron_lbaas/drivers/radware/v2_driver.py
View File

@ -213,7 +213,8 @@ class RadwareLBaaSV2Driver(base_v2_driver.RadwareLBaaSBaseV2Driver):
_rest_wrapper(self.rest_client.call(
'POST', tmpl_resource,
{'parameters': dict(self.workflow_params,
service_params=service)},
service_params=service),
'tenants': [lb.tenant_id]},
TEMPLATE_HEADER))
@log_helpers.log_method_call

4
neutron_lbaas/tests/unit/drivers/radware/test_v2_plugin_driver.py
View File

@ -124,7 +124,7 @@ WF_CREATE_PARAMS = {'parameters':
"ha_ip_pool_name": "default", "allocate_ha_vrrp": True,
"allocate_ha_ips": True, "data_port": 1,
"data_ip_address": "192.168.200.99", "data_ip_mask": "255.255.255.0",
"gateway": "192.168.200.1", "ha_port": 2}}
"gateway": "192.168.200.1", "ha_port": 2}, 'tenants': "_REPLACE_"}
WF_APPLY_PARAMS = {
'parameters': {'listeners': [], 'pools': [], 'admin_state_up': True,
@ -510,6 +510,7 @@ class TestLBaaSDriver(TestLBaaSDriverBase):
self.wf_srv_params = copy.deepcopy(WF_SRV_PARAMS)
self.wf_create_params = copy.deepcopy(WF_CREATE_PARAMS)
self.wf_create_params['tenants'] = [self._tenant_id]
self.wf_apply_params = copy.deepcopy(WF_APPLY_PARAMS)
self.addCleanup(self.driver.completion_handler.join)
@ -946,6 +947,7 @@ class TestLBaaSDriverDebugOptions(TestLBaaSDriverBase):
wf_srv_params['primary']['network'][
'portgroups'] = [s['subnet'][
'network_id']]
wf_params['tenants'] = [self._tenant_id]
wf_params['parameters']['service_params'] = (
wf_srv_params)
wf_params['parameters']['configure_l3'] = False