x/vmware-nsx
Code Issues Proposed changes

Merge "BigSwitch plugin: allow 'external' keyword in router rules"

Browse Source
This commit is contained in:
Jenkins 2013-09-18 13:57:35 +00:00 committed by Gerrit Code Review
commit f797905d20
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
neutron/plugins/bigswitch/extensions/routerrule.py
View File

@ -40,12 +40,13 @@ def convert_to_valid_router_rules(data):
Validates and converts router rules to the appropriate data structure Validates and converts router rules to the appropriate data structure
Example argument = [{'source': 'any', 'destination': 'any', Example argument = [{'source': 'any', 'destination': 'any',
'action':'deny'}, 'action':'deny'},
{'source': '1.1.1.1/32', 'destination': 'any', {'source': '1.1.1.1/32', 'destination': 'external',
'action':'permit', 'action':'permit',
'nexthops': ['1.1.1.254', '1.1.1.253']} 'nexthops': ['1.1.1.254', '1.1.1.253']}
] ]
""" """
V4ANY = '0.0.0.0/0' V4ANY = '0.0.0.0/0'
CIDRALL = ['any', 'external']
if not isinstance(data, list): if not isinstance(data, list):
emsg = _("Invalid data format for router rule: '%s'") % data emsg = _("Invalid data format for router rule: '%s'") % data
LOG.debug(emsg) LOG.debug(emsg)
@ -58,8 +59,8 @@ def convert_to_valid_router_rules(data):
if not isinstance(rule['nexthops'], list): if not isinstance(rule['nexthops'], list):
rule['nexthops'] = rule['nexthops'].split('+') rule['nexthops'] = rule['nexthops'].split('+')
src = V4ANY if rule['source'] == 'any' else rule['source'] src = V4ANY if rule['source'] in CIDRALL else rule['source']
dst = V4ANY if rule['destination'] == 'any' else rule['destination'] dst = V4ANY if rule['destination'] in CIDRALL else rule['destination']
errors = [attr._verify_dict_keys(expected_keys, rule, False), errors = [attr._verify_dict_keys(expected_keys, rule, False),
attr._validate_subnet(dst), attr._validate_subnet(dst),

2
neutron/tests/unit/bigswitch/test_router_db.py
View File

@ -327,7 +327,7 @@ class RouterDBTestCase(test_l3_plugin.L3NatDBIntTestCase):
rules = body['router']['router_rules'] rules = body['router']['router_rules']
self.assertEqual(_strip_rule_ids(rules), router_rules) self.assertEqual(_strip_rule_ids(rules), router_rules)
# Try after adding another rule # Try after adding another rule
router_rules.append({'source': 'any', router_rules.append({'source': 'external',
'destination': '8.8.8.8/32', 'destination': '8.8.8.8/32',
'action': 'permit', 'nexthops': []}) 'action': 'permit', 'nexthops': []})
body = self._update('routers', r['router']['id'], body = self._update('routers', r['router']['id'],