Switch to new oslo library names

Change-Id: Icea55acb2b7ff8bc3374791ac5f030fb17b4a066
stable/ocata
armando-migliaccio 2015-07-06 23:10:46 -07:00
parent b236055be1
commit d4f5606c0e
15 changed files with 27 additions and 18 deletions

View File

@ -19,7 +19,7 @@ from alembic import context
from neutron.db import model_base
from oslo.config import cfg
from oslo_config import cfg
from oslo_db.sqlalchemy import session
import sqlalchemy as sa
from sqlalchemy import event

View File

@ -17,7 +17,7 @@
from neutronclient.common import utils
from neutronclient.i18n import _
from neutronclient.neutron import v2_0 as l2gatewayV20
from oslo.serialization import jsonutils
from oslo_serialization import jsonutils
L2_GW = 'l2_gateway'
INTERFACE_DELIMITER = ";"

View File

@ -17,6 +17,7 @@
"""
Command-line interface to the L2gateway APIs
"""
from __future__ import print_function
import sys
@ -25,7 +26,7 @@ from cliff import commandmanager
from neutronclient.common import clientmanager
from neutronclient.common import exceptions as exc
from neutronclient import shell as neutronshell
from oslo.utils import encodeutils
from oslo_utils import encodeutils
from networking_l2gw.l2gatewayclient.l2gateway.v2_0 import l2gateway
from networking_l2gw.l2gatewayclient.l2gateway.v2_0 import l2gateway_connection

View File

@ -12,13 +12,14 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
import copy
import socket
import ssl
import time
from oslo.serialization import jsonutils
from oslo_log import log as logging
from oslo_serialization import jsonutils
from oslo_utils import excutils
from neutron.i18n import _LE

View File

@ -12,14 +12,15 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
import random
import eventlet
from neutron.i18n import _LE
from oslo.serialization import jsonutils
from oslo_log import log as logging
from oslo_serialization import jsonutils
from oslo_utils import excutils
from networking_l2gw.services.l2gateway.agent.ovsdb import base_connection

View File

@ -12,11 +12,12 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
import random
import socket
from oslo.serialization import jsonutils
from oslo_log import log as logging
from oslo_serialization import jsonutils
from oslo_utils import excutils
from neutron.i18n import _LE

View File

@ -11,7 +11,7 @@
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.from oslo.config import cfg
# under the License.
import random

View File

@ -15,7 +15,7 @@
from neutron.common import config
from oslo.config import cfg
from oslo_config import cfg
from oslo_log import log as logging
LOG = logging.getLogger(__name__)

View File

@ -26,8 +26,8 @@ from networking_l2gw.services.l2gateway.common import topics
from networking_l2gw.services.l2gateway import exceptions as l2gw_exc
from networking_l2gw.services.l2gateway import plugin as l2gw_plugin
from oslo.config import cfg
from oslo import messaging
from oslo_config import cfg
from oslo_log import log as logging
LOG = logging.getLogger(__name__)

View File

@ -11,7 +11,8 @@
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.from oslo.config import cfg
# under the License.
from neutron.common import constants as n_const
from neutron.common import exceptions
from neutron.common import rpc as n_rpc
@ -30,8 +31,8 @@ from networking_l2gw.services.l2gateway.common import ovsdb_schema
from networking_l2gw.services.l2gateway.common import topics
from networking_l2gw.services.l2gateway import exceptions as l2gw_exc
from oslo.config import cfg
from oslo import messaging
from oslo_config import cfg
from oslo_log import log as logging
from oslo_utils import importutils

View File

@ -12,6 +12,7 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
import mock
from neutron.callbacks import events
@ -24,8 +25,8 @@ from networking_l2gw.db.l2gateway import l2gateway_db
from networking_l2gw.services.l2gateway.common import constants
from networking_l2gw.services.l2gateway import exceptions
from oslo.utils import importutils
from oslo_log import log as logging
from oslo_utils import importutils
DB_PLUGIN_KLASS = 'neutron.db.db_base_plugin_v2.NeutronDbPluginV2'
LOG = logging.getLogger(__name__)

View File

@ -12,6 +12,7 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
import contextlib
import socket
import ssl
@ -25,7 +26,7 @@ from networking_l2gw.services.l2gateway.agent import l2gateway_config as conf
from networking_l2gw.services.l2gateway.agent.ovsdb import base_connection
from networking_l2gw.services.l2gateway.common import config
from oslo.config import cfg
from oslo_config import cfg
from oslo_log import log as logging
LOG = logging.getLogger(__name__)

View File

@ -12,6 +12,7 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
import contextlib
import socket
import ssl
@ -32,9 +33,9 @@ from networking_l2gw.services.l2gateway import exceptions
from networking_l2gw.tests.unit.services.l2gateway.agent.ovsdb import (
test_base_connection as base_test)
from oslo.config import cfg
from oslo.serialization import jsonutils
from oslo_config import cfg
from oslo_log import log as logging
from oslo_serialization import jsonutils
LOG = logging.getLogger(__name__)

View File

@ -12,6 +12,7 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
import contextlib
import random
import socket
@ -32,9 +33,9 @@ from networking_l2gw.services.l2gateway import exceptions
from networking_l2gw.tests.unit.services.l2gateway.agent.ovsdb import (
test_base_connection as base_test)
from oslo.config import cfg
from oslo.serialization import jsonutils
from oslo_config import cfg
from oslo_log import log as logging
from oslo_serialization import jsonutils
LOG = logging.getLogger(__name__)

View File

@ -20,7 +20,7 @@ import mock
from neutron.common import config as common_config
from neutron.tests import base
from oslo.config import cfg
from oslo_config import cfg
from networking_l2gw.services.l2gateway.common import config
from networking_l2gw.services.l2gateway import l2gw_agent as agent