From e7d4c5c256c74c31e0b0238bfa579a4fbbcef436 Mon Sep 17 00:00:00 2001 From: tengqm Date: Thu, 12 Feb 2015 22:40:31 +0800 Subject: [PATCH] Fix orchestration sample json files This patch fixes the sample JSON files based on recently merged patches to software config and software deployments. Please refer to the change here: https://review.openstack.org/154307 The major change is about exposing creation_time and updated_time in some APIs. Change-Id: Ib873ea98b2b3d278e1dee304ae2071f1d79c0c80 --- .../src/v1/samples/config_create_resp.json | 3 ++- .../orchestration-api/src/v1/samples/config_show.json | 7 ++++--- .../src/v1/samples/deployment_create_resp.json | 6 ++++-- .../orchestration-api/src/v1/samples/deployment_list.json | 6 ++++-- .../src/v1/samples/deployment_metadata.json | 6 +++++- .../orchestration-api/src/v1/samples/deployment_show.json | 6 ++++-- .../src/v1/samples/deployment_update_resp.json | 6 ++++-- 7 files changed, 27 insertions(+), 13 deletions(-) diff --git a/api-ref/src/wadls/orchestration-api/src/v1/samples/config_create_resp.json b/api-ref/src/wadls/orchestration-api/src/v1/samples/config_create_resp.json index 32c075bf7..5025435b9 100644 --- a/api-ref/src/wadls/orchestration-api/src/v1/samples/config_create_resp.json +++ b/api-ref/src/wadls/orchestration-api/src/v1/samples/config_create_resp.json @@ -1,5 +1,6 @@ { "software_config": { + "creation_time": "2015-01-31T15:12:36Z", "inputs": [ { "default": null, @@ -28,4 +29,4 @@ "config": "#!/bin/sh -x\necho \"Writing to /tmp/$bar\"\necho $foo > /tmp/$bar\necho -n \"The file /tmp/$bar contains `cat /tmp/$bar` for server $deploy_server_id during $deploy_action\" > $heat_outputs_path.result\necho \"Written to /tmp/$bar\"\necho \"Output to stderr\" 1>&2", "id": "ddee7aca-aa32-4335-8265-d436b20db4f1" } -} \ No newline at end of file +} diff --git a/api-ref/src/wadls/orchestration-api/src/v1/samples/config_show.json b/api-ref/src/wadls/orchestration-api/src/v1/samples/config_show.json index 32c075bf7..e89b2b1c0 100644 --- a/api-ref/src/wadls/orchestration-api/src/v1/samples/config_show.json +++ b/api-ref/src/wadls/orchestration-api/src/v1/samples/config_show.json @@ -24,8 +24,9 @@ "description": null } ], - "options": null, + "creation_time": "2015-01-31T15:12:36Z", + "id": "ddee7aca-aa32-4335-8265-d436b20db4f1", "config": "#!/bin/sh -x\necho \"Writing to /tmp/$bar\"\necho $foo > /tmp/$bar\necho -n \"The file /tmp/$bar contains `cat /tmp/$bar` for server $deploy_server_id during $deploy_action\" > $heat_outputs_path.result\necho \"Written to /tmp/$bar\"\necho \"Output to stderr\" 1>&2", - "id": "ddee7aca-aa32-4335-8265-d436b20db4f1" + "options": null } -} \ No newline at end of file +} diff --git a/api-ref/src/wadls/orchestration-api/src/v1/samples/deployment_create_resp.json b/api-ref/src/wadls/orchestration-api/src/v1/samples/deployment_create_resp.json index db9ce5c82..736f1e15b 100644 --- a/api-ref/src/wadls/orchestration-api/src/v1/samples/deployment_create_resp.json +++ b/api-ref/src/wadls/orchestration-api/src/v1/samples/deployment_create_resp.json @@ -7,6 +7,8 @@ "input_values": null, "action": "CREATE", "status_reason": "Deploy data available", - "id": "ef422fa5-719a-419e-a10c-72e3a367b0b8" + "id": "ef422fa5-719a-419e-a10c-72e3a367b0b8", + "creation_time": "2015-01-31T15:12:36Z", + "updated_time": "2015-01-31T15:18:21Z" } -} \ No newline at end of file +} diff --git a/api-ref/src/wadls/orchestration-api/src/v1/samples/deployment_list.json b/api-ref/src/wadls/orchestration-api/src/v1/samples/deployment_list.json index 043258bce..95b783c55 100644 --- a/api-ref/src/wadls/orchestration-api/src/v1/samples/deployment_list.json +++ b/api-ref/src/wadls/orchestration-api/src/v1/samples/deployment_list.json @@ -13,7 +13,9 @@ "input_values": null, "action": "CREATE", "status_reason": "Outputs received", - "id": "ef422fa5-719a-419e-a10c-72e3a367b0b8" + "id": "ef422fa5-719a-419e-a10c-72e3a367b0b8", + "creation_time": "2015-01-31T15:12:36Z", + "updated_time": "2015-01-31T15:18:21Z" } ] -} \ No newline at end of file +} diff --git a/api-ref/src/wadls/orchestration-api/src/v1/samples/deployment_metadata.json b/api-ref/src/wadls/orchestration-api/src/v1/samples/deployment_metadata.json index 3768c2bde..8c5bd9a9d 100644 --- a/api-ref/src/wadls/orchestration-api/src/v1/samples/deployment_metadata.json +++ b/api-ref/src/wadls/orchestration-api/src/v1/samples/deployment_metadata.json @@ -58,6 +58,8 @@ } ], "options": null, + "creation_time": "2015-01-31T15:12:36Z", + "updated_time": "2015-01-31T15:18:21Z", "config": "#!/bin/sh -x\necho \"Writing to /tmp/$bar\"\necho $foo > /tmp/$bar\necho -n \"The file /tmp/$bar contains `cat /tmp/$bar` for server $deploy_server_id during $deploy_action\" > $heat_outputs_path.result\necho \"Written to /tmp/$bar\"\necho \"Output to stderr\" 1>&2", "id": "3d5ec2a8-7004-43b6-a7f6-542bdbe9d434" }, @@ -119,8 +121,10 @@ } ], "options": null, + "creation_time": "2015-01-31T16:14:13Z", + "updated_time": "2015-01-31T16:18:19Z", "config": "#!/bin/sh -x\necho \"Writing to /tmp/$bar\"\necho $foo > /tmp/$bar\necho -n \"The file /tmp/$bar contains `cat /tmp/$bar` for server $deploy_server_id during $deploy_action\" > $heat_outputs_path.result\necho \"Written to /tmp/$bar\"\necho \"Output to stderr\" 1>&2", "id": "8da95794-2ad9-4979-8ae5-739ce314c5cd" } ] -} \ No newline at end of file +} diff --git a/api-ref/src/wadls/orchestration-api/src/v1/samples/deployment_show.json b/api-ref/src/wadls/orchestration-api/src/v1/samples/deployment_show.json index 0444210b4..b234235ac 100644 --- a/api-ref/src/wadls/orchestration-api/src/v1/samples/deployment_show.json +++ b/api-ref/src/wadls/orchestration-api/src/v1/samples/deployment_show.json @@ -7,6 +7,8 @@ "input_values": null, "action": "CREATE", "status_reason": "Deploy data available", - "id": "06e87bcc-33a2-4bce-aebd-533e698282d3" + "id": "06e87bcc-33a2-4bce-aebd-533e698282d3", + "creation_time": "2015-01-31T15:12:36Z", + "updated_time": "2015-01-31T15:18:21Z" } -} \ No newline at end of file +} diff --git a/api-ref/src/wadls/orchestration-api/src/v1/samples/deployment_update_resp.json b/api-ref/src/wadls/orchestration-api/src/v1/samples/deployment_update_resp.json index ef2259938..19b7bbfec 100644 --- a/api-ref/src/wadls/orchestration-api/src/v1/samples/deployment_update_resp.json +++ b/api-ref/src/wadls/orchestration-api/src/v1/samples/deployment_update_resp.json @@ -12,6 +12,8 @@ "input_values": null, "action": "CREATE", "status_reason": "Outputs received", - "id": "06e87bcc-33a2-4bce-aebd-533e698282d3" + "id": "06e87bcc-33a2-4bce-aebd-533e698282d3", + "creation_time": "2015-01-31T15:12:36Z", + "updated_time": "2015-01-31T15:18:21Z" } -} \ No newline at end of file +}