From 094df9e2e5e4bb1b4d927a36adcf309a4d3659eb Mon Sep 17 00:00:00 2001 From: Omer Anson Date: Tue, 13 Feb 2018 16:47:54 +0200 Subject: [PATCH] Revert "Temporarily remove failing unit test" This reverts commit c7fcf45b99577b3b7c0f3e8515ff6619943321f9. The requirements and lower-constraints were updated to use the libraries that fix the issue that caused us to exclude this test. Change-Id: I07dd917f2dcb23ee43056086762bd9e828ec2310 --- dragonflow/tests/unit/test_mech_driver.py | 1 + lower-constraints.txt | 4 ++-- requirements.txt | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dragonflow/tests/unit/test_mech_driver.py b/dragonflow/tests/unit/test_mech_driver.py index 56f2e4a3c..a90ea923c 100644 --- a/dragonflow/tests/unit/test_mech_driver.py +++ b/dragonflow/tests/unit/test_mech_driver.py @@ -374,6 +374,7 @@ class TestDFMechDriver(DFMechanismDriverTestCase): self.nb_api.update.assert_called_once() lport = self.nb_api.update.call_args_list[0][0][0] self.assertIsInstance(lport, l2.LogicalPort) + self.assertEqual(port['revision_number'], lport.version) def test_delete_network(self): network, _lswitch = self._test_create_network_revision() diff --git a/lower-constraints.txt b/lower-constraints.txt index c143db4e6..5d18e6f38 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -63,7 +63,7 @@ munch==2.2.0 netaddr==0.7.18 netifaces==0.10.6 neutron-lib==1.18.0 -neutron==13.0.0.0b1 +neutron==13.0.0.0b2 openstackdocstheme==1.18.1 openstacksdk==0.13.0 os-client-config==1.29.0 @@ -138,7 +138,7 @@ snowballstemmer==1.2.1 Sphinx==1.6.5 sphinxcontrib-websupport==1.0.1 sqlalchemy-migrate==0.11.0 -SQLAlchemy==1.0.10 +SQLAlchemy==1.2.0 sqlparse==0.2.4 statsd==3.2.2 stestr==2.0.0 diff --git a/requirements.txt b/requirements.txt index f242bb9bf..332de124a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,7 +10,7 @@ kazoo>=2.2 # Apache-2.0 ovs>=2.8.0 # Apache-2.0 pyzmq>=14.3.1 # LGPL+BSD ryu>=4.24 # Apache-2.0 -SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.0.10 # MIT +SQLAlchemy>=1.2.0 # MIT alembic>=0.8.10 # MIT neutron-lib>=1.18.0 # Apache-2.0 oslo.config>=5.2.0 # Apache-2.0