diff --git a/nova/exception.py b/nova/exception.py index b0b69091240e..ef95cb3df808 100644 --- a/nova/exception.py +++ b/nova/exception.py @@ -659,7 +659,7 @@ class FloatingIpExists(NovaException): class FloatingIpNotFound(NotFound): - ec2_code = "UnsupportedOpperation" + ec2_code = "UnsupportedOperation" msg_fmt = _("Floating ip not found for id %(id)s.") @@ -690,7 +690,7 @@ class NoMoreFloatingIps(FloatingIpNotFound): class FloatingIpAssociated(NovaException): - ec2_code = "UnsupportedOpperation" + ec2_code = "UnsupportedOperation" msg_fmt = _("Floating ip %(address)s is associated.") @@ -703,12 +703,12 @@ class NoFloatingIpsDefined(NotFound): class NoFloatingIpInterface(NotFound): - ec2_code = "UnsupportedOpperation" + ec2_code = "UnsupportedOperation" msg_fmt = _("Interface %(interface)s not found.") class CannotDisassociateAutoAssignedFloatingIP(NovaException): - ec2_code = "UnsupportedOpperation" + ec2_code = "UnsupportedOperation" msg_fmt = _("Cannot disassociate auto assigned floating ip") diff --git a/nova/filters.py b/nova/filters.py index 04757ecec183..6e5fd6920fc2 100644 --- a/nova/filters.py +++ b/nova/filters.py @@ -35,7 +35,7 @@ class BaseFilter(object): def filter_all(self, filter_obj_list, filter_properties): """Yield objects that pass the filter. - Can be overriden in a subclass, if you need to base filtering + Can be overridden in a subclass, if you need to base filtering decisions on all objects. Otherwise, one can just override _filter_one() to filter a single object. """ diff --git a/nova/weights.py b/nova/weights.py index 7dca2e40dd3f..da5c93a7adbd 100644 --- a/nova/weights.py +++ b/nova/weights.py @@ -34,7 +34,7 @@ class BaseWeigher(object): """Base class for pluggable weighers.""" def _weight_multiplier(self): """How weighted this weigher should be. Normally this would - be overriden in a subclass based on a config value. + be overridden in a subclass based on a config value. """ return 1.0