from neutron.common import constants
from neutron.db import agents_db
-from neutron.db.agentschedulers_db import AgentSchedulerDbMixin
+from neutron.db import agentschedulers_db
from neutron.db import model_base
from neutron.db import models_v2
from neutron.extensions import l3agentscheduler
class L3AgentSchedulerDbMixin(l3agentscheduler.L3AgentSchedulerPluginBase,
- AgentSchedulerDbMixin):
+ agentschedulers_db.AgentSchedulerDbMixin):
"""Mixin class to add l3 agent scheduler extension to plugins
using the l3 agent for routing.
"""
return [l3_agent
for l3_agent in query
- if AgentSchedulerDbMixin.is_eligible_agent(active, l3_agent)]
+ if agentschedulers_db.AgentSchedulerDbMixin.is_eligible_agent(
+ active, l3_agent)]
def get_l3_agent_candidates(self, sync_router, l3_agents):
"""Get the valid l3 agents for the router from a list of l3_agents."""
from neutron.db import models_v2
from neutron.db import servicetype_db as st_db
from neutron.extensions import loadbalancer
-from neutron.extensions.loadbalancer import LoadBalancerPluginBase
from neutron import manager
from neutron.openstack.common.db import exception
from neutron.openstack.common import excutils
primary_key=True)
-class LoadBalancerPluginDb(LoadBalancerPluginBase,
+class LoadBalancerPluginDb(loadbalancer.LoadBalancerPluginBase,
base_db.CommonDbMixin):
"""Wraps loadbalancer with SQLAlchemy models.
#
# @author: Mark McClain, DreamHost
-from logging.config import fileConfig
+from logging import config as logging_config
from alembic import context
from sqlalchemy import create_engine, pool
# Interpret the config file for Python logging.
# This line sets up loggers basically.
-fileConfig(config.config_file_name)
+logging_config.fileConfig(config.config_file_name)
plugin_class_path = neutron_config.core_plugin
active_plugins = [plugin_class_path]
# License for the specific language governing permissions and limitations
# under the License.
-from six.moves import xrange
+from six import moves
import sqlalchemy
from sqlalchemy.orm.properties import RelationshipProperty
criteria_list = []
for i, sort in enumerate(sorts):
crit_attrs = [(getattr(model, sorts[j][0]) == marker_values[j])
- for j in xrange(i)]
+ for j in moves.xrange(i)]
model_attr = getattr(model, sort[0])
if sort[1]:
crit_attrs.append((model_attr > marker_values[i]))
from neutron.db import model_base
from neutron.db import models_v2
from neutron.extensions import vpnaas
-from neutron.extensions.vpnaas import VPNPluginBase
from neutron import manager
from neutron.openstack.common import excutils
from neutron.openstack.common import log as logging
cascade="all, delete-orphan")
-class VPNPluginDb(VPNPluginBase, base_db.CommonDbMixin):
+class VPNPluginDb(vpnaas.VPNPluginBase, base_db.CommonDbMixin):
"""VPN plugin database class using SQLAlchemy models."""
def __init__(self):
from neutron.openstack.common import log as logging
from neutron.openstack.common import loopingcall
from neutron.openstack.common.rpc import service
-from neutron.openstack.common.service import ProcessLauncher
+from neutron.openstack.common import service as common_service
from neutron import wsgi
rpc.start()
return rpc
else:
- launcher = ProcessLauncher(wait_interval=1.0)
+ launcher = common_service.ProcessLauncher(wait_interval=1.0)
launcher.launch_service(rpc, workers=cfg.CONF.rpc_workers)
return launcher
except Exception:
#
# @author: Ivar Lazzaro, Embrane, Inc. ivar@embrane.com
-from functools import wraps
+import functools
from heleosapi import exceptions as h_exc
else:
handler[event].append(f)
- @wraps(f)
+ @functools.wraps(f)
def wrapped_f(*args, **kwargs):
return f(*args, **kwargs)
import sqlalchemy as sql
-from neutron.db.models_v2 import model_base
+from neutron.db import model_base
class PoolPort(model_base.BASEV2):
# @author: Mark McClain, DreamHost
import itertools
-from six.moves import xrange
+from six import moves
from neutron.agent.linux import utils
from neutron.plugins.common import constants as qconstants
continue
elif '-' in code:
low, hi = code.split('-')[:2]
- retval.update(str(i) for i in xrange(int(low), int(hi) + 1))
+ retval.update(str(i) for i in moves.xrange(int(low), int(hi) + 1))
else:
retval.add(code)
return retval
# @author: Paul Michali, Cisco Systems, Inc.
import abc
-from collections import namedtuple
+import collections
import requests
import netaddr
LOG = logging.getLogger(__name__)
-RollbackStep = namedtuple('RollbackStep', ['action', 'resource_id', 'title'])
+RollbackStep = collections.namedtuple('RollbackStep',
+ ['action', 'resource_id', 'title'])
class CsrResourceCreateFailure(exceptions.NeutronException):
server.stop()
server.wait()
- @mock.patch('neutron.wsgi.ProcessLauncher')
+ @mock.patch('neutron.openstack.common.service.ProcessLauncher')
def test_start_multiple_workers(self, ProcessLauncher):
launcher = ProcessLauncher.return_value
from neutron.openstack.common import gettextutils
from neutron.openstack.common import jsonutils
from neutron.openstack.common import log as logging
-from neutron.openstack.common.service import ProcessLauncher
+from neutron.openstack.common import service as common_service
socket_opts = [
cfg.IntOpt('backlog',
else:
# Minimize the cost of checking for child exit by extending the
# wait interval past the default of 0.01s.
- self._launcher = ProcessLauncher(wait_interval=1.0)
+ self._launcher = common_service.ProcessLauncher(wait_interval=1.0)
self._server = WorkerService(self, application)
self._launcher.launch_service(self._server, workers=workers)
Code Review / openstack-build / neutron-build.git / commitdiff