diff options
author | Bin Yang <bin.yang@windriver.com> | 2018-05-16 10:20:30 +0800 |
---|---|---|
committer | Bin Yang <bin.yang@windriver.com> | 2018-05-16 10:20:30 +0800 |
commit | 8e08c9dc1f6303827a07294e4792d3d49fbbac3c (patch) | |
tree | 2d33c69f562d0c1510ba90b9095519b4715edecf /windriver/titanium_cloud/vesagent/vesagent_ctrl.py | |
parent | be067e5c7c253ad4509aa173d4fc5782209fe288 (diff) |
Fix bugs for GET API and tasks
Change-Id: If1748109359b9180aac46e14d3e4261def171460
Issue-ID: Issue-ID: MULTICLOUD-232
Signed-off-by: Bin Yang <bin.yang@windriver.com>
Diffstat (limited to 'windriver/titanium_cloud/vesagent/vesagent_ctrl.py')
-rw-r--r-- | windriver/titanium_cloud/vesagent/vesagent_ctrl.py | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/windriver/titanium_cloud/vesagent/vesagent_ctrl.py b/windriver/titanium_cloud/vesagent/vesagent_ctrl.py index fdc9f71a..7049aee0 100644 --- a/windriver/titanium_cloud/vesagent/vesagent_ctrl.py +++ b/windriver/titanium_cloud/vesagent/vesagent_ctrl.py @@ -164,10 +164,15 @@ class VesAgentCtrl(APIView): self._logger.debug("with META: %s" % request.META) try: # get vesagent_config from cloud region - viminfo = extsys.get_vim_by_id(vimid) - cloud_extra_info_str = viminfo.get('cloud_extra_info', None) - cloud_extra_info = json.loads(cloud_extra_info_str) if cloud_extra_info_str is not None else None - vesagent_config = cloud_extra_info.get("vesagent_config", None) if cloud_extra_info is not None else None + try: + viminfo = extsys.get_vim_by_id(vimid) + cloud_extra_info_str = viminfo.get('cloud_extra_info', '') + cloud_extra_info = json.loads(cloud_extra_info_str) if cloud_extra_info_str != '' else None + vesagent_config = cloud_extra_info.get("vesagent_config", None) if cloud_extra_info is not None else None + except Exception as e: + #ignore this error + self._logger.warn("cloud extra info is provided with data in bad format: %s" % cloud_extra_info_str) + pass vesagent_backlogs = self.getBacklogsOneVIM(vimid) @@ -363,7 +368,6 @@ class VesAgentCtrl(APIView): if VesAgentBacklogsVimListStr is not None: VesAgentBacklogsVimList = json.loads(VesAgentBacklogsVimListStr) VesAgentBacklogsVimList = [v for v in VesAgentBacklogsVimList if v != vimid] - VesAgentBacklogsVimList = self.vimid_ VesAgentBacklogsVimList.append(vimid) logger.info("VesAgentBacklogs.vimlist is %s" % VesAgentBacklogsVimList) |