Drop use of 'oslo' namespace package
The Oslo libraries have moved all of their code out of the 'oslo' namespace package into per-library packages. The namespace package was retained during kilo for backwards compatibility, but will be removed by the liberty-2 milestone. This change removes the use of the namespace package, replacing it with the new package names. The patches in the libraries will be put on hold until application patches have landed, or L2, whichever comes first. At that point, new versions of the libraries without namespace packages will be released as a major version update. Please merge this patch, or an equivalent, before L2 to avoid problems with those library releases. Blueprint: remove-namespace-packages https://blueprints.launchpad.net/oslo-incubator/+spec/remove-namespace-packages Change-Id: I474dcd9de166b00d02b3586858a28797e97a3231
This commit is contained in:
@@ -17,7 +17,7 @@ import logging
|
|||||||
from xml.etree import ElementTree as etree
|
from xml.etree import ElementTree as etree
|
||||||
from xml.parsers import expat
|
from xml.parsers import expat
|
||||||
|
|
||||||
from oslo.serialization import jsonutils
|
from oslo_serialization import jsonutils
|
||||||
import six
|
import six
|
||||||
|
|
||||||
from neutronclient.common import constants
|
from neutronclient.common import constants
|
||||||
|
@@ -22,8 +22,8 @@ import logging
|
|||||||
import netaddr
|
import netaddr
|
||||||
import os
|
import os
|
||||||
|
|
||||||
from oslo.utils import encodeutils
|
from oslo_utils import encodeutils
|
||||||
from oslo.utils import importutils
|
from oslo_utils import importutils
|
||||||
import six
|
import six
|
||||||
|
|
||||||
from neutronclient.common import exceptions
|
from neutronclient.common import exceptions
|
||||||
|
@@ -10,7 +10,7 @@
|
|||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from oslo import i18n
|
import oslo_i18n as i18n
|
||||||
|
|
||||||
_translators = i18n.TranslatorFactory(domain='neutronclient')
|
_translators = i18n.TranslatorFactory(domain='neutronclient')
|
||||||
|
|
||||||
|
@@ -24,7 +24,7 @@ import re
|
|||||||
from cliff.formatters import table
|
from cliff.formatters import table
|
||||||
from cliff import lister
|
from cliff import lister
|
||||||
from cliff import show
|
from cliff import show
|
||||||
from oslo.serialization import jsonutils
|
from oslo_serialization import jsonutils
|
||||||
import six
|
import six
|
||||||
|
|
||||||
from neutronclient.common import command
|
from neutronclient.common import command
|
||||||
|
@@ -16,7 +16,7 @@
|
|||||||
|
|
||||||
import argparse
|
import argparse
|
||||||
|
|
||||||
from oslo.serialization import jsonutils
|
from oslo_serialization import jsonutils
|
||||||
|
|
||||||
from neutronclient.common import exceptions
|
from neutronclient.common import exceptions
|
||||||
from neutronclient.common import utils
|
from neutronclient.common import utils
|
||||||
|
@@ -20,7 +20,7 @@ import argparse
|
|||||||
|
|
||||||
from cliff import lister
|
from cliff import lister
|
||||||
from cliff import show
|
from cliff import show
|
||||||
from oslo.serialization import jsonutils
|
from oslo_serialization import jsonutils
|
||||||
import six
|
import six
|
||||||
|
|
||||||
from neutronclient.common import exceptions
|
from neutronclient.common import exceptions
|
||||||
|
@@ -18,7 +18,7 @@ from __future__ import print_function
|
|||||||
|
|
||||||
import argparse
|
import argparse
|
||||||
|
|
||||||
from oslo.serialization import jsonutils
|
from oslo_serialization import jsonutils
|
||||||
|
|
||||||
from neutronclient.common import exceptions
|
from neutronclient.common import exceptions
|
||||||
from neutronclient.common import utils
|
from neutronclient.common import utils
|
||||||
|
@@ -16,7 +16,7 @@
|
|||||||
|
|
||||||
import argparse
|
import argparse
|
||||||
|
|
||||||
from oslo.serialization import jsonutils
|
from oslo_serialization import jsonutils
|
||||||
|
|
||||||
from neutronclient.common import exceptions
|
from neutronclient.common import exceptions
|
||||||
from neutronclient.common import utils
|
from neutronclient.common import utils
|
||||||
|
@@ -14,7 +14,7 @@
|
|||||||
# under the License.
|
# under the License.
|
||||||
#
|
#
|
||||||
|
|
||||||
from oslo.serialization import jsonutils
|
from oslo_serialization import jsonutils
|
||||||
|
|
||||||
from neutronclient.common import exceptions
|
from neutronclient.common import exceptions
|
||||||
from neutronclient.common import utils
|
from neutronclient.common import utils
|
||||||
|
@@ -33,7 +33,7 @@ from keystoneclient.auth.identity import v3 as v3_auth
|
|||||||
from keystoneclient import discover
|
from keystoneclient import discover
|
||||||
from keystoneclient.openstack.common.apiclient import exceptions as ks_exc
|
from keystoneclient.openstack.common.apiclient import exceptions as ks_exc
|
||||||
from keystoneclient import session
|
from keystoneclient import session
|
||||||
from oslo.utils import encodeutils
|
from oslo_utils import encodeutils
|
||||||
import six.moves.urllib.parse as urlparse
|
import six.moves.urllib.parse as urlparse
|
||||||
|
|
||||||
from cliff import app
|
from cliff import app
|
||||||
|
@@ -19,7 +19,7 @@ import logging
|
|||||||
import uuid
|
import uuid
|
||||||
|
|
||||||
import fixtures
|
import fixtures
|
||||||
from oslo.serialization import jsonutils
|
from oslo_serialization import jsonutils
|
||||||
from requests_mock.contrib import fixture as mock_fixture
|
from requests_mock.contrib import fixture as mock_fixture
|
||||||
import testtools
|
import testtools
|
||||||
|
|
||||||
|
@@ -20,7 +20,7 @@ import sys
|
|||||||
|
|
||||||
import fixtures
|
import fixtures
|
||||||
from mox3 import mox
|
from mox3 import mox
|
||||||
from oslo.utils import encodeutils
|
from oslo_utils import encodeutils
|
||||||
from oslotest import base
|
from oslotest import base
|
||||||
import requests
|
import requests
|
||||||
import six
|
import six
|
||||||
|
@@ -14,7 +14,7 @@
|
|||||||
|
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
from oslo.serialization import jsonutils
|
from oslo_serialization import jsonutils
|
||||||
|
|
||||||
from neutronclient.neutron.v2_0 import agent
|
from neutronclient.neutron.v2_0 import agent
|
||||||
from neutronclient.tests.unit import test_cli20
|
from neutronclient.tests.unit import test_cli20
|
||||||
|
@@ -17,7 +17,7 @@ import itertools
|
|||||||
import sys
|
import sys
|
||||||
|
|
||||||
from mox3 import mox
|
from mox3 import mox
|
||||||
from oslo.serialization import jsonutils
|
from oslo_serialization import jsonutils
|
||||||
|
|
||||||
from neutronclient.common import exceptions
|
from neutronclient.common import exceptions
|
||||||
from neutronclient.neutron.v2_0 import network
|
from neutronclient.neutron.v2_0 import network
|
||||||
|
Reference in New Issue
Block a user