Browse Source

Use get_writer_session from neutron-lib

In addition, requirements needs to be updated.
Both changes are dependent on each other.

Change-Id: I3bcb854705737d131de63a36609b95095f005317
Stephen Ma 8 months ago
parent
commit
84a78c3e81

+ 2
- 2
lower-constraints.txt View File

@@ -52,8 +52,8 @@ msgpack==0.5.6
52 52
 munch==2.2.0
53 53
 netaddr==0.7.19
54 54
 netifaces==0.10.6
55
-neutron-lib==1.13.0
56
-neutron==12.0.0
55
+neutron-lib==1.18.0
56
+neutron==13.0.0.0b3
57 57
 openstacksdk==0.12.0
58 58
 os-client-config==1.29.0
59 59
 os-service-types==1.2.0

+ 1
- 1
networking_vsphere/db/ovsvapp_db.py View File

@@ -16,8 +16,8 @@
16 16
 from oslo_log import log
17 17
 import sqlalchemy.orm.exc as sa_exc
18 18
 
19
-from neutron.db import api as db_api
20 19
 from neutron.db import common_db_mixin
20
+from neutron_lib.db import api as db_api
21 21
 from neutron_lib import exceptions as exc
22 22
 
23 23
 from networking_vsphere._i18n import _, _LE, _LI, _LW

+ 2
- 1
networking_vsphere/tests/unit/extensions/test_ovsvapp_mitigated_cluster_resource.py View File

@@ -14,11 +14,12 @@
14 14
 #    under the License.
15 15
 
16 16
 
17
-from neutron.db import api as db_api
18 17
 from neutron.tests.unit import testlib_api
19 18
 from neutron_lib import context
19
+from neutron_lib.db import api as db_api
20 20
 from neutron_lib import exceptions as exc
21 21
 
22
+
22 23
 from networking_vsphere.db import ovsvapp_db
23 24
 from networking_vsphere.db import ovsvapp_models
24 25
 

+ 1
- 1
networking_vsphere/tests/unit/ml2/test_dvs_mechanism_driver.py View File

@@ -45,7 +45,7 @@ class VMwareDVSMechanismDriverTestCase(base.BaseTestCase):
45 45
         self.dvs_notifier = mock.Mock()
46 46
         self.driver.network_map = {'physnet1': mock.Mock()}
47 47
 
48
-    @mock.patch('neutron.db.api.get_writer_session')
48
+    @mock.patch('neutron_lib.db.api.get_writer_session')
49 49
     @mock.patch('networking_vsphere.utils.dvs_util.'
50 50
                 'create_network_map_from_config', return_value='network_map')
51 51
     def test_initialize(self, create_network_map_from_config, get_session):

+ 1
- 1
networking_vsphere/utils/db.py View File

@@ -13,8 +13,8 @@
13 13
 #    License for the specific language governing permissions and limitations
14 14
 #    under the License.
15 15
 
16
-from neutron.db import api as db_api
17 16
 from neutron.db.models import agent as agents_db
17
+from neutron_lib.db import api as db_api
18 18
 
19 19
 from networking_vsphere.common import constants
20 20
 

+ 2
- 2
requirements.txt View File

@@ -4,8 +4,8 @@
4 4
 
5 5
 pbr!=2.1.0,>=2.0.0 # Apache-2.0
6 6
 Babel!=2.4.0,>=2.3.4 # BSD
7
-neutron-lib>=1.13.0 # Apache-2.0
8
-neutron>=12.0.0 # Apache-2.0
7
+neutron-lib>=1.18.0 # Apache-2.0
8
+neutron>=13.0.0.0b3 # Apache-2.0
9 9
 oslo.vmware>=2.17.0 # Apache-2.0
10 10
 ovsdbapp>=0.10.0 # Apache-2.0
11 11
 

Loading…
Cancel
Save