From f835d61147d21b0b8016777516e65c69ac1e15e9 Mon Sep 17 00:00:00 2001 From: Gary Kotton Date: Tue, 4 Oct 2016 17:57:32 -0700 Subject: [PATCH] NSX|V: remove unused parameter jobdata is no longer used. This is since we removed the background tasks for reading the edge status. TrivialFix Change-Id: I47f0298dda9b4de4d2447eabdead67f0c9e4baab --- vmware_nsx/plugins/nsx_v/vshield/edge_appliance_driver.py | 4 ++-- vmware_nsx/tests/unit/nsx_v/vshield/test_vcns_driver.py | 8 -------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/vmware_nsx/plugins/nsx_v/vshield/edge_appliance_driver.py b/vmware_nsx/plugins/nsx_v/vshield/edge_appliance_driver.py index 33b2bf57e6..c54c55244b 100644 --- a/vmware_nsx/plugins/nsx_v/vshield/edge_appliance_driver.py +++ b/vmware_nsx/plugins/nsx_v/vshield/edge_appliance_driver.py @@ -290,7 +290,7 @@ class EdgeApplianceDriver(object): def update_interface(self, router_id, edge_id, index, network, tunnel_index=-1, address=None, netmask=None, - secondary=None, jobdata=None, is_connected=True, + secondary=None, is_connected=True, address_groups=None): LOG.debug("VCNS: update vnic %(index)d: %(addr)s %(netmask)s", { 'index': index, 'addr': address, 'netmask': netmask}) @@ -362,7 +362,7 @@ class EdgeApplianceDriver(object): # avoid bug 1389358 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", {'vnic_index': index, 'edge_id': edge_id}) try: diff --git a/vmware_nsx/tests/unit/nsx_v/vshield/test_vcns_driver.py b/vmware_nsx/tests/unit/nsx_v/vshield/test_vcns_driver.py index 6c9c32f7c4..527bd0ae20 100644 --- a/vmware_nsx/tests/unit/nsx_v/vshield/test_vcns_driver.py +++ b/vmware_nsx/tests/unit/nsx_v/vshield/test_vcns_driver.py @@ -356,14 +356,6 @@ class VcnsDriverTestCase(base.BaseTestCase): availability_zone=self.az) 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): self.vcns_driver.deploy_edge( self.ctx, 'router-id', 'myedge', 'internal-network',