x/vmware-nsx
Code Issues Proposed changes

Merge "Fix and enable H90x tests"

Browse Source
This commit is contained in:
Jenkins 2013-06-10 16:16:51 +00:00 committed by Gerrit Code Review
commit d8b40a0b63
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
quantum/plugins/midonet/midonet_lib.py
View File

@ -903,7 +903,7 @@ class MidoClient:
port_group_id = None port_group_id = None
# handle source # handle source
if not remote_ip_prefix is None: if remote_ip_prefix is not None:
nw_src_address, nw_src_length = remote_ip_prefix.split('/') nw_src_address, nw_src_length = remote_ip_prefix.split('/')
elif not remote_group_id is None: # security group as a srouce elif not remote_group_id is None: # security group as a srouce
source_pg = self.pg_manager.get_for_sg(tenant_id, remote_group_id) source_pg = self.pg_manager.get_for_sg(tenant_id, remote_group_id)

2
quantum/policy.py
View File

@ -99,7 +99,7 @@ def _set_rules(data):
for actual_policy in ['_'.join(item) for item in for actual_policy in ['_'.join(item) for item in
itertools.product(new_actions, itertools.product(new_actions,
new_policies)]: new_policies)]:
if not actual_policy in policies: if actual_policy not in policies:
# New policy, same rule # New policy, same rule
LOG.info(_("Inserting policy:%(new_policy)s in place " LOG.info(_("Inserting policy:%(new_policy)s in place "
"of deprecated policy:%(old_policy)s"), "of deprecated policy:%(old_policy)s"),

2
quantum/tests/unit/nicira/fake_nvpapiclient.py
View File

@ -260,7 +260,7 @@ class FakeClient:
return fake_gwservice return fake_gwservice
def _build_relation(self, src, dst, resource_type, relation): def _build_relation(self, src, dst, resource_type, relation):
if not relation in self.MANAGED_RELATIONS[resource_type]: if relation not in self.MANAGED_RELATIONS[resource_type]:
return # Relation is not desired in output return # Relation is not desired in output
if not '_relations' in src or not src['_relations'].get(relation): if not '_relations' in src or not src['_relations'].get(relation):
return # Item does not have relation return # Item does not have relation

3
tox.ini
View File

@ -36,8 +36,7 @@ commands = {posargs}
# H301 one import per line # H301 one import per line
# H302 import only modules # H302 import only modules
# TODO(marun) H404 multi line docstring should start with a summary # TODO(marun) H404 multi line docstring should start with a summary
# TODO(marun) H901,902 use the not operator inline for clarity ignore = E711,E712,E125,H301,H302,H404
ignore = E711,E712,E125,H301,H302,H404,H901,H902
show-source = true show-source = true
builtins = _ builtins = _
exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,tools exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,tools