x
/
vmware-nsx
Code Issues Proposed changes

Merge "Ensure that _ does not override translation function"

This commit is contained in:
Jenkins 2016-07-03 19:25:09 +00:00 committed by Gerrit Code Review
parent b5703e527e 9b9c262d92
commit 44dcc5cad9
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vmware_nsx/plugins/nsx_v/vshield/edge_utils.py
View File

@ -502,7 +502,7 @@ class EdgeManager(object):
2. Update the address groups to an existing tunnel
"""
LOG.debug("Query the vnic %s for DHCP Edge %s", vnic_index, edge_id)
_, vnic_config = self.nsxv_manager.get_interface(edge_id, vnic_index)
h, vnic_config = self.nsxv_manager.get_interface(edge_id, vnic_index)
sub_iface_dict = vnic_config.get('subInterfaces')
port_group_id = vnic_config.get('portgroupId')
new_tunnel_creation = True

2
vmware_nsx/plugins/nsx_v3/plugin.py
View File

@ -2231,7 +2231,7 @@ class NsxV3Plugin(agentschedulers_db.AZDhcpAgentSchedulerDbMixin,
'device_owner': const.ROUTER_INTERFACE_OWNERS}
ports = self.get_ports(context, filters=filters)
for port in ports:
_, nsx_port_id = nsx_db.get_nsx_switch_and_port_id(
nsx_s_id_, nsx_port_id = nsx_db.get_nsx_switch_and_port_id(
context.session, port['id'])
if nsx_port_id:
name = utils.get_name_and_uuid(