summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--novaclient/client.py4
-rw-r--r--novaclient/i18n.py6
-rw-r--r--novaclient/shell.py4
-rw-r--r--novaclient/tests/unit/fixture_data/floatingips.py2
-rw-r--r--novaclient/tests/unit/fixture_data/hosts.py2
-rw-r--r--novaclient/tests/unit/fixture_data/images.py2
-rw-r--r--novaclient/tests/unit/fixture_data/keypairs.py2
-rw-r--r--novaclient/tests/unit/fixture_data/networks.py2
-rw-r--r--novaclient/tests/unit/fixture_data/security_group_rules.py2
-rw-r--r--novaclient/tests/unit/fixture_data/security_groups.py2
-rw-r--r--novaclient/tests/unit/fixture_data/server_groups.py2
-rw-r--r--novaclient/tests/unit/fixture_data/servers.py2
-rw-r--r--novaclient/tests/unit/utils.py2
-rw-r--r--novaclient/tests/unit/v2/fakes.py2
-rw-r--r--novaclient/tests/unit/v2/test_servers.py2
-rw-r--r--novaclient/tests/unit/v2/test_shell.py2
-rw-r--r--novaclient/utils.py4
-rw-r--r--novaclient/v2/flavors.py2
-rw-r--r--novaclient/v2/servers.py2
-rw-r--r--novaclient/v2/shell.py6
20 files changed, 27 insertions, 27 deletions
diff --git a/novaclient/client.py b/novaclient/client.py
index 007cf914..85d618da 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 e9d39d4a..6a17312d 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 439a98d9..4e7b5c96 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 10772a79..f5ad1c10 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 5c1ff60a..28ff17ef 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 4ec47258..0eb8a14f 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 9314c58a..64d102ea 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 9ef692c3..d2743fc6 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 5f1d2fad..d0806c5c 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 ac5d182c..c1a3073c 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 1fcfdea5..bf4c82d0 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 3766f429..0bece964 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 ab1ddcd1..6aaf0ed2 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 343c421e..b36f5429 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 c43aed42..c1a876e7 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 b1b9b808..139ea18e 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 2cf4fc61..50310bfd 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 54b0f497..1db42e24 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 ba576ffd..624651b0 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 33653a12..f609d671 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
View Lorry Controller Status