Remove all imports from oslo namespace

oslo namespace is deprecated

Change-Id: I345eb210222d8e973b99f27821099f52883ab27d

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
 

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

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
 

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

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

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

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

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
 

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

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

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
 

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

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

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
 

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

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
 

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

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

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
 

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