diff options
| author |   Xiaohua Zhang <xiaohua.zhang@windriver.com> | 2018-11-30 08:52:54 +0000 |
|---|---|---|
| committer | Xiaohua Zhang <xiaohua.zhang@windriver.com> | 2018-11-30 08:52:54 +0000 |
| commit | 0f8c7107308a0191c2c4df8a3070ed8868c64480 (patch) | |
| tree | 27df2993b4d72a06f06ec88ad1e152547bc4c451 /ocata | |
| parent | f8c71ac2d1a764c953f5c8cf513aa8d3f9810578 (diff) | |
Fix issue of Delete Infra_workload
Enforce client to pass in workload_id
Change-Id: I017321920aad665bee352499e0b43f5c5db5898c
Issue-ID: MULTICLOUD-423
Signed-off-by: Xiaohua Zhang <xiaohua.zhang@windriver.com>
Diffstat (limited to 'ocata')
| -rw-r--r-- | ocata/ocata/resource/views/infra_workload.py | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/ocata/ocata/resource/views/infra_workload.py b/ocata/ocata/resource/views/infra_workload.py index d78e3cee..b9d754b6 100644 --- a/ocata/ocata/resource/views/infra_workload.py +++ b/ocata/ocata/resource/views/infra_workload.py @@ -41,7 +41,7 @@ class InfraWorkload(APIView): self._logger.info("data: %s" % request.data) self._logger.debug("META: %s" % request.META) - try : + try: data = request.data oof_directive = data.get("oof_directives", {}) template_type = data.get("template_type", None) @@ -59,7 +59,7 @@ class InfraWorkload(APIView): for attr in directive2.get("attributes", []): label_name = attr["attribute_name"] label_value = attr["attribute_value"] - if parameters.has_key(label_name): + if label_name in parameters: template_data["parameters"][label_name] = label_value else: self._logger.warn("There is no parameter exist: %s" % label_name) @@ -119,7 +119,7 @@ class InfraWorkload(APIView): self._logger.info("vimid, requri: %s, %s" % (vimid, requri)) self._logger.debug("META: %s" % request.META) - try : + try: # assume the workload_type is heat template_type = "heat" stack_id = requri @@ -299,13 +299,19 @@ class InfraWorkload(APIView): aai_transactions = {"transactions": transactions} self._logger.debug("aai_transactions :%s" % aai_transactions) - return aai_transactions + return aai_transactions def delete(self, request, vimid="", requri=""): self._logger.info("vimid, requri: %s, %s" % (vimid, requri)) self._logger.debug("META: %s" % request.META) - try : + try: + if requri == "": + raise VimDriverNewtonException( + message="workload_id is not specified", + content="workload_id must be specified to delete the workload", + status_code=400) + # assume the workload_type is heat template_type = "heat" stack_id = requri |