x/vmware-nsx
Code Issues Proposed changes

Merge "NSXv Admin: Fix gw-edge firewall config"

Browse Source
This commit is contained in:
Jenkins 2017-06-12 12:59:30 +00:00 committed by Gerrit Code Review
commit 9ed4a1615f
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
vmware_nsx/shell/admin/plugins/nsxv/resources/gw_edges.py
View File

@ -115,7 +115,8 @@ def _assemble_gw_edge(name, size, external_iface_info, internal_iface_info,
edge['vnics']['vnics'].append(vnic_external) edge['vnics']['vnics'].append(vnic_external)
edge['vnics']['vnics'].append(vnic_internal) edge['vnics']['vnics'].append(vnic_internal)
edge['features'] = [{'firewall': {'enabled': False}}] edge['featureConfigs']['features'] = [{'featureType': 'firewall_4.0',
'enabled': False}]
if default_gateway: if default_gateway:
edge['features'] = {'routing': edge['features'] = {'routing':
{'staticRouting': {'staticRouting':
@ -201,8 +202,8 @@ def delete_bgp_gw(resource, event, trigger, **kwargs):
edge_id = properties['gw-edge-id'] edge_id = properties['gw-edge-id']
try: try:
nsxv.vcns.delete_edge(edge_id) nsxv.vcns.delete_edge(edge_id)
except exceptions.ResourceNotFound: except Exception:
LOG.error("Edge %s was not found", edge_id) LOG.error("Failed to delete edge %s", edge_id)
return return
@ -254,10 +255,11 @@ def create_redis_rule(resource, event, trigger, **kwargs):
res = [{'edge_id': edge_id, res = [{'edge_id': edge_id,
'prefix': prefix_name if prefix_name else 'ANY', 'prefix': prefix_name if prefix_name else 'ANY',
'learner-protocol': 'bgp',
'learn-from': ', '.join(set(learn_from)), 'learn-from': ', '.join(set(learn_from)),
'action': properties['action']} for edge_id in edge_ids] 'action': properties['action']} for edge_id in edge_ids]
headers = ['edge_id', 'prefix', 'learn-from', 'action'] headers = ['edge_id', 'prefix', 'learner-protocol', 'learn-from', 'action']
LOG.info(formatters.output_formatter( LOG.info(formatters.output_formatter(
'Routing redistribution rule', res, headers)) 'Routing redistribution rule', res, headers))