File new-oslo2.diff of Package python-neutronclient

Index: python-neutronclient-2.3.12/neutronclient/common/serializer.py
===================================================================
--- python-neutronclient-2.3.12.orig/neutronclient/common/serializer.py
+++ python-neutronclient-2.3.12/neutronclient/common/serializer.py
@@ -20,9 +20,12 @@
 import logging
 from xml.etree import ElementTree as etree
 from xml.parsers import expat
 
-from oslo.serialization import jsonutils
+try:
+    from oslo.serialization import jsonutils
+except:
+    from oslo_serialization import jsonutils
 import six
 
 from neutronclient.common import constants
 from neutronclient.common import exceptions as exception
Index: python-neutronclient-2.3.12/neutronclient/neutron/v2_0/__init__.py
===================================================================
--- python-neutronclient-2.3.12.orig/neutronclient/neutron/v2_0/__init__.py
+++ python-neutronclient-2.3.12/neutronclient/neutron/v2_0/__init__.py
@@ -23,9 +23,12 @@ import re
 
 from cliff.formatters import table
 from cliff import lister
 from cliff import show
-from oslo.serialization import jsonutils
+try:
+    from oslo.serialization import jsonutils
+except:
+    from oslo_serialization import jsonutils
 import six
 
 from neutronclient.common import command
 from neutronclient.common import exceptions
Index: python-neutronclient-2.3.12/neutronclient/neutron/v2_0/port.py
===================================================================
--- python-neutronclient-2.3.12.orig/neutronclient/neutron/v2_0/port.py
+++ python-neutronclient-2.3.12/neutronclient/neutron/v2_0/port.py
@@ -15,9 +15,12 @@
 #
 
 import argparse
 
-from oslo.serialization import jsonutils
+try:
+    from oslo.serialization import jsonutils
+except:
+    from oslo_serialization import jsonutils
 
 from neutronclient.common import exceptions
 from neutronclient.common import utils
 from neutronclient.i18n import _
Index: python-neutronclient-2.3.12/neutronclient/neutron/v2_0/quota.py
===================================================================
--- python-neutronclient-2.3.12.orig/neutronclient/neutron/v2_0/quota.py
+++ python-neutronclient-2.3.12/neutronclient/neutron/v2_0/quota.py
@@ -19,9 +19,12 @@ from __future__ import print_function
 import argparse
 
 from cliff import lister
 from cliff import show
-from oslo.serialization import jsonutils
+try:
+    from oslo.serialization import jsonutils
+except:
+    from oslo_serialization import jsonutils
 import six
 
 from neutronclient.common import exceptions
 from neutronclient.common import utils
Index: python-neutronclient-2.3.12/neutronclient/neutron/v2_0/router.py
===================================================================
--- python-neutronclient-2.3.12.orig/neutronclient/neutron/v2_0/router.py
+++ python-neutronclient-2.3.12/neutronclient/neutron/v2_0/router.py
@@ -17,9 +17,12 @@
 from __future__ import print_function
 
 import argparse
 
-from oslo.serialization import jsonutils
+try:
+    from oslo.serialization import jsonutils
+except:
+    from oslo_serialization import jsonutils
 
 from neutronclient.common import exceptions
 from neutronclient.common import utils
 from neutronclient.i18n import _
Index: python-neutronclient-2.3.12/neutronclient/neutron/v2_0/subnet.py
===================================================================
--- python-neutronclient-2.3.12.orig/neutronclient/neutron/v2_0/subnet.py
+++ python-neutronclient-2.3.12/neutronclient/neutron/v2_0/subnet.py
@@ -15,9 +15,12 @@
 #
 
 import argparse
 
-from oslo.serialization import jsonutils
+try:
+    from oslo.serialization import jsonutils
+except:
+    from oslo_serialization import jsonutils
 
 from neutronclient.common import exceptions
 from neutronclient.common import utils
 from neutronclient.i18n import _
Index: python-neutronclient-2.3.12/neutronclient/neutron/v2_0/vpn/ipsec_site_connection.py
===================================================================
--- python-neutronclient-2.3.12.orig/neutronclient/neutron/v2_0/vpn/ipsec_site_connection.py
+++ python-neutronclient-2.3.12/neutronclient/neutron/v2_0/vpn/ipsec_site_connection.py
@@ -15,9 +15,12 @@
 #
 # @author: Swaminathan Vasudevan, Hewlett-Packard.
 #
 
-from oslo.serialization import jsonutils
+try:
+    from oslo.serialization import jsonutils
+except:
+    from oslo_serialization import jsonutils
 
 from neutronclient.common import exceptions
 from neutronclient.common import utils
 from neutronclient.i18n import _
Index: python-neutronclient-2.3.12/neutronclient/tests/unit/test_auth.py
===================================================================
--- python-neutronclient-2.3.12.orig/neutronclient/tests/unit/test_auth.py
+++ python-neutronclient-2.3.12/neutronclient/tests/unit/test_auth.py
@@ -18,9 +18,12 @@ import json
 import logging
 import uuid
 
 import fixtures
-from oslo.serialization import jsonutils
+try:
+    from oslo.serialization import jsonutils
+except:
+    from oslo_serialization import jsonutils
 from requests_mock.contrib import fixture as mock_fixture
 import testtools
 
 from keystoneclient.auth.identity import v2 as ks_v2_auth
Index: python-neutronclient-2.3.12/neutronclient/tests/unit/test_cli20_agents.py
===================================================================
--- python-neutronclient-2.3.12.orig/neutronclient/tests/unit/test_cli20_agents.py
+++ python-neutronclient-2.3.12/neutronclient/tests/unit/test_cli20_agents.py
@@ -13,9 +13,12 @@
 #    under the License.
 
 import sys
 
-from oslo.serialization import jsonutils
+try:
+    from oslo.serialization import jsonutils
+except:
+    from oslo_serialization import jsonutils
 
 from neutronclient.neutron.v2_0 import agent
 from neutronclient.tests.unit import test_cli20
 
Index: python-neutronclient-2.3.12/neutronclient/tests/unit/test_cli20_network.py
===================================================================
--- python-neutronclient-2.3.12.orig/neutronclient/tests/unit/test_cli20_network.py
+++ python-neutronclient-2.3.12/neutronclient/tests/unit/test_cli20_network.py
@@ -16,9 +16,12 @@
 import itertools
 import sys
 
 from mox3 import mox
-from oslo.serialization import jsonutils
+try:
+    from oslo.serialization import jsonutils
+except:
+    from oslo_serialization import jsonutils
 
 from neutronclient.common import exceptions
 from neutronclient.neutron.v2_0 import network
 from neutronclient import shell