x
/
powervc-driver
Code Issues Proposed changes

move to use oslo.i18/utils/serialization 

nova is switching to use oslo.i18n, oslo.utils, oslo.serialization with
change
d0e0ade702
nova.openstack.common removed some modules that has been replaced by the
ones from oslo.i18n, oslo.utils, oslo.serialization.

Closes-Bug: #1384039
Change-Id: I9fae9b61599a50b54fc40552b2c90fceb75d8522
This commit is contained in:
terryyao 2014-10-23 00:07:25 +08:00
parent d2d4e304be
commit 7b84b07f0b
16 changed files with 39 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cinder-powervc/bin/cinder-powervc
View File

@ -1,5 +1,5 @@
#!/usr/bin/env python #!/usr/bin/env python
# Copyright 2013 IBM Corp. # Copyright 2013, 2014 IBM Corp.
"""Starter script for the PowerVC cinder-volume Service.""" """Starter script for the PowerVC cinder-volume Service."""
@ -18,11 +18,11 @@ POSSIBLE_TOPDIR = os.path.normpath(os.path.join(
if os.path.exists(os.path.join(POSSIBLE_TOPDIR, 'powervc', '__init__.py')): if os.path.exists(os.path.join(POSSIBLE_TOPDIR, 'powervc', '__init__.py')):
sys.path.insert(0, POSSIBLE_TOPDIR) sys.path.insert(0, POSSIBLE_TOPDIR)
from cinder.openstack.common import gettextutils from oslo import i18n
# TODO RYKAL # TODO RYKAL
# This should go in the base __init__ folder I think # This should go in the base __init__ folder I think
gettextutils.install('cinder') i18n.install('cinder')
# NOTE: Import powervc driver common config at the very beginning to parse # NOTE: Import powervc driver common config at the very beginning to parse
# AMQP. # AMQP.

6
cinder-powervc/test/powervc/volume/driver/test_powervc_cinder.py
View File

@ -1,4 +1,4 @@
# Copyright 2013 IBM Corp. # Copyright 2013, 2014 IBM Corp.
# mock module # mock module
import mock import mock
import sys import sys
@ -7,8 +7,8 @@ import unittest
sys.modules['powervc.common.client'] = mock.MagicMock() sys.modules['powervc.common.client'] = mock.MagicMock()
# import _ # import _
from cinder.openstack.common import gettextutils from oslo import i18n
gettextutils.install('cinder') i18n.install('cinder')
from powervc.common import config from powervc.common import config
from cinder import exception from cinder import exception
from cinder import db from cinder import db

6
cinder-powervc/test/powervc/volume/manager/test_manager.py
View File

@ -1,6 +1,6 @@
# Copyright 2013 IBM Corp. # Copyright 2013, 2014 IBM Corp.
from cinder.openstack.common import gettextutils from oslo import i18n
gettextutils.install('cinder') i18n.install('cinder')
import unittest import unittest
import mox import mox
from powervc.volume.manager.manager import PowerVCCinderManager from powervc.volume.manager.manager import PowerVCCinderManager

2
common-powervc/powervc/common/client/service.py
View File

@ -5,7 +5,7 @@ import re
import urlparse import urlparse
import powervc.common.client.delegate as delegate import powervc.common.client.delegate as delegate
from glanceclient.openstack.common import importutils from oslo.utils import importutils
from powervc.common.constants import SERVICE_TYPES as SERVICE_TYPES from powervc.common.constants import SERVICE_TYPES as SERVICE_TYPES
from powervc.common import netutils from powervc.common import netutils
from powervc.common.client.extensions.glance import Extended_V2_Client from powervc.common.client.extensions.glance import Extended_V2_Client

4
common-powervc/powervc/common/utils.py
View File

@ -1,4 +1,4 @@
# Copyright 2013 IBM Corp. # Copyright 2013, 2014 IBM Corp.
import logging import logging
import exception import exception
import os import os
@ -7,7 +7,7 @@ import threading
import time import time
from eventlet.semaphore import Semaphore from eventlet.semaphore import Semaphore
from glanceclient.openstack.common import importutils from oslo.utils import importutils
from powervc.common import config from powervc.common import config
from powervc.common import constants from powervc.common import constants
from powervc.common.exception import StorageConnectivityGroupNotFound from powervc.common.exception import StorageConnectivityGroupNotFound

6
common-powervc/test/common/client/test_glance.py
View File

@ -1,12 +1,12 @@
# Copyright 2013 IBM Corp. # Copyright 2013, 2014 IBM Corp.
import unittest import unittest
import mox import mox
from mock import MagicMock from mock import MagicMock
import glanceclient.v1.images as imagesV1 import glanceclient.v1.images as imagesV1
import glanceclient.v1.image_members as membersV1 import glanceclient.v1.image_members as membersV1
from glanceclient.openstack.common import gettextutils from oslo import i18n
gettextutils.install('common-glance-client-ut') i18n.install('common-glance-client-ut')
import powervc.common.utils as common_utils import powervc.common.utils as common_utils

8
glance-powervc/bin/glance-powervc
View File

@ -1,5 +1,5 @@
#!/usr/bin/env python #!/usr/bin/env python
# Copyright 2013 IBM Corp. # Copyright 2013, 2014 IBM Corp.
"""Starter script for the PowerVC Driver ImageManager Service.""" """Starter script for the PowerVC Driver ImageManager Service."""
@ -24,8 +24,8 @@ if os.path.exists(os.path.join(POSSIBLE_TOPDIR, 'powervc', '__init__.py')):
# TODO RYKAL # TODO RYKAL
# This should go in the base __init__ folder I think # This should go in the base __init__ folder I think
from nova.openstack.common import gettextutils from oslo import i18n
gettextutils.install('glance') i18n.install('glance')
# NOTE: Import powervc driver common config at the very beginning to parse # NOTE: Import powervc driver common config at the very beginning to parse
# AMQP. # AMQP.
@ -35,7 +35,7 @@ from powervc.glance.common import config as glance_config
from nova.openstack.common import log from nova.openstack.common import log
from nova.openstack.common import service from nova.openstack.common import service
from nova.openstack.common import importutils from oslo.utils import importutils
CONF = glance_config.CONF CONF = glance_config.CONF

6
glance-powervc/powervc/glance/manager/manager.py
View File

@ -1,4 +1,4 @@
# Copyright 2013 IBM Corp. # Copyright 2013, 2014 IBM Corp.
""" """
PowerVC Driver ImageManager service PowerVC Driver ImageManager service
@ -16,8 +16,8 @@ from powervc.common import config
from nova.openstack.common import service from nova.openstack.common import service
from nova.openstack.common import log as logging from nova.openstack.common import log as logging
from nova.openstack.common import timeutils from oslo.utils import timeutils
from nova.openstack.common import jsonutils from oslo.serialization import jsonutils
from glanceclient.v1 import images as v1images from glanceclient.v1 import images as v1images
from glanceclient.exc import CommunicationError from glanceclient.exc import CommunicationError
from glanceclient.exc import HTTPNotFound from glanceclient.exc import HTTPNotFound

6
neutron-powervc/bin/neutron-powervc-agent
View File

@ -1,5 +1,5 @@
#!/usr/bin/env python #!/usr/bin/env python
# Copyright 2013 IBM Corp. # Copyright 2013, 2014 IBM Corp.
import os import os
import sys import sys
@ -31,8 +31,8 @@ if os.path.exists(os.path.join(POSSIBLE_TOPDIR, 'powervc', '__init__.py')):
# TODO RYKAL # TODO RYKAL
# This should go in the base __init__ folder I think # This should go in the base __init__ folder I think
from neutron.openstack.common import gettextutils from oslo import i18n
gettextutils.install('neutron') i18n.install('neutron')
# NOTE: Import powervc driver common config at the very beginning to parse # NOTE: Import powervc driver common config at the very beginning to parse
# AMQP. # AMQP.

6
nova-powervc/bin/nova-powervc
View File

@ -13,11 +13,7 @@ POSSIBLE_TOPDIR = os.path.normpath(os.path.join(
if os.path.exists(os.path.join(POSSIBLE_TOPDIR, 'powervc', '__init__.py')): if os.path.exists(os.path.join(POSSIBLE_TOPDIR, 'powervc', '__init__.py')):
sys.path.insert(0, POSSIBLE_TOPDIR) sys.path.insert(0, POSSIBLE_TOPDIR)
from nova.openstack.common import gettextutils from nova import i18n
# TODO RYKAL
# This should go in the base __init__ folder I think
gettextutils.install('nova')
from powervc.nova.cmd.compute import main from powervc.nova.cmd.compute import main

8
nova-powervc/powervc/nova/driver/compute/manager.py
View File

@ -1,4 +1,4 @@
# Copyright 2013 IBM Corp. # Copyright 2013, 2014 IBM Corp.
""" """
Doing PowerVC initialize work, including image, instance sync. Doing PowerVC initialize work, including image, instance sync.
@ -25,12 +25,12 @@ from nova.image import glance
from nova.compute import flavors from nova.compute import flavors
from nova.compute import task_states from nova.compute import task_states
from nova.compute import vm_states from nova.compute import vm_states
from nova.openstack.common import importutils from oslo.utils import importutils
from nova.openstack.common import log as logging from nova.openstack.common import log as logging
from nova.openstack.common import timeutils from oslo.utils import timeutils
from nova.openstack.common import loopingcall from nova.openstack.common import loopingcall
from nova.openstack.common.loopingcall import LoopingCallDone from nova.openstack.common.loopingcall import LoopingCallDone
from nova.openstack.common import jsonutils from oslo.serialization import jsonutils
from nova import objects from nova import objects
from nova.objects import instance as instance_obj from nova.objects import instance as instance_obj
from nova.objects import base as obj_base from nova.objects import base as obj_base

6
nova-powervc/powervc/nova/driver/virt/powervc/driver.py
View File

@ -1,4 +1,4 @@
# Copyright 2013 IBM Corp. # Copyright 2013, 2014 IBM Corp.
import nova import nova
from novaclient.exceptions import NotFound from novaclient.exceptions import NotFound
from novaclient.exceptions import BadRequest from novaclient.exceptions import BadRequest
@ -6,9 +6,9 @@ from nova import exception
from nova.compute import task_states from nova.compute import task_states
from nova.image import glance from nova.image import glance
from nova.virt import driver from nova.virt import driver
from nova.openstack.common import jsonutils from oslo.serialization import jsonutils
from nova.openstack.common import log as logging from nova.openstack.common import log as logging
from nova.openstack.common import excutils from oslo.utils import excutils
from powervc.nova.driver.virt.powervc import service from powervc.nova.driver.virt.powervc import service
from powervc.nova.driver.compute import constants from powervc.nova.driver.compute import constants
from powervc.nova.common import exception as pvc_exception from powervc.nova.common import exception as pvc_exception

4
nova-powervc/powervc/nova/driver/virt/powervc/service.py
View File

@ -1,4 +1,4 @@
# Copyright 2013 IBM Corp. # Copyright 2013, 2014 IBM Corp.
import httplib import httplib
from novaclient import exceptions from novaclient import exceptions
@ -17,7 +17,7 @@ from powervc.common import utils
from powervc import utils as powervc_utils from powervc import utils as powervc_utils
from powervc.common.gettextutils import _ from powervc.common.gettextutils import _
from nova.exception import Invalid from nova.exception import Invalid
from nova.openstack.common import excutils from oslo.utils import excutils
from powervc.nova.driver.compute import task_states from powervc.nova.driver.compute import task_states
from nova.compute import flavors from nova.compute import flavors
from novaclient.v1_1 import servers from novaclient.v1_1 import servers

2
nova-powervc/powervc/nova/extension/host_maintenance_mode.py
View File

@ -4,7 +4,7 @@ from webob import exc
from nova.api.openstack import extensions from nova.api.openstack import extensions
from nova.api.openstack import wsgi from nova.api.openstack import wsgi
from nova import compute from nova import compute
from nova.openstack.common.gettextutils import _ from nova.i18n import _
from powervc.common import constants as common_constants from powervc.common import constants as common_constants
from powervc.common import config from powervc.common import config

5
nova-powervc/test/compute/test_sync_instance.py
View File

@ -1,9 +1,8 @@
# Copyright 2013 IBM Corp. # Copyright 2013, 2014 IBM Corp.
import unittest import unittest
import mox import mox
from nova.openstack.common import gettextutils from nova.i18n import _
gettextutils.install('nova')
from nova.compute import flavors from nova.compute import flavors

2
nova-powervc/test/nova/driver/virt/powervc/test_driver.py
View File

@ -7,7 +7,7 @@ import os
from nova import exception from nova import exception
os.environ['EVENTLET_NO_GREENDNS'] = 'yes' os.environ['EVENTLET_NO_GREENDNS'] = 'yes'
from nova import test from nova import test
from nova.openstack.common import jsonutils from oslo.serialization import jsonutils
from nova.compute import task_states from nova.compute import task_states
from nova.image import glance from nova.image import glance
from nova import db from nova import db