diff --git a/novaclient/client.py b/novaclient/client.py index 007cf9140..85d618da1 100644 --- a/novaclient/client.py +++ b/novaclient/client.py @@ -28,8 +28,8 @@ import re import socket from keystoneclient import adapter -from oslo.utils import importutils -from oslo.utils import netutils +from oslo_utils import importutils +from oslo_utils import netutils import requests from requests import adapters diff --git a/novaclient/i18n.py b/novaclient/i18n.py index e9d39d4ab..6a17312d6 100644 --- a/novaclient/i18n.py +++ b/novaclient/i18n.py @@ -10,16 +10,16 @@ # License for the specific language governing permissions and limitations # under the License. -"""oslo.i18n integration module for novaclient. +"""oslo_i18n integration module for novaclient. See http://docs.openstack.org/developer/oslo.i18n/usage.html . """ -from oslo import i18n +import oslo_i18n -_translators = i18n.TranslatorFactory(domain='novaclient') +_translators = oslo_i18n.TranslatorFactory(domain='novaclient') # The primary translation function using the well-known name "_" _ = _translators.primary diff --git a/novaclient/shell.py b/novaclient/shell.py index 439a98d99..4e7b5c96c 100644 --- a/novaclient/shell.py +++ b/novaclient/shell.py @@ -33,8 +33,8 @@ from keystoneclient.auth.identity.generic import password from keystoneclient.auth.identity.generic import token from keystoneclient.auth.identity import v3 as identity from keystoneclient import session as ksession -from oslo.utils import encodeutils -from oslo.utils import strutils +from oslo_utils import encodeutils +from oslo_utils import strutils import pkg_resources import six diff --git a/novaclient/tests/unit/fixture_data/floatingips.py b/novaclient/tests/unit/fixture_data/floatingips.py index 10772a798..f5ad1c10f 100644 --- a/novaclient/tests/unit/fixture_data/floatingips.py +++ b/novaclient/tests/unit/fixture_data/floatingips.py @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from novaclient.tests.unit import fakes from novaclient.tests.unit.fixture_data import base diff --git a/novaclient/tests/unit/fixture_data/hosts.py b/novaclient/tests/unit/fixture_data/hosts.py index 5c1ff60a3..28ff17ef1 100644 --- a/novaclient/tests/unit/fixture_data/hosts.py +++ b/novaclient/tests/unit/fixture_data/hosts.py @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from six.moves.urllib import parse from novaclient.tests.unit.fixture_data import base diff --git a/novaclient/tests/unit/fixture_data/images.py b/novaclient/tests/unit/fixture_data/images.py index 4ec472581..0eb8a14f1 100644 --- a/novaclient/tests/unit/fixture_data/images.py +++ b/novaclient/tests/unit/fixture_data/images.py @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from novaclient.tests.unit import fakes from novaclient.tests.unit.fixture_data import base diff --git a/novaclient/tests/unit/fixture_data/keypairs.py b/novaclient/tests/unit/fixture_data/keypairs.py index 9314c58a5..64d102ea5 100644 --- a/novaclient/tests/unit/fixture_data/keypairs.py +++ b/novaclient/tests/unit/fixture_data/keypairs.py @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from novaclient.tests.unit import fakes from novaclient.tests.unit.fixture_data import base diff --git a/novaclient/tests/unit/fixture_data/networks.py b/novaclient/tests/unit/fixture_data/networks.py index 9ef692c3e..d2743fc60 100644 --- a/novaclient/tests/unit/fixture_data/networks.py +++ b/novaclient/tests/unit/fixture_data/networks.py @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from novaclient.tests.unit.fixture_data import base diff --git a/novaclient/tests/unit/fixture_data/security_group_rules.py b/novaclient/tests/unit/fixture_data/security_group_rules.py index 5f1d2fad5..d0806c5ce 100644 --- a/novaclient/tests/unit/fixture_data/security_group_rules.py +++ b/novaclient/tests/unit/fixture_data/security_group_rules.py @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from novaclient.tests.unit import fakes from novaclient.tests.unit.fixture_data import base diff --git a/novaclient/tests/unit/fixture_data/security_groups.py b/novaclient/tests/unit/fixture_data/security_groups.py index ac5d182c6..c1a3073cf 100644 --- a/novaclient/tests/unit/fixture_data/security_groups.py +++ b/novaclient/tests/unit/fixture_data/security_groups.py @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from novaclient.tests.unit import fakes from novaclient.tests.unit.fixture_data import base diff --git a/novaclient/tests/unit/fixture_data/server_groups.py b/novaclient/tests/unit/fixture_data/server_groups.py index 1fcfdea55..bf4c82d0e 100644 --- a/novaclient/tests/unit/fixture_data/server_groups.py +++ b/novaclient/tests/unit/fixture_data/server_groups.py @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from novaclient.tests.unit.fixture_data import base diff --git a/novaclient/tests/unit/fixture_data/servers.py b/novaclient/tests/unit/fixture_data/servers.py index 3766f4290..0bece9642 100644 --- a/novaclient/tests/unit/fixture_data/servers.py +++ b/novaclient/tests/unit/fixture_data/servers.py @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from novaclient.tests.unit import fakes from novaclient.tests.unit.fixture_data import base diff --git a/novaclient/tests/unit/utils.py b/novaclient/tests/unit/utils.py index ab1ddcd18..6aaf0ed20 100644 --- a/novaclient/tests/unit/utils.py +++ b/novaclient/tests/unit/utils.py @@ -15,7 +15,7 @@ import os import fixtures import mock -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import requests from requests_mock.contrib import fixture as requests_mock_fixture import six diff --git a/novaclient/tests/unit/v2/fakes.py b/novaclient/tests/unit/v2/fakes.py index 343c421e2..b36f5429d 100644 --- a/novaclient/tests/unit/v2/fakes.py +++ b/novaclient/tests/unit/v2/fakes.py @@ -17,7 +17,7 @@ import datetime import mock -from oslo.utils import strutils +from oslo_utils import strutils import six from six.moves.urllib import parse diff --git a/novaclient/tests/unit/v2/test_servers.py b/novaclient/tests/unit/v2/test_servers.py index c43aed422..c1a876e75 100644 --- a/novaclient/tests/unit/v2/test_servers.py +++ b/novaclient/tests/unit/v2/test_servers.py @@ -13,7 +13,7 @@ # under the License. import mock -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import six from novaclient import exceptions diff --git a/novaclient/tests/unit/v2/test_shell.py b/novaclient/tests/unit/v2/test_shell.py index b1b9b8085..139ea18e5 100644 --- a/novaclient/tests/unit/v2/test_shell.py +++ b/novaclient/tests/unit/v2/test_shell.py @@ -22,7 +22,7 @@ import os import fixtures import mock -from oslo.utils import timeutils +from oslo_utils import timeutils import six from six.moves import builtins diff --git a/novaclient/utils.py b/novaclient/utils.py index 2cf4fc619..50310bfdb 100644 --- a/novaclient/utils.py +++ b/novaclient/utils.py @@ -18,8 +18,8 @@ import textwrap import time import uuid -from oslo.serialization import jsonutils -from oslo.utils import encodeutils +from oslo_serialization import jsonutils +from oslo_utils import encodeutils import pkg_resources import prettytable import six diff --git a/novaclient/v2/flavors.py b/novaclient/v2/flavors.py index 54b0f4974..1db42e24e 100644 --- a/novaclient/v2/flavors.py +++ b/novaclient/v2/flavors.py @@ -16,7 +16,7 @@ Flavor interface. """ -from oslo.utils import strutils +from oslo_utils import strutils from six.moves.urllib import parse from novaclient import base diff --git a/novaclient/v2/servers.py b/novaclient/v2/servers.py index ba576ffd2..624651b05 100644 --- a/novaclient/v2/servers.py +++ b/novaclient/v2/servers.py @@ -21,7 +21,7 @@ Server interface. import base64 -from oslo.utils import encodeutils +from oslo_utils import encodeutils import six from six.moves.urllib import parse diff --git a/novaclient/v2/shell.py b/novaclient/v2/shell.py index 33653a121..f609d671b 100644 --- a/novaclient/v2/shell.py +++ b/novaclient/v2/shell.py @@ -28,9 +28,9 @@ import os import sys import time -from oslo.utils import encodeutils -from oslo.utils import strutils -from oslo.utils import timeutils +from oslo_utils import encodeutils +from oslo_utils import strutils +from oslo_utils import timeutils import six from novaclient import client