summaryrefslogtreecommitdiffstats
path: root/windriver/titanium_cloud/vesagent/vesagent_ctrl.py
diff options
context:
space:
mode:
authorXiaohua Zhang <xiaohua.zhang@windriver.com>2018-11-27 10:31:54 +0000
committerXiaohua Zhang <xiaohua.zhang@windriver.com>2018-11-27 10:31:54 +0000
commitf8c71ac2d1a764c953f5c8cf513aa8d3f9810578 (patch)
tree1fdd124fc76e4d35c2880dee0e9d52e9b0826487 /windriver/titanium_cloud/vesagent/vesagent_ctrl.py
parent78ead3c00e16cf9e4fd24535a925d3766c6f6aa8 (diff)
Fix pep8 errors in windriver plugin
Fix errors in vesagent Change-Id: I9cb0afda7a17a08246fcee8439e1ef2775609948 Issue-ID: MULTICLOUD-420 Signed-off-by: Xiaohua Zhang <xiaohua.zhang@windriver.com>
Diffstat (limited to 'windriver/titanium_cloud/vesagent/vesagent_ctrl.py')
-rw-r--r--windriver/titanium_cloud/vesagent/vesagent_ctrl.py46
1 files changed, 21 insertions, 25 deletions
diff --git a/windriver/titanium_cloud/vesagent/vesagent_ctrl.py b/windriver/titanium_cloud/vesagent/vesagent_ctrl.py
index 8bfa3c38..86b4ef51 100644
--- a/windriver/titanium_cloud/vesagent/vesagent_ctrl.py
+++ b/windriver/titanium_cloud/vesagent/vesagent_ctrl.py
@@ -13,7 +13,7 @@
# limitations under the License.
import logging
-import traceback
+# import traceback
import json
from rest_framework import status
@@ -29,6 +29,7 @@ from django.core.cache import cache
logger = logging.getLogger(__name__)
+
class VesAgentCtrl(APIView):
'''
control plane of VesAgent
@@ -152,7 +153,6 @@ class VesAgentCtrl(APIView):
self._logger = logger
self.proxy_prefix = settings.MULTICLOUD_PREFIX
-
def get(self, request, vimid=""):
'''
get blob of vesagent-config
@@ -169,8 +169,8 @@ class VesAgentCtrl(APIView):
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
+ except Exception:
+ # ignore this error
self._logger.warn("cloud extra info is provided with data in bad format: %s" % cloud_extra_info_str)
pass
@@ -182,11 +182,10 @@ class VesAgentCtrl(APIView):
status=status.HTTP_500_INTERNAL_SERVER_ERROR)
self._logger.info("return with %s" % status.HTTP_200_OK)
- return Response(data={"vesagent_config":vesagent_config,
+ return Response(data={"vesagent_config": vesagent_config,
"vesagent_backlogs": vesagent_backlogs},
status=status.HTTP_200_OK)
-
def post(self, request, vimid=""):
'''
update the blob of vesagent-config, rebuild the backlog for the vesagent workers,
@@ -207,12 +206,13 @@ class VesAgentCtrl(APIView):
:param vimid:
:return:
'''
+
self._logger.info("vimid: %s" % vimid)
self._logger.debug("with META: %s, with data: %s" % (request.META, request.data))
try:
vesagent_config = None
if request.data is None or request.data.get("vesagent_config", None) is None:
- #Try to load the vesagent_config out of cloud_region["cloud_extra_info"]
+ # Try to load the vesagent_config out of cloud_region["cloud_extra_info"]
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
@@ -222,7 +222,7 @@ class VesAgentCtrl(APIView):
if vesagent_config is None:
return Response(data={'vesagent_config is not provided'},
- status=status.HTTP_400_BAD_REQUEST)
+ status=status.HTTP_400_BAD_REQUEST)
vesagent_backlogs = self.buildBacklogsOneVIM(vimid, vesagent_config)
@@ -235,7 +235,7 @@ class VesAgentCtrl(APIView):
status=status.HTTP_500_INTERNAL_SERVER_ERROR)
self._logger.info("return with %s" % status.HTTP_201_CREATED)
- return Response(data={"vesagent_config":vesagent_config,
+ return Response(data={"vesagent_config": vesagent_config,
"vesagent_backlogs": vesagent_backlogs},
status=status.HTTP_201_CREATED)
@@ -259,7 +259,6 @@ class VesAgentCtrl(APIView):
self._logger.info("return with %s" % status.HTTP_200_OK)
return Response(status=status.HTTP_200_OK)
-
def getBacklogsOneVIM(self, vimid):
'''
remove the specified backlogs for a VIM
@@ -337,7 +336,7 @@ class VesAgentCtrl(APIView):
self._logger.debug("return")
return 0
- def buildBacklogsOneVIM(self, vimid, vesagent_config = None):
+ def buildBacklogsOneVIM(self, vimid, vesagent_config=None):
'''
build and cache backlog for specific cloud region,spawn vesagent workers if needed
:param vimid:
@@ -349,7 +348,7 @@ class VesAgentCtrl(APIView):
VesAgentBacklogsConfig = None
try:
- if vesagent_config :
+ if vesagent_config:
# now rebuild the backlog
VesAgentBacklogsConfig = {
"vimid": vimid,
@@ -358,7 +357,6 @@ class VesAgentCtrl(APIView):
"backlogs": [self.buildBacklog(vimid, b) for b in vesagent_config.get("backlogs", [])]
}
-
# add/update the backlog into cache
VesAgentBacklogsConfigStr = json.dumps(VesAgentBacklogsConfig)
# cache forever
@@ -375,14 +373,14 @@ class VesAgentCtrl(APIView):
logger.debug("VesAgentBacklogs.vimlist is %s" % VesAgentBacklogsVimList)
- #cache forever
+ # cache forever
cache.set("VesAgentBacklogs.vimlist", json.dumps(VesAgentBacklogsVimList), None)
# notify schduler
scheduleBacklogs.delay(vimid)
except Exception as e:
self._logger.error("exception:%s" % str(e))
- VesAgentBacklogsConfig = {"error":"exception occurs during build backlogs"}
+ VesAgentBacklogsConfig = {"error": "exception occurs during build backlogs"}
self._logger.debug("return")
return VesAgentBacklogsConfig
@@ -413,7 +411,6 @@ class APIv1VesAgentCtrl(VesAgentCtrl):
# self._logger = logger
self.proxy_prefix = settings.MULTICLOUD_API_V1_PREFIX
-
def get(self, request, cloud_owner="", cloud_region_id=""):
'''
:param request:
@@ -421,11 +418,10 @@ class APIv1VesAgentCtrl(VesAgentCtrl):
:param cloud_region_id:
:return:
'''
- self._logger.info("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(APIv1VesAgentCtrl,self).get(request, vimid)
-
+ return super(APIv1VesAgentCtrl, self).get(request, vimid)
def post(self, request, cloud_owner="", cloud_region_id=""):
'''
@@ -435,11 +431,10 @@ class APIv1VesAgentCtrl(VesAgentCtrl):
:param cloud_region_id:
:return:
'''
- self._logger.info("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(APIv1VesAgentCtrl,self).post(request, vimid)
-
+ return super(APIv1VesAgentCtrl, self).post(request, vimid)
def delete(self, request, cloud_owner="", cloud_region_id=""):
'''
@@ -449,8 +444,9 @@ class APIv1VesAgentCtrl(VesAgentCtrl):
:param cloud_region_id:
:return:
'''
- self._logger.info("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(APIv1VesAgentCtrl,self).delete(request, vimid)
-
+ return super(APIv1VesAgentCtrl, self).delete(request, vimid)