summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--nova/adminclient.py1
-rw-r--r--nova/api/ec2/admin.py1
-rw-r--r--nova/api/openstack/backup_schedules.py1
-rw-r--r--nova/api/openstack/servers.py2
-rw-r--r--nova/compute/api.py1
-rw-r--r--nova/compute/manager.py18
-rw-r--r--nova/db/sqlalchemy/api.py4
-rw-r--r--nova/exception.py3
-rw-r--r--nova/process.py2
-rw-r--r--nova/server.py2
-rw-r--r--nova/tests/api/openstack/test_servers.py4
-rw-r--r--nova/twistd.py2
-rw-r--r--nova/virt/fake.py1
-rw-r--r--nova/virt/libvirt_conn.py5
-rw-r--r--nova/virt/xenapi/network_utils.py1
-rw-r--r--nova/virt/xenapi/vm_utils.py1
-rw-r--r--nova/virt/xenapi/vmops.py1
-rw-r--r--nova/virt/xenapi/volumeops.py1
-rw-r--r--nova/virt/xenapi_conn.py2
19 files changed, 34 insertions, 19 deletions
diff --git a/nova/adminclient.py b/nova/adminclient.py
index 5a62cce7d..6ae9f0c0f 100644
--- a/nova/adminclient.py
+++ b/nova/adminclient.py
@@ -194,6 +194,7 @@ class HostInfo(object):
class NovaAdminClient(object):
+
def __init__(
self,
clc_url=DEFAULT_CLC_URL,
diff --git a/nova/api/ec2/admin.py b/nova/api/ec2/admin.py
index 1c6ab688d..fac01369e 100644
--- a/nova/api/ec2/admin.py
+++ b/nova/api/ec2/admin.py
@@ -168,6 +168,7 @@ class AdminController(object):
# FIXME(vish): these host commands don't work yet, perhaps some of the
# required data can be retrieved from service objects?
+
def describe_hosts(self, _context, **_kwargs):
"""Returns status info for all nodes. Includes:
* Disk Space
diff --git a/nova/api/openstack/backup_schedules.py b/nova/api/openstack/backup_schedules.py
index 3ed691d7b..fc70b5c6c 100644
--- a/nova/api/openstack/backup_schedules.py
+++ b/nova/api/openstack/backup_schedules.py
@@ -24,6 +24,7 @@ import nova.image.service
class Controller(wsgi.Controller):
+
def __init__(self):
pass
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index dcd959ae7..5c3322f7c 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -195,5 +195,3 @@ class Controller(wsgi.Controller):
logging.error("Compute.api::unpause %s", readable)
return faults.Fault(exc.HTTPUnprocessableEntity())
return exc.HTTPAccepted()
-
-
diff --git a/nova/compute/api.py b/nova/compute/api.py
index 79da79cd1..7420c40d2 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -293,7 +293,6 @@ class ComputeAPI(base.Base):
{"method": "unpause_instance",
"args": {"instance_id": instance['id']}})
-
def rescue(self, context, instance_id):
"""Rescue the given instance."""
instance = self.db.instance_get_by_internal_id(context, instance_id)
diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index ae33fe5b9..0c0ba7450 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -196,9 +196,7 @@ class ComputeManager(manager.Manager):
@staticmethod
def _update_state_callback(self, context, instance_id, result):
- """Update instance state when Deferred task completes.
- This staticmethod must be wrappered in a
- lambda to pass in self, context & instance_id."""
+ """Update instance state when Deferred task completes."""
self._update_state(context, instance_id)
@defer.inlineCallbacks
@@ -214,10 +212,10 @@ class ComputeManager(manager.Manager):
instance_id,
power_state.NOSTATE,
'pausing')
- yield self.driver.pause(instance_ref,
- lambda result : self._update_state_callback(self,
- context,
- instance_id,
+ yield self.driver.pause(instance_ref,
+ lambda result: self._update_state_callback(self,
+ context,
+ instance_id,
result))
@defer.inlineCallbacks
@@ -234,9 +232,9 @@ class ComputeManager(manager.Manager):
power_state.NOSTATE,
'unpausing')
yield self.driver.unpause(instance_ref,
- lambda result : self._update_state_callback(self,
- context,
- instance_id,
+ lambda result: self._update_state_callback(self,
+ context,
+ instance_id,
result))
@exception.wrap_exception
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index 55036d1d1..935063609 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -528,6 +528,8 @@ def fixed_ip_update(context, address, values):
#TODO(gundlach): instance_create and volume_create are nearly identical
#and should be refactored. I expect there are other copy-and-paste
#functions between the two of them as well.
+
+
@require_context
def instance_create(context, values):
"""Create a new Instance record in the database.
@@ -913,6 +915,8 @@ def network_get(context, network_id, session=None):
# NOTE(vish): pylint complains because of the long method name, but
# it fits with the names of the rest of the methods
# pylint: disable-msg=C0103
+
+
@require_admin_context
def network_get_associated_fixed_ips(context, network_id):
session = get_session()
diff --git a/nova/exception.py b/nova/exception.py
index 6d6c37338..9af4017ba 100644
--- a/nova/exception.py
+++ b/nova/exception.py
@@ -27,6 +27,7 @@ import traceback
class ProcessExecutionError(IOError):
+
def __init__(self, stdout=None, stderr=None, exit_code=None, cmd=None,
description=None):
if description is None:
@@ -39,11 +40,13 @@ class ProcessExecutionError(IOError):
class Error(Exception):
+
def __init__(self, message=None):
super(Error, self).__init__(message)
class ApiError(Error):
+
def __init__(self, message='Unknown', code='Unknown'):
self.message = message
self.code = code
diff --git a/nova/process.py b/nova/process.py
index b33df048b..39fddef6f 100644
--- a/nova/process.py
+++ b/nova/process.py
@@ -40,6 +40,8 @@ flags.DEFINE_integer('process_pool_size', 4,
# This is based on _BackRelay from twister.internal.utils, but modified to
# capture both stdout and stderr, without odd stderr handling, and also to
# handle stdin
+
+
class BackRelayWithInput(protocol.ProcessProtocol):
"""
Trivial protocol for communicating with a process and turning its output
diff --git a/nova/server.py b/nova/server.py
index a0ee54681..3b9086177 100644
--- a/nova/server.py
+++ b/nova/server.py
@@ -42,7 +42,7 @@ flags.DEFINE_bool('daemonize', False, 'daemonize this process')
# clutter.
flags.DEFINE_bool('use_syslog', True, 'output to syslog when daemonizing')
flags.DEFINE_string('logfile', None, 'log file to output to')
-flags.DEFINE_string('logdir', None, 'directory to keep log files in '
+flags.DEFINE_string('logdir', None, 'directory to keep log files in '
'(will be prepended to $logfile)')
flags.DEFINE_string('pidfile', None, 'pid file to output to')
flags.DEFINE_string('working_directory', './', 'working directory...')
diff --git a/nova/tests/api/openstack/test_servers.py b/nova/tests/api/openstack/test_servers.py
index 8e48017d0..ba432f6c3 100644
--- a/nova/tests/api/openstack/test_servers.py
+++ b/nova/tests/api/openstack/test_servers.py
@@ -84,9 +84,9 @@ class ServersTest(unittest.TestCase):
instance_address)
self.stubs.Set(nova.db.api, 'instance_get_floating_address',
instance_address)
- self.stubs.Set(nova.compute.api.ComputeAPI, 'pause',
+ self.stubs.Set(nova.compute.api.ComputeAPI, 'pause',
fake_compute_api)
- self.stubs.Set(nova.compute.api.ComputeAPI, 'unpause',
+ self.stubs.Set(nova.compute.api.ComputeAPI, 'unpause',
fake_compute_api)
self.allow_admin = FLAGS.allow_admin_api
diff --git a/nova/twistd.py b/nova/twistd.py
index cb5648ce6..e6c3101f1 100644
--- a/nova/twistd.py
+++ b/nova/twistd.py
@@ -43,7 +43,7 @@ else:
FLAGS = flags.FLAGS
-flags.DEFINE_string('logdir', None, 'directory to keep log files in '
+flags.DEFINE_string('logdir', None, 'directory to keep log files in '
'(will be prepended to $logfile)')
diff --git a/nova/virt/fake.py b/nova/virt/fake.py
index c56907175..59acabc21 100644
--- a/nova/virt/fake.py
+++ b/nova/virt/fake.py
@@ -259,5 +259,6 @@ class FakeConnection(object):
class FakeInstance(object):
+
def __init__(self):
self._state = power_state.NOSTATE
diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py
index 97ff49a10..5939f0afe 100644
--- a/nova/virt/libvirt_conn.py
+++ b/nova/virt/libvirt_conn.py
@@ -119,6 +119,7 @@ def get_connection(read_only):
class LibvirtConnection(object):
+
def __init__(self, read_only):
(self.libvirt_uri,
template_file,
@@ -298,12 +299,12 @@ class LibvirtConnection(object):
@exception.wrap_exception
def pause(self, instance, callback):
raise exception.APIError("pause not supported for libvirt.")
-
+
@defer.inlineCallbacks
@exception.wrap_exception
def unpause(self, instance, callback):
raise exception.APIError("unpause not supported for libvirt.")
-
+
@defer.inlineCallbacks
@exception.wrap_exception
def rescue(self, instance):
diff --git a/nova/virt/xenapi/network_utils.py b/nova/virt/xenapi/network_utils.py
index 8cb4cce3a..cffaf7f23 100644
--- a/nova/virt/xenapi/network_utils.py
+++ b/nova/virt/xenapi/network_utils.py
@@ -27,6 +27,7 @@ class NetworkHelper():
"""
The class that wraps the helper methods together.
"""
+
def __init__(self):
return
diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py
index 77edb576e..c17dc0bed 100644
--- a/nova/virt/xenapi/vm_utils.py
+++ b/nova/virt/xenapi/vm_utils.py
@@ -49,6 +49,7 @@ class VMHelper():
"""
The class that wraps the helper methods together.
"""
+
def __init__(self):
return
diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py
index 7c5db0b73..405a8518e 100644
--- a/nova/virt/xenapi/vmops.py
+++ b/nova/virt/xenapi/vmops.py
@@ -36,6 +36,7 @@ class VMOps(object):
"""
Management class for VM-related tasks
"""
+
def __init__(self, session):
global XenAPI
if XenAPI is None:
diff --git a/nova/virt/xenapi/volumeops.py b/nova/virt/xenapi/volumeops.py
index a4c7a3861..1943ccab0 100644
--- a/nova/virt/xenapi/volumeops.py
+++ b/nova/virt/xenapi/volumeops.py
@@ -20,6 +20,7 @@ Management class for Storage-related functions (attach, detach, etc).
class VolumeOps(object):
+
def __init__(self, session):
self._session = session
diff --git a/nova/virt/xenapi_conn.py b/nova/virt/xenapi_conn.py
index ebd572258..fa87bb779 100644
--- a/nova/virt/xenapi_conn.py
+++ b/nova/virt/xenapi_conn.py
@@ -101,6 +101,7 @@ def get_connection(_):
class XenAPIConnection(object):
""" A connection to XenServer or Xen Cloud Platform """
+
def __init__(self, url, user, pw):
session = XenAPISession(url, user, pw)
self._vmops = VMOps(session)
@@ -155,6 +156,7 @@ class XenAPIConnection(object):
class XenAPISession(object):
""" The session to invoke XenAPI SDK calls """
+
def __init__(self, url, user, pw):
self._session = XenAPI.Session(url)
self._session.login_with_password(user, pw)
generated by cgit (git 2.34.1) at 2025-09-24 10:49:22 +0000