F5 P/O agent code change for Openstack Queens lbaasv2 #1405
Conversation
1. change code for Openstack Queens version 2. fix some old bugs (cherry picked from commit 9d56e48) Conflicts: f5_openstack_agent/lbaasv2/drivers/bigip/lbaas_builder.py
| @@ -126,9 +126,9 @@ def old_setup_vcmp_method_test(mock_mgmt_root, mock_driver, mock_host_obj): | |||
| def test___init__(setup_vcmp_mgr): | |||
| vcmp = setup_vcmp_mgr | |||
| assert vcmp.vcmp_hosts != [] | |||
| assert len(vcmp.vcmp_hosts) is 2 | |||
| assert len(vcmp.vcmp_hosts) == 2 | |||
There was a problem hiding this comment.
these are common places which IMO is irrelevant to queens_engineering. put them into a separate commit so that they are submitted into each branch we need?(e.g. 9.6 9.7 etc, if needed).
There was a problem hiding this comment.
I will do it, after I fix the loopback4 things, or you can help me a bit :D
| @@ -71,7 +71,7 @@ def main(): | |||
| """F5 LBaaS agent for OpenStack.""" | |||
| cfg.CONF.register_opts(OPTS) | |||
| cfg.CONF.register_opts(manager.OPTS) | |||
| cfg.CONF.register_opts(interface.OPTS) | |||
| cfg.CONF.register_opts(INTERFACE_OPTS) | |||
There was a problem hiding this comment.
this way seems to make it quite complicated. should probably Try this way: copy the content of INTERFACE_OPTS into this file , then this line can be always the same between each branch. each branch has the same and we dont have to consider queens differently.
There was a problem hiding this comment.
Frankly speaking, I think it would not be that necessary to duplicate code and change the dependency.
There was a problem hiding this comment.
in that way, we do not need a separate queens branch. we can still use our existing 9.8 branch for queens, as well as the original M N, O. thus, avoid many inconveniences for maintenance work.
| @@ -50,8 +50,8 @@ def read_json(self): | |||
| self.esdJSONDict.update(fileJSONDict) | |||
|
|
|||
| except ValueError as err: | |||
| LOG.error('ESD JSON File is invalid: %s', err) | |||
| raise f5_ex.esdJSONFileInvalidException() | |||
| LOG.error('ESD JSON File is invalid: %s', err) | |||
(cherry picked from commit 9d56e48)
Conflicts:
f5_openstack_agent/lbaasv2/drivers/bigip/lbaas_builder.py