From 738dacf1d511843a693f59d67299548a782600bc Mon Sep 17 00:00:00 2001 From: Adit Sarfaty Date: Mon, 16 Sep 2019 10:42:41 +0300 Subject: [PATCH] Bump openstackclient & osc-lib version And update the UT to reflect the change in commit I9878f327e39f56852cc0fb6e4eee9105b7141da9 Change-Id: I02f1ab663eb60f9b19bede0714cc6200582c39ee --- lower-constraints.txt | 4 ++-- requirements.txt | 4 ++-- vmware_nsx/tests/unit/osc/v2/test_port.py | 10 +++++----- vmware_nsx/tests/unit/osc/v2/test_router.py | 2 +- vmware_nsx/tests/unit/osc/v2/test_security_group.py | 4 ++-- vmware_nsx/tests/unit/osc/v2/test_subnet.py | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/lower-constraints.txt b/lower-constraints.txt index 6318e896e6..bd4eb624be 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -24,13 +24,13 @@ oslo.service==1.31.0 oslo.utils==3.33.0 oslo.vmware==2.17.0 oslotest==3.2.0 -osc-lib==1.10.0 +osc-lib==1.14.0 pbr==4.0.0 prettytable==0.7.2 psycopg2==2.7 PyMySQL==0.7.6 pylint==1.7.1 -python-openstackclient==3.16.0 +python-openstackclient==4.0.0 reno==2.5.0 requests==2.14.2 six==1.11.0 diff --git a/requirements.txt b/requirements.txt index a422e85fce..a6362e0b7d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,9 +12,9 @@ SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.2.0 # MIT six>=1.11.0 # MIT stevedore>=1.20.0 # Apache-2.0 neutron-lib>=1.28.0 # Apache-2.0 -osc-lib>=1.10.0 # Apache-2.0 +osc-lib>=1.14.0 # Apache-2.0 octavia-lib>=1.3.1 # Apache-2.0 -python-openstackclient>=3.16.0 # Apache-2.0 +python-openstackclient>=4.0.0 # Apache-2.0 oslo.concurrency>=3.26.0 # Apache-2.0 oslo.context>=2.19.2 # Apache-2.0 oslo.config>=5.2.0 # Apache-2.0 diff --git a/vmware_nsx/tests/unit/osc/v2/test_port.py b/vmware_nsx/tests/unit/osc/v2/test_port.py index e94af84fc4..0a835678f3 100644 --- a/vmware_nsx/tests/unit/osc/v2/test_port.py +++ b/vmware_nsx/tests/unit/osc/v2/test_port.py @@ -73,7 +73,7 @@ class TestCreatePort(test_port.TestCreatePort): ref_columns, ref_data = self._get_common_cols_data(self._port) self.assertEqual(ref_columns, columns) - self.assertEqual(ref_data, data) + self.assertItemEqual(ref_data, data) def _test_create_with_vnix_index(self, val, is_valid=True): self._test_create_with_arg_and_val('vnic_index', val, is_valid) @@ -112,7 +112,7 @@ class TestCreatePort(test_port.TestCreatePort): ref_columns, ref_data = self._get_common_cols_data(self._port) self.assertEqual(ref_columns, columns) - self.assertEqual(ref_data, data) + self.assertItemEqual(ref_data, data) def test_create_with_provider_security_groups(self): # create a port with few provider security groups @@ -144,7 +144,7 @@ class TestCreatePort(test_port.TestCreatePort): ref_columns, ref_data = self._get_common_cols_data(self._port) self.assertEqual(ref_columns, columns) - self.assertEqual(ref_data, data) + self.assertItemEqual(ref_data, data) def test_create_with_provider_security_group_by_name(self): # create a port with 1 provider security group @@ -174,7 +174,7 @@ class TestCreatePort(test_port.TestCreatePort): ref_columns, ref_data = self._get_common_cols_data(self._port) self.assertEqual(ref_columns, columns) - self.assertEqual(ref_data, data) + self.assertItemEqual(ref_data, data) def _test_create_with_flag_arg( self, arg_name, validate_name, validate_val): @@ -204,7 +204,7 @@ class TestCreatePort(test_port.TestCreatePort): ref_columns, ref_data = self._get_common_cols_data(self._port) self.assertEqual(ref_columns, columns) - self.assertEqual(ref_data, data) + self.assertItemEqual(ref_data, data) def test_create_with_mac_learning(self): self._test_create_with_flag_arg( diff --git a/vmware_nsx/tests/unit/osc/v2/test_router.py b/vmware_nsx/tests/unit/osc/v2/test_router.py index de0619d78c..7974230fa9 100644 --- a/vmware_nsx/tests/unit/osc/v2/test_router.py +++ b/vmware_nsx/tests/unit/osc/v2/test_router.py @@ -66,7 +66,7 @@ class TestCreateRouter(test_router.TestCreateRouter): }) self.assertEqual(self.columns, columns) - self.assertEqual(self.data, data) + self.assertItemEqual(self.data, data) def _test_create_with_size(self, size, is_valid=True): self._test_create_with_arg_and_val('router_size', size, is_valid) diff --git a/vmware_nsx/tests/unit/osc/v2/test_security_group.py b/vmware_nsx/tests/unit/osc/v2/test_security_group.py index c74533c815..e07c56b02a 100644 --- a/vmware_nsx/tests/unit/osc/v2/test_security_group.py +++ b/vmware_nsx/tests/unit/osc/v2/test_security_group.py @@ -71,7 +71,7 @@ class TestCreateSecurityGroup( validate_name: validate_val, }) self.assertEqual(self.columns, columns) - self.assertEqual(self.data, data) + self.assertItemEqual(self.data, data) def test_create_with_logging(self): self._test_create_with_flag_arg('logging', 'logging', True) @@ -108,7 +108,7 @@ class TestCreateSecurityGroup( arg_name: arg_val, }) self.assertEqual(self.columns, columns) - self.assertEqual(self.data, data) + self.assertItemEqual(self.data, data) def test_create_with_policy(self): self._test_create_with_arg_val('policy', 'policy-1') diff --git a/vmware_nsx/tests/unit/osc/v2/test_subnet.py b/vmware_nsx/tests/unit/osc/v2/test_subnet.py index 77e625bb96..f49b18df4e 100644 --- a/vmware_nsx/tests/unit/osc/v2/test_subnet.py +++ b/vmware_nsx/tests/unit/osc/v2/test_subnet.py @@ -72,7 +72,7 @@ class TestCreateSubnet(test_subnet.TestCreateSubnet): }) self.assertEqual(self.columns, columns) - self.assertEqual(self.data, data) + self.assertItemEqual(self.data, data) def _test_create_with_tag(self, add_tags=True): self.skipTest('Unblock gate')