Merge "NSXv: eliminate task from edge rename operation"

vmware_nsx/plugins/nsx_v/vshield/edge_appliance_driver.py

@@ -390,27 +390,6 @@ class EdgeApplianceDriver(object):
 
         return status
 
-    def _rename_edge(self, task):
-        edge_id = task.userdata['edge_id']
-        LOG.debug("start rename edge %s", edge_id)
-        try:
-            # First get the current edge structure
-            # [0] is the status, [1] is the body
-            edge = self.vcns.get_edge(edge_id)[1]
-            # remove some data that will make the update fail
-            edge_utils.remove_irrelevant_keys_from_edge_request(edge)
-            # set the new name in the request
-            edge['name'] = task.userdata['name']
-            # update the edge
-            self.vcns.update_edge(edge_id, edge)
-            status = task_constants.TaskStatus.COMPLETED
-        except exceptions.VcnsApiException as e:
-            LOG.error(_LE("Failed to rename edge: %s"),
-                      e.response)
-            status = task_constants.TaskStatus.ERROR
-
-        return status
-
     def _delete_edge(self, task):
         edge_id = task.userdata['edge_id']
         LOG.debug("VCNS: start destroying edge %s", edge_id)
@@ -562,20 +541,21 @@ class EdgeApplianceDriver(object):
         self.task_manager.add(task)
         return task
 
-    def rename_edge(self, router_id, edge_id, name):
+    def rename_edge(self, edge_id, name):
         """rename edge."""
-        task_name = 'rename-%s' % name
-
-        userdata = {
-            'edge_id': edge_id,
-            'name': name
-        }
-        task = tasks.Task(task_name, router_id,
-                          self._rename_edge,
-                          userdata=userdata)
-        task.add_result_monitor(self.callbacks.edge_rename_result)
-        self.task_manager.add(task)
-        return task
+        try:
+            # First get the current edge structure
+            # [0] is the status, [1] is the body
+            edge = self.vcns.get_edge(edge_id)[1]
+            # remove some data that will make the update fail
+            edge_utils.remove_irrelevant_keys_from_edge_request(edge)
+            # set the new name in the request
+            edge['name'] = name
+            # update the edge
+            self.vcns.update_edge(edge_id, edge)
+        except exceptions.VcnsApiException as e:
+            LOG.error(_LE("Failed to rename edge: %s"),
+                      e.response)
 
     def delete_edge(self, resource_id, edge_id, jobdata=None, dist=False):
         task_name = 'delete-%s' % edge_id

vmware_nsx/plugins/nsx_v/vshield/edge_utils.py

@@ -764,9 +764,7 @@ class EdgeManager(object):
         edge_id = binding['edge_id']
         with locking.LockManager.get_lock(str(edge_id)):
             router_name = self._build_lrouter_name(router_id, new_name)
-            task = self.nsxv_manager.rename_edge(
-                router_id, edge_id, router_name)
-            task.wait(task_const.TaskState.RESULT)
+            self.nsxv_manager.rename_edge(edge_id, router_name)
 
     def update_dhcp_edge_bindings(self, context, network_id):
         """Reconfigure the DHCP to the edge."""
@@ -2319,9 +2317,6 @@ class NsxVCallbacks(object):
         except sa_exc.NoResultFound:
             LOG.warning(_LW("Router Binding for %s not found"), router_id)
 
-    def edge_rename_result(self, task):
-        LOG.debug("edge_rename_result %d", task.status)
-
     def interface_update_result(self, task):
         LOG.debug("interface_update_result %d", task.status)
 

vmware_nsx/tests/unit/nsx_v/test_plugin.py

@@ -2610,7 +2610,6 @@ class TestExclusiveRouterTestCase(L3NatTest, L3NatTestCaseBase,
                                     {'router': {'name': new_name}})
                 self.assertEqual(new_name, body['router']['name'])
                 edge_rename.assert_called_once_with(
-                    router_id,
                     edge_id,
                     new_name + '-' + router_id)