Migrate to oslo.serialization
This removes akanda.rug's usage of openstack.common.jsonutils and instead uses the equivalent oslo_serialiation.jsonutils. Note the old module is still left in place as its used by other old oslo-incubator things. Change-Id: I94c3d0433180120fc55328ae9ae6917af518ffc9
This commit is contained in:
parent
c05a9e52b1
commit
bd8d9c177d
|
@ -19,7 +19,7 @@ import logging
|
|||
import requests
|
||||
|
||||
from oslo.config import cfg
|
||||
from akanda.rug.openstack.common import jsonutils
|
||||
from oslo_serialization import jsonutils
|
||||
|
||||
AKANDA_ULA_PREFIX = 'fdca:3ba5:a17a:acda::/64'
|
||||
AKANDA_MGT_SERVICE_PORT = 5000
|
||||
|
|
|
@ -21,7 +21,7 @@ import re
|
|||
import netaddr
|
||||
from oslo.config import cfg
|
||||
|
||||
from akanda.rug.openstack.common import jsonutils
|
||||
from oslo_serialization import jsonutils
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
|
|
@ -180,7 +180,7 @@ class TestAkandaClient(unittest.TestCase):
|
|||
|
||||
def test_load_provider_rules(self):
|
||||
rules_dict = {'labels': {}, 'preanchors': [], 'postanchors': []}
|
||||
with mock.patch('akanda.rug.openstack.common.jsonutils.load') as load:
|
||||
with mock.patch('oslo_serialization.jsonutils.load') as load:
|
||||
load.return_value = rules_dict
|
||||
with mock.patch('__builtin__.open') as mock_open:
|
||||
r = conf_mod.load_provider_rules('/the/path')
|
||||
|
|
|
@ -3,6 +3,7 @@ httplib2
|
|||
python-neutronclient>=2.3.0,<3
|
||||
oslo.config>=1.2.0
|
||||
oslo.context>=0.2.0,<0.3.0
|
||||
oslo.serialization>=1.4.0,<1.5.0
|
||||
kombu>=2.4.8
|
||||
WebOb>=1.2.3,<1.3
|
||||
python-novaclient>=2.15.0
|
||||
|
|
Loading…
Reference in New Issue