From e016bb7558044dc72a25e3f52da30e5e693d1169 Mon Sep 17 00:00:00 2001 From: Gary Kotton Date: Sun, 12 Mar 2017 01:58:25 -0800 Subject: [PATCH] NSX|V: ensure correct parameter is passed The callback complete_edge_creation has a number of parameters that do not need to be passed. Here we make sure that the new ones past are the correct ones. Change-Id: I2a512058b7ab7acc845dc3b4a2bbe7cd3701102b --- vmware_nsx/plugins/nsx_v/vshield/edge_appliance_driver.py | 2 +- vmware_nsx/plugins/nsx_v/vshield/edge_utils.py | 2 +- 2 files changed, 2 insertions(+), 2 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 838e49332b..56c4810345 100644 --- a/vmware_nsx/plugins/nsx_v/vshield/edge_appliance_driver.py +++ b/vmware_nsx/plugins/nsx_v/vshield/edge_appliance_driver.py @@ -444,7 +444,7 @@ class EdgeApplianceDriver(object): self.callbacks.complete_edge_creation( context, edge_id, name, router_id, dist, True, - availability_zone, deploy_metadata) + availability_zone, deploy_metadata=deploy_metadata) except exceptions.VcnsApiException: self.callbacks.complete_edge_creation( diff --git a/vmware_nsx/plugins/nsx_v/vshield/edge_utils.py b/vmware_nsx/plugins/nsx_v/vshield/edge_utils.py index 3954a118a7..30d5600d2b 100644 --- a/vmware_nsx/plugins/nsx_v/vshield/edge_utils.py +++ b/vmware_nsx/plugins/nsx_v/vshield/edge_utils.py @@ -720,7 +720,7 @@ class EdgeManager(object): with locking.LockManager.get_lock(str(edge_id)): self.nsxv_manager.callbacks.complete_edge_creation( context, edge_id, lrouter['name'], lrouter['id'], dist, - True, deploy_metadata) + True, deploy_metadata=deploy_metadata) try: self.nsxv_manager.rename_edge(edge_id, name)