pep8: fix coriolis/a-e/, coriolis/exception.py, coriolis/rpc.py, cori…

…olis/wsman.py

coriolis/cmd/__init__.py

@@ -3,6 +3,4 @@
 
 import eventlet
 
-from coriolis import conf
-
 eventlet.monkey_patch()

coriolis/conductor/rpc/utils.py

@@ -46,7 +46,7 @@ def check_create_registration_for_service(
                     mapped_regions=mapped_regions, providers=providers,
                     specs=specs)
             return worker_service
-        except Exception as ex:
+        except Exception:
             LOG.warn(
                 "Failed to register service with specs %s. Retrying again in "
                 "%d seconds. Error was: %s", props, retry_period,

coriolis/constants.py

@@ -360,7 +360,8 @@
     MINION_POOL_STATUS_DEALLOCATING_MACHINES,
     MINION_POOL_STATUS_DEALLOCATING_SHARED_RESOURCES]
 
-MINION_MACHINE_IDENTIFIER_FORMAT = "coriolis-pool-%(pool_id)s-minion-%(minion_id)s"
+MINION_MACHINE_IDENTIFIER_FORMAT = (
+    "coriolis-pool-%(pool_id)s-minion-%(minion_id)s")
 MINION_MACHINE_STATUS_UNINITIALIZED = "UNINITIALIZED"
 MINION_MACHINE_STATUS_HEALTHCHECKING = "HEALTHCHECKING"
 MINION_MACHINE_STATUS_ALLOCATING = "ALLOCATING"

coriolis/endpoint_options/__init__.py

@@ -1,2 +0,0 @@
-# Copyright 2020 Cloudbase Solutions Srl
-# All Rights Reserved.

coriolis/endpoint_options/api.py

@@ -23,10 +23,12 @@ def get_endpoint_destination_options(
 
     def get_endpoint_source_minion_pool_options(
             self, ctxt, endpoint_id, env=None, option_names=None):
-        return self._rpc_minion_manager_client.get_endpoint_source_minion_pool_options(
+        return (self._rpc_minion_manager_client.
+                get_endpoint_source_minion_pool_options)(
             ctxt, endpoint_id, env, option_names)
 
     def get_endpoint_destination_minion_pool_options(
             self, ctxt, endpoint_id, env=None, option_names=None):
-        return self._rpc_minion_manager_client.get_endpoint_destination_minion_pool_options(
+        return (self._rpc_minion_manager_client.
+                get_endpoint_destination_minion_pool_options)(
             ctxt, endpoint_id, env, option_names)

coriolis/endpoint_resources/__init__.py

@@ -1,2 +0,0 @@
-# Copyright 2020 Cloudbase Solutions Srl
-# All Rights Reserved.

coriolis/endpoints/api.py

@@ -48,12 +48,14 @@ def validate_source_environment(self, ctxt, endpoint_id, source_env):
     @utils.bad_request_on_error("Invalid source minion pool environment: %s")
     def validate_endpoint_source_minion_pool_options(
             self, ctxt, endpoint_id, pool_environment):
-        return self._rpc_minion_manager_client.validate_endpoint_source_minion_pool_options(
+        return (self._rpc_minion_manager_client.
+                validate_endpoint_source_minion_pool_options)(
             ctxt, endpoint_id, pool_environment)
 
     @utils.bad_request_on_error(
         "Invalid destination minion pool environment: %s")
     def validate_endpoint_destination_minion_pool_options(
             self, ctxt, endpoint_id, pool_environment):
-        return self._rpc_minion_manager_client.validate_endpoint_destination_minion_pool_options(
+        return (self._rpc_minion_manager_client.
+                validate_endpoint_destination_minion_pool_options)(
             ctxt, endpoint_id, pool_environment)

coriolis/exception.py

@@ -300,7 +300,8 @@ class OSMorphingToolsNotFound(NotFound):
 
 class OSDetectToolsNotFound(NotFound):
     message = _(
-        'No "%(os_type)s" OS detect tools were able to identify the OS for this VM. '
+        'No "%(os_type)s" OS detect tools were able to identify the OS for '
+        ' this VM. '
         'This would indicate that it was either not possible to determine the '
         'exact OS release, or this OS release is not supported by Coriolis. '
         'Suggestions include performing any needed OSMorphing steps manually '

coriolis/rpc.py

@@ -1,15 +1,13 @@
 # Copyright 2016 Cloudbase Solutions Srl
 # All Rights Reserved.
 
-import contextlib
 import coriolis.exception
 import oslo_messaging as messaging
 
 from oslo_config import cfg
 from oslo_log import log as logging
 
 from coriolis import context
-from coriolis import utils
 
 
 rpc_opts = [

coriolis/wsman.py

@@ -52,7 +52,7 @@ def connect(self, url, username, auth=None, password=None,
 
     @classmethod
     def from_connection_info(cls, connection_info, timeout=DEFAULT_TIMEOUT):
-        """ Returns a wsman.WSManConnection object for the provided conn info. """
+        """ Returns a wsman.WSManConnection obj for the provided conn info. """
         if not isinstance(connection_info, dict):
             raise ValueError(
                 "WSMan connection must be a dict. Got type '%s', value: %s" %
@@ -63,8 +63,8 @@ def from_connection_info(cls, connection_info, timeout=DEFAULT_TIMEOUT):
         missing = [key for key in required_keys if key not in connection_info]
         if missing:
             raise ValueError(
-                "The following keys were missing from WSMan connection info %s. "
-                "Got: %s" % (missing, connection_info))
+                "The following keys were missing from WSMan connection "
+                "info %s. Got: %s" % (missing, connection_info))
 
         host = connection_info["ip"]
         port = connection_info.get("port", 5986)