openstack
/
dragonflow
Code Issues Proposed changes

Re-add a test that was removed from the gate 

In some cases the dragonflow-dsvm-fullstack-etcd-zmq failed on the
test_reconnect_of_controller check. This was because we did not allow
sufficient time for the controller to reconnect if the host was very
busy and/or the VM was slow.
Allowing double the time resolved the issue.

Change-Id: Ia9bd70f2cf680e24d0bc02bdfa2aa615fea4b440
Closes-Bug: #1737889
This commit is contained in:
Shachar Snapiri 2017-12-13 10:05:19 +02:00
parent 6a06bbe1f6
commit 3079462810
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dragonflow/tests/fullstack/test_apps.py
View File

@ -39,6 +39,8 @@ from dragonflow.tests.fullstack import test_objects as objects
LOG = log.getLogger(__name__)
_CONTROLLER_RECONNECT_TIMEOUT = 10
def _get_port_mac_and_ip(port, force_addr_pairs=False):
port_lport = port.port.get_logical_port()
@ -920,7 +922,6 @@ class TestL3App(test_base.DFTestBase):
def test_icmp_other_router_interface(self):
self._test_icmp_address('192.168.13.1')
@testtools.skip("bug/1737889")
def test_reconnect_of_controller(self):
cmd = ["ovs-vsctl", "get-controller", cfg.CONF.df.integration_bridge]
controller = utils.execute(cmd, run_as_root=True).strip()
@ -959,7 +960,7 @@ class TestL3App(test_base.DFTestBase):
cmd[1] = "set-controller"
cmd.append(controller)
utils.execute(cmd, run_as_root=True)
time.sleep(const.DEFAULT_CMD_TIMEOUT)
time.sleep(_CONTROLLER_RECONNECT_TIMEOUT)
self._test_icmp_address(dst_ip)
def _create_icmp_test_port_policies(self, icmp_filter):