Bug 575 Fix token refresh for VCD VIMconnector
Change-Id: I10ba41f3e4361410eba050a028ce7d8e015ef673
Signed-off-by: Ravi Chamarty <ravi.chamarty@riftio.com>
diff --git a/osm_ro/vimconn_vmware.py b/osm_ro/vimconn_vmware.py
index eb4e237..4405609 100644
--- a/osm_ro/vimconn_vmware.py
+++ b/osm_ro/vimconn_vmware.py
@@ -6298,12 +6298,18 @@
Returns org and vdc object
"""
- org = Org(self.client, resource=self.client.get_org())
- vdc = org.get_vdc(self.tenant_name)
+ vdc = None
+ try:
+ org = Org(self.client, resource=self.client.get_org())
+ vdc = org.get_vdc(self.tenant_name)
+ except Exception as e:
+ # pyvcloud not giving a specific exception, Refresh nevertheless
+ self.logger.debug("Received exception {}, refreshing token ".format(str(e)))
#Retry once, if failed by refreshing token
if vdc is None:
self.get_token()
+ org = Org(self.client, resource=self.client.get_org())
vdc = org.get_vdc(self.tenant_name)
return org, vdc