Merge "Use osc_lib in server_image.py"

Author: Jenkins

openstackclient/compute/v2/server_image.py

@@ -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 _
 
 

openstackclient/tests/compute/v2/test_server_image.py

@@ -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