diff --git a/neutron/agent/linux/openvswitch_firewall/firewall.py b/neutron/agent/linux/openvswitch_firewall/firewall.py index 518d26219df..692bcba10f7 100644 --- a/neutron/agent/linux/openvswitch_firewall/firewall.py +++ b/neutron/agent/linux/openvswitch_firewall/firewall.py @@ -207,7 +207,7 @@ class SGPortMap(object): class ConjIdMap(object): - """Handle conjuction ID allocations and deallocations.""" + """Handle conjunction ID allocations and deallocations.""" def __init__(self): self.id_map = collections.defaultdict(self._conj_id_factory) diff --git a/neutron/db/quota/driver.py b/neutron/db/quota/driver.py index 0cfb44a972c..7312496edc4 100644 --- a/neutron/db/quota/driver.py +++ b/neutron/db/quota/driver.py @@ -82,7 +82,7 @@ class DbQuotaDriver(object): the detailed quotas (limit, used, reserved). :param context: The request context, for access checks. :param resources: A dictionary of the registered resource keys. - :return dict: mapping resource name in dict to its correponding limit + :return dict: mapping resource name in dict to its corresponding limit used and reserved. Reserved currently returns default value of 0 """ res_reserve_info = quota_api.get_reservations_for_resources( diff --git a/neutron/objects/qos/policy.py b/neutron/objects/qos/policy.py index 02d7f6273be..0826b43c327 100644 --- a/neutron/objects/qos/policy.py +++ b/neutron/objects/qos/policy.py @@ -313,7 +313,7 @@ class QosPolicy(rbac_db.NeutronRbacObject): def get_bound_tenant_ids(cls, context, policy_id): """Implements RbacNeutronObject.get_bound_tenant_ids. - :returns: set -- a set of tenants' ids dependant on QosPolicy. + :returns: set -- a set of tenants' ids dependent on QosPolicy. """ net = models_v2.Network qosnet = qos_db_model.QosNetworkPolicyBinding