diff options
| author |   Bin Yang <bin.yang@windriver.com> | 2018-08-14 07:35:52 +0000 |
|---|---|---|
| committer | Bin Yang <bin.yang@windriver.com> | 2018-08-14 07:35:52 +0000 |
| commit | adeadd2b361a0612e289b5a8dd85de9b1d041193 (patch) | |
| tree | 07f0ab43ea3964c1efc19f89a455ec416ddf9d01 /windriver/titanium_cloud | |
| parent | b906025377784de4152de1963b8c7df005d8b59c (diff) | |
Upgrade API for capacity_check
Change-Id: If53c734294907eb4a4d108a2c7e81d537c53eb8f
Issue-ID: MULTICLOUD-297
Signed-off-by: Bin Yang <bin.yang@windriver.com>
Diffstat (limited to 'windriver/titanium_cloud')
| -rw-r--r-- | windriver/titanium_cloud/resource/views/capacity.py | 13 | ||||
| -rw-r--r-- | windriver/titanium_cloud/urls.py | 4 | ||||
| -rw-r--r-- | windriver/titanium_cloud/vesagent/vesagent_ctrl.py | 2 |
3 files changed, 16 insertions, 3 deletions
diff --git a/windriver/titanium_cloud/resource/views/capacity.py b/windriver/titanium_cloud/resource/views/capacity.py index 6adb8785..26a673c0 100644 --- a/windriver/titanium_cloud/resource/views/capacity.py +++ b/windriver/titanium_cloud/resource/views/capacity.py @@ -140,3 +140,16 @@ class CapacityCheck(APIView): return Response(data={'result': hasEnoughResource, 'error': str(e)}, status=status.HTTP_500_INTERNAL_SERVER_ERROR) + + +class CapacityCheckV1(APIView): + + def __init__(self): + self._logger = logger + + def post(self, request, cloud_owner="", cloud_region_id=""): + self._logger.info("vimid, data> %s,%s, %s" % (cloud_owner, cloud_region_id, request.data)) + self._logger.debug("META> %s" % request.META) + + vimid = extsys.encode_vim_id(cloud_owner, cloud_region_id) + return super(CapacityCheckV1, self).post(request, vimid) diff --git a/windriver/titanium_cloud/urls.py b/windriver/titanium_cloud/urls.py index cc538d63..f1ee90a5 100644 --- a/windriver/titanium_cloud/urls.py +++ b/windriver/titanium_cloud/urls.py @@ -58,8 +58,8 @@ urlpatterns = [ # url(r'^api/multicloud-titanium_cloud/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)/(?P<cloud_region_id>[0-9a-zA-Z_-]+)/' # '(?P<tenantid>[0-9a-zA-Z_-]{20,})/', include('titanium_cloud.requests.urls')), # CapacityCheck -# url(r'^api/multicloud-titanium_cloud/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)/(?P<cloud_region_id>[0-9a-zA-Z_-]+)/capacity_check/?$', -# capacity.CapacityCheck.as_view()), + url(r'^api/multicloud-titanium_cloud/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)/(?P<cloud_region_id>[0-9a-zA-Z_-]+)/capacity_check/?$', + capacity.CapacityCheckV1.as_view()), # events # url(r'^api/multicloud-titanium_cloud/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)/(?P<cloud_region_id>[0-9a-zA-Z_-]+)/events_check/?$', # events.EventsCheck.as_view()), diff --git a/windriver/titanium_cloud/vesagent/vesagent_ctrl.py b/windriver/titanium_cloud/vesagent/vesagent_ctrl.py index 207ae561..d93ccc22 100644 --- a/windriver/titanium_cloud/vesagent/vesagent_ctrl.py +++ b/windriver/titanium_cloud/vesagent/vesagent_ctrl.py @@ -423,5 +423,5 @@ class VesAgentCtrlV1(VesAgentCtrl): self._logger.debug("with META: %s" % request.META) #temp realization for API upgrading only, assume cloud_owner does not contains "_" , refactor it later - vimid = cloud_owner+"_"+cloud_region_id + vimid = extsys.encode_vim_id(cloud_owner, cloud_region_id) return super(VesAgentCtrlV1,self).get(request, vimid) |