Merge "Use osc_lib in server_image.py"
This commit is contained in:
commit
a0c07ca450
openstackclient
@ -17,12 +17,12 @@
|
||||
|
||||
import sys
|
||||
|
||||
from osc_lib.command import command
|
||||
from osc_lib import exceptions
|
||||
from osc_lib import utils
|
||||
from oslo_utils import importutils
|
||||
import six
|
||||
|
||||
from openstackclient.common import command
|
||||
from openstackclient.common import exceptions
|
||||
from openstackclient.common import utils
|
||||
from openstackclient.i18n import _
|
||||
|
||||
|
||||
|
@ -12,8 +12,9 @@
|
||||
#
|
||||
import mock
|
||||
|
||||
from openstackclient.common import exceptions
|
||||
from openstackclient.common import utils as common_utils
|
||||
from osc_lib import exceptions
|
||||
from osc_lib import utils as common_utils
|
||||
|
||||
from openstackclient.compute.v2 import server_image
|
||||
from openstackclient.tests.compute.v2 import fakes as compute_fakes
|
||||
from openstackclient.tests.image.v2 import fakes as image_fakes
|
||||
|
Loading…
x
Reference in New Issue
Block a user