summaryrefslogtreecommitdiffstats
path: root/share/starlingx_base/resource
diff options
context:
space:
mode:
authorXiaohua Zhang <xiaohua.zhang@windriver.com>2019-04-08 04:37:12 +0000
committerXiaohua Zhang <xiaohua.zhang@windriver.com>2019-04-08 04:37:12 +0000
commitdfad902004f1ff9b86651f10ae5cc13814d954a0 (patch)
treee3066d174e0c16ea9540f4df7ae05e12925db629 /share/starlingx_base/resource
parentcdaa33fc9ee8acefdfabbdbb5c3f04c57fd3d932 (diff)
Add multi-tenant support for infra_workload API
Change-Id: I0e792dc29967ed3f3fc487dd7fbff4039e601d92 Issue-ID: MULTICLOUD-543 Signed-off-by: Xiaohua Zhang <xiaohua.zhang@windriver.com>
Diffstat (limited to 'share/starlingx_base/resource')
-rw-r--r--share/starlingx_base/resource/infra_workload.py33
1 files changed, 25 insertions, 8 deletions
diff --git a/share/starlingx_base/resource/infra_workload.py b/share/starlingx_base/resource/infra_workload.py
index 912d3f69..745e9f03 100644
--- a/share/starlingx_base/resource/infra_workload.py
+++ b/share/starlingx_base/resource/infra_workload.py
@@ -43,6 +43,9 @@ class InfraWorkload(newton_infra_workload.InfraWorkload):
self._logger.info("data: %s" % request.data)
self._logger.debug("META: %s" % request.META)
+ # Get the specified tenant id
+ specified_project_idorname = request.META.get("Project", None)
+
resp_template = {
"template_type": "HEAT",
"workload_id": workloadid,
@@ -61,7 +64,7 @@ class InfraWorkload(newton_infra_workload.InfraWorkload):
# post to create a new stack,
# stack id available only after creating a stack is done
progress_code, progress_status, progress_msg =\
- worker_self.workload_create(vimid, request.data)
+ worker_self.workload_create(vimid, request.data, specified_project_idorname)
resp_template["workload_status"] = progress_status
resp_template["workload_status_reason"] = progress_msg
@@ -82,7 +85,8 @@ class InfraWorkload(newton_infra_workload.InfraWorkload):
backlog_item = {
"id": workloadid,
"worker": worker_self.workload_update,
- "payload": (worker_self, vimid, workloadid, request.data),
+ "payload": (worker_self, vimid, workloadid,
+ request.data, specified_project_idorname),
"repeat": 0, # one time job
# format of status: retcode:0 is ok, otherwise error code from http status, Status ENUM, Message
"status": (
@@ -136,6 +140,9 @@ class InfraWorkload(newton_infra_workload.InfraWorkload):
self._logger.info("vimid, workload id: %s, %s" % (vimid, workloadid))
self._logger.debug("META: %s" % request.META)
+ # Get the specified tenant id
+ specified_project_idorname = request.META.get("Project", None)
+
resp_template = {
"template_type": "HEAT",
"workload_id": workloadid,
@@ -172,12 +179,16 @@ class InfraWorkload(newton_infra_workload.InfraWorkload):
# by name
progress_code, progress_status, progress_msg =\
worker_self.workload_status(
- vimid, stack_name=workload_name)
+ vimid, stack_name=workload_name,
+ project_idorname=specified_project_idorname
+ )
else:
# by id
progress_code, progress_status, progress_msg =\
worker_self.workload_status(
- vimid, stack_id=workloadid)
+ vimid, stack_id=workloadid,
+ project_idorname=specified_project_idorname
+ )
resp_template["workload_status"] = progress_status
resp_template["workload_status_reason"] = progress_msg
@@ -196,7 +207,8 @@ class InfraWorkload(newton_infra_workload.InfraWorkload):
)
progress_code, progress_status, progress_msg =\
worker_self.workload_status(
- vimid, stack_id=workloadid)
+ vimid, stack_id=workloadid,
+ project_idorname=specified_project_idorname)
resp_template["workload_status"] = progress_status
resp_template["workload_status_reason"] = progress_msg
@@ -234,6 +246,9 @@ class InfraWorkload(newton_infra_workload.InfraWorkload):
self._logger.info("vimid, workload id: %s, %s" % (vimid, workloadid))
self._logger.debug("META: %s" % request.META)
+ # Get the specified tenant id
+ specified_project_idorname = request.META.get("Project", None)
+
resp_template = {
"template_type": "HEAT",
"workload_id": workloadid,
@@ -262,7 +277,8 @@ class InfraWorkload(newton_infra_workload.InfraWorkload):
backlog_item = {
"id": workloadid,
"worker": worker_self.workload_delete,
- "payload": (worker_self, vimid, workloadid, request.data),
+ "payload": (worker_self, vimid, workloadid, request.data,
+ specified_project_idorname),
"repeat": 0, # one time job
# format of status: retcode:0 is ok, otherwise error code from http status, Status ENUM, Message
"status": (
@@ -446,7 +462,7 @@ class InfraWorkloadHelper(infra_workload_helper.InfraWorkloadHelper):
# try 2: reuse the input: template_data
return template_data
- def workload_create(self, vimid, workload_data):
+ def workload_create(self, vimid, workload_data, project_idorname=None):
'''
Instantiate a stack over target cloud region (OpenStack instance)
The template for workload will be fetched from sdc client
@@ -497,7 +513,8 @@ class InfraWorkloadHelper(infra_workload_helper.InfraWorkloadHelper):
retcode, v2_token_resp_json, os_status = \
helper.MultiCloudIdentityHelper(
settings.MULTICLOUD_API_V1_PREFIX,
- cloud_owner, regionid, "/v2.0/tokens"
+ cloud_owner, regionid, "/v2.0/tokens",
+ {"Project": project_idorname}
)
if retcode > 0 or not v2_token_resp_json:
errmsg = "authenticate fails:%s,%s, %s" %\