x/vmware-nsx
Code Issues Proposed changes

Merge "Start using octavia-lib"

Browse Source
This commit is contained in:
Zuul 2019-03-21 13:28:34 +00:00 committed by Gerrit Code Review
commit 0be608d8b0
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lower-constraints.txt
View File

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

5
requirements.txt
View File

@ -12,6 +12,7 @@ six>=1.10.0 # MIT
stevedore>=1.20.0 # Apache-2.0 stevedore>=1.20.0 # Apache-2.0
neutron-lib>=1.25.0 # Apache-2.0 neutron-lib>=1.25.0 # Apache-2.0
osc-lib>=1.10.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 python-openstackclient>=3.16.0 # Apache-2.0
oslo.concurrency>=3.26.0 # Apache-2.0 oslo.concurrency>=3.26.0 # Apache-2.0
oslo.context>=2.19.2 # 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.db>=4.37.0 # Apache-2.0
oslo.i18n>=3.15.3 # Apache-2.0 oslo.i18n>=3.15.3 # Apache-2.0
oslo.log>=3.36.0 # 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.service>=1.31.0 # Apache-2.0
oslo.utils>=3.33.0 # Apache-2.0 oslo.utils>=3.33.0 # Apache-2.0
oslo.vmware>=2.17.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-vpnaas>=12.0.0 # Apache-2.0
neutron-dynamic-routing>=12.0.0 # Apache-2.0 neutron-dynamic-routing>=12.0.0 # Apache-2.0
vmware-nsxlib>=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 # The comment below indicates this project repo is current with neutron-lib
# and should receive neutron-lib consumption patches as they are released # and should receive neutron-lib consumption patches as they are released

6
vmware_nsx/services/lbaas/octavia/octavia_driver.py
View File

@ -24,12 +24,12 @@ from oslo_messaging.rpc import dispatcher
import pecan import pecan
from stevedore import driver as stevedore_driver 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.api.drivers import utils as oct_utils
from octavia.db import api as db_apis from octavia.db import api as db_apis
from octavia.db import repositories 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 from vmware_nsx.services.lbaas.octavia import constants as d_const

3
vmware_nsx/tests/unit/services/lbaas/test_octavia_driver.py
View File

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