diff options
| author |   Bin Yang <bin.yang@windriver.com> | 2019-08-27 10:26:21 +0000 |
|---|---|---|
| committer | Bin Yang <bin.yang@windriver.com> | 2019-08-28 07:31:32 +0000 |
| commit | 9b0ce8f730becd6f5a1bd5048c247fb3cf4b728a (patch) | |
| tree | 990073f9fd620cc002b5510fc9ab92753e5a4f4e | |
| parent | c552ae8b51d3fdae4cfc4cf7a4e996f62fd348db (diff) | |
Add get api v1 to registration API
Fix error of cache set with object
Change-Id: Ie397fefa4e19be2a7257ecd5adaa8dd63472b355
Issue-ID: MULTICLOUD-792
Signed-off-by: Bin Yang <bin.yang@windriver.com>
(cherry picked from commit 24f743142abe736e88fe7f4bf69511d2de823ab6)
| -rw-r--r-- | share/common/msapi/helper.py | 5 | ||||
| -rw-r--r-- | share/starlingx_base/registration/registration.py | 7 |
2 files changed, 10 insertions, 2 deletions
diff --git a/share/common/msapi/helper.py b/share/common/msapi/helper.py index d45a7293..da730d0d 100644 --- a/share/common/msapi/helper.py +++ b/share/common/msapi/helper.py @@ -354,6 +354,7 @@ class MultiCloudThreadHelper(object): "id": item["id"], "status": item["status"] } + cache_item_for_query_str = json.dumps(cache_item_for_query) if item.get("repeat", 0) == 0: self.owner.expire(backlog_id) # keep only the id and status @@ -361,7 +362,7 @@ class MultiCloudThreadHelper(object): #update cache try: - cache.set(self.owner.cache_expired_prefix + cache_item_for_query["id"], cache_item_for_query, 3600*24) + cache.set(self.owner.cache_expired_prefix + cache_item_for_query["id"], cache_item_for_query_str, 3600*24) cache.delete(self.owner.cache_prefix + cache_item_for_query["id"]) except Exception as e: logger.error(e.message) @@ -369,7 +370,7 @@ class MultiCloudThreadHelper(object): item["timestamp"] = now #update cache try: - cache.set(self.owner.cache_prefix + cache_item_for_query["id"], cache_item_for_query, 3600*24) + cache.set(self.owner.cache_prefix + cache_item_for_query["id"], cache_item_for_query_str, 3600*24) except Exception as e: logger.error(e.message) pass diff --git a/share/starlingx_base/registration/registration.py b/share/starlingx_base/registration/registration.py index b6ed9250..ebd2109c 100644 --- a/share/starlingx_base/registration/registration.py +++ b/share/starlingx_base/registration/registration.py @@ -83,6 +83,13 @@ class APIv1Registry(newton_registration.Registry): super(APIv1Registry, self).__init__() # self._logger = logger + def get(self, request, cloud_owner="", cloud_region_id=""): + self._logger.debug("get cloud region: %s, %s" + % (cloud_owner, cloud_region_id)) + + vimid = extsys.encode_vim_id(cloud_owner, cloud_region_id) + return super(APIv1Registry, self).get(request, vimid) + def post(self, request, cloud_owner="", cloud_region_id=""): self._logger.info("registration with : %s, %s" % (cloud_owner, cloud_region_id)) |