diff options
author | Haibin Huang <haibin.huang@intel.com> | 2019-12-11 21:44:24 +0800 |
---|---|---|
committer | Haibin Huang <haibin.huang@intel.com> | 2019-12-11 21:49:31 +0800 |
commit | 5e6c31fe515e0b7193b7679403ea2f6ecf13489f (patch) | |
tree | 5c4264b48ac1fc90ef5fb13e798cd105a895bf83 /pike/pike/proxy/views/services.py | |
parent | 952c8c09d3bc18c22e35f573c460e7cdb9d54d9d (diff) |
Improve the code coverage for pike
Issue-ID: MULTICLOUD-964
Signed-off-by: Haibin Huang <haibin.huang@intel.com>
Change-Id: I711b6953730fad74b06ecd371d9e5717298cbf21
Diffstat (limited to 'pike/pike/proxy/views/services.py')
-rw-r--r-- | pike/pike/proxy/views/services.py | 57 |
1 files changed, 26 insertions, 31 deletions
diff --git a/pike/pike/proxy/views/services.py b/pike/pike/proxy/views/services.py index 7fe6d601..d5bfd527 100644 --- a/pike/pike/proxy/views/services.py +++ b/pike/pike/proxy/views/services.py @@ -1,7 +1,4 @@ -''' -services -''' -# Copyright (c) 2018 Intel Corporation. +# Copyright (c) 2019 Intel Corporation. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,21 +14,22 @@ services import logging +# from rest_framework import status + +# from django.conf import settings from newton_base.proxy import services as newton_services from common.msapi import extsys -LOGGER = logging.getLogger(__name__) +logger = logging.getLogger(__name__) # DEBUG=True class Services(newton_services.Services): - ''' - class services - ''' def __init__(self): - self._logger = LOGGER + super(Services, self).__init__() + # self._logger = logger class GetTenants(newton_services.GetTenants): @@ -40,13 +38,12 @@ class GetTenants(newton_services.GetTenants): ''' def __init__(self): - self._logger = LOGGER + super(GetTenants, self).__init__() + # self._logger = logger def get(self, request, vimid="", servicetype="identity", requri='v3/projects'): - self._logger.debug("GetTenants--get::META> %s" % request.META) - self._logger.debug("GetTenants--get::data> %s" % request.data) - self._logger.debug("GetTenants--get::vimid, servicetype, requri> %s,%s,%s" - % (vimid, servicetype, requri)) + self._logger.info("vimid: %s" % (vimid)) + self._logger.debug("with servicetype, requri> %s,%s" % (servicetype, requri)) return super(GetTenants, self).get(request, vimid, servicetype, requri) @@ -55,10 +52,10 @@ class APIv1Services(Services): def __init__(self): super(APIv1Services, self).__init__() - # self._logger = loggier + # self._logger = logger def head(self, request, cloud_owner="", cloud_region_id="", servicetype="", requri=""): - self._logger.debug("cloud_owner,cloud_region_id: %s,%s" % (cloud_owner, cloud_region_id)) + self._logger.info("cloud_owner,cloud_region_id: %s,%s" % (cloud_owner, cloud_region_id)) # self._logger.info("servicetype, requri> %s,%s" % (servicetype, requri)) # self._logger.debug("META, data> %s , %s" % (request.META, request.data)) @@ -66,31 +63,31 @@ class APIv1Services(Services): return super(APIv1Services, self).head(request, vimid, servicetype, requri) def get(self, request, cloud_owner="", cloud_region_id="", servicetype="", requri=""): - self._logger.debug("cloud_owner,cloud_region_id: %s,%s" % (cloud_owner, cloud_region_id)) + self._logger.info("cloud_owner,cloud_region_id: %s,%s" % (cloud_owner, cloud_region_id)) vimid = extsys.encode_vim_id(cloud_owner, cloud_region_id) return super(APIv1Services, self).get(request, vimid, servicetype, requri) def post(self, request, cloud_owner="", cloud_region_id="", servicetype="", requri=""): - self._logger.debug("cloud_owner,cloud_region_id: %s,%s" % (cloud_owner, cloud_region_id)) + self._logger.info("cloud_owner,cloud_region_id: %s,%s" % (cloud_owner, cloud_region_id)) vimid = extsys.encode_vim_id(cloud_owner, cloud_region_id) return super(APIv1Services, self).post(request, vimid, servicetype, requri) def put(self, request, cloud_owner="", cloud_region_id="", servicetype="", requri=""): - self._logger.debug("cloud_owner,cloud_region_id: %s,%s" % (cloud_owner, cloud_region_id)) + self._logger.info("cloud_owner,cloud_region_id: %s,%s" % (cloud_owner, cloud_region_id)) vimid = extsys.encode_vim_id(cloud_owner, cloud_region_id) return super(APIv1Services, self).put(request, vimid, servicetype, requri) def patch(self, request, cloud_owner="", cloud_region_id="", servicetype="", requri=""): - self._logger.debug("cloud_owner,cloud_region_id: %s,%s" % (cloud_owner, cloud_region_id)) + self._logger.info("cloud_owner,cloud_region_id: %s,%s" % (cloud_owner, cloud_region_id)) vimid = extsys.encode_vim_id(cloud_owner, cloud_region_id) return super(APIv1Services, self).patch(request, vimid, servicetype, requri) def delete(self, request, cloud_owner="", cloud_region_id="", servicetype="", requri=""): - self._logger.debug("cloud_owner,cloud_region_id: %s,%s" % (cloud_owner, cloud_region_id)) + self._logger.info("cloud_owner,cloud_region_id: %s,%s" % (cloud_owner, cloud_region_id)) vimid = extsys.encode_vim_id(cloud_owner, cloud_region_id) return super(APIv1Services, self).delete(request, vimid, servicetype, requri) @@ -106,16 +103,15 @@ class APIv1GetTenants(GetTenants): # self._logger = logger def head(self, request, cloud_owner="", cloud_region_id="", servicetype="identity", requri=""): - self._logger.debug("cloud_owner,cloud_region_id: %s,%s" % (cloud_owner, cloud_region_id)) + self._logger.info("cloud_owner,cloud_region_id: %s,%s" % (cloud_owner, cloud_region_id)) # self._logger.info("servicetype, requri> %s,%s" % (servicetype, requri)) # self._logger.debug("META, data> %s , %s" % (request.META, request.data)) vimid = extsys.encode_vim_id(cloud_owner, cloud_region_id) return super(APIv1GetTenants, self).head(request, vimid, servicetype, requri) - def get(self, request, cloud_owner="", cloud_region_id="", servicetype="identity", - requri='v3/projects'): - self._logger.debug("cloud_owner,cloud_region_id: %s,%s" % (cloud_owner, cloud_region_id)) + def get(self, request, cloud_owner="", cloud_region_id="", servicetype="identity", requri='v3/projects'): + self._logger.info("cloud_owner,cloud_region_id: %s,%s" % (cloud_owner, cloud_region_id)) # self._logger.debug("with servicetype, requri> %s,%s" % (servicetype, requri)) # self._logger.debug("with META> %s" % request.META) @@ -123,7 +119,7 @@ class APIv1GetTenants(GetTenants): return super(APIv1GetTenants, self).get(request, vimid, servicetype, requri) def post(self, request, cloud_owner="", cloud_region_id="", servicetype="identity", requri=""): - self._logger.debug("cloud_owner,cloud_region_id: %s,%s" % (cloud_owner, cloud_region_id)) + self._logger.info("cloud_owner,cloud_region_id: %s,%s" % (cloud_owner, cloud_region_id)) # self._logger.debug("with servicetype, requri> %s,%s" % (servicetype, requri)) # self._logger.debug("with META> %s" % request.META) # self._logger.debug("with data> %s" % request.data) @@ -132,20 +128,19 @@ class APIv1GetTenants(GetTenants): return super(APIv1GetTenants, self).post(request, vimid, servicetype, requri) def put(self, request, cloud_owner="", cloud_region_id="", servicetype="identity", requri=""): - self._logger.debug("cloud_owner,cloud_region_id: %s,%s" % (cloud_owner, cloud_region_id)) + self._logger.info("cloud_owner,cloud_region_id: %s,%s" % (cloud_owner, cloud_region_id)) vimid = extsys.encode_vim_id(cloud_owner, cloud_region_id) return super(APIv1GetTenants, self).put(request, vimid, servicetype, requri) def patch(self, request, cloud_owner="", cloud_region_id="", servicetype="identity", requri=""): - self._logger.debug("cloud_owner,cloud_region_id: %s,%s" % (cloud_owner, cloud_region_id)) + self._logger.info("cloud_owner,cloud_region_id: %s,%s" % (cloud_owner, cloud_region_id)) vimid = extsys.encode_vim_id(cloud_owner, cloud_region_id) return super(APIv1GetTenants, self).patch(request, vimid, servicetype, requri) - def delete(self, request, cloud_owner="", cloud_region_id="", servicetype="identity", - requri=""): - self._logger.debug("cloud_owner,cloud_region_id: %s,%s" % (cloud_owner, cloud_region_id)) + def delete(self, request, cloud_owner="", cloud_region_id="", servicetype="identity", requri=""): + self._logger.info("cloud_owner,cloud_region_id: %s,%s" % (cloud_owner, cloud_region_id)) vimid = extsys.encode_vim_id(cloud_owner, cloud_region_id) return super(APIv1GetTenants, self).delete(request, vimid, servicetype, requri) |