From 2e5319c05b452b5f7e37d97887804be13da5a290 Mon Sep 17 00:00:00 2001 From: Kam Nasim Date: Wed, 21 Mar 2018 15:09:22 -0400 Subject: [PATCH] Remove tpmconfig Sysinv APIs With the new Certificate orchestration APIs added for Distributed Cloud, there is no need to have separate tpmconfig-XXX APIs. In the interest of minimizing code bloat, this commit gets rid of the SysInv APIs for tpmconfig, the CGCTS CLI equivalents, and the REST API documentation. Notice that as a CLI only convenience we support passing in the reserved "tpm" keyword in place of the UUID in order to save users from first listing to query UUID and then doing a show Change-Id: I5a13668b20e7988319b08f0df1a00e839633d01d Signed-off-by: Kristine Bujold --- .../api-ref/src/docbkx/ch_sysinv-api-v1.xml | 29 ---- .../api_samples/certconfig_show-response.json | 10 +- .../v1/api_samples/tpmconfig_add-request.json | 5 - .../api_samples/tpmconfig_add-response.json | 19 --- .../api_samples/tpmconfig_modify-request.json | 14 -- .../tpmconfig_modify-response.json | 19 --- .../api_samples/tpmconfig_show-response.json | 20 --- .../src/wadls/sysinv-api/v1/common.ent | 31 ----- .../wadls/sysinv-api/v1/sysinv-api-v1.wadl | 128 +----------------- 9 files changed, 11 insertions(+), 264 deletions(-) delete mode 100644 restapi-doc/restapi-doc/api-ref/src/wadls/sysinv-api/v1/api_samples/tpmconfig_add-request.json delete mode 100644 restapi-doc/restapi-doc/api-ref/src/wadls/sysinv-api/v1/api_samples/tpmconfig_add-response.json delete mode 100644 restapi-doc/restapi-doc/api-ref/src/wadls/sysinv-api/v1/api_samples/tpmconfig_modify-request.json delete mode 100644 restapi-doc/restapi-doc/api-ref/src/wadls/sysinv-api/v1/api_samples/tpmconfig_modify-response.json delete mode 100644 restapi-doc/restapi-doc/api-ref/src/wadls/sysinv-api/v1/api_samples/tpmconfig_show-response.json diff --git a/restapi-doc/restapi-doc/api-ref/src/docbkx/ch_sysinv-api-v1.xml b/restapi-doc/restapi-doc/api-ref/src/docbkx/ch_sysinv-api-v1.xml index 43457a524..338a8a638 100644 --- a/restapi-doc/restapi-doc/api-ref/src/docbkx/ch_sysinv-api-v1.xml +++ b/restapi-doc/restapi-doc/api-ref/src/docbkx/ch_sysinv-api-v1.xml @@ -1368,35 +1368,6 @@ configuration entity for the system. - - - - -
- Trusted Platform Module (TPM) Configuration - These APIs allow for the display and configuration of - Trusted Platform Module (TPM). - - - - - - - - - - - - - - - -
- diff --git a/restapi-doc/restapi-doc/api-ref/src/wadls/sysinv-api/v1/api_samples/certconfig_show-response.json b/restapi-doc/restapi-doc/api-ref/src/wadls/sysinv-api/v1/api_samples/certconfig_show-response.json index d0f0e2f38..890414027 100644 --- a/restapi-doc/restapi-doc/api-ref/src/wadls/sysinv-api/v1/api_samples/certconfig_show-response.json +++ b/restapi-doc/restapi-doc/api-ref/src/wadls/sysinv-api/v1/api_samples/certconfig_show-response.json @@ -1,8 +1,14 @@ { "uuid": "ada8f12c-0ab2-49b7-bad9-946e34cedd69", - "certtype": "ssl", + "certtype": "tpm_mode", "expiry_date": "2018-03-27T18:15:23+00:00", "signature": "ssl_14615813356245445293", "start_date": "2017-03-27T18:15:23+00:00", - "issuer": null + "issuer": null, + "details": { + "state" : { + "controller-0": "tpm-config-applied", + "controller-1": "tpm-config-applied" + } + } } diff --git a/restapi-doc/restapi-doc/api-ref/src/wadls/sysinv-api/v1/api_samples/tpmconfig_add-request.json b/restapi-doc/restapi-doc/api-ref/src/wadls/sysinv-api/v1/api_samples/tpmconfig_add-request.json deleted file mode 100644 index 10367842b..000000000 --- a/restapi-doc/restapi-doc/api-ref/src/wadls/sysinv-api/v1/api_samples/tpmconfig_add-request.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "cert_path" : "/etc/ssl/private/key.pem", - "public_path" : "/etc/ssl/private/cert.pem", - "tpm_path" : "/etc/ssl/private/object.tpm" -} diff --git a/restapi-doc/restapi-doc/api-ref/src/wadls/sysinv-api/v1/api_samples/tpmconfig_add-response.json b/restapi-doc/restapi-doc/api-ref/src/wadls/sysinv-api/v1/api_samples/tpmconfig_add-response.json deleted file mode 100644 index 5e9c13db5..000000000 --- a/restapi-doc/restapi-doc/api-ref/src/wadls/sysinv-api/v1/api_samples/tpmconfig_add-response.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "tpm_path": "/etc/ssl/private/object.tpm", - "uuid": "6e06345a-9d02-41bf-9af7-4593ad7db14c", - "links": [{ - "href": "http://192.168.204.2:6385/v1/tpmconfigs/6e06345a-9d02-41bf-9af7-4593ad7db14c", - "rel": "self" - }, { - "href": "http://192.168.204.2:6385/tpmconfigs/6e06345a-9d02-41bf-9af7-4593ad7db14c", - "rel": "bookmark" - }], - "public_path": null, - "created_at": "2017-05-30T16:52:36.788395+00:00", - "updated_at": null, - "state": { - "controller-0": "tpm-config-applying", - "controller-1": "tpm-config-applying" - }, - "cert_path": null -} diff --git a/restapi-doc/restapi-doc/api-ref/src/wadls/sysinv-api/v1/api_samples/tpmconfig_modify-request.json b/restapi-doc/restapi-doc/api-ref/src/wadls/sysinv-api/v1/api_samples/tpmconfig_modify-request.json deleted file mode 100644 index 8996a8824..000000000 --- a/restapi-doc/restapi-doc/api-ref/src/wadls/sysinv-api/v1/api_samples/tpmconfig_modify-request.json +++ /dev/null @@ -1,14 +0,0 @@ -[{ - "path" : "/cert_path", - "value" : "/etc/ssl/private/key2.pem", - "op" : "replace" - }, { - "path" : "/public_path", - "value" : "/etc/ssl/private/cert2.pem", - "op" : "replace" - }, { - "path" : "/tpm_path", - "value" : "/etc/ssl/private/object2.tpm", - "op" : "replace" - } -] diff --git a/restapi-doc/restapi-doc/api-ref/src/wadls/sysinv-api/v1/api_samples/tpmconfig_modify-response.json b/restapi-doc/restapi-doc/api-ref/src/wadls/sysinv-api/v1/api_samples/tpmconfig_modify-response.json deleted file mode 100644 index 1b849e41e..000000000 --- a/restapi-doc/restapi-doc/api-ref/src/wadls/sysinv-api/v1/api_samples/tpmconfig_modify-response.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "tpm_path": "/etc/ssl/private/object2.tpm", - "uuid": "6e06345a-9d02-41bf-9af7-4593ad7db14c", - "links": [{ - "href": "http://192.168.204.2:6385/v1/tpmconfigs/6e06345a-9d02-41bf-9af7-4593ad7db14c", - "rel": "self" - }, { - "href": "http://192.168.204.2:6385/tpmconfigs/6e06345a-9d02-41bf-9af7-4593ad7db14c", - "rel": "bookmark" - }], - "public_path": null, - "created_at": "2017-05-30T16:52:36.788395+00:00", - "updated_at": "2017-06-21T15:12:16.666333+00:00", - "state": { - "controller-0": "tpm-config-applying", - "controller-1": "tpm-config-applying" - }, - "cert_path": null -} diff --git a/restapi-doc/restapi-doc/api-ref/src/wadls/sysinv-api/v1/api_samples/tpmconfig_show-response.json b/restapi-doc/restapi-doc/api-ref/src/wadls/sysinv-api/v1/api_samples/tpmconfig_show-response.json deleted file mode 100644 index de69aa047..000000000 --- a/restapi-doc/restapi-doc/api-ref/src/wadls/sysinv-api/v1/api_samples/tpmconfig_show-response.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "tpmconfigs": [{ - "tpm_path": "/etc/ssl/private/object.tpm", - "uuid": "556159b8-f39b-47ec-a410-e2d5499b6661", - "links": [{ - "href": "http://192.168.204.2:6385/v1/tpmconfigs/556159b8-f39b-47ec-a410-e2d5499b6661", - "rel": "self" - }, { - "href": "http://192.168.204.2:6385/tpmconfigs/556159b8-f39b-47ec-a410-e2d5499b6661", - "rel": "bookmark" - }], - "public_path": null, - "created_at": "2017-05-30T14:49:16.445438+00:00", - "updated_at": null, - "state": { - "controller-0": "tpm-config-applied" - }, - "cert_path": null - }] -} diff --git a/restapi-doc/restapi-doc/api-ref/src/wadls/sysinv-api/v1/common.ent b/restapi-doc/restapi-doc/api-ref/src/wadls/sysinv-api/v1/common.ent index 94e3fac56..b4f531830 100644 --- a/restapi-doc/restapi-doc/api-ref/src/wadls/sysinv-api/v1/common.ent +++ b/restapi-doc/restapi-doc/api-ref/src/wadls/sysinv-api/v1/common.ent @@ -4161,37 +4161,6 @@ '> - - - - - This parameter specifies the path to the certificate (private) - to upload to TPM. - - - - - - This parameter specifies the path to store the TPM - object context. - - - - - - This parameter specifies the path to store the public certificate - - - - '> - - - - - - - - - - - - The unique identifier of the TPM configuration. - - - - - - @@ -7344,7 +7326,9 @@ OAM Controller-1 IP Address. - Shows attributes of the Certificate configuration. + Shows attributes of the Certificate configuration, including + additional details if available for that certificate mode + @@ -7380,112 +7364,6 @@ OAM Controller-1 IP Address. &commonFaults; &getFaults; - - - - - - - - Shows attributes of the TPM configuration. - - - - - - &commonListShowParameters; - - - - - - - - &commonFaults; &getFaults; - - - - - Adds a TPM configuration. - - - - - - - &tpmconfigCommonParameters; - - - - - - - - - - - - &tpmconfigCommonParameters; - &commonListShowParameters; - - - - - - - - &postPutFaults; - - - - - Modifies a TPM configuration. - - - - - - &tpmconfigCommonParameters; - - - - - - - - - - - - &tpmconfigCommonParameters; - &commonListShowParameters; - - - - - - - - &postPutFaults; - - - - - Deletes a TPM configuration. - - - - - - - - - -