openstack
/
neutron-lbaas
Code Issues Proposed changes

Merge "Do not send project_id to Octavia API on PUTs"

This commit is contained in:
Jenkins 2016-01-09 07:48:36 +00:00 committed by Gerrit Code Review
parent ce76339ce6 6d44f59c33
commit 3bd76bba2d
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
neutron_lbaas/drivers/octavia/driver.py
View File

@ -247,10 +247,10 @@ class ListenerManager(driver_base.BaseListenerManager):
'protocol_port': listener.protocol_port,
'connection_limit': listener.connection_limit,
'tls_certificate_id': listener.default_tls_container_id,
'sni_containers': sni_container_ids,
'project_id': listener.tenant_id
'sni_containers': sni_container_ids
}
if create:
args['project_id'] = listener.tenant_id
args['id'] = listener.id
write_func(url, args)
@ -286,8 +286,7 @@ class PoolManager(driver_base.BasePoolManager):
'description': pool.description,
'enabled': pool.admin_state_up,
'protocol': pool.protocol,
'lb_algorithm': pool.lb_algorithm,
'project_id': pool.tenant_id
'lb_algorithm': pool.lb_algorithm
}
if pool.session_persistence:
args['session_persistence'] = {
@ -295,6 +294,7 @@ class PoolManager(driver_base.BasePoolManager):
'cookie_name': pool.session_persistence.cookie_name,
}
if create:
args['project_id'] = pool.tenant_id
args['id'] = pool.id
write_func(url, args)
@ -362,7 +362,7 @@ class HealthMonitorManager(driver_base.BaseHealthMonitorManager):
return s
@classmethod
def _write(cls, write_func, url, hm):
def _write(cls, write_func, url, hm, create=True):
args = {
'type': hm.type,
'delay': hm.delay,
@ -372,9 +372,10 @@ class HealthMonitorManager(driver_base.BaseHealthMonitorManager):
'http_method': hm.http_method,
'url_path': hm.url_path,
'expected_codes': hm.expected_codes,
'enabled': hm.admin_state_up,
'project_id': hm.tenant_id
'enabled': hm.admin_state_up
}
if create:
args['project_id'] = hm.tenant_id
write_func(cls._url(hm), args)
@async_op
@ -383,7 +384,7 @@ class HealthMonitorManager(driver_base.BaseHealthMonitorManager):
@async_op
def update(self, context, old_hm, hm):
self._write(self.driver.req.put, self._url(hm), hm)
self._write(self.driver.req.put, self._url(hm), hm, create=False)
@async_op
def delete(self, context, hm):

3
neutron_lbaas/tests/unit/drivers/octavia/test_octavia_driver.py
View File

@ -160,6 +160,7 @@ class TestOctaviaDriver(BaseOctaviaDriverTest):
# Update listener test.
del args['id']
del args['project_id']
m.update(listener, listener, list_url_id, args)
# Delete listener.
@ -197,6 +198,7 @@ class TestOctaviaDriver(BaseOctaviaDriverTest):
# Test update pool.
del args['id']
del args['project_id']
m.update(pool, pool, pool_url_id, args)
# Test pool delete.
@ -269,6 +271,7 @@ class TestOctaviaDriver(BaseOctaviaDriverTest):
m.create(hm, hm_url, args)
# Test HM update
del args['project_id']
m.update(hm, hm, hm_url, args)
# Test HM delete