From 5478615a08971455605dcb1c35a73872ffd82f4c Mon Sep 17 00:00:00 2001 From: Bin Yang Date: Wed, 28 Aug 2019 03:47:27 +0000 Subject: Fix unregistration error Change-Id: I907239e0d3f54bdd8cab6103cb3525626e629e39 Issue-ID: MULTICLOUD-793 Signed-off-by: Bin Yang --- share/starlingx_base/registration/registration.py | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) (limited to 'share/starlingx_base/registration') diff --git a/share/starlingx_base/registration/registration.py b/share/starlingx_base/registration/registration.py index ebd2109c..e953f9b3 100644 --- a/share/starlingx_base/registration/registration.py +++ b/share/starlingx_base/registration/registration.py @@ -253,16 +253,23 @@ class RegistryHelper(newton_registration.RegistryHelper): self._logger.debug("update cloud region fails %s" % e.message) try: - super(RegistryHelper, self).registryV0(vimid, project_idorname) + return super(RegistryHelper, self).registryV0(vimid, project_idorname) except Exception as e: - self._logger.debug("registryV0 fails %s" % e.message) + errmsg = "registryV0 fails %s" % str(e) + self._logger.debug(errmsg) + return 11, errmsg - return 0 - - def unregistry(self, vimid=""): + def unregistryV0(self, vimid=""): '''extend base method''' - return self.super(RegistryHelper, self).unregistry(vimid) + try: + return super(RegistryHelper, self).unregistryV0(vimid) + except Exception as e: + errmsg = "unregistryV0 fails %s" % str(e) + self._logger.debug(errmsg) + return 11, errmsg + + # return (0, "Succeed") def _get_ovsdpdk_capabilities(self, extra_specs, viminfo): '''extend base method''' -- cgit