x
/
vmware-nsx
Code Issues Proposed changes

Merge "NSX|V: remove unused parameter"

This commit is contained in:
Jenkins 2016-10-07 09:15:55 +00:00 committed by Gerrit Code Review
parent 657cc2abd9 f835d61147
commit f5ae9b3443
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vmware_nsx/plugins/nsx_v/vshield/edge_appliance_driver.py
View File

@ -290,7 +290,7 @@ class EdgeApplianceDriver(object):
def update_interface(self, router_id, edge_id, index, network, def update_interface(self, router_id, edge_id, index, network,
tunnel_index=-1, address=None, netmask=None, tunnel_index=-1, address=None, netmask=None,
secondary=None, jobdata=None, is_connected=True, secondary=None, is_connected=True,
address_groups=None): address_groups=None):
LOG.debug("VCNS: update vnic %(index)d: %(addr)s %(netmask)s", { LOG.debug("VCNS: update vnic %(index)d: %(addr)s %(netmask)s", {
'index': index, 'addr': address, 'netmask': netmask}) 'index': index, 'addr': address, 'netmask': netmask})
@ -362,7 +362,7 @@ class EdgeApplianceDriver(object):
# avoid bug 1389358 # avoid bug 1389358
self.check_edge_jobs(edge_id) self.check_edge_jobs(edge_id)
def delete_interface(self, router_id, edge_id, index, jobdata=None): def delete_interface(self, router_id, edge_id, index):
LOG.debug("Deleting vnic %(vnic_index)s: on edge %(edge_id)s", LOG.debug("Deleting vnic %(vnic_index)s: on edge %(edge_id)s",
{'vnic_index': index, 'edge_id': edge_id}) {'vnic_index': index, 'edge_id': edge_id})
try: try:

8
vmware_nsx/tests/unit/nsx_v/vshield/test_vcns_driver.py
View File

@ -356,14 +356,6 @@ class VcnsDriverTestCase(base.BaseTestCase):
availability_zone=self.az) availability_zone=self.az)
self.assertEqual(self.edge_id, 'edge-1') self.assertEqual(self.edge_id, 'edge-1')
def edge_delete_result(self, task):
if task.status == ts_const.TaskStatus.COMPLETED:
task.userdata['jobdata']['edge_delete_result'] = True
def interface_update_result(self, task):
if task.status == ts_const.TaskStatus.COMPLETED:
task.userdata['jobdata']['interface_update_result'] = True
def test_deploy_edge_with(self): def test_deploy_edge_with(self):
self.vcns_driver.deploy_edge( self.vcns_driver.deploy_edge(
self.ctx, 'router-id', 'myedge', 'internal-network', self.ctx, 'router-id', 'myedge', 'internal-network',