openstack
/
neutron
Code Issues Proposed changes

Merge "Fix typos in neutron code"

This commit is contained in:
Jenkins 2015-08-06 09:29:44 +00:00 committed by Gerrit Code Review
parent 3d5eab8fa7 e12851f2df
commit 86f3788634
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/db/flavors_db.py
View File

@ -276,7 +276,7 @@ class FlavorManager(common_db_mixin.CommonDbMixin):
sp = service_profile['service_profile']
with context.session.begin(subtransactions=True):
driver_klass = self._load_dummy_driver(sp['driver'])
# 'get_service_type' must be a static method so it cant be changed
# 'get_service_type' must be a static method so it can't be changed
svc_type = DummyServiceDriver.get_service_type()
sp_db = ServiceProfile(id=uuidutils.generate_uuid(),

11
neutron/tests/common/conn_testers.py
View File

@ -154,11 +154,12 @@ class ConnectionTester(fixtures.Fixture):
dst_port_info = str()
src_port_info = str()
if dst_port is not None:
dst_port_info = " and destionation port %d" % dst_port
dst_port_info = " and destination port %d" % dst_port
if src_port is not None:
src_port_info = " and source port %d" % src_port
raise ConnectionTesterException("%s connection with %s protocol%s"
"%s was established but it "
raise ConnectionTesterException("%s connection with protocol %s, "
"source port %s, destination "
"port %s was established but it "
"shouldn't be possible" % (
direction, protocol,
src_port_info, dst_port_info))
@ -191,8 +192,8 @@ class ConnectionTester(fixtures.Fixture):
pass
else:
raise ConnectionTesterException(
'Established %s connection with protocol %s, source port %s, '
'destination port %s can still send packets throught' % (
'Established %s connection with protocol %s, source port %s, '
'destination port %s can still send packets through' % (
direction, protocol, src_port, dst_port))
@_validate_direction