diff options
| author |   Xiaohua Zhang <xiaohua.zhang@windriver.com> | 2018-10-12 08:37:27 +0000 |
|---|---|---|
| committer | Xiaohua Zhang <xiaohua.zhang@windriver.com> | 2018-10-12 08:37:27 +0000 |
| commit | ceb8740788a698acc8c4990bead774461c1b408d (patch) | |
| tree | b55761b7563a00c2fad66bb0a3e371bef3058fe9 | |
| parent | 746d316b6c14885dc0fd8e0784f9ab88050cdbeb (diff) | |
Fix bug in infra_workload
Pass template data to underlying VIM to instantiate a stack
Change-Id: Ibad0d8bb0ecf82b05234ba433f5bbad8d3476cc7
Issue-ID: MULTICLOUD-375
Signed-off-by: Xiaohua Zhang <xiaohua.zhang@windriver.com>
| -rw-r--r-- | pike/pike/resource/views/infra_workload.py | 2 | ||||
| -rw-r--r-- | windriver/titanium_cloud/resource/views/infra_workload.py | 18 |
2 files changed, 11 insertions, 9 deletions
diff --git a/pike/pike/resource/views/infra_workload.py b/pike/pike/resource/views/infra_workload.py index 4d0b6716..e25c6d15 100644 --- a/pike/pike/resource/views/infra_workload.py +++ b/pike/pike/resource/views/infra_workload.py @@ -86,7 +86,7 @@ class InfraWorkload(APIView): self._logger.info("retrieve stack resources, URI:%s" % resource_uri) retcode, content, os_status = helper.MultiCloudServiceHelper(cloud_owner, regionid, v2_token_resp_json, service_type, - resource_uri, None, "POST") + resource_uri, template_data, "POST") stack1 = content.get('stack', None) if retcode == 0 and content else None resp_template = { "template_type": template_type, diff --git a/windriver/titanium_cloud/resource/views/infra_workload.py b/windriver/titanium_cloud/resource/views/infra_workload.py index f69aa44c..6b620daf 100644 --- a/windriver/titanium_cloud/resource/views/infra_workload.py +++ b/windriver/titanium_cloud/resource/views/infra_workload.py @@ -87,8 +87,8 @@ class InfraWorkload(APIView): service_type = "orchestration" resource_uri = "/stacks" self._logger.info("retrieve stack resources, URI:%s" % resource_uri) - retcode, content, os_status = helper.MultiCloudServiceHelper(cloud_owner, regionid, v2_token_resp_json, service_type, - resource_uri, None, "POST") + retcode, content, os_status = helper.MultiCloudServiceHelper(cloud_owner, regionid, v2_token_resp_json, + service_type, resource_uri, template_data, "POST") stack1 = content.get('stack', None) if retcode == 0 and content else None resp_template = { "template_type": template_type, @@ -264,7 +264,8 @@ class InfraWorkload(APIView): service_type = "orchestration" resource_uri = "/stacks/%s/resources"%(stack_id) self._logger.info("retrieve stack resources, URI:%s" % resource_uri) - retcode, content, os_status = helper.MultiCloudServiceHelper(cloud_owner, regionid, v2_token_resp_json, service_type, resource_uri, None, "GET") + retcode, content, os_status = helper.MultiCloudServiceHelper(cloud_owner, regionid, v2_token_resp_json, + service_type, resource_uri, None, "GET") resources = content.get('resources', []) if retcode == 0 and content else [] #find and update resources @@ -277,8 +278,8 @@ class InfraWorkload(APIView): service_type = "compute" resource_uri = "/servers/%s" % (resource['physical_resource_id']) self._logger.info("retrieve vserver detail, URI:%s" % resource_uri) - retcode, content, os_status = helper.MultiCloudServiceHelper(cloud_owner, regionid, v2_token_resp_json, service_type, - resource_uri, None, "GET") + retcode, content, os_status = helper.MultiCloudServiceHelper(cloud_owner, regionid, v2_token_resp_json, + service_type, resource_uri, None, "GET") self._logger.debug(" resp data:%s" % content) vserver_detail = content.get('server', None) if retcode == 0 and content else None if vserver_detail: @@ -329,8 +330,8 @@ class InfraWorkload(APIView): service_type = "network" resource_uri = "/v2.0/ports/%s" % (resource['physical_resource_id']) self._logger.info("retrieve vport detail, URI:%s" % resource_uri) - retcode, content, os_status = helper.MultiCloudServiceHelper(cloud_owner, regionid, v2_token_resp_json, service_type, - resource_uri, None, "GET") + retcode, content, os_status = helper.MultiCloudServiceHelper(cloud_owner, regionid, v2_token_resp_json, + service_type, resource_uri, None, "GET") self._logger.debug(" resp data:%s" % content) vport_detail = content.get('port', None) if retcode == 0 and content else None @@ -401,7 +402,8 @@ class InfraWorkload(APIView): service_type = "orchestration" resource_uri = "/stacks/%s/resources"%(stack_id) self._logger.info("retrieve stack resources, URI:%s" % resource_uri) - retcode, content, os_status = helper.MultiCloudServiceHelper(cloud_owner, regionid, v2_token_resp_json, service_type, resource_uri, None, "GET") + retcode, content, os_status = helper.MultiCloudServiceHelper(cloud_owner, regionid, v2_token_resp_json, + service_type, resource_uri, None, "GET") resources = content.get('resources', []) if retcode == 0 and content else [] vserver_list = [resource['physical_resource_id'] for resource in resources |