x/vmware-nsx
Code Issues Proposed changes

Merge "Fixes typos in comments"

Browse Source
This commit is contained in:
Jenkins 2013-08-15 14:23:53 +00:00 committed by Gerrit Code Review
commit 005ca6eb29
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/db/db_base_plugin_v2.py
View File

@ -211,7 +211,7 @@ class NeutronDbPluginV2(neutron_plugin_base_v2.NeutronPluginBaseV2,
_dict_extend_functions = {} _dict_extend_functions = {}
def __init__(self): def __init__(self):
# NOTE(jkoelker) This is an incomlete implementation. Subclasses # NOTE(jkoelker) This is an incomplete implementation. Subclasses
# must override __init__ and setup the database # must override __init__ and setup the database
# and not call into this class's __init__. # and not call into this class's __init__.
# This connection is setup as memory for the tests. # This connection is setup as memory for the tests.

6
neutron/db/l3_db.py
View File

@ -75,7 +75,7 @@ class ExternalNetwork(model_base.BASEV2):
class FloatingIP(model_base.BASEV2, models_v2.HasId, models_v2.HasTenant): class FloatingIP(model_base.BASEV2, models_v2.HasId, models_v2.HasTenant):
"""Represents a floating IP address. """Represents a floating IP address.
This IP address may or many not be allocated to a tenant, and may or This IP address may or may not be allocated to a tenant, and may or
may not be associated with an internal port/ip address/router. may not be associated with an internal port/ip address/router.
""" """
@ -302,8 +302,8 @@ class L3_NAT_db_mixin(l3.RouterPluginBase):
try: try:
rport_qry = context.session.query(models_v2.Port) rport_qry = context.session.query(models_v2.Port)
rports = rport_qry.filter_by(device_id=router_id) rports = rport_qry.filter_by(device_id=router_id)
# its possible these ports on on the same network, but # It's possible these ports are on the same network, but
# different subnet # different subnets.
new_ipnet = netaddr.IPNetwork(subnet_cidr) new_ipnet = netaddr.IPNetwork(subnet_cidr)
for p in rports: for p in rports:
for ip in p['fixed_ips']: for ip in p['fixed_ips']: