Merge "Start using octavia-lib"

lower-constraints.txt

@@ -51,7 +51,7 @@ munch==2.1.0
 netaddr==0.7.18
 netifaces==0.10.4
 neutron-lib==1.25.0
-octavia==3.0.0
+octavia-lib==1.1.1 # Apache-2.0
 openstackdocstheme==1.18.1
 os-client-config==1.28.0
 os-service-types==1.2.0
@@ -70,7 +70,7 @@ oslo.policy==1.30.0
 oslo.privsep==1.32.0
 oslo.reports==1.18.0
 oslo.rootwrap==5.8.0
-oslo.serialization==2.18.0
+oslo.serialization==2.28.1
 oslo.service==1.31.0
 oslo.utils==3.33.0
 oslo.versionedobjects==1.31.2

requirements.txt

@@ -12,6 +12,7 @@ six>=1.10.0 # MIT
 stevedore>=1.20.0 # Apache-2.0
 neutron-lib>=1.25.0 # Apache-2.0
 osc-lib>=1.10.0 # Apache-2.0
+octavia-lib>=1.1.1 # Apache-2.0
 python-openstackclient>=3.16.0 # Apache-2.0
 oslo.concurrency>=3.26.0 # Apache-2.0
 oslo.context>=2.19.2 # Apache-2.0
@@ -19,7 +20,7 @@ oslo.config>=5.2.0 # Apache-2.0
 oslo.db>=4.37.0 # Apache-2.0
 oslo.i18n>=3.15.3 # Apache-2.0
 oslo.log>=3.36.0 # Apache-2.0
-oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0
+oslo.serialization>=2.28.1 # Apache-2.0
 oslo.service>=1.31.0 # Apache-2.0
 oslo.utils>=3.33.0 # Apache-2.0
 oslo.vmware>=2.17.0 # Apache-2.0
@@ -38,7 +39,7 @@ neutron-fwaas>=12.0.0 # Apache-2.0
 neutron-vpnaas>=12.0.0 # Apache-2.0
 neutron-dynamic-routing>=12.0.0 # Apache-2.0
 vmware-nsxlib>=12.0.0 # Apache-2.0
-#octavia>=3.0.0 # Apache-2.0
+
 
 # The comment below indicates this project repo is current with neutron-lib
 # and should receive neutron-lib consumption patches as they are released

vmware_nsx/services/lbaas/octavia/octavia_driver.py

@@ -24,12 +24,12 @@ from oslo_messaging.rpc import dispatcher
 import pecan
 from stevedore import driver as stevedore_driver
 
-from octavia.api.drivers import driver_lib
-from octavia.api.drivers import exceptions
-from octavia.api.drivers import provider_base as driver_base
 from octavia.api.drivers import utils as oct_utils
 from octavia.db import api as db_apis
 from octavia.db import repositories
+from octavia_lib.api.drivers import driver_lib
+from octavia_lib.api.drivers import exceptions
+from octavia_lib.api.drivers import provider_base as driver_base
 
 from vmware_nsx.services.lbaas.octavia import constants as d_const
 

vmware_nsx/tests/unit/services/lbaas/test_octavia_driver.py

@@ -19,13 +19,14 @@ import testtools
 
 from oslo_utils import uuidutils
 
+from octavia_lib.api.drivers import data_models
+
 code_ok = True
 # Skip duplications between Octavia & Neutron configurations and missing
 # configuration groups
 with mock.patch('oslo_config.cfg.ConfigOpts.import_group'),\
     mock.patch('oslo_config.cfg.ConfigOpts.__getattr__'):
     try:
-        from octavia.api.drivers import data_models
         from vmware_nsx.services.lbaas.octavia import octavia_driver as driver
     except ImportError:
         # Octavia code not found