summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--nova/auth/fakeldap.py4
-rw-r--r--nova/auth/manager.py4
-rw-r--r--nova/compute/api.py5
-rw-r--r--nova/compute/manager.py2
-rw-r--r--nova/crypto.py2
-rw-r--r--nova/db/sqlalchemy/api.py16
-rw-r--r--nova/fakerabbit.py2
-rw-r--r--nova/log.py4
-rwxr-xr-xnova/network/linux_net.py16
-rw-r--r--nova/network/manager.py6
-rw-r--r--nova/notifier/list_notifier.py2
-rw-r--r--nova/rpc/common.py4
-rw-r--r--nova/rpc/impl_carrot.py2
-rw-r--r--nova/rpc/impl_kombu.py4
-rw-r--r--nova/scheduler/api.py2
-rw-r--r--nova/scheduler/driver.py4
-rw-r--r--nova/scheduler/manager.py2
-rw-r--r--nova/test.py4
-rw-r--r--nova/utils.py4
-rw-r--r--nova/virt/driver.py6
20 files changed, 48 insertions, 47 deletions
diff --git a/nova/auth/fakeldap.py b/nova/auth/fakeldap.py
index f1e769278..f576da8e7 100644
--- a/nova/auth/fakeldap.py
+++ b/nova/auth/fakeldap.py
@@ -114,7 +114,7 @@ def _match_query(query, attrs):
"""Match an ldap query to an attribute dictionary.
The characters &, |, and ! are supported in the query. No syntax checking
- is performed, so malformed querys will not work correctly.
+ is performed, so malformed queries will not work correctly.
"""
# cut off the parentheses
inner = query[1:-1]
@@ -171,7 +171,7 @@ def _match(key, value, attrs):
def _subs(value):
"""Returns a list of subclass strings.
- The strings represent the ldap objectclass plus any subclasses that
+ The strings represent the ldap object class plus any subclasses that
inherit from it. Fakeldap doesn't know about the ldap object structure,
so subclasses need to be defined manually in the dictionary below.
diff --git a/nova/auth/manager.py b/nova/auth/manager.py
index e0504464e..93b4244ad 100644
--- a/nova/auth/manager.py
+++ b/nova/auth/manager.py
@@ -99,7 +99,7 @@ class AuthBase(object):
This method will return the id of the object if the object
is of this class, otherwise it will return the original object.
- This allows methods to accept objects or ids as paramaters.
+ This allows methods to accept objects or ids as parameters.
"""
if isinstance(obj, cls):
return obj.id
@@ -692,7 +692,7 @@ class AuthManager(object):
@type admin: bool
@param admin: Whether to set the admin flag. The admin flag gives
- superuser status regardless of roles specifed for the user.
+ superuser status regardless of roles specified for the user.
@type create_project: bool
@param: Whether to create a project for the user with the same name.
diff --git a/nova/compute/api.py b/nova/compute/api.py
index 899febcd8..a996fa310 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -1470,7 +1470,7 @@ class API(base.Base):
'host': output['host'],
'port': output['port']}})
- # hostignore and portignore are compatability params for noVNC
+ # hostignore and portignore are compatibility params for noVNC
return {'url': '%s/vnc_auto.html?token=%s&host=%s&port=%s' % (
FLAGS.vncproxy_url,
output['token'],
@@ -1542,7 +1542,8 @@ class API(base.Base):
# TODO(tr3buchet): currently network_info doesn't contain floating IPs
# in its info, if this changes, the next few lines will need to
- # accomodate the info containing floating as well as fixed ip addresses
+ # accommodate the info containing floating as well as fixed ip
+ # addresses
fixed_ip_addrs = []
for info in self.network_api.get_instance_nw_info(context,
instance):
diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 76a8ab7f6..2bb315d8f 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -138,7 +138,7 @@ class ComputeManager(manager.SchedulerDependentManager):
def __init__(self, compute_driver=None, *args, **kwargs):
"""Load configuration options and connect to the hypervisor."""
# TODO(vish): sync driver creation logic with the rest of the system
- # and redocument the module docstring
+ # and re-document the module docstring
if not compute_driver:
compute_driver = FLAGS.compute_driver
diff --git a/nova/crypto.py b/nova/crypto.py
index 71bef80f2..e97852572 100644
--- a/nova/crypto.py
+++ b/nova/crypto.py
@@ -52,7 +52,7 @@ flags.DEFINE_string('key_file',
os.path.join('private', 'cakey.pem'),
_('Filename of private key'))
flags.DEFINE_string('crl_file', 'crl.pem',
- _('Filename of root Certificate Revokation List'))
+ _('Filename of root Certificate Revocation List'))
flags.DEFINE_string('keys_path', '$state_path/keys',
_('Where we keep our keys'))
flags.DEFINE_string('ca_path', '$state_path/CA',
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index e3420199d..77d018d43 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -124,7 +124,7 @@ def require_context(f):
def require_instance_exists(f):
"""Decorator to require the specified instance to exist.
- Requres the wrapped function to use context and instance_id as
+ Requires the wrapped function to use context and instance_id as
their first two arguments.
"""
@@ -138,7 +138,7 @@ def require_instance_exists(f):
def require_volume_exists(f):
"""Decorator to require the specified volume to exist.
- Requres the wrapped function to use context and volume_id as
+ Requires the wrapped function to use context and volume_id as
their first two arguments.
"""
@@ -947,7 +947,7 @@ def fixed_ip_update(context, address, values):
@require_context
def virtual_interface_create(context, values):
- """Create a new virtual interface record in teh database.
+ """Create a new virtual interface record in the database.
:param values: = dict containing column values
"""
@@ -1043,7 +1043,7 @@ def virtual_interface_get_by_fixed_ip(context, fixed_ip_id):
def virtual_interface_get_by_instance(context, instance_id):
"""Gets all virtual interfaces for instance.
- :param instance_id: = id of the instance to retreive vifs for
+ :param instance_id: = id of the instance to retrieve vifs for
"""
session = get_session()
vif_refs = session.query(models.VirtualInterface).\
@@ -1072,7 +1072,7 @@ def virtual_interface_get_by_instance_and_network(context, instance_id,
def virtual_interface_get_by_network(context, network_id):
"""Gets all virtual_interface on network.
- :param network_id: = network to retreive vifs for
+ :param network_id: = network to retrieve vifs for
"""
session = get_session()
vif_refs = session.query(models.VirtualInterface).\
@@ -1085,7 +1085,7 @@ def virtual_interface_get_by_network(context, network_id):
@require_context
def virtual_interface_delete(context, vif_id):
- """Delete virtual interface record from teh database.
+ """Delete virtual interface record from the database.
:param vif_id: = id of vif to delete
"""
@@ -1724,7 +1724,7 @@ def network_associate(context, project_id, force=False):
or if force is True
force solves race condition where a fresh project has multiple instance
- builds simultaneosly picked up by multiple network hosts which attempt
+ builds simultaneously picked up by multiple network hosts which attempt
to associate the project with multiple networks
force should only be used as a direct consequence of user request
all automated requests should not use force
@@ -1744,7 +1744,7 @@ def network_associate(context, project_id, force=False):
network_ref = network_query(project_id)
if force or not network_ref:
- # in force mode or project doesn't have a network so assocaite
+ # in force mode or project doesn't have a network so associate
# with a new network
# get new network
diff --git a/nova/fakerabbit.py b/nova/fakerabbit.py
index e7e9dab77..2807a76f6 100644
--- a/nova/fakerabbit.py
+++ b/nova/fakerabbit.py
@@ -16,7 +16,7 @@
# License for the specific language governing permissions and limitations
# under the License.
-"""Based a bit on the carrot.backeds.queue backend... but a lot better."""
+"""Based a bit on the carrot.backends.queue backend... but a lot better."""
import Queue as queue
diff --git a/nova/log.py b/nova/log.py
index 23b83ab5b..0f2153af4 100644
--- a/nova/log.py
+++ b/nova/log.py
@@ -131,7 +131,7 @@ def _get_log_file_path(binary=None):
class NovaLogger(logging.Logger):
"""NovaLogger manages request context and formatting.
- This becomes the class that is instanciated by logging.getLogger.
+ This becomes the class that is instantiated by logging.getLogger.
"""
@@ -323,7 +323,7 @@ logging.setLoggerClass(NovaLogger)
def audit(msg, *args, **kwargs):
- """Shortcut for logging to root log with sevrity 'AUDIT'."""
+ """Shortcut for logging to root log with severity 'AUDIT'."""
logging.root.log(AUDIT, msg, *args, **kwargs)
diff --git a/nova/network/linux_net.py b/nova/network/linux_net.py
index 099842979..0cda55b32 100755
--- a/nova/network/linux_net.py
+++ b/nova/network/linux_net.py
@@ -218,14 +218,14 @@ class IptablesManager(object):
intended for rules that need to live at the top of the FORWARD and OUTPUT
chains. It's in both the ipv4 and ipv6 set of tables.
- For ipv4 and ipv6, the builtin INPUT, OUTPUT, and FORWARD filter chains are
- wrapped, meaning that the "real" INPUT chain has a rule that jumps to the
- wrapped INPUT chain, etc. Additionally, there's a wrapped chain named
+ For ipv4 and ipv6, the built-in INPUT, OUTPUT, and FORWARD filter chains
+ are wrapped, meaning that the "real" INPUT chain has a rule that jumps to
+ the wrapped INPUT chain, etc. Additionally, there's a wrapped chain named
"local" which is jumped to from nova-filter-top.
- For ipv4, the builtin PREROUTING, OUTPUT, and POSTROUTING nat chains are
- wrapped in the same was as the builtin filter chains. Additionally, there's
- a snat chain that is applied after the POSTROUTING chain.
+ For ipv4, the built-in PREROUTING, OUTPUT, and POSTROUTING nat chains are
+ wrapped in the same was as the built-in filter chains. Additionally,
+ there's a snat chain that is applied after the POSTROUTING chain.
"""
@@ -253,7 +253,7 @@ class IptablesManager(object):
tables['filter'].add_rule('nova-filter-top', '-j $local',
wrap=False)
- # Wrap the builtin chains
+ # Wrap the built-in chains
builtin_chains = {4: {'filter': ['INPUT', 'OUTPUT', 'FORWARD'],
'nat': ['PREROUTING', 'OUTPUT', 'POSTROUTING']},
6: {'filter': ['INPUT', 'OUTPUT', 'FORWARD']}}
@@ -364,7 +364,7 @@ class IptablesManager(object):
return True
# We filter duplicates, letting the *last* occurrence take
- # precendence.
+ # precedence.
new_filter.reverse()
new_filter = filter(_weed_out_duplicates, new_filter)
new_filter.reverse()
diff --git a/nova/network/manager.py b/nova/network/manager.py
index 7e917e6bf..0822e9b07 100644
--- a/nova/network/manager.py
+++ b/nova/network/manager.py
@@ -517,7 +517,7 @@ class NetworkManager(manager.SchedulerDependentManager):
self.host,
time)
if num:
- LOG.debug(_('Dissassociated %s stale fixed ip(s)'), num)
+ LOG.debug(_('Disassociated %s stale fixed ip(s)'), num)
def set_network_host(self, context, network_ref):
"""Safely sets the host of the network."""
@@ -656,7 +656,7 @@ class NetworkManager(manager.SchedulerDependentManager):
instance_type_id, host):
"""Creates network info list for instance.
- called by allocate_for_instance and netowrk_api
+ called by allocate_for_instance and network_api
context needs to be elevated
:returns: network info list [(network,info),(network,info)...]
where network = dict containing pertinent data from a network db object
@@ -976,7 +976,7 @@ class NetworkManager(manager.SchedulerDependentManager):
net['vlan'] = vlan
net['bridge'] = 'br%s' % vlan
- # NOTE(vish): This makes ports unique accross the cloud, a more
+ # NOTE(vish): This makes ports unique across the cloud, a more
# robust solution would be to make them uniq per ip
net['vpn_public_port'] = kwargs['vpn_start'] + index
diff --git a/nova/notifier/list_notifier.py b/nova/notifier/list_notifier.py
index 955ae1b57..62847c85f 100644
--- a/nova/notifier/list_notifier.py
+++ b/nova/notifier/list_notifier.py
@@ -53,7 +53,7 @@ def _get_drivers():
def notify(message):
- """Passes notification to mulitple notifiers in a list."""
+ """Passes notification to multiple notifiers in a list."""
for driver in _get_drivers():
try:
driver.notify(message)
diff --git a/nova/rpc/common.py b/nova/rpc/common.py
index 120d6ad14..a7597d29b 100644
--- a/nova/rpc/common.py
+++ b/nova/rpc/common.py
@@ -13,10 +13,10 @@ flags.DEFINE_integer('rpc_conn_pool_size', 30,
class RemoteError(exception.NovaException):
"""Signifies that a remote class has raised an exception.
- Containes a string representation of the type of the original exception,
+ Contains a string representation of the type of the original exception,
the value of the original exception, and the traceback. These are
sent to the parent as a joined string so printing the exception
- contains all of the relevent info.
+ contains all of the relevant info.
"""
message = _("Remote error: %(exc_type)s %(value)s\n%(traceback)s.")
diff --git a/nova/rpc/impl_carrot.py b/nova/rpc/impl_carrot.py
index 303a4ff88..2a518d7d7 100644
--- a/nova/rpc/impl_carrot.py
+++ b/nova/rpc/impl_carrot.py
@@ -274,7 +274,7 @@ class AdapterConsumer(Consumer):
@exception.wrap_exception()
def _process_data(self, msg_id, ctxt, method, args):
- """Thread that maigcally looks for a method on the proxy
+ """Thread that magically looks for a method on the proxy
object and calls it.
"""
diff --git a/nova/rpc/impl_kombu.py b/nova/rpc/impl_kombu.py
index e7fc491ea..74c8cf412 100644
--- a/nova/rpc/impl_kombu.py
+++ b/nova/rpc/impl_kombu.py
@@ -319,7 +319,7 @@ class Connection(object):
self.reconnect()
def reconnect(self):
- """Handles reconnecting and re-estblishing queues"""
+ """Handles reconnecting and re-establishing queues"""
if self.connection:
try:
self.connection.close()
@@ -609,7 +609,7 @@ class ProxyCallback(object):
@exception.wrap_exception()
def _process_data(self, ctxt, method, args):
- """Thread that maigcally looks for a method on the proxy
+ """Thread that magically looks for a method on the proxy
object and calls it.
"""
diff --git a/nova/scheduler/api.py b/nova/scheduler/api.py
index 41cdb80a3..dae5b1d8f 100644
--- a/nova/scheduler/api.py
+++ b/nova/scheduler/api.py
@@ -60,7 +60,7 @@ def get_host_list(context):
def get_zone_list(context):
- """Return a list of zones assoicated with this zone."""
+ """Return a list of zones associated with this zone."""
items = _call_scheduler('get_zone_list', context)
for item in items:
item['api_url'] = item['api_url'].replace('\\/', '/')
diff --git a/nova/scheduler/driver.py b/nova/scheduler/driver.py
index b276b11df..5041c3346 100644
--- a/nova/scheduler/driver.py
+++ b/nova/scheduler/driver.py
@@ -36,7 +36,7 @@ from nova.api.ec2 import ec2utils
FLAGS = flags.FLAGS
LOG = logging.getLogger('nova.scheduler.driver')
flags.DEFINE_integer('service_down_time', 60,
- 'maximum time since last checkin for up service')
+ 'maximum time since last check-in for up service')
flags.DECLARE('instances_path', 'nova.compute.manager')
@@ -116,7 +116,7 @@ def encode_instance(instance, local=True):
class Scheduler(object):
- """The base class that all Scheduler clases should inherit from."""
+ """The base class that all Scheduler classes should inherit from."""
def __init__(self):
self.zone_manager = None
diff --git a/nova/scheduler/manager.py b/nova/scheduler/manager.py
index f5a268adb..0f973341e 100644
--- a/nova/scheduler/manager.py
+++ b/nova/scheduler/manager.py
@@ -66,7 +66,7 @@ class SchedulerManager(manager.Manager):
return self.zone_manager.get_zone_list()
def get_zone_capabilities(self, context=None):
- """Get the normalized set of capabilites for this zone."""
+ """Get the normalized set of capabilities for this zone."""
return self.zone_manager.get_zone_capabilities(context)
def update_service_capabilities(self, context=None, service_name=None,
diff --git a/nova/test.py b/nova/test.py
index be259ce27..abd1294d4 100644
--- a/nova/test.py
+++ b/nova/test.py
@@ -69,7 +69,7 @@ class skip_test(object):
class skip_if(object):
- """Decorator that skips a test if contition is true."""
+ """Decorator that skips a test if condition is true."""
def __init__(self, condition, msg):
self.condition = condition
self.message = msg
@@ -152,7 +152,7 @@ class TestCase(unittest.TestCase):
if FLAGS.image_service == 'nova.image.fake.FakeImageService':
nova.image.fake.FakeImageService_reset()
- # Reset any overriden flags
+ # Reset any overridden flags
self.reset_flags()
# Stop any timers
diff --git a/nova/utils.py b/nova/utils.py
index 0023442b1..a30d90ff1 100644
--- a/nova/utils.py
+++ b/nova/utils.py
@@ -872,7 +872,7 @@ def gen_uuid():
def is_uuid_like(val):
- """For our purposes, a UUID is a string in canoical form:
+ """For our purposes, a UUID is a string in canonical form:
aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa
"""
@@ -910,7 +910,7 @@ def is_valid_ipv4(address):
def monkey_patch():
""" If the Flags.monkey_patch set as True,
- this functuion patches a decorator
+ this function patches a decorator
for all functions in specified modules.
You can set decorators for each modules
using FLAGS.monkey_patch_modules.
diff --git a/nova/virt/driver.py b/nova/virt/driver.py
index bcdd20f2c..c2056f19d 100644
--- a/nova/virt/driver.py
+++ b/nova/virt/driver.py
@@ -87,9 +87,9 @@ class ComputeDriver(object):
virtual network interface, and these IDs are opaque to the rest of Nova.
Some methods here take an instance of nova.compute.service.Instance. This
- is the datastructure used by nova.compute to store details regarding an
+ is the data structure used by nova.compute to store details regarding an
instance, and pass them into this layer. This layer is responsible for
- translating that generic datastructure into terms that are specific to the
+ translating that generic data structure into terms that are specific to the
virtualization platform.
"""
@@ -365,7 +365,7 @@ class ComputeDriver(object):
This message is sent to the virtualization drivers on hosts that are
running an instance that belongs to a security group that has a rule
that references the security group identified by `security_group_id`.
- It is the responsiblity of this method to make sure any rules
+ It is the responsibility of this method to make sure any rules
that authorize traffic flow with members of the security group are
updated and any new members can communicate, and any removed members
cannot.
generated by cgit (git 2.34.1) at 2025-09-23 15:03:04 +0000