summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLingxian Kong <anlin.kong@gmail.com>2019-12-24 16:53:18 +1300
committerLingxian Kong <anlin.kong@gmail.com>2019-12-24 22:15:09 +1300
commitdacb400e0bc3c267d55c5d99032b4692f421f141 (patch)
tree7045db8cd050ba6c62fcc91821d1f0df8da41f80
parentb4bc1d85f0f6e3a625cbfb0af1ecb9b08dff310d (diff)
downloadtrove-dacb400e0bc3c267d55c5d99032b4692f421f141.tar.gz
Improve API doc
Change-Id: If48ef016c6fb7a875ceabc9f106e4cd85858d147
-rw-r--r--.zuul.yaml1
-rw-r--r--api-ref/source/api-versions.inc36
-rw-r--r--api-ref/source/backups.inc125
-rw-r--r--api-ref/source/configurations.inc164
-rw-r--r--api-ref/source/database-instance-actions.inc221
-rw-r--r--api-ref/source/databases.inc155
-rw-r--r--api-ref/source/datastore-versions.inc391
-rw-r--r--api-ref/source/datastores.inc87
-rwxr-xr-xapi-ref/source/index.rst13
-rw-r--r--api-ref/source/instance-actions.inc311
-rw-r--r--api-ref/source/instance-logs.inc (renamed from api-ref/source/database-instance-logs.inc)97
-rw-r--r--api-ref/source/instances.inc (renamed from api-ref/source/database-instances.inc)281
-rwxr-xr-xapi-ref/source/parameters.yaml16
-rw-r--r--api-ref/source/quotas.inc31
-rw-r--r--api-ref/source/samples/backup-create-request.json (renamed from api-ref/source/samples/db-backup-create-request.json)0
-rw-r--r--api-ref/source/samples/backup-create-response.json (renamed from api-ref/source/samples/db-backup-create-response.json)0
-rw-r--r--api-ref/source/samples/backup-get-response.json (renamed from api-ref/source/samples/db-backup-get-response.json)0
-rw-r--r--api-ref/source/samples/backup-list-response.json (renamed from api-ref/source/samples/db-backup-list-response.json)0
-rw-r--r--api-ref/source/samples/config-group-create-request.json (renamed from api-ref/source/samples/db-create-config-group-request.json)0
-rw-r--r--api-ref/source/samples/config-group-create-response.json (renamed from api-ref/source/samples/db-create-config-group-response.json)0
-rw-r--r--api-ref/source/samples/config-group-list-instances-response.json (renamed from api-ref/source/samples/db-config-group-instances-response.json)0
-rw-r--r--api-ref/source/samples/config-group-patch-request.json (renamed from api-ref/source/samples/db-patch-config-group-request.json)0
-rw-r--r--api-ref/source/samples/config-group-put-request.json (renamed from api-ref/source/samples/db-update-config-group-request.json)0
-rw-r--r--api-ref/source/samples/config-group-show-response.json (renamed from api-ref/source/samples/db-config-group-details-response.json)0
-rw-r--r--api-ref/source/samples/config-groups-list-response.json (renamed from api-ref/source/samples/db-list-cfg-groups-response.json)0
-rw-r--r--api-ref/source/samples/databases-create-request.json (renamed from api-ref/source/samples/db-create-databases-request.json)6
-rw-r--r--api-ref/source/samples/databases-list-response.json (renamed from api-ref/source/samples/db-grant-user-access-request.json)3
-rw-r--r--api-ref/source/samples/datastore-list-response.json96
-rw-r--r--api-ref/source/samples/datastore-show-response.json32
-rw-r--r--api-ref/source/samples/datastore-version-create-request.json11
-rw-r--r--api-ref/source/samples/datastore-version-list-response.json19
-rw-r--r--api-ref/source/samples/datastore-version-mgmt-list-response.json30
-rw-r--r--api-ref/source/samples/datastore-version-mgmt-patch-request.json4
-rw-r--r--api-ref/source/samples/datastore-version-mgmt-show-response.json15
-rw-r--r--api-ref/source/samples/datastore-version-parameter-create-request.json9
-rw-r--r--api-ref/source/samples/datastore-version-parameter-create-response.json12
-rw-r--r--api-ref/source/samples/datastore-version-parameter-list-response.json36
-rw-r--r--api-ref/source/samples/datastore-version-parameter-show-response.json8
-rw-r--r--api-ref/source/samples/datastore-version-parameter-update-request.json9
-rw-r--r--api-ref/source/samples/datastore-version-parameter-update-response.json10
-rw-r--r--api-ref/source/samples/datastore-version-show-response.json17
-rw-r--r--api-ref/source/samples/db-attach-config-group-request-json-http.txt7
-rw-r--r--api-ref/source/samples/db-attach-config-group-response-json-http.txt5
-rw-r--r--api-ref/source/samples/db-backup-create-incremental-request-json-http.txt7
-rw-r--r--api-ref/source/samples/db-backup-create-incremental-request.json9
-rw-r--r--api-ref/source/samples/db-backup-create-incremental-response-json-http.txt5
-rw-r--r--api-ref/source/samples/db-backup-create-incremental-response.json19
-rw-r--r--api-ref/source/samples/db-backup-create-request-json-http.txt7
-rw-r--r--api-ref/source/samples/db-backup-create-response-json-http.txt5
-rw-r--r--api-ref/source/samples/db-backup-delete-request-json-http.txt7
-rw-r--r--api-ref/source/samples/db-backup-delete-response-json-http.txt5
-rw-r--r--api-ref/source/samples/db-backup-get-request-json-http.txt7
-rw-r--r--api-ref/source/samples/db-backup-get-response-json-http.txt5
-rw-r--r--api-ref/source/samples/db-backup-list-request-json-http.txt7
-rw-r--r--api-ref/source/samples/db-backup-list-response-json-http.txt5
-rw-r--r--api-ref/source/samples/db-backup-restore-request-json-http.txt7
-rw-r--r--api-ref/source/samples/db-backup-restore-request.json12
-rw-r--r--api-ref/source/samples/db-backup-restore-response-json-http.txt5
-rw-r--r--api-ref/source/samples/db-backup-restore-response.json41
-rw-r--r--api-ref/source/samples/db-backups-by-instance-request-json-http.txt7
-rw-r--r--api-ref/source/samples/db-backups-by-instance-response-json-http.txt5
-rw-r--r--api-ref/source/samples/db-backups-by-instance-response.json38
-rw-r--r--api-ref/source/samples/db-change-user-attributes-request-json-http.txt7
-rw-r--r--api-ref/source/samples/db-change-user-attributes-request.json6
-rw-r--r--api-ref/source/samples/db-change-user-attributes-response-json-http.txt5
-rw-r--r--api-ref/source/samples/db-change-users-password-request-json-http.txt6
-rw-r--r--api-ref/source/samples/db-change-users-password-request.json12
-rw-r--r--api-ref/source/samples/db-change-users-password-response-json-http.txt4
-rw-r--r--api-ref/source/samples/db-check-root-user-request-json-http.txt7
-rw-r--r--api-ref/source/samples/db-check-root-user-response-json-http.txt5
-rw-r--r--api-ref/source/samples/db-config-group-details-request-json-http.txt6
-rw-r--r--api-ref/source/samples/db-config-group-details-response-json-http.txt4
-rw-r--r--api-ref/source/samples/db-config-group-instances-request-json-http.txt6
-rw-r--r--api-ref/source/samples/db-config-group-instances-response-json-http.txt4
-rw-r--r--api-ref/source/samples/db-configuration-attach-to-instance-request-json-http.txt7
-rw-r--r--api-ref/source/samples/db-configuration-attach-to-instance-request.json5
-rw-r--r--api-ref/source/samples/db-configuration-attach-to-instance-response-json-http.txt5
-rw-r--r--api-ref/source/samples/db-configuration-create-request-json-http.txt7
-rw-r--r--api-ref/source/samples/db-configuration-create-request.json14
-rw-r--r--api-ref/source/samples/db-configuration-create-response-json-http.txt5
-rw-r--r--api-ref/source/samples/db-configuration-create-response.json17
-rw-r--r--api-ref/source/samples/db-configuration-delete-request-json-http.txt7
-rw-r--r--api-ref/source/samples/db-configuration-delete-response-json-http.txt5
-rw-r--r--api-ref/source/samples/db-configuration-detach-from-instance-request-json-http.txt7
-rw-r--r--api-ref/source/samples/db-configuration-detach-from-instance-request.json5
-rw-r--r--api-ref/source/samples/db-configuration-detach-from-instance-response-json-http.txt5
-rw-r--r--api-ref/source/samples/db-configuration-details-request-json-http.txt7
-rw-r--r--api-ref/source/samples/db-configuration-details-response-json-http.txt5
-rw-r--r--api-ref/source/samples/db-configuration-details-response.json17
-rw-r--r--api-ref/source/samples/db-configuration-edit-parameters-request-json-http.txt7
-rw-r--r--api-ref/source/samples/db-configuration-edit-parameters-request.json7
-rw-r--r--api-ref/source/samples/db-configuration-edit-parameters-response-json-http.txt5
-rw-r--r--api-ref/source/samples/db-configuration-list-instances-request-json-http.txt7
-rw-r--r--api-ref/source/samples/db-configuration-list-instances-response-json-http.txt5
-rw-r--r--api-ref/source/samples/db-configuration-list-instances-response.json8
-rw-r--r--api-ref/source/samples/db-configuration-list-request-json-http.txt7
-rw-r--r--api-ref/source/samples/db-configuration-list-response-json-http.txt5
-rw-r--r--api-ref/source/samples/db-configuration-list-response.json14
-rw-r--r--api-ref/source/samples/db-configuration-parameter-for-datastore-version-request-json-http.txt7
-rw-r--r--api-ref/source/samples/db-configuration-parameter-for-datastore-version-response-json-http.txt5
-rw-r--r--api-ref/source/samples/db-configuration-parameter-for-datastore-version-response.json7
-rw-r--r--api-ref/source/samples/db-configuration-parameter-without-datastore-version-request-json-http.txt7
-rw-r--r--api-ref/source/samples/db-configuration-parameter-without-datastore-version-response-json-http.txt5
-rw-r--r--api-ref/source/samples/db-configuration-parameter-without-datastore-version-response.json7
-rw-r--r--api-ref/source/samples/db-configuration-parameters-for-datastore-version-request-json-http.txt7
-rw-r--r--api-ref/source/samples/db-configuration-parameters-for-datastore-version-response-json-http.txt5
-rw-r--r--api-ref/source/samples/db-configuration-parameters-for-datastore-version-response.json51
-rw-r--r--api-ref/source/samples/db-configuration-parameters-without-datastore-version-request-json-http.txt7
-rw-r--r--api-ref/source/samples/db-configuration-parameters-without-datastore-version-response-json-http.txt5
-rw-r--r--api-ref/source/samples/db-configuration-parameters-without-datastore-version-response.json51
-rw-r--r--api-ref/source/samples/db-configuration-update-parameters-request-json-http.txt7
-rw-r--r--api-ref/source/samples/db-configuration-update-parameters-request.json10
-rw-r--r--api-ref/source/samples/db-configuration-update-parameters-response-json-http.txt5
-rw-r--r--api-ref/source/samples/db-create-config-group-request-json-http.txt7
-rw-r--r--api-ref/source/samples/db-create-config-group-response-json-http.txt5
-rw-r--r--api-ref/source/samples/db-create-databases-request-json-http.txt7
-rw-r--r--api-ref/source/samples/db-create-databases-response-json-http.txt5
-rw-r--r--api-ref/source/samples/db-create-instance-request-json-http.txt7
-rw-r--r--api-ref/source/samples/db-create-instance-response-json-http.txt5
-rw-r--r--api-ref/source/samples/db-create-instance-response.json41
-rw-r--r--api-ref/source/samples/db-create-users-request-json-http.txt7
-rw-r--r--api-ref/source/samples/db-create-users-response-json-http.txt5
-rw-r--r--api-ref/source/samples/db-datastore-by-id-request-json-http.txt7
-rw-r--r--api-ref/source/samples/db-datastore-by-id-response-json-http.txt5
-rw-r--r--api-ref/source/samples/db-datastore-by-id-response.json33
-rw-r--r--api-ref/source/samples/db-datastore-parameters-response.json258
-rw-r--r--api-ref/source/samples/db-datastore-version-by-id-request-json-http.txt7
-rw-r--r--api-ref/source/samples/db-datastore-version-by-id-response-json-http.txt5
-rw-r--r--api-ref/source/samples/db-datastore-version-by-id-response.json17
-rw-r--r--api-ref/source/samples/db-datastore-versions-list-request-json-http.txt7
-rw-r--r--api-ref/source/samples/db-datastore-versions-list-response-json-http.txt5
-rw-r--r--api-ref/source/samples/db-datastore-versions-list-response.json19
-rw-r--r--api-ref/source/samples/db-datastores-list-request-json-http.txt7
-rw-r--r--api-ref/source/samples/db-datastores-list-response-json-http.txt5
-rw-r--r--api-ref/source/samples/db-datastores-list-response.json35
-rw-r--r--api-ref/source/samples/db-delete-config-group-request-json-http.txt6
-rw-r--r--api-ref/source/samples/db-delete-databases-request-json-http.txt7
-rw-r--r--api-ref/source/samples/db-delete-databases-response-json-http.txt5
-rw-r--r--api-ref/source/samples/db-delete-instance-request-json-http.txt7
-rw-r--r--api-ref/source/samples/db-delete-instance-response-json-http.txt5
-rw-r--r--api-ref/source/samples/db-delete-root-request-json-http.txt7
-rw-r--r--api-ref/source/samples/db-delete-users-request-json-http.txt7
-rw-r--r--api-ref/source/samples/db-delete-users-response-json-http.txt5
-rw-r--r--api-ref/source/samples/db-detach-config-group-request-json-http.txt7
-rw-r--r--api-ref/source/samples/db-detach-config-group-request.json3
-rw-r--r--api-ref/source/samples/db-detach-config-group-response-json-http.txt5
-rw-r--r--api-ref/source/samples/db-detach-replica-request-json-http.txt7
-rw-r--r--api-ref/source/samples/db-detach-replica-response-json-http.txt5
-rw-r--r--api-ref/source/samples/db-disable-root-user-request-json-http.txt7
-rw-r--r--api-ref/source/samples/db-disable-root-user-response-json-http.txt5
-rw-r--r--api-ref/source/samples/db-enable-root-user-request-json-http.txt7
-rw-r--r--api-ref/source/samples/db-enable-root-user-response-json-http.txt5
-rw-r--r--api-ref/source/samples/db-enable-root-user-response.json6
-rw-r--r--api-ref/source/samples/db-faults-badRequest.json6
-rw-r--r--api-ref/source/samples/db-faults-instanceFault.json6
-rw-r--r--api-ref/source/samples/db-faults-itemNotFound.json6
-rw-r--r--api-ref/source/samples/db-get-default-instance-configuration-request-json-http.txt7
-rw-r--r--api-ref/source/samples/db-get-default-instance-configuration-response-json-http.txt5
-rw-r--r--api-ref/source/samples/db-grant-user-access-request-json-http.txt6
-rw-r--r--api-ref/source/samples/db-grant-user-access-response-json-http.txt4
-rw-r--r--api-ref/source/samples/db-instance-disable-log-response.json12
-rw-r--r--api-ref/source/samples/db-instance-discard-log-response.json12
-rw-r--r--api-ref/source/samples/db-instance-eject-replica-request-json-http.txt6
-rw-r--r--api-ref/source/samples/db-instance-enable-log-response.json12
-rw-r--r--api-ref/source/samples/db-instance-promote-replica-request-json-http.txt6
-rw-r--r--api-ref/source/samples/db-instance-publish-log-response.json12
-rw-r--r--api-ref/source/samples/db-instance-reboot-request-json-http.txt7
-rw-r--r--api-ref/source/samples/db-instance-reboot-response-json-http.txt5
-rw-r--r--api-ref/source/samples/db-instance-resize-flavor-request-json-http.txt7
-rw-r--r--api-ref/source/samples/db-instance-resize-flavor-response-json-http.txt5
-rw-r--r--api-ref/source/samples/db-instance-resize-instance-request-json-http.txt6
-rw-r--r--api-ref/source/samples/db-instance-resize-instance-request.json5
-rw-r--r--api-ref/source/samples/db-instance-resize-instance-response-json-http.txt4
-rw-r--r--api-ref/source/samples/db-instance-resize-volume-request-json-http.txt7
-rw-r--r--api-ref/source/samples/db-instance-resize-volume-response-json-http.txt5
-rw-r--r--api-ref/source/samples/db-instance-restart-request-json-http.txt7
-rw-r--r--api-ref/source/samples/db-instance-restart-response-json-http.txt5
-rw-r--r--api-ref/source/samples/db-instance-show-log-response.json12
-rw-r--r--api-ref/source/samples/db-instance-status-detail-request-json-http.txt7
-rw-r--r--api-ref/source/samples/db-instance-status-detail-response-json-http.txt5
-rw-r--r--api-ref/source/samples/db-instance-status-detail-response.json43
-rw-r--r--api-ref/source/samples/db-instances-index-pagination-request-json-http.txt7
-rw-r--r--api-ref/source/samples/db-instances-index-pagination-response-json-http.txt5
-rw-r--r--api-ref/source/samples/db-instances-index-pagination-response.json78
-rw-r--r--api-ref/source/samples/db-instances-index-request-json-http.txt7
-rw-r--r--api-ref/source/samples/db-instances-index-response-json-http.txt5
-rw-r--r--api-ref/source/samples/db-instances-index-response.json41
-rw-r--r--api-ref/source/samples/db-list-cfg-defaults-request-json-http.txt7
-rw-r--r--api-ref/source/samples/db-list-cfg-defaults-response-json-http.txt5
-rw-r--r--api-ref/source/samples/db-list-cfg-defaults-response.json45
-rw-r--r--api-ref/source/samples/db-list-cfg-groups-request-json-http.txt7
-rw-r--r--api-ref/source/samples/db-list-cfg-groups-response-json-http.txt5
-rw-r--r--api-ref/source/samples/db-list-databases-pagination-request-json-http.txt7
-rw-r--r--api-ref/source/samples/db-list-databases-pagination-response-json-http.txt5
-rw-r--r--api-ref/source/samples/db-list-databases-pagination-response.json13
-rw-r--r--api-ref/source/samples/db-list-databases-request-json-http.txt7
-rw-r--r--api-ref/source/samples/db-list-databases-response-json-http.txt5
-rw-r--r--api-ref/source/samples/db-list-databases-response.json19
-rw-r--r--api-ref/source/samples/db-list-datastore-versions-request-json-http.txt6
-rw-r--r--api-ref/source/samples/db-list-datastore-versions-response-json-http.txt4
-rw-r--r--api-ref/source/samples/db-list-datastore-versions.json18
-rw-r--r--api-ref/source/samples/db-list-parameters-request-json-http.txt6
-rw-r--r--api-ref/source/samples/db-list-parameters-response-json-http.txt4
-rw-r--r--api-ref/source/samples/db-list-parameters-response.json258
-rw-r--r--api-ref/source/samples/db-list-user-access-request-json-http.txt6
-rw-r--r--api-ref/source/samples/db-list-user-access-response-json-http.txt4
-rw-r--r--api-ref/source/samples/db-list-user-access-response.json10
-rw-r--r--api-ref/source/samples/db-list-user-dbs-request-json-http.txt6
-rw-r--r--api-ref/source/samples/db-list-user-dbs-response-json-http.txt4
-rw-r--r--api-ref/source/samples/db-list-users-pagination-request-json-http.txt7
-rw-r--r--api-ref/source/samples/db-list-users-pagination-response-json-http.txt5
-rw-r--r--api-ref/source/samples/db-list-users-request-json-http.txt7
-rw-r--r--api-ref/source/samples/db-list-users-response-json-http.txt5
-rw-r--r--api-ref/source/samples/db-list-users-response.json43
-rw-r--r--api-ref/source/samples/db-mgmt-get-account-details-request-json-http.txt7
-rw-r--r--api-ref/source/samples/db-mgmt-get-account-details-response-json-http.txt5
-rw-r--r--api-ref/source/samples/db-mgmt-get-account-details-response.json8
-rw-r--r--api-ref/source/samples/db-mgmt-get-host-detail-request-json-http.txt7
-rw-r--r--api-ref/source/samples/db-mgmt-get-host-detail-response-json-http.txt5
-rw-r--r--api-ref/source/samples/db-mgmt-get-host-detail-response.json17
-rw-r--r--api-ref/source/samples/db-mgmt-get-instance-details-request-json-http.txt7
-rw-r--r--api-ref/source/samples/db-mgmt-get-instance-details-response-json-http.txt5
-rw-r--r--api-ref/source/samples/db-mgmt-get-instance-details-response.json84
-rw-r--r--api-ref/source/samples/db-mgmt-get-root-details-request-json-http.txt7
-rw-r--r--api-ref/source/samples/db-mgmt-get-root-details-response-json-http.txt5
-rw-r--r--api-ref/source/samples/db-mgmt-get-root-details-response.json7
-rw-r--r--api-ref/source/samples/db-mgmt-get-storage-request-json-http.txt7
-rw-r--r--api-ref/source/samples/db-mgmt-get-storage-response-json-http.txt5
-rw-r--r--api-ref/source/samples/db-mgmt-get-storage-response.json18
-rw-r--r--api-ref/source/samples/db-mgmt-instance-diagnostics-request-json-http.txt7
-rw-r--r--api-ref/source/samples/db-mgmt-instance-diagnostics-response-json-http.txt5
-rw-r--r--api-ref/source/samples/db-mgmt-instance-diagnostics-response.json11
-rw-r--r--api-ref/source/samples/db-mgmt-instance-index-request-json-http.txt7
-rw-r--r--api-ref/source/samples/db-mgmt-instance-index-response-json-http.txt5
-rw-r--r--api-ref/source/samples/db-mgmt-instance-index-response.json62
-rw-r--r--api-ref/source/samples/db-mgmt-list-accounts-request-json-http.txt7
-rw-r--r--api-ref/source/samples/db-mgmt-list-accounts-response-json-http.txt5
-rw-r--r--api-ref/source/samples/db-mgmt-list-accounts-response.json8
-rw-r--r--api-ref/source/samples/db-mgmt-list-hosts-request-json-http.txt7
-rw-r--r--api-ref/source/samples/db-mgmt-list-hosts-response-json-http.txt5
-rw-r--r--api-ref/source/samples/db-mgmt-list-hosts-response.json12
-rw-r--r--api-ref/source/samples/db-patch-config-group-request-json-http.txt7
-rw-r--r--api-ref/source/samples/db-patch-config-group-response-json-http.txt5
-rw-r--r--api-ref/source/samples/db-restore-delete-request-json-http.txt7
-rw-r--r--api-ref/source/samples/db-restore-delete-response-json-http.txt5
-rw-r--r--api-ref/source/samples/db-revoke-user-access-request-json-http.txt6
-rw-r--r--api-ref/source/samples/db-revoke-user-access-response-json-http.txt4
-rw-r--r--api-ref/source/samples/db-show-parameter-details-request-json-http.txt6
-rw-r--r--api-ref/source/samples/db-show-parameter-details-response-json-http.txt4
-rw-r--r--api-ref/source/samples/db-show-parameter-details.json8
-rw-r--r--api-ref/source/samples/db-update-config-group-request-json-http.txt7
-rw-r--r--api-ref/source/samples/db-update-config-group-response-json-http.txt5
-rw-r--r--api-ref/source/samples/db-version-request-json-http.txt6
-rw-r--r--api-ref/source/samples/db-version-response-json-http.txt4
-rw-r--r--api-ref/source/samples/db-version-response.json13
-rw-r--r--api-ref/source/samples/db-versions-request-json-http.txt6
-rw-r--r--api-ref/source/samples/db-versions-response-json-http.txt4
-rw-r--r--api-ref/source/samples/instance-action-eject-replica-request.json (renamed from api-ref/source/samples/db-instance-eject-replica-request.json)0
-rw-r--r--api-ref/source/samples/instance-action-promote-replica-request.json (renamed from api-ref/source/samples/db-instance-promote-replica-request.json)0
-rw-r--r--api-ref/source/samples/instance-action-reset-status-request.json3
-rw-r--r--api-ref/source/samples/instance-action-resize-request.json (renamed from api-ref/source/samples/db-instance-resize-flavor-request.json)2
-rw-r--r--api-ref/source/samples/instance-action-resize-volume-request.json (renamed from api-ref/source/samples/db-instance-resize-volume-request.json)0
-rw-r--r--api-ref/source/samples/instance-action-restart-request.json (renamed from api-ref/source/samples/db-instance-restart-request.json)0
-rw-r--r--api-ref/source/samples/instance-backup-list-response.json21
-rw-r--r--api-ref/source/samples/instance-configuration-list-response.json (renamed from api-ref/source/samples/db-get-default-instance-configuration-response.json)28
-rw-r--r--api-ref/source/samples/instance-create-request.json (renamed from api-ref/source/samples/db-create-instance-request.json)0
-rw-r--r--api-ref/source/samples/instance-create-response.json41
-rw-r--r--api-ref/source/samples/instance-list-detail-response.json91
-rw-r--r--api-ref/source/samples/instance-list-response.json44
-rw-r--r--api-ref/source/samples/instance-log-disable-request.json (renamed from api-ref/source/samples/db-instance-disable-log-request.json)0
-rw-r--r--api-ref/source/samples/instance-log-disable-response.json12
-rw-r--r--api-ref/source/samples/instance-log-discard-request.json (renamed from api-ref/source/samples/db-instance-discard-log-request.json)0
-rw-r--r--api-ref/source/samples/instance-log-discard-response.json12
-rw-r--r--api-ref/source/samples/instance-log-enable-request.json (renamed from api-ref/source/samples/db-instance-enable-log-request.json)0
-rw-r--r--api-ref/source/samples/instance-log-enable-response.json12
-rw-r--r--api-ref/source/samples/instance-log-list-response.json (renamed from api-ref/source/samples/db-instance-list-logs-response.json)0
-rw-r--r--api-ref/source/samples/instance-log-publish-request.json (renamed from api-ref/source/samples/db-instance-publish-log-request.json)0
-rw-r--r--api-ref/source/samples/instance-log-publish-response.json12
-rw-r--r--api-ref/source/samples/instance-log-show-request.json (renamed from api-ref/source/samples/db-instance-show-log-request.json)0
-rw-r--r--api-ref/source/samples/instance-log-show-response.json12
-rw-r--r--api-ref/source/samples/instance-mgmt-action-migrate-request.json5
-rw-r--r--api-ref/source/samples/instance-mgmt-action-reboot-request.json (renamed from api-ref/source/samples/db-instance-reboot-request.json)2
-rw-r--r--api-ref/source/samples/instance-mgmt-action-reset-task-status-request.json3
-rw-r--r--api-ref/source/samples/instance-mgmt-action-stop-request.json3
-rw-r--r--api-ref/source/samples/instance-mgmt-list-response.json114
-rw-r--r--api-ref/source/samples/instance-mgmt-show-response.json104
-rw-r--r--api-ref/source/samples/instance-patch-detach-replica-request.json (renamed from api-ref/source/samples/db-detach-replica-request.json)0
-rw-r--r--api-ref/source/samples/instance-patch-update-name-request.json (renamed from api-ref/source/samples/db-update-instance-name-request.json)0
-rw-r--r--api-ref/source/samples/instance-patch-upgrade-datastore-version-request.json (renamed from api-ref/source/samples/db-upgrade-instance-datastore-version-request.json)0
-rw-r--r--api-ref/source/samples/instance-put-attach-config-group-request.json (renamed from api-ref/source/samples/db-attach-config-group-request.json)0
-rw-r--r--api-ref/source/samples/instance-show-response.json46
-rw-r--r--api-ref/source/samples/limit-show-response.json55
-rw-r--r--api-ref/source/samples/user-check-root-response.json (renamed from api-ref/source/samples/db-check-root-user-response.json)0
-rw-r--r--api-ref/source/samples/user-create-request.json (renamed from api-ref/source/samples/db-create-users-request.json)7
-rw-r--r--api-ref/source/samples/user-enable-root-response.json6
-rw-r--r--api-ref/source/samples/user-grant-databases-access-request.json7
-rw-r--r--api-ref/source/samples/user-list-response.json (renamed from api-ref/source/samples/db-list-users-pagination-response.json)13
-rw-r--r--api-ref/source/samples/user-put-request.json7
-rw-r--r--api-ref/source/samples/user-show-response.json (renamed from api-ref/source/samples/db-list-user-dbs-response.json)10
-rw-r--r--api-ref/source/samples/user-show-root-history-response.json7
-rw-r--r--api-ref/source/samples/users-put-request.json9
-rw-r--r--api-ref/source/samples/versions-response.json (renamed from api-ref/source/samples/db-versions-response.json)4
-rw-r--r--api-ref/source/user-management.inc303
-rw-r--r--api-ref/source/users.inc289
-rw-r--r--trove/common/api.py4
-rw-r--r--trove/extensions/mgmt/instances/models.py5
306 files changed, 2398 insertions, 3725 deletions
diff --git a/.zuul.yaml b/.zuul.yaml
index c87142c2..c9fd5ea0 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -327,6 +327,7 @@
- openstack/tempest
irrelevant-files:
- ^.*\.rst$
+ - ^api-ref/.*$
- ^doc/.*$
- ^etc/.*$
- ^releasenotes/.*$
diff --git a/api-ref/source/api-versions.inc b/api-ref/source/api-versions.inc
index a795bf91..b629ec5d 100644
--- a/api-ref/source/api-versions.inc
+++ b/api-ref/source/api-versions.inc
@@ -4,8 +4,7 @@
API versions
============
-Lists information for all Database Service API versions and shows
-Database Service v1.0 details.
+Lists information for all Database Service API versions.
List versions
@@ -13,40 +12,13 @@ List versions
.. rest_method:: GET /
-Lists information about all Database Service API versions.
+Lists information about all Database Service API versions. No authentication
+needed.
Normal response codes: 200
-Error response codes: badRequest(400), unauthorized(401), forbidden(403),
-itemNotFound(404), badMethod(405), overLimit(413), unprocessableEntity(422),
-instanceFault(500), notImplemented(501), serviceUnavailable(503)
-
-
-Response Example
-----------------
-
-.. literalinclude:: samples/db-versions-response.json
- :language: javascript
-
-
-
-
-Show version details
-~~~~~~~~~~~~~~~~~~~~
-
-.. rest_method:: GET /v1.0
-
-Shows details for the Database Service API v1.0.
-
-Normal response codes: 200
-
-Error response codes: badRequest(400), unauthorized(401), forbidden(403),
-itemNotFound(404), badMethod(405), overLimit(413), unprocessableEntity(422),
-instanceFault(500), notImplemented(501), serviceUnavailable(503)
-
-
Response Example
----------------
-.. literalinclude:: samples/db-version-response.json
+.. literalinclude:: samples/versions-response.json
:language: javascript
diff --git a/api-ref/source/backups.inc b/api-ref/source/backups.inc
index d842619a..9fd8d331 100644
--- a/api-ref/source/backups.inc
+++ b/api-ref/source/backups.inc
@@ -4,7 +4,7 @@
Backups
=======
-List, show details, create and delete backups.
+
List database backups
@@ -17,16 +17,12 @@ using query string parameters. The following filters are supported:
- ``instance_id={instance_id}`` - Return the list of backups for a particular
database instance.
-- ``all_projects`` - Return the list of backups for all the projects, this is
- admin only param by default.
+- ``all_projects=True/False`` - Return the list of backups for all the
+ projects, this is an admin only param by default.
+- ``datastore={datastore}`` - Return a list of backups of the same datastore.
Normal response codes: 200
-Error response codes: badRequest(400), unauthorized(401), forbidden(403),
-itemNotFound(404), badMethod(405), overLimit(413), unprocessableEntity(422),
-instanceFault(500), notImplemented(501), serviceUnavailable(503)
-
-
Request
-------
@@ -60,34 +56,42 @@ Response Parameters
Response Example
----------------
-.. literalinclude:: samples/db-backup-list-response.json
+.. literalinclude:: samples/backup-list-response.json
:language: javascript
-List database backups for an instance
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. rest_method:: GET /v1.0/{project_id}/instances/{instanceId}/backups
+Create database backup
+~~~~~~~~~~~~~~~~~~~~~~
-List all database backups for the specified instance. This is equivalent to
-``GET /v1.0/{project_id}/backups?instance_id={instanceId}``.
+.. rest_method:: POST /v1.0/{project_id}/backups
-Normal response codes: 200
+Creates a database backup for instance.
-Error response codes: badRequest(400), unauthorized(401), forbidden(403),
-itemNotFound(404), badMethod(405), overLimit(413), unprocessableEntity(422),
-instanceFault(500), notImplemented(501), serviceUnavailable(503)
+In the Trove deployment with service tenant enabled, The backup data is
+stored as objects in OpenStack Swift service in the user's
+container(``database_backups`` by default)
+Normal response codes: 202
Request
-------
.. rest_parameters:: parameters.yaml
- - instanceId: instanceId
- project_id: project_id
+ - name: backup_name
+ - instance: backup_instanceId
+ - parent_id: backup_parentId
+ - incremental: backup_incremental
+ - description: backup_description
+
+Request Example
+---------------
+
+.. literalinclude:: samples/backup-create-request.json
+ :language: javascript
Response Parameters
@@ -95,7 +99,6 @@ Response Parameters
.. rest_parameters:: parameters.yaml
- - backups: backup_list
- created: created
- datastore: datastore2
- datastore.type: datastore_type1
@@ -115,7 +118,7 @@ Response Parameters
Response Example
----------------
-.. literalinclude:: samples/db-backups-by-instance-response.json
+.. literalinclude:: samples/backup-create-response.json
:language: javascript
@@ -130,11 +133,6 @@ Show detailes of a backup.
Normal response codes: 200
-Error response codes: badRequest(400), unauthorized(401), forbidden(403),
-itemNotFound(404), badMethod(405), overLimit(413), unprocessableEntity(422),
-instanceFault(500), notImplemented(501), serviceUnavailable(503)
-
-
Request
-------
@@ -168,71 +166,7 @@ Response Parameters
Response Example
----------------
-.. literalinclude:: samples/db-backup-get-response.json
- :language: javascript
-
-
-
-
-Create database backup
-~~~~~~~~~~~~~~~~~~~~~~
-
-.. rest_method:: POST /v1.0/{project_id}/backups
-
-Creates a database backup for instance.
-
-Normal response codes: 202
-
-Error response codes: badRequest(400), unauthorized(401), forbidden(403),
-itemNotFound(404), badMethod(405), overLimit(413), unprocessableEntity(422),
-instanceFault(500), notImplemented(501), serviceUnavailable(503)
-
-
-Request
--------
-
-.. rest_parameters:: parameters.yaml
-
- - name: backup_name
- - instance: backup_instanceId
- - parent_id: backup_parentId
- - incremental: backup_incremental
- - description: backup_description
- - project_id: project_id
-
-
-Request Example
----------------
-
-.. literalinclude:: samples/db-backup-create-request.json
- :language: javascript
-
-
-Response Parameters
--------------------
-
-.. rest_parameters:: parameters.yaml
-
- - created: created
- - datastore: datastore2
- - datastore.type: datastore_type1
- - datastore.version: datastore_version_name
- - datastore.version_id: datastore_version_id1
- - description: backup_description1
- - id: backup_id
- - instance_id: backup_instanceId
- - locationRef: backup_locationRef
- - name: backup_name
- - parent_id: backup_parentId1
- - size: backup_size
- - status: backup_status
- - updated: updated
-
-
-Response Example
-----------------
-
-.. literalinclude:: samples/db-backup-create-response.json
+.. literalinclude:: samples/backup-get-response.json
:language: javascript
@@ -247,15 +181,10 @@ Deletes a database backup.
Normal response codes: 202
-Error response codes: badRequest(400), unauthorized(401), forbidden(403),
-itemNotFound(404), badMethod(405), overLimit(413), unprocessableEntity(422),
-instanceFault(500), notImplemented(501), serviceUnavailable(503)
-
-
Request
-------
.. rest_parameters:: parameters.yaml
- - backupId: backup_id
- project_id: project_id
+ - backupId: backup_id \ No newline at end of file
diff --git a/api-ref/source/configurations.inc b/api-ref/source/configurations.inc
index 188d9733..d65ce5bb 100644
--- a/api-ref/source/configurations.inc
+++ b/api-ref/source/configurations.inc
@@ -1,24 +1,20 @@
.. -*- rst -*-
-=====================================
-Configuration groups (configurations)
-=====================================
+====================
+Configuration groups
+====================
-Creates and lists all configuration groups.
-Create configuration group
-~~~~~~~~~~~~~~~~~~~~~~~~~~
-.. rest_method:: POST /v1.0/{project_id}/configurations
+List configuration groups
+~~~~~~~~~~~~~~~~~~~~~~~~~
-Creates a configuration group.
+.. rest_method:: GET /v1.0/{project_id}/configurations
-Normal response codes: 200
+Lists all configuration groups.
-Error response codes: badRequest(400), unauthorized(401), forbidden(403),
-itemNotFound(404), badMethod(405), overLimit(413), unprocessableEntity(422),
-instanceFault(500), notImplemented(501), serviceUnavailable(503)
+Normal response codes: 200
Request
@@ -26,106 +22,90 @@ Request
.. rest_parameters:: parameters.yaml
- - datastore: datastore
- - values: values
- - name: name
- project_id: project_id
-Request Example
----------------
-
-.. literalinclude:: samples/db-create-config-group-request.json
- :language: javascript
-
-
Response Example
----------------
-.. literalinclude:: samples/db-create-config-group-response.json
+.. literalinclude:: samples/config-groups-list-response.json
:language: javascript
-List configuration groups
-~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. rest_method:: GET /v1.0/{project_id}/configurations
+Create configuration group
+~~~~~~~~~~~~~~~~~~~~~~~~~~
-Lists all configuration groups.
+.. rest_method:: POST /v1.0/{project_id}/configurations
-The list includes the associated data store and data store version
-for each configuration group.
+Creates a configuration group.
Normal response codes: 200
-Error response codes: badRequest(400), unauthorized(401), forbidden(403),
-itemNotFound(404), badMethod(405), overLimit(413), unprocessableEntity(422),
-instanceFault(500), notImplemented(501), serviceUnavailable(503)
-
-
Request
-------
.. rest_parameters:: parameters.yaml
- project_id: project_id
+ - datastore: datastore
+ - name: name
+ - values: values
+
+
+Request Example
+---------------
+
+.. literalinclude:: samples/config-group-create-request.json
+ :language: javascript
Response Example
----------------
-.. literalinclude:: samples/db-list-cfg-groups-response.json
+.. literalinclude:: samples/config-group-create-response.json
:language: javascript
-List configuration group instances
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Show configuration group details
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.. rest_method:: GET /v1.0/{project_id}/configurations/{configId}/instances
+.. rest_method:: GET /v1.0/{project_id}/configurations/{configId}
-Lists the instances associated with the specified configuration group.
+Lists details about a configuration group, including its values.
Normal response codes: 200
-Error response codes: badRequest(400), unauthorized(401), forbidden(403),
-itemNotFound(404), badMethod(405), overLimit(413), unprocessableEntity(422),
-instanceFault(500), notImplemented(501), serviceUnavailable(503)
-
Request
-------
.. rest_parameters:: parameters.yaml
- - configId: configId
- project_id: project_id
+ - configId: configId
Response Example
----------------
-.. literalinclude:: samples/db-config-group-instances-response.json
+.. literalinclude:: samples/config-group-show-response.json
:language: javascript
-Delete configuration group
-~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. rest_method:: DELETE /v1.0/{project_id}/configurations/{configId}
+List instances applied the configuration group
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Deletes a configuration group.
+.. rest_method:: GET /v1.0/{project_id}/configurations/{configId}/instances
-Normal response codes: 202
+Lists the instances associated with the specified configuration group.
-Error response codes: badRequest(400), unauthorized(401), forbidden(403),
-itemNotFound(404), badMethod(405), overLimit(413), unprocessableEntity(422),
-instanceFault(500), notImplemented(501), serviceUnavailable(503)
+Normal response codes: 200
Request
@@ -133,8 +113,15 @@ Request
.. rest_parameters:: parameters.yaml
- - configId: configId
- project_id: project_id
+ - configId: configId
+
+
+Response Example
+----------------
+
+.. literalinclude:: samples/config-group-list-instances-response.json
+ :language: javascript
@@ -148,49 +135,35 @@ Sets new values for a configuration group.
Normal response codes: 200
-Error response codes: badRequest(400), unauthorized(401), forbidden(403),
-itemNotFound(404), badMethod(405), overLimit(413), unprocessableEntity(422),
-instanceFault(500), notImplemented(501), serviceUnavailable(503)
-
Request
-------
.. rest_parameters:: parameters.yaml
- - values: values
- - configId: configId
- project_id: project_id
+ - configId: configId
+ - values: values
Request Example
---------------
-.. literalinclude:: samples/db-patch-config-group-request.json
+.. literalinclude:: samples/config-group-patch-request.json
:language: javascript
-Response Example
-----------------
-.. literalinclude:: samples/db-patch-config-group-response-json-http.txt
- :language: javascript
-
-
-
-
-Show configuration group details
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.. rest_method:: GET /v1.0/{project_id}/configurations/{configId}
+Update configuration group
+~~~~~~~~~~~~~~~~~~~~~~~~~~
-Lists details about a configuration group, including its values.
+.. rest_method:: PUT /v1.0/{project_id}/configurations/{configId}
+Sets new values for a configuration group. Also lets you change the name and
+description of the configuration group.
-Normal response codes: 200
-Error response codes: badRequest(400), unauthorized(401), forbidden(403),
-itemNotFound(404), badMethod(405), overLimit(413), unprocessableEntity(422),
-instanceFault(500), notImplemented(501), serviceUnavailable(503)
+Normal response codes: 202
Request
@@ -198,31 +171,30 @@ Request
.. rest_parameters:: parameters.yaml
- - configId: configId
- project_id: project_id
+ - configId: configId
+ - values: values
+ - description: description
+ - name: name
-Response Example
-----------------
+Request Example
+---------------
-.. literalinclude:: samples/db-config-group-details-response.json
+.. literalinclude:: samples/config-group-put-request.json
:language: javascript
-Update configuration group
+Delete configuration group
~~~~~~~~~~~~~~~~~~~~~~~~~~
-.. rest_method:: PUT /v1.0/{project_id}/configurations/{configId}
+.. rest_method:: DELETE /v1.0/{project_id}/configurations/{configId}
-Sets new values for a configuration group. Also lets you change the name and
-description of the configuration group.
+Deletes a configuration group.
Normal response codes: 202
-Error response codes: badRequest(400), unauthorized(401), forbidden(403),
-itemNotFound(404), badMethod(405), overLimit(413), unprocessableEntity(422),
-instanceFault(500), notImplemented(501), serviceUnavailable(503)
Request
@@ -230,15 +202,5 @@ Request
.. rest_parameters:: parameters.yaml
- - values: values
- - description: description
- - name: name
- - configId: configId
- project_id: project_id
-
-
-Request Example
----------------
-
-.. literalinclude:: samples/db-update-config-group-request.json
- :language: javascript
+ - configId: configId \ No newline at end of file
diff --git a/api-ref/source/database-instance-actions.inc b/api-ref/source/database-instance-actions.inc
deleted file mode 100644
index 7d43ea4a..00000000
--- a/api-ref/source/database-instance-actions.inc
+++ /dev/null
@@ -1,221 +0,0 @@
-.. -*- rst -*-
-
-==================================
-Database instance actions (action)
-==================================
-
-Resizes instances and volumes and restarts instances.
-
-
-Restart instance
-~~~~~~~~~~~~~~~~
-
-.. rest_method:: POST /v1.0/{project_id}/instances/{instanceId}/action
-
-Restarts the database service for an instance.
-
-The restart operation restarts only the database instance. Restarting
-the database erases any dynamic configuration settings that you make
-in the database instance.
-
-The database instance is unavailable until the instance restarts.
-
-Normal response codes: 202
-
-Error response codes: badRequest(400), unauthorized(401), forbidden(403),
-itemNotFound(404), badMethod(405), overLimit(413), badMediaType(415),
-unprocessableEntity(422), instanceFault(500), notImplemented(501),
-serviceUnavailable(503)
-
-
-Request
--------
-
-.. rest_parameters:: parameters.yaml
-
- - instanceId: instanceId
- - project_id: project_id
-
-
-Request Example
----------------
-
-.. literalinclude:: samples/db-instance-restart-request.json
- :language: javascript
-
-
-
-
-Resize instance
-~~~~~~~~~~~~~~~
-
-.. rest_method:: POST /v1.0/{project_id}/instances/{instanceId}/action
-
-Resizes the memory for an instance.
-
-If you provide a valid ``flavorRef``, this operation changes the
-memory size of the instance, and restarts the database.
-
-Normal response codes: 202
-
-Error response codes: badRequest(400), unauthorized(401), forbidden(403),
-itemNotFound(404), badMethod(405), overLimit(413), badMediaType(415),
-unprocessableEntity(422), instanceFault(500), notImplemented(501),
-serviceUnavailable(503)
-
-
-Request
--------
-
-.. rest_parameters:: parameters.yaml
-
- - instanceId: instanceId
- - project_id: project_id
-
-
-Request Example
----------------
-
-.. literalinclude:: samples/db-instance-resize-instance-request.json
- :language: javascript
-
-
-
-
-Resize instance volume
-~~~~~~~~~~~~~~~~~~~~~~
-
-.. rest_method:: POST /v1.0/{project_id}/instances/{instanceId}/action
-
-Resizes the volume that is attached to an instance.
-
-You can use this operation to increase but not decrease the volume
-size. A valid volume size is an integer value in gigabytes (GB).
-
-You cannot increase the volume to a size that is larger than the
-API volume size limit.
-
-Normal response codes: 202
-
-Error response codes: badRequest(400), unauthorized(401), forbidden(403),
-itemNotFound(404), badMethod(405), overLimit(413), badMediaType(415),
-unprocessableEntity(422), instanceFault(500), notImplemented(501),
-serviceUnavailable(503)
-
-
-Request
--------
-
-.. rest_parameters:: parameters.yaml
-
- - instanceId: instanceId
- - project_id: project_id
-
-
-Request Example
----------------
-
-.. literalinclude:: samples/db-instance-resize-volume-request.json
- :language: javascript
-
-
-
-
-Promote instance to replica source
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. rest_method:: POST /v1.0/{project_id}/instances/{instanceId}/action
-
-Promotes a replica.
-
-If you have set up replication, and the base instance is still
-reachable, you can use this operation to promote a replica to be
-the new base instance.
-
-This can be useful if you want to make a configuration change to
-the base instance that your replicas are replicating from. For
-example, you might want to increase the disk or CPU capacity. If
-you made the change on the base instance directly, you would need
-to take the base instance down for the duration of the operation.
-Instead, you can create a replica, make the configuration change on
-the replica, and then promote the replica to become the new base
-instance.
-
-For ``instanceId``, pass in the instance ID of the replica you want
-to promote.
-
-Normal response codes: 202
-
-Error response codes: badRequest(400), unauthorized(401), forbidden(403),
-itemNotFound(404), badMethod(405), overLimit(413), badMediaType(415),
-unprocessableEntity(422), instanceFault(500), notImplemented(501),
-serviceUnavailable(503)
-
-
-Request
--------
-
-.. rest_parameters:: parameters.yaml
-
- - instanceId: instanceId
- - project_id: project_id
-
-
-Request Example
----------------
-
-.. literalinclude:: samples/db-instance-promote-replica-request.json
- :language: javascript
-
-
-
-
-Delete replication base instance
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. rest_method:: POST /v1.0/{project_id}/instances/{instanceId}/action
-
-Deletes the base instance in a replication set.
-
-If the base instance becomes unreachable, you can use this
-operation to delete the base instance.
-
-This operation:
-
-- Finds the replica that has processed the greatest number of
- transactions and picks that replica to use as the new base
- instance.
-
-- Transfers the public IP of the old base instance to the new base
- instance (which is the newly-promoted replica).
-
-- Deletes the old base instance.
-
-- Takes all the instances in the replication set and makes them
- start replicating from the new base instance.
-
-For ``instanceId``, pass in the instance ID of the unreachable base
-instance.
-
-Normal response codes: 202
-
-Error response codes: badRequest(400), unauthorized(401), forbidden(403),
-itemNotFound(404), badMethod(405), overLimit(413), badMediaType(415),
-unprocessableEntity(422), instanceFault(500), notImplemented(501),
-serviceUnavailable(503)
-
-
-Request
--------
-
-.. rest_parameters:: parameters.yaml
-
- - instanceId: instanceId
- - project_id: project_id
-
-
-Request Example
----------------
-
-.. literalinclude:: samples/db-instance-eject-replica-request.json
- :language: javascript
diff --git a/api-ref/source/databases.inc b/api-ref/source/databases.inc
index aaf60a1c..c7c1df77 100644
--- a/api-ref/source/databases.inc
+++ b/api-ref/source/databases.inc
@@ -1,53 +1,83 @@
.. -*- rst -*-
-=====================
-Databases (databases)
-=====================
+=========
+Databases
+=========
-Creates, lists all, and deletes databases.
-Delete database
-~~~~~~~~~~~~~~~
-.. rest_method:: DELETE /v1.0/{project_id}/instances/{instanceId}/databases/{databaseName}
+Create database
+~~~~~~~~~~~~~~~
-Deletes a database.
+.. rest_method:: POST /v1.0/{project_id}/instances/{instanceId}/databases
-This operation also deletes all data that is associated with the
-database.
+Creates a database within an instance.
Normal response codes: 202
-Error response codes: badRequest(400), unauthorized(401), forbidden(403),
-itemNotFound(404), badMethod(405), overLimit(413), unprocessableEntity(422),
-instanceFault(500), notImplemented(501), serviceUnavailable(503)
-
Request
-------
.. rest_parameters:: parameters.yaml
+ - project_id: project_id
- instanceId: instanceId
- - databaseName: databaseName
+ - name: name
+ - characterSet: characterSet
+ - collate: collate
+
+
+Request Example
+---------------
+
+.. literalinclude:: samples/databases-create-request.json
+ :language: javascript
+
+
+
+
+List instance databases
+~~~~~~~~~~~~~~~~~~~~~~~
+
+.. rest_method:: GET /v1.0/{project_id}/instances/{instanceId}/databases
+
+Lists databases for an instance.
+
+This operation returns only the user-defined databases and not the system
+databases. Only the database administrator can get system databases such as
+``mysql``, ``information_schema``, and ``lost+found``.
+
+Normal response codes: 200
+
+
+Request
+-------
+
+.. rest_parameters:: parameters.yaml
+
- project_id: project_id
+ - instanceId: instanceId
+
+Response Example
+----------------
+.. literalinclude:: samples/databases-list-response.json
+ :language: javascript
-Create database
-~~~~~~~~~~~~~~~
-.. rest_method:: POST /v1.0/{project_id}/instances/{instanceId}/databases
-Creates a database within an instance.
+List instance databases for a user
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Normal response codes: 202
+.. rest_method:: GET /v1.0/{project_id}/instances/{instanceId}/users/{user_name}/databases
+
+Get all the databases that the user has access to.
-Error response codes: badRequest(400), unauthorized(401), forbidden(403),
-itemNotFound(404), badMethod(405), overLimit(413), unprocessableEntity(422),
-instanceFault(500), notImplemented(501), serviceUnavailable(503)
+Normal response codes: 200
Request
@@ -55,39 +85,57 @@ Request
.. rest_parameters:: parameters.yaml
- - characterSet: characterSet
- - collate: collate
- - name: name
+ - project_id: project_id
- instanceId: instanceId
+ - user_name: user_name
+
+
+Response Example
+----------------
+
+.. literalinclude:: samples/databases-list-response.json
+ :language: javascript
+
+
+
+
+Grant databases access
+~~~~~~~~~~~~~~~~~~~~~~
+
+.. rest_method:: PUT /v1.0/{project_id}/instances/{instanceId}/users/{user_name}/databases
+
+Grant user access to the databases.
+
+Normal response codes: 202
+
+
+Request
+-------
+
+.. rest_parameters:: parameters.yaml
+
- project_id: project_id
+ - instanceId: instanceId
+ - user_name: user_name
Request Example
---------------
-.. literalinclude:: samples/db-create-databases-request.json
+.. literalinclude:: samples/user-grant-databases-access-request.json
:language: javascript
-List instance databases
+Revoke databases access
~~~~~~~~~~~~~~~~~~~~~~~
-.. rest_method:: GET /v1.0/{project_id}/instances/{instanceId}/databases
-
-Lists databases for an instance.
-
-This operation returns only the user-defined databases and not the
-system databases. Only the database administrator can view the
-``mysql``, ``information_schema``, and ``lost+found`` system
-databases.
+.. rest_method:: DELETE /v1.0/{project_id}/instances/{instanceId}/users/{user_name}/databases/{database_name}
-Normal response codes: 200
+Revoke user access to the database.
-Error response codes: badRequest(400), unauthorized(401), forbidden(403),
-itemNotFound(404), badMethod(405), overLimit(413), unprocessableEntity(422),
-instanceFault(500), notImplemented(501), serviceUnavailable(503)
+Normal response codes: 202
Request
@@ -95,12 +143,29 @@ Request
.. rest_parameters:: parameters.yaml
- - instanceId: instanceId
- project_id: project_id
+ - instanceId: instanceId
+ - user_name: user_name
+ - database_name: databaseName
-Response Example
-----------------
-.. literalinclude:: samples/db-list-databases-response.json
- :language: javascript
+
+Delete database
+~~~~~~~~~~~~~~~
+
+.. rest_method:: DELETE /v1.0/{project_id}/instances/{instanceId}/databases/{database_name}
+
+Deletes a database.
+
+Normal response codes: 202
+
+
+Request
+-------
+
+.. rest_parameters:: parameters.yaml
+
+ - project_id: project_id
+ - instanceId: instanceId
+ - database_name: databaseName \ No newline at end of file
diff --git a/api-ref/source/datastore-versions.inc b/api-ref/source/datastore-versions.inc
new file mode 100644
index 00000000..7318006e
--- /dev/null
+++ b/api-ref/source/datastore-versions.inc
@@ -0,0 +1,391 @@
+.. -*- rst -*-
+
+==================
+Datastore Versions
+==================
+
+
+
+
+List datastore versions
+~~~~~~~~~~~~~~~~~~~~~~~
+
+.. rest_method:: GET /v1.0/{project_id}/datastores/{datastore}/versions
+
+Get all the registered versions for a given datastore
+
+Request
+-------
+
+.. rest_parameters:: parameters.yaml
+
+ - project_id: project_id
+ - datastore: data_store
+
+Response Example
+----------------
+
+.. literalinclude:: samples/datastore-version-list-response.json
+ :language: javascript
+
+
+
+
+Show datastore version
+~~~~~~~~~~~~~~~~~~~~~~
+
+.. rest_method:: GET /v1.0/{project_id}/datastores/{datastore}/versions/{version}
+
+Get information for a given datastore version(name or ID)
+
+Request
+-------
+
+.. rest_parameters:: parameters.yaml
+
+ - project_id: project_id
+ - datastore: data_store
+ - version: version
+
+Response Example
+----------------
+
+.. literalinclude:: samples/datastore-version-show-response.json
+ :language: javascript
+
+
+
+
+List datastore version configuration parameters
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. rest_method:: GET /v1.0/{project_id}/datastores/{datastore}/versions/{version}/parameters
+
+Get all the config parameters associated with the specified datastore version
+
+Request
+-------
+
+.. rest_parameters:: parameters.yaml
+
+ - project_id: project_id
+ - datastore: data_store
+ - version: version
+
+Response Example
+----------------
+
+.. literalinclude:: samples/datastore-version-parameter-list-response.json
+ :language: javascript
+
+
+
+
+Show datastore version configuration parameter
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. rest_method:: GET /v1.0/{project_id}/datastores/{datastore}/versions/{version}/parameters/{parameter_name}
+
+Get the specified config parameter definition.
+
+Request
+-------
+
+.. rest_parameters:: parameters.yaml
+
+ - project_id: project_id
+ - datastore: data_store
+ - version: version
+ - parameter_name: parameter_name
+
+Response Example
+----------------
+
+.. literalinclude:: samples/datastore-version-parameter-show-response.json
+ :language: javascript
+
+
+
+
+Show datastore version
+~~~~~~~~~~~~~~~~~~~~~~
+
+.. rest_method:: GET /v1.0/{project_id}/datastores/versions/{datastore_version_id}
+
+Get information for a given datastore version ID.
+
+Request
+-------
+
+.. rest_parameters:: parameters.yaml
+
+ - project_id: project_id
+ - datastore_version_id: datastore_version_id
+
+Response Example
+----------------
+
+.. literalinclude:: samples/datastore-version-show-response.json
+ :language: javascript
+
+
+
+
+List datastore version configuration parameters
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. rest_method:: GET /v1.0/{project_id}/datastores/versions/{datastore_version_id}/parameters
+
+Get all the config parameters associated with the specified datastore version
+ID.
+
+Request
+-------
+
+.. rest_parameters:: parameters.yaml
+
+ - project_id: project_id
+ - datastore_version_id: datastore_version_id
+
+Response Example
+----------------
+
+.. literalinclude:: samples/datastore-version-parameter-list-response.json
+ :language: javascript
+
+
+
+Show datastore version configuration parameter
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. rest_method:: GET /v1.0/{project_id}/datastores/versions/{datastore_version_id}/parameters/{parameter_name}
+
+Get the specified config parameter definition.
+
+Request
+-------
+
+.. rest_parameters:: parameters.yaml
+
+ - project_id: project_id
+ - datastore_version_id: datastore_version_id
+ - parameter_name: parameter_name
+
+Response Example
+----------------
+
+.. literalinclude:: samples/datastore-version-parameter-show-response.json
+ :language: javascript
+
+
+
+Create datastore version configuration parameters
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. rest_method:: POST /v1.0/{project_id}/mgmt/datastores/versions/{datastore_version_id}/parameters
+
+Admin only API. Register a configuration parameter for the specified datastore
+version. The parameter definition contains the type, minimum and maximum
+values(if type is integer), and whether you must restart the instance after the
+parameter value is changed.
+
+Normal response codes: 200
+
+Request
+-------
+
+.. rest_parameters:: parameters.yaml
+
+ - project_id: project_id
+ - datastore_version_id: datastore_version_id
+
+Request Example
+---------------
+
+.. literalinclude:: samples/datastore-version-parameter-create-request.json
+ :language: javascript
+
+Response Example
+----------------
+
+.. literalinclude:: samples/datastore-version-parameter-create-response.json
+ :language: javascript
+
+
+
+
+Update a datastore version configuration parameter
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. rest_method:: PUT /v1.0/{project_id}/mgmt/datastores/versions/{datastore_version_id}/parameters/{parameter_name}
+
+Admin only API. Update a configuration parameter for the specified datastore
+version.
+
+Normal response codes: 200
+
+Request
+-------
+
+.. rest_parameters:: parameters.yaml
+
+ - project_id: project_id
+ - datastore_version_id: datastore_version_id
+ - parameter_name: parameter_name
+
+Request Example
+---------------
+
+.. literalinclude:: samples/datastore-version-parameter-update-request.json
+ :language: javascript
+
+Response Example
+----------------
+
+.. literalinclude:: samples/datastore-version-parameter-update-response.json
+ :language: javascript
+
+
+
+
+Delete a datastore version configuration parameter
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. rest_method:: DELETE /v1.0/{project_id}/mgmt/datastores/versions/{datastore_version_id}/parameters/{parameter_name}
+
+Admin only API. Remove a configuration parameter for the specified datastore
+version.
+
+Normal response codes: 204
+
+Request
+-------
+
+.. rest_parameters:: parameters.yaml
+
+ - project_id: project_id
+ - datastore_version_id: datastore_version_id
+ - parameter_name: parameter_name
+
+
+
+
+Create datastore version
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. rest_method:: POST /v1.0/{project_id}/mgmt/datastore-versions
+
+Admin only API. Register a datastore version, create the datastore if doesn't
+exist.
+
+Normal response codes: 202
+
+Request
+-------
+
+.. rest_parameters:: parameters.yaml
+
+ - project_id: project_id
+
+Request Example
+---------------
+
+.. literalinclude:: samples/datastore-version-create-request.json
+ :language: javascript
+
+
+
+
+List datastore versions
+~~~~~~~~~~~~~~~~~~~~~~~
+
+.. rest_method:: GET /v1.0/{project_id}/mgmt/datastore-versions
+
+Admin only API. Get all the datastore versions.
+
+Normal response codes: 200
+
+Request
+-------
+
+.. rest_parameters:: parameters.yaml
+
+ - project_id: project_id
+
+Response Example
+----------------
+
+.. literalinclude:: samples/datastore-version-mgmt-list-response.json
+ :language: javascript
+
+
+
+
+Show datastore version details
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. rest_method:: GET /v1.0/{project_id}/mgmt/datastore-versions/{datastore_version_id}
+
+Admin only API. Get information for a datastore version.
+
+Normal response codes: 200
+
+Request
+-------
+
+.. rest_parameters:: parameters.yaml
+
+ - project_id: project_id
+ - datastore_version_id: datastore_version_id
+
+Response Example
+----------------
+
+.. literalinclude:: samples/datastore-version-mgmt-show-response.json
+ :language: javascript
+
+
+
+
+Update datastore version details
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. rest_method:: PATCH /v1.0/{project_id}/mgmt/datastore-versions/{datastore_version_id}
+
+Admin only API. Update a specific datastore version.
+
+Normal response codes: 202
+
+Request
+-------
+
+.. rest_parameters:: parameters.yaml
+
+ - project_id: project_id
+ - datastore_version_id: datastore_version_id
+
+Request Example
+---------------
+
+.. literalinclude:: samples/datastore-version-mgmt-patch-request.json
+ :language: javascript
+
+
+
+
+Delete a datastore version
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. rest_method:: DELETE /v1.0/{project_id}/mgmt/datastore-versions/{datastore_version_id}
+
+Admin only API. Delete a specific datastore version.
+
+Normal response codes: 202
+
+Request
+-------
+
+.. rest_parameters:: parameters.yaml
+
+ - project_id: project_id
+ - datastore_version_id: datastore_version_id \ No newline at end of file
diff --git a/api-ref/source/datastores.inc b/api-ref/source/datastores.inc
index db77a964..28c8df63 100644
--- a/api-ref/source/datastores.inc
+++ b/api-ref/source/datastores.inc
@@ -1,111 +1,52 @@
.. -*- rst -*-
-========================
-Data stores (datastores)
-========================
+==========
+Datastores
+==========
-Lists data store versions, lists parameters for data stores, and
-shows parameter details for a data store version.
-Show configuration parameter details
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.. rest_method:: GET /v1.0/{project_id}/datastores/versions/{datastore_version_id}/parameters/{parameter_name}
+List datastores
+~~~~~~~~~~~~~~~
-Displays details for a configuration parameter associated with a data store
-version.
-
-Details include the type, minimum and maximum values, and whether
-you must restart the instance after you change the parameter value.
-
-Normal response codes: 200
-
-Error response codes: badRequest(400), unauthorized(401), forbidden(403),
-itemNotFound(404), badMethod(405), overLimit(413), unprocessableEntity(422),
-instanceFault(500), notImplemented(501), serviceUnavailable(503)
+.. rest_method:: GET /v1.0/{project_id}/datastores
+Get all the datastores registered in the system
Request
-------
.. rest_parameters:: parameters.yaml
- - parameter_name: parameter_name
- - datastore_version_id: datastore_version_id
- project_id: project_id
-
Response Example
----------------
-.. literalinclude:: samples/db-show-parameter-details.json
+.. literalinclude:: samples/datastore-list-response.json
:language: javascript
-List datastore versions
-~~~~~~~~~~~~~~~~~~~~~~~
+Show datastore details
+~~~~~~~~~~~~~~~~~~~~~~
-.. rest_method:: GET /v1.0/{project_id}/datastores/{datastore_name}/versions
-
-Lists the available versions of a data store.
-
-Normal response codes: 200
-
-Error response codes: badRequest(400), unauthorized(401), forbidden(403),
-itemNotFound(404), badMethod(405), overLimit(413), unprocessableEntity(422),
-instanceFault(500), notImplemented(501), serviceUnavailable(503)
+.. rest_method:: GET /v1.0/{project_id}/datastores/{datastore}
+Shows datastore details
Request
-------
.. rest_parameters:: parameters.yaml
- - datastore_name: datastore_name
- project_id: project_id
-
-
-Response Example
-----------------
-
-.. literalinclude:: samples/db-list-datastore-versions.json
- :language: javascript
-
-
-
-
-List configuration parameters
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. rest_method:: GET /v1.0/{project_id}/datastores/versions/{datastore_version_id}/parameters
-
-Lists the available configuration parameters for a data store version.
-
-Parameter information includes the type, minimum and maximum
-values, and whether you must restart the instance after you change
-a parameter value.
-
-Normal response codes: 200
-
-Error response codes: badRequest(400), unauthorized(401), forbidden(403),
-itemNotFound(404), badMethod(405), overLimit(413), unprocessableEntity(422),
-instanceFault(500), notImplemented(501), serviceUnavailable(503)
-
-
-Request
--------
-
-.. rest_parameters:: parameters.yaml
-
- - datastore_version_id: datastore_version_id
- - project_id: project_id
-
+ - datastore: data_store
Response Example
----------------
-.. literalinclude:: samples/db-list-parameters-response.json
+.. literalinclude:: samples/datastore-show-response.json
:language: javascript
diff --git a/api-ref/source/index.rst b/api-ref/source/index.rst
index ae0fc886..ed988b90 100755
--- a/api-ref/source/index.rst
+++ b/api-ref/source/index.rst
@@ -7,12 +7,13 @@
.. rest_expand_all::
.. include:: api-versions.inc
-.. include:: database-instances.inc
-.. include:: database-instance-actions.inc
-.. include:: database-instance-logs.inc
-.. include:: databases.inc
-.. include:: user-management.inc
.. include:: datastores.inc
-.. include:: configurations.inc
+.. include:: datastore-versions.inc
+.. include:: instances.inc
+.. include:: instance-actions.inc
+.. include:: instance-logs.inc
.. include:: backups.inc
+.. include:: configurations.inc
+.. include:: databases.inc
+.. include:: users.inc
.. include:: quotas.inc
diff --git a/api-ref/source/instance-actions.inc b/api-ref/source/instance-actions.inc
new file mode 100644
index 00000000..eb56f8ea
--- /dev/null
+++ b/api-ref/source/instance-actions.inc
@@ -0,0 +1,311 @@
+.. -*- rst -*-
+
+================
+Instance actions
+================
+
+
+
+
+Restart instance
+~~~~~~~~~~~~~~~~
+
+.. rest_method:: POST /v1.0/{project_id}/instances/{instanceId}/action
+
+Restarts the database service for an instance.
+
+The restart operation restarts only the database instance. Restarting
+the database erases any dynamic configuration settings that you make
+in the database instance.
+
+The database service is unavailable until the instance restart finishes.
+
+Normal response codes: 202
+
+Request
+-------
+
+.. rest_parameters:: parameters.yaml
+
+ - project_id: project_id
+ - instanceId: instanceId
+
+Request Example
+---------------
+
+.. literalinclude:: samples/instance-action-restart-request.json
+ :language: javascript
+
+
+
+
+Resize instance flavor
+~~~~~~~~~~~~~~~~~~~~~~
+
+.. rest_method:: POST /v1.0/{project_id}/instances/{instanceId}/action
+
+Resizes the (Nova)flavor for an instance.
+
+If you provide a valid ``flavorRef``, this operation changes the
+memory size of the instance, and restarts the database.
+
+Normal response codes: 202
+
+Request
+-------
+
+.. rest_parameters:: parameters.yaml
+
+ - project_id: project_id
+ - instanceId: instanceId
+ - flavorRef: flavorRef
+
+Request Example
+---------------
+
+.. literalinclude:: samples/instance-action-resize-request.json
+ :language: javascript
+
+
+
+
+Resize instance volume
+~~~~~~~~~~~~~~~~~~~~~~
+
+.. rest_method:: POST /v1.0/{project_id}/instances/{instanceId}/action
+
+Resizes the volume that is attached to an instance.
+
+You can use this operation to increase but not decrease the volume
+size. A valid volume size is an integer value in gigabytes (GB).
+
+You cannot increase the volume to a size that is larger than the
+API volume size limit.
+
+Normal response codes: 202
+
+Request
+-------
+
+.. rest_parameters:: parameters.yaml
+
+ - project_id: project_id
+ - instanceId: instanceId
+ - volume: volume
+
+Request Example
+---------------
+
+.. literalinclude:: samples/instance-action-resize-volume-request.json
+ :language: javascript
+
+
+
+
+Promote instance to replica master
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. rest_method:: POST /v1.0/{project_id}/instances/{instanceId}/action
+
+Promotes a replica.
+
+If you have set up replication, and the master instance is still reachable, you
+can use this operation to promote a replica to be the new master instance.
+
+This can be useful if you want to make a configuration change or maintenance to
+the master instance. If you made the change on the master instance directly,
+you would need to take the master instance down for the duration of the
+operation. Instead, you can create a replica, make the configuration change on
+the replica, and then promote the replica to become the new master instance.
+
+Once this command is executed, the status of all the instances will be set to
+``PROMOTE`` and Trove will work its magic until all of them to come back to
+``HEALTHY``.
+
+The ``instanceId`` is the instance ID of the replica you want to promote.
+
+Normal response codes: 202
+
+Request
+-------
+
+.. rest_parameters:: parameters.yaml
+
+ - project_id: project_id
+ - instanceId: instanceId
+
+Request Example
+---------------
+
+.. literalinclude:: samples/instance-action-promote-replica-request.json
+ :language: javascript
+
+
+
+
+Eject the master instance
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. rest_method:: POST /v1.0/{project_id}/instances/{instanceId}/action
+
+Remove the master instance in a replication set.
+
+This should be only done in a failed master scenario. This command ejects the
+current master and then forces a re-election for the new master. The new master
+is effectively the one with the most current replica of the old master.
+
+Once this command is executed, the status of all the instances will be set to
+``EJECT`` and Trove will work its magic until all of them to come back to
+``HEALTHY``.
+
+The ``instanceId`` is the ID of the current unavailable master instance.
+
+Normal response codes: 202
+
+Request
+-------
+
+.. rest_parameters:: parameters.yaml
+
+ - project_id: project_id
+ - instanceId: instanceId
+
+Request Example
+---------------
+
+.. literalinclude:: samples/instance-action-eject-replica-request.json
+ :language: javascript
+
+
+
+
+Reset instance status
+~~~~~~~~~~~~~~~~~~~~~
+
+.. rest_method:: POST /v1.0/{project_id}/instances/{instanceId}/action
+
+Set instance service status to ``ERROR`` and clear the current task status.
+Mark any running backup operations as ``FAILED``.
+
+Normal response codes: 202
+
+Request
+-------
+
+.. rest_parameters:: parameters.yaml
+
+ - project_id: project_id
+ - instanceId: instanceId
+
+Request Example
+---------------
+
+.. literalinclude:: samples/instance-action-reset-status-request.json
+ :language: javascript
+
+
+
+
+Stop database service
+~~~~~~~~~~~~~~~~~~~~~
+
+.. rest_method:: POST /v1.0/{project_id}/mgmt/instances/{instanceId}/action
+
+Admin only API. Stop database service inside an instance.
+
+Normal response codes: 202
+
+Request
+-------
+
+.. rest_parameters:: parameters.yaml
+
+ - project_id: project_id
+ - instanceId: instanceId
+
+Request Example
+---------------
+
+.. literalinclude:: samples/instance-mgmt-action-stop-request.json
+ :language: javascript
+
+
+
+
+Reboot instance
+~~~~~~~~~~~~~~~
+
+.. rest_method:: POST /v1.0/{project_id}/mgmt/instances/{instanceId}/action
+
+Admin only API. Reboot the database instance, database service will be stopped
+before rebooting.
+
+Normal response codes: 202
+
+Request
+-------
+
+.. rest_parameters:: parameters.yaml
+
+ - project_id: project_id
+ - instanceId: instanceId
+
+Request Example
+---------------
+
+.. literalinclude:: samples/instance-mgmt-action-reboot-request.json
+ :language: javascript
+
+
+
+
+Cold Migrate instance
+~~~~~~~~~~~~~~~~~~~~~
+
+.. rest_method:: POST /v1.0/{project_id}/mgmt/instances/{instanceId}/action
+
+Admin only API. Migrate(resize) the database instance, database service will be
+stopped before migrating.
+
+Normal response codes: 202
+
+Request
+-------
+
+.. rest_parameters:: parameters.yaml
+
+ - project_id: project_id
+ - instanceId: instanceId
+
+Request Example
+---------------
+
+.. literalinclude:: samples/instance-mgmt-action-migrate-request.json
+ :language: javascript
+
+
+
+
+Reset instance task status
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. rest_method:: POST /v1.0/{project_id}/mgmt/instances/{instanceId}/action
+
+Admin only API. Reset task status of an instance, mark any running backup
+operations as ``FAILED``.
+
+Normal response codes: 202
+
+Request
+-------
+
+.. rest_parameters:: parameters.yaml
+
+ - project_id: project_id
+ - instanceId: instanceId
+
+Request Example
+---------------
+
+.. literalinclude:: samples/instance-mgmt-action-reset-task-status-request.json
+ :language: javascript \ No newline at end of file
diff --git a/api-ref/source/database-instance-logs.inc b/api-ref/source/instance-logs.inc
index 64de9eab..ae1e1ac3 100644
--- a/api-ref/source/database-instance-logs.inc
+++ b/api-ref/source/instance-logs.inc
@@ -1,10 +1,10 @@
.. -*- rst -*-
-======================
-Database instance logs
-======================
+=============
+Instance logs
+=============
+
-List, show details, enable, disable, publish, and discard logs for instances.
List instance logs
@@ -15,24 +15,18 @@ List instance logs
Listing all logs for an instance.
Different datastore backend has its own ``guest_log_exposed_logs``
-configuration to determine which type of logs will be listed by default. For
-admin context, all logs will be listed.
+configuration to determine which type of logs will be listed by default. Admin
+user can get all the logs.
Normal response codes: 200
-Error response codes: badRequest(400), unauthorized(401), forbidden(403),
-itemNotFound(404), badMethod(405), overLimit(413), badMediaType(415),
-unprocessableEntity(422), instanceFault(500), notImplemented(501),
-serviceUnavailable(503)
-
-
Request
-------
.. rest_parameters:: parameters.yaml
- - instanceId: instanceId
- project_id: project_id
+ - instanceId: instanceId
Response Parameters
@@ -54,7 +48,7 @@ Response Parameters
Response Example
----------------
-.. literalinclude:: samples/db-instance-list-logs-response.json
+.. literalinclude:: samples/instance-log-list-response.json
:language: javascript
@@ -69,29 +63,21 @@ Show details for a instance log.
Normal response codes: 200
-Error response codes: badRequest(400), unauthorized(401), forbidden(403),
-itemNotFound(404), badMethod(405), overLimit(413), badMediaType(415),
-unprocessableEntity(422), instanceFault(500), notImplemented(501),
-serviceUnavailable(503)
-
-
Request
-------
.. rest_parameters:: parameters.yaml
- - instanceId: instanceId
- project_id: project_id
+ - instanceId: instanceId
- name: log_name
-
Request Example
---------------
-.. literalinclude:: samples/db-instance-show-log-request.json
+.. literalinclude:: samples/instance-log-show-request.json
:language: javascript
-
Response Parameters
-------------------
@@ -107,11 +93,10 @@ Response Parameters
- prefix: log_prefix
- metafile: log_metafile
-
Response Example
----------------
-.. literalinclude:: samples/db-instance-show-log-response.json
+.. literalinclude:: samples/instance-log-show-response.json
:language: javascript
@@ -126,30 +111,22 @@ Enable a log type for a instance.
Normal response codes: 200
-Error response codes: badRequest(400), unauthorized(401), forbidden(403),
-itemNotFound(404), badMethod(405), overLimit(413), badMediaType(415),
-unprocessableEntity(422), instanceFault(500), notImplemented(501),
-serviceUnavailable(503)
-
-
Request
-------
.. rest_parameters:: parameters.yaml
- - instanceId: instanceId
- project_id: project_id
+ - instanceId: instanceId
- name: log_name
- enable: log_enable_action
-
Request Example
---------------
-.. literalinclude:: samples/db-instance-enable-log-request.json
+.. literalinclude:: samples/instance-log-enable-request.json
:language: javascript
-
Response Parameters
-------------------
@@ -165,11 +142,10 @@ Response Parameters
- prefix: log_prefix
- metafile: log_metafile
-
Response Example
----------------
-.. literalinclude:: samples/db-instance-enable-log-response.json
+.. literalinclude:: samples/instance-log-enable-response.json
:language: javascript
@@ -184,30 +160,22 @@ Disable a log type for a instance.
Normal response codes: 200
-Error response codes: badRequest(400), unauthorized(401), forbidden(403),
-itemNotFound(404), badMethod(405), overLimit(413), badMediaType(415),
-unprocessableEntity(422), instanceFault(500), notImplemented(501),
-serviceUnavailable(503)
-
-
Request
-------
.. rest_parameters:: parameters.yaml
- - instanceId: instanceId
- project_id: project_id
+ - instanceId: instanceId
- name: log_name
- disable: log_disable_action
-
Request Example
---------------
-.. literalinclude:: samples/db-instance-disable-log-request.json
+.. literalinclude:: samples/instance-log-disable-request.json
:language: javascript
-
Response Parameters
-------------------
@@ -227,7 +195,7 @@ Response Parameters
Response Example
----------------
-.. literalinclude:: samples/db-instance-disable-log-response.json
+.. literalinclude:: samples/instance-log-disable-response.json
:language: javascript
@@ -240,34 +208,26 @@ Publish instance log
Publish a log type for a instance.
-*Note:* ``publish`` will automatically ``enable`` a log.
+Publish`` will automatically ``enable`` a log.
Normal response codes: 200
-Error response codes: badRequest(400), unauthorized(401), forbidden(403),
-itemNotFound(404), badMethod(405), overLimit(413), badMediaType(415),
-unprocessableEntity(422), instanceFault(500), notImplemented(501),
-serviceUnavailable(503)
-
-
Request
-------
.. rest_parameters:: parameters.yaml
- - instanceId: instanceId
- project_id: project_id
+ - instanceId: instanceId
- name: log_name
- publish: log_publish_action
-
Request Example
---------------
-.. literalinclude:: samples/db-instance-publish-log-request.json
+.. literalinclude:: samples/instance-log-publish-request.json
:language: javascript
-
Response Parameters
-------------------
@@ -283,11 +243,10 @@ Response Parameters
- prefix: log_prefix
- metafile: log_metafile
-
Response Example
----------------
-.. literalinclude:: samples/db-instance-publish-log-response.json
+.. literalinclude:: samples/instance-log-publish-response.json
:language: javascript
@@ -302,19 +261,13 @@ Discard all previously published logs for a instance.
Normal response codes: 200
-Error response codes: badRequest(400), unauthorized(401), forbidden(403),
-itemNotFound(404), badMethod(405), overLimit(413), badMediaType(415),
-unprocessableEntity(422), instanceFault(500), notImplemented(501),
-serviceUnavailable(503)
-
-
Request
-------
.. rest_parameters:: parameters.yaml
- - instanceId: instanceId
- project_id: project_id
+ - instanceId: instanceId
- name: log_name
- discard: log_discard_action
@@ -322,7 +275,7 @@ Request
Request Example
---------------
-.. literalinclude:: samples/db-instance-discard-log-request.json
+.. literalinclude:: samples/instance-log-discard-request.json
:language: javascript
@@ -345,5 +298,5 @@ Response Parameters
Response Example
----------------
-.. literalinclude:: samples/db-instance-discard-log-response.json
- :language: javascript
+.. literalinclude:: samples/instance-log-discard-response.json
+ :language: javascript \ No newline at end of file
diff --git a/api-ref/source/database-instances.inc b/api-ref/source/instances.inc
index 41c1e09f..62da0653 100644
--- a/api-ref/source/database-instances.inc
+++ b/api-ref/source/instances.inc
@@ -1,13 +1,10 @@
.. -*- rst -*-
-==============================
-Database instances (instances)
-==============================
+=========
+Instances
+=========
+
-Lists, shows details for, creates, attaches a configuration group to, detaches
-a configuration group from, update the name, upgrade datastore version,
-deletes, lists configuration defaults, creates root, and determines whether
-root is enabled, for instances.
List database instances
@@ -15,17 +12,11 @@ List database instances
.. rest_method:: GET /v1.0/{project_id}/instances
-Lists information, including status, for all database instances.
-
-Lists status and information for all database instances.
+Lists information for all database instances. Supported filters:
+include_clustered
Normal response codes: 200
-Error response codes: badRequest(400), unauthorized(401), forbidden(403),
-itemNotFound(404), badMethod(405), overLimit(413), unprocessableEntity(422),
-instanceFault(500), notImplemented(501), serviceUnavailable(503)
-
-
Request
-------
@@ -33,52 +24,57 @@ Request
- project_id: project_id
-
Response Example
----------------
-.. literalinclude:: samples/db-instances-index-response.json
+.. literalinclude:: samples/instance-list-response.json
:language: javascript
-Show database instance details
+List database instances(admin)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.. rest_method:: GET /v1.0/{project_id}/instances/{instanceId}
+.. rest_method:: GET /v1.0/{project_id}/mgmt/instances
-Shows database instance details.
+Admin only API. Get all the instances, supported filters: deleted,
+include_clustered. Could show more information such as Cinder volume ID, Nova
+server information, etc.
-Lists the status and details of the database instance.
+Normal response codes: 200
-Lists the volume size in gigabytes (GB) and the approximate GB
-used. After instance creation, the ``used`` value is greater than 0, which
-is expected as databases may create some basic (non empty) files to
-represent an empty schema. The response does not include the ``used``
-attribute when the instance status is ``BUILD``, ``REBOOT``,
-``RESIZE``, or ``ERROR``.
+Response Example
+----------------
+
+.. literalinclude:: samples/instance-mgmt-list-response.json
+ :language: javascript
-Normal response codes: 200
-Error response codes: badRequest(400), unauthorized(401), forbidden(403),
-itemNotFound(404), badMethod(405), overLimit(413), unprocessableEntity(422),
-instanceFault(500), notImplemented(501), serviceUnavailable(503)
+List database instances(with details)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. rest_method:: GET /v1.0/{project_id}/instances/detail
+
+Lists information for all database instances with more details, such as created
+and updated time, service status updated time, the failure message, etc.
+Supported filters: include_clustered
+
+Normal response codes: 200
+
Request
-------
.. rest_parameters:: parameters.yaml
- - instanceId: instanceId
- project_id: project_id
-
Response Example
----------------
-.. literalinclude:: samples/db-instance-status-detail-response.json
+.. literalinclude:: samples/instance-list-detail-response.json
:language: javascript
@@ -99,11 +95,6 @@ unless the ``access`` parameter is defined.
Normal response codes: 200
-Error response codes: badRequest(400), unauthorized(401), forbidden(403),
-itemNotFound(404), badMethod(405), overLimit(413), unprocessableEntity(422),
-instanceFault(500), notImplemented(501), serviceUnavailable(503)
-
-
Request
-------
@@ -147,7 +138,7 @@ Request
Request Example
---------------
-.. literalinclude:: samples/db-create-instance-request.json
+.. literalinclude:: samples/instance-create-request.json
:language: javascript
@@ -209,120 +200,98 @@ Response Parameters
Response Example
----------------
-.. literalinclude:: samples/db-create-instance-response.json
+.. literalinclude:: samples/instance-create-response.json
:language: javascript
-Attach configuration group
-~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. rest_method:: PUT /v1.0/{project_id}/instances/{instanceId}
+Show database instance details
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Attaches a configuration group to an instance.
+.. rest_method:: GET /v1.0/{project_id}/instances/{instanceId}
-Normal response codes: 202
+Shows database instance details.
-Error response codes: badRequest(400), unauthorized(401), forbidden(403),
-itemNotFound(404), badMethod(405), overLimit(413), badMediaType(415),
-unprocessableEntity(422), instanceFault(500), notImplemented(501),
-serviceUnavailable(503)
+Lists the volume size in gigabytes (GB) and the approximate GB
+used. After instance creation, the ``used`` value is greater than 0, which
+is expected as databases may create some basic (non empty) files to
+represent an empty schema. The response does not include the ``used``
+attribute when the instance status is ``BUILD``, ``REBOOT``,
+``RESIZE``, or ``ERROR``.
+Normal response codes: 200
Request
-------
.. rest_parameters:: parameters.yaml
- - configuration: configuration
- - instanceId: instanceId
- project_id: project_id
+ - instanceId: instanceId
-Request Example
----------------
+Response Example
+----------------
-.. literalinclude:: samples/db-attach-config-group-request.json
+.. literalinclude:: samples/instance-show-response.json
:language: javascript
-Detach configuration group
-~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. rest_method:: PUT /v1.0/{project_id}/instances/{instanceId}
-
-Detaches a configuration group from an instance.
-
-When you pass in only an instance ID and omit the configuration ID,
-this operation detaches any configuration group that was attached
-to the instance.
+Show database instance details(admin)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Normal response codes: 202
+.. rest_method:: GET /v1.0/{project_id}/mgmt/instances/{instanceId}
-Error response codes: badRequest(400), unauthorized(401), forbidden(403),
-itemNotFound(404), badMethod(405), overLimit(413), badMediaType(415),
-unprocessableEntity(422), instanceFault(500), notImplemented(501),
-serviceUnavailable(503)
+Admin only API. Get an instance information, including Cinder volume, Nova
+server, etc.
+Normal response codes: 200
Request
-------
.. rest_parameters:: parameters.yaml
- - configuration: configuration
- - instanceId: instanceId
- project_id: project_id
+ - instanceId: instanceId
-Request Example
----------------
-.. literalinclude:: samples/db-detach-config-group-request.json
- :language: javascript
+Response Example
+----------------
+.. literalinclude:: samples/instance-mgmt-show-response.json
+ :language: javascript
-Detach replica
-~~~~~~~~~~~~~~
-.. rest_method:: PATCH /v1.0/{project_id}/instances/{instanceId}
+Attach/Detach configuration group
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Detaches a replica from its replication source.
+.. rest_method:: PUT /v1.0/{project_id}/instances/{instanceId}
-If you created an instance that is a replica of a source instance,
-you can detach the replica from the source. This can be useful if
-the source becomes unavailable. In this case, you can detach the
-replica from the source, making the replica a standalone database
-instance. You can then take the new standalone instance and create
-a new replica of that instance.
+Attach or detach a configuration group for an instance. When you pass in only
+an instance ID and omit the configuration ID, this operation detaches any
+configuration group that was attached to the instance.
Normal response codes: 202
-Error response codes: badRequest(400), unauthorized(401), forbidden(403),
-itemNotFound(404), badMethod(405), overLimit(413), badMediaType(415),
-unprocessableEntity(422), instanceFault(500), notImplemented(501),
-serviceUnavailable(503)
-
-
Request
-------
.. rest_parameters:: parameters.yaml
- - replica_of: replica_of
- - slave_of: slave_of
- - instanceId: instanceId
- project_id: project_id
-
+ - instanceId: instanceId
+ - configuration: configuration
Request Example
---------------
-.. literalinclude:: samples/db-detach-replica-request.json
+.. literalinclude:: samples/instance-put-attach-config-group-request.json
:language: javascript
@@ -337,34 +306,27 @@ Update the instance name.
Normal response codes: 202
-Error response codes: badRequest(400), unauthorized(401), forbidden(403),
-itemNotFound(404), badMethod(405), overLimit(413), badMediaType(415),
-unprocessableEntity(422), instanceFault(500), notImplemented(501),
-serviceUnavailable(503)
-
-
Request
-------
.. rest_parameters:: parameters.yaml
+ - project_id: project_id
+ - instanceId: instanceId
- instance: instance
- name: instanceName
- - instanceId: instanceId
- - project_id: project_id
-
Request Example
---------------
-.. literalinclude:: samples/db-update-instance-name-request.json
+.. literalinclude:: samples/instance-patch-update-name-request.json
:language: javascript
-Upgrade datastore version
-~~~~~~~~~~~~~~~~~~~~~~~~~
+Upgrade datastore version for instance
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.. rest_method:: PATCH /v1.0/{project_id}/instances/{instanceId}
@@ -376,27 +338,56 @@ and changes back to ``HEALTHY`` after upgrading finishes, otherwize changes to
Normal response codes: 202
-Error response codes: badRequest(400), unauthorized(401), forbidden(403),
-itemNotFound(404), badMethod(405), overLimit(413), badMediaType(415),
-unprocessableEntity(422), instanceFault(500), notImplemented(501),
-serviceUnavailable(503)
-
-
Request
-------
.. rest_parameters:: parameters.yaml
+ - project_id: project_id
+ - instanceId: instanceId
- instance: instance
- datastore_version: datastore_version
- - instanceId: instanceId
- - project_id: project_id
+Request Example
+---------------
+
+.. literalinclude:: samples/instance-patch-upgrade-datastore-version-request.json
+ :language: javascript
+
+
+
+
+Detach replica
+~~~~~~~~~~~~~~
+
+.. rest_method:: PATCH /v1.0/{project_id}/instances/{instanceId}
+
+Detaches a replica from its replication source.
+
+If you created an instance that is a replica of a source instance,
+you can detach the replica from the source later on. This can be useful if
+the source becomes unavailable. In this case, you can detach the
+replica from the source, making the replica a standalone database
+instance. You can then take the new standalone instance and create
+a new replica of that instance.
+
+Normal response codes: 202
+
+Request
+-------
+
+.. rest_parameters:: parameters.yaml
+
+ - project_id: project_id
+ - instanceId: instanceId
+ - instance: instance
+ - replica_of: replica_of
+ - slave_of: slave_of
Request Example
---------------
-.. literalinclude:: samples/db-upgrade-instance-datastore-version-request.json
+.. literalinclude:: samples/instance-patch-detach-replica-request.json
:language: javascript
@@ -407,56 +398,68 @@ Delete database instance
.. rest_method:: DELETE /v1.0/{project_id}/instances/{instanceId}
-Deletes a database instance, including any associated data.
-
-This operation does not delete any read slaves.
+Deletes a database instance.
-You cannot complete this operation when the instance state is
-either ``REBUILDING`` or ``BUILDING``.
+This operation does not delete any slaves.
Normal response codes: 202
-Error response codes: badRequest(400), unauthorized(401), forbidden(403),
-itemNotFound(404), badMethod(405), overLimit(413), unprocessableEntity(422),
-instanceFault(500), notImplemented(501), serviceUnavailable(503)
+Request
+-------
+
+.. rest_parameters:: parameters.yaml
+
+ - project_id: project_id
+ - instanceId: instanceId
+
+
+List backups of database instance
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. rest_method:: GET /v1.0/{project_id}/instances/{instanceId}/backups
+
+Get all the backups for an instance.
+
+Normal response codes: 200
+
Request
-------
.. rest_parameters:: parameters.yaml
- - instanceId: instanceId
- project_id: project_id
+ - instanceId: instanceId
+Response Example
+----------------
+.. literalinclude:: samples/instance-backup-list-response.json
+ :language: javascript
-List configuration defaults
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.. rest_method:: GET /v1.0/{project_id}/instances/{instanceId}/configuration
-Lists the configuration defaults for an instance.
+List default configuration parameters of database instance
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Normal response codes: 200
+.. rest_method:: GET /v1.0/{project_id}/instances/{instanceId}/configuration
-Error response codes: badRequest(400), unauthorized(401), forbidden(403),
-itemNotFound(404), badMethod(405), overLimit(413), unprocessableEntity(422),
-instanceFault(500), notImplemented(501), serviceUnavailable(503)
+Get the default configuration parameters for an instance.
+Normal response codes: 200
Request
-------
.. rest_parameters:: parameters.yaml
- - instanceId: instanceId
- project_id: project_id
-
+ - instanceId: instanceId
Response Example
----------------
-.. literalinclude:: samples/db-list-cfg-defaults-response.json
+.. literalinclude:: samples/instance-configuration-list-response.json
:language: javascript
diff --git a/api-ref/source/parameters.yaml b/api-ref/source/parameters.yaml
index c0e4a852..17deaa3d 100755
--- a/api-ref/source/parameters.yaml
+++ b/api-ref/source/parameters.yaml
@@ -11,6 +11,12 @@ configId:
in: path
required: false
type: string
+data_store:
+ description: |
+ Name or ID of the data store.
+ in: path
+ required: false
+ type: string
databaseName:
description: |
The name for the database.
@@ -39,7 +45,7 @@ instanceId:
description: |
The ID of the database instance.
in: path
- required: false
+ required: true
type: string
parameter_name:
description: |
@@ -66,6 +72,12 @@ user_project:
in: path
required: true
type: string
+version:
+ description: |
+ Name or ID of the datastore version.
+ in: path
+ required: false
+ type: string
# variables in body
access:
description: |
@@ -362,7 +374,7 @@ flavorId1:
flavorRef:
description: |
Reference (href), which is the actual URI to a
- flavor as it appears in the list flavors response. Rather than
+ flavor as it appears in the list flavors response. Rather than
the flavor URI, you can also pass the flavor ID (integer) as the
``flavorRef`` value. For example, ``1``.
in: body
diff --git a/api-ref/source/quotas.inc b/api-ref/source/quotas.inc
index 7035bb78..0571ff5b 100644
--- a/api-ref/source/quotas.inc
+++ b/api-ref/source/quotas.inc
@@ -4,7 +4,34 @@
Quotas
======
-Show and update quotas.
+
+
+
+Show resources limit for current project
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. rest_method:: GET /v1.0/{project_id}/limits
+
+Get resources quota and rate limit for the current project.
+
+Normal response codes: 200
+
+
+Request
+-------
+
+.. rest_parameters:: parameters.yaml
+
+ - project_id: project_id
+
+Response Example
+----------------
+
+.. literalinclude:: samples/limit-show-response.json
+ :language: javascript
+
+
+
Show resources quota for a specific project
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -42,6 +69,8 @@ Response Example
:language: javascript
+
+
Update resources quota for a specific project
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/api-ref/source/samples/db-backup-create-request.json b/api-ref/source/samples/backup-create-request.json
index bf4f86c9..bf4f86c9 100644
--- a/api-ref/source/samples/db-backup-create-request.json
+++ b/api-ref/source/samples/backup-create-request.json
diff --git a/api-ref/source/samples/db-backup-create-response.json b/api-ref/source/samples/backup-create-response.json
index fc964dd1..fc964dd1 100644
--- a/api-ref/source/samples/db-backup-create-response.json
+++ b/api-ref/source/samples/backup-create-response.json
diff --git a/api-ref/source/samples/db-backup-get-response.json b/api-ref/source/samples/backup-get-response.json
index e7f59285..e7f59285 100644
--- a/api-ref/source/samples/db-backup-get-response.json
+++ b/api-ref/source/samples/backup-get-response.json
diff --git a/api-ref/source/samples/db-backup-list-response.json b/api-ref/source/samples/backup-list-response.json
index 0ede6314..0ede6314 100644
--- a/api-ref/source/samples/db-backup-list-response.json
+++ b/api-ref/source/samples/backup-list-response.json
diff --git a/api-ref/source/samples/db-create-config-group-request.json b/api-ref/source/samples/config-group-create-request.json
index 2da236da..2da236da 100644
--- a/api-ref/source/samples/db-create-config-group-request.json
+++ b/api-ref/source/samples/config-group-create-request.json
diff --git a/api-ref/source/samples/db-create-config-group-response.json b/api-ref/source/samples/config-group-create-response.json
index 7a2c4fe6..7a2c4fe6 100644
--- a/api-ref/source/samples/db-create-config-group-response.json
+++ b/api-ref/source/samples/config-group-create-response.json
diff --git a/api-ref/source/samples/db-config-group-instances-response.json b/api-ref/source/samples/config-group-list-instances-response.json
index b25b471d..b25b471d 100644
--- a/api-ref/source/samples/db-config-group-instances-response.json
+++ b/api-ref/source/samples/config-group-list-instances-response.json
diff --git a/api-ref/source/samples/db-patch-config-group-request.json b/api-ref/source/samples/config-group-patch-request.json
index bdb87bd4..bdb87bd4 100644
--- a/api-ref/source/samples/db-patch-config-group-request.json
+++ b/api-ref/source/samples/config-group-patch-request.json
diff --git a/api-ref/source/samples/db-update-config-group-request.json b/api-ref/source/samples/config-group-put-request.json
index f98de45d..f98de45d 100644
--- a/api-ref/source/samples/db-update-config-group-request.json
+++ b/api-ref/source/samples/config-group-put-request.json
diff --git a/api-ref/source/samples/db-config-group-details-response.json b/api-ref/source/samples/config-group-show-response.json
index a5ee26b4..a5ee26b4 100644
--- a/api-ref/source/samples/db-config-group-details-response.json
+++ b/api-ref/source/samples/config-group-show-response.json
diff --git a/api-ref/source/samples/db-list-cfg-groups-response.json b/api-ref/source/samples/config-groups-list-response.json
index 5bdaa990..5bdaa990 100644
--- a/api-ref/source/samples/db-list-cfg-groups-response.json
+++ b/api-ref/source/samples/config-groups-list-response.json
diff --git a/api-ref/source/samples/db-create-databases-request.json b/api-ref/source/samples/databases-create-request.json
index 92ea30ce..215ee99b 100644
--- a/api-ref/source/samples/db-create-databases-request.json
+++ b/api-ref/source/samples/databases-create-request.json
@@ -3,13 +3,13 @@
{
"character_set": "utf8",
"collate": "utf8_general_ci",
- "name": "testingdb"
+ "name": "databaseA"
},
{
- "name": "anotherdb"
+ "name": "databaseB"
},
{
- "name": "oneMoreDB"
+ "name": "databaseC"
}
]
}
diff --git a/api-ref/source/samples/db-grant-user-access-request.json b/api-ref/source/samples/databases-list-response.json
index c7c8b75e..d85e1434 100644
--- a/api-ref/source/samples/db-grant-user-access-request.json
+++ b/api-ref/source/samples/databases-list-response.json
@@ -1,6 +1,9 @@
{
"databases": [
{
+ "name": "databaseB"
+ },
+ {
"name": "databaseC"
},
{
diff --git a/api-ref/source/samples/datastore-list-response.json b/api-ref/source/samples/datastore-list-response.json
new file mode 100644
index 00000000..727180d3
--- /dev/null
+++ b/api-ref/source/samples/datastore-list-response.json
@@ -0,0 +1,96 @@
+{
+ "datastores": [
+ {
+ "default_version": "9e46a201-e92e-4ae0-af89-4af12a21bb45",
+ "id": "75dc45e0-2c3c-47ee-a5b8-5213288e3fe2",
+ "links": [
+ {
+ "href": "https://127.0.0.1:8779/v1.0/9f8dd5eacb074c9f87d2d822c9092aa5/datastores/75dc45e0-2c3c-47ee-a5b8-5213288e3fe2",
+ "rel": "self"
+ },
+ {
+ "href": "https://127.0.0.1:8779/datastores/75dc45e0-2c3c-47ee-a5b8-5213288e3fe2",
+ "rel": "bookmark"
+ }
+ ],
+ "name": "mariadb",
+ "versions": [
+ {
+ "id": "9e46a201-e92e-4ae0-af89-4af12a21bb45",
+ "links": [
+ {
+ "href": "https://127.0.0.1:8779/v1.0/9f8dd5eacb074c9f87d2d822c9092aa5/datastores/versions/9e46a201-e92e-4ae0-af89-4af12a21bb45",
+ "rel": "self"
+ },
+ {
+ "href": "https://127.0.0.1:8779/datastores/versions/9e46a201-e92e-4ae0-af89-4af12a21bb45",
+ "rel": "bookmark"
+ }
+ ],
+ "name": "10.4"
+ }
+ ]
+ },
+ {
+ "default_version": "b3d5c099-dbd5-4518-baa3-7c7c195671bf",
+ "id": "3bf89e46-c3ed-4db6-a423-6e6709ec21ef",
+ "links": [
+ {
+ "href": "https://127.0.0.1:8779/v1.0/9f8dd5eacb074c9f87d2d822c9092aa5/datastores/3bf89e46-c3ed-4db6-a423-6e6709ec21ef",
+ "rel": "self"
+ },
+ {
+ "href": "https://127.0.0.1:8779/datastores/3bf89e46-c3ed-4db6-a423-6e6709ec21ef",
+ "rel": "bookmark"
+ }
+ ],
+ "name": "mysql",
+ "versions": [
+ {
+ "id": "b3d5c099-dbd5-4518-baa3-7c7c195671bf",
+ "links": [
+ {
+ "href": "https://127.0.0.1:8779/v1.0/9f8dd5eacb074c9f87d2d822c9092aa5/datastores/versions/b3d5c099-dbd5-4518-baa3-7c7c195671bf",
+ "rel": "self"
+ },
+ {
+ "href": "https://127.0.0.1:8779/datastores/versions/b3d5c099-dbd5-4518-baa3-7c7c195671bf",
+ "rel": "bookmark"
+ }
+ ],
+ "name": "5.7"
+ }
+ ]
+ },
+ {
+ "id": "cc9ee471-e781-43bf-a796-423c5d549997",
+ "links": [
+ {
+ "href": "https://127.0.0.1:8779/v1.0/9f8dd5eacb074c9f87d2d822c9092aa5/datastores/cc9ee471-e781-43bf-a796-423c5d549997",
+ "rel": "self"
+ },
+ {
+ "href": "https://127.0.0.1:8779/datastores/cc9ee471-e781-43bf-a796-423c5d549997",
+ "rel": "bookmark"
+ }
+ ],
+ "name": "postgresql",
+ "versions": [
+ {
+ "id": "4eb0179d-fe11-4556-9422-5267d2fc7625",
+ "links": [
+ {
+ "href": "https://127.0.0.1:8779/v1.0/9f8dd5eacb074c9f87d2d822c9092aa5/datastores/versions/4eb0179d-fe11-4556-9422-5267d2fc7625",
+ "rel": "self"
+ },
+ {
+ "href": "https://127.0.0.1:8779/datastores/versions/4eb0179d-fe11-4556-9422-5267d2fc7625",
+ "rel": "bookmark"
+ }
+ ],
+ "name": "12"
+ }
+ ]
+ }
+ ]
+} \ No newline at end of file
diff --git a/api-ref/source/samples/datastore-show-response.json b/api-ref/source/samples/datastore-show-response.json
new file mode 100644
index 00000000..b1f005d2
--- /dev/null
+++ b/api-ref/source/samples/datastore-show-response.json
@@ -0,0 +1,32 @@
+{
+ "datastore": {
+ "id": "cc9ee471-e781-43bf-a796-423c5d549997",
+ "links": [
+ {
+ "href": "https://127.0.0.1:8779/v1.0/9f8dd5eacb074c9f87d2d822c9092aa5/datastores/cc9ee471-e781-43bf-a796-423c5d549997",
+ "rel": "self"
+ },
+ {
+ "href": "https://127.0.0.1:8779/datastores/cc9ee471-e781-43bf-a796-423c5d549997",
+ "rel": "bookmark"
+ }
+ ],
+ "name": "postgresql",
+ "versions": [
+ {
+ "id": "4eb0179d-fe11-4556-9422-5267d2fc7625",
+ "links": [
+ {
+ "href": "https://127.0.0.1:8779/v1.0/9f8dd5eacb074c9f87d2d822c9092aa5/datastores/versions/4eb0179d-fe11-4556-9422-5267d2fc7625",
+ "rel": "self"
+ },
+ {
+ "href": "https://127.0.0.1:8779/datastores/versions/4eb0179d-fe11-4556-9422-5267d2fc7625",
+ "rel": "bookmark"
+ }
+ ],
+ "name": "12"
+ }
+ ]
+ }
+}
diff --git a/api-ref/source/samples/datastore-version-create-request.json b/api-ref/source/samples/datastore-version-create-request.json
new file mode 100644
index 00000000..9107eb63
--- /dev/null
+++ b/api-ref/source/samples/datastore-version-create-request.json
@@ -0,0 +1,11 @@
+{
+ "version": {
+ "datastore_name": "mysql",
+ "datastore_manager": "mysql",
+ "name": "test",
+ "image": "58b83318-cb18-4189-8d89-a015dc3839dd",
+ "active": true,
+ "default": false,
+ "packages": []
+ }
+} \ No newline at end of file
diff --git a/api-ref/source/samples/datastore-version-list-response.json b/api-ref/source/samples/datastore-version-list-response.json
new file mode 100644
index 00000000..4c20d87a
--- /dev/null
+++ b/api-ref/source/samples/datastore-version-list-response.json
@@ -0,0 +1,19 @@
+{
+ "versions": [
+ {
+ "datastore": "cc9ee471-e781-43bf-a796-423c5d549997",
+ "id": "4eb0179d-fe11-4556-9422-5267d2fc7625",
+ "links": [
+ {
+ "href": "https://127.0.0.1:8779/v1.0/9f8dd5eacb074c9f87d2d822c9092aa5/datastores/versions/4eb0179d-fe11-4556-9422-5267d2fc7625",
+ "rel": "self"
+ },
+ {
+ "href": "https://127.0.0.1:8779/datastores/versions/4eb0179d-fe11-4556-9422-5267d2fc7625",
+ "rel": "bookmark"
+ }
+ ],
+ "name": "12"
+ }
+ ]
+} \ No newline at end of file
diff --git a/api-ref/source/samples/datastore-version-mgmt-list-response.json b/api-ref/source/samples/datastore-version-mgmt-list-response.json
new file mode 100644
index 00000000..47e363fd
--- /dev/null
+++ b/api-ref/source/samples/datastore-version-mgmt-list-response.json
@@ -0,0 +1,30 @@
+{
+ "versions": [
+ {
+ "active": true,
+ "datastore_id": "75dc45e0-2c3c-47ee-a5b8-5213288e3fe2",
+ "datastore_manager": "mariadb",
+ "datastore_name": "mariadb",
+ "default": false,
+ "id": "385fa391-f6f1-4444-9d80-7dc3b2188fa3",
+ "image": "42706631-3b76-4d1c-95c9-6a85e72eebda",
+ "name": "10.4-dev-train",
+ "packages": [
+ ""
+ ]
+ },
+ {
+ "active": true,
+ "datastore_id": "cc9ee471-e781-43bf-a796-423c5d549997",
+ "datastore_manager": "postgresql",
+ "datastore_name": "postgresql",
+ "default": false,
+ "id": "4eb0179d-fe11-4556-9422-5267d2fc7625",
+ "image": "2eb8005f-270c-492f-977e-3c041a622ef7",
+ "name": "12",
+ "packages": [
+ ""
+ ]
+ }
+ ]
+} \ No newline at end of file
diff --git a/api-ref/source/samples/datastore-version-mgmt-patch-request.json b/api-ref/source/samples/datastore-version-mgmt-patch-request.json
new file mode 100644
index 00000000..85b98a22
--- /dev/null
+++ b/api-ref/source/samples/datastore-version-mgmt-patch-request.json
@@ -0,0 +1,4 @@
+{
+ "image": "42706631-3b76-4d1c-95c9-6a85e72eebda",
+ "active": true
+} \ No newline at end of file
diff --git a/api-ref/source/samples/datastore-version-mgmt-show-response.json b/api-ref/source/samples/datastore-version-mgmt-show-response.json
new file mode 100644
index 00000000..8f1b78bf
--- /dev/null
+++ b/api-ref/source/samples/datastore-version-mgmt-show-response.json
@@ -0,0 +1,15 @@
+{
+ "version": {
+ "active": true,
+ "datastore_id": "75dc45e0-2c3c-47ee-a5b8-5213288e3fe2",
+ "datastore_manager": "mariadb",
+ "datastore_name": "mariadb",
+ "default": false,
+ "id": "385fa391-f6f1-4444-9d80-7dc3b2188fa3",
+ "image": "42706631-3b76-4d1c-95c9-6a85e72eebda",
+ "name": "10.4-dev-train",
+ "packages": [
+ ""
+ ]
+ }
+} \ No newline at end of file
diff --git a/api-ref/source/samples/datastore-version-parameter-create-request.json b/api-ref/source/samples/datastore-version-parameter-create-request.json
new file mode 100644
index 00000000..06af544e
--- /dev/null
+++ b/api-ref/source/samples/datastore-version-parameter-create-request.json
@@ -0,0 +1,9 @@
+{
+ "configuration-parameter": {
+ "name": "connect_timeout",
+ "data_type": "integer",
+ "min_size": 64,
+ "max_size": 65535,
+ "restart_required": 0
+ }
+} \ No newline at end of file
diff --git a/api-ref/source/samples/datastore-version-parameter-create-response.json b/api-ref/source/samples/datastore-version-parameter-create-response.json
new file mode 100644
index 00000000..a57bc3d3
--- /dev/null
+++ b/api-ref/source/samples/datastore-version-parameter-create-response.json
@@ -0,0 +1,12 @@
+{
+ "configuration-parameters": [
+ {
+ "datastore_version_id": "4eb0179d-fe11-4556-9422-5267d2fc7625",
+ "max": 65535,
+ "min": 64,
+ "name": "connect_timeout",
+ "restart_required": false,
+ "type": "integer"
+ }
+ ]
+} \ No newline at end of file
diff --git a/api-ref/source/samples/datastore-version-parameter-list-response.json b/api-ref/source/samples/datastore-version-parameter-list-response.json
new file mode 100644
index 00000000..6355e52f
--- /dev/null
+++ b/api-ref/source/samples/datastore-version-parameter-list-response.json
@@ -0,0 +1,36 @@
+{
+ "configuration-parameters": [
+ {
+ "datastore_version_id": "b3d5c099-dbd5-4518-baa3-7c7c195671bf",
+ "max": 1,
+ "min": 0,
+ "name": "autocommit",
+ "restart_required": false,
+ "type": "integer"
+ },
+ {
+ "datastore_version_id": "b3d5c099-dbd5-4518-baa3-7c7c195671bf",
+ "max": 65535,
+ "min": 1,
+ "name": "auto_increment_increment",
+ "restart_required": false,
+ "type": "integer"
+ },
+ {
+ "datastore_version_id": "b3d5c099-dbd5-4518-baa3-7c7c195671bf",
+ "max": 65535,
+ "min": 1,
+ "name": "auto_increment_offset",
+ "restart_required": false,
+ "type": "integer"
+ },
+ {
+ "datastore_version_id": "b3d5c099-dbd5-4518-baa3-7c7c195671bf",
+ "max": 31536000,
+ "min": 1,
+ "name": "wait_timeout",
+ "restart_required": false,
+ "type": "integer"
+ }
+ ]
+} \ No newline at end of file
diff --git a/api-ref/source/samples/datastore-version-parameter-show-response.json b/api-ref/source/samples/datastore-version-parameter-show-response.json
new file mode 100644
index 00000000..8915d0ba
--- /dev/null
+++ b/api-ref/source/samples/datastore-version-parameter-show-response.json
@@ -0,0 +1,8 @@
+{
+ "datastore_version_id": "b3d5c099-dbd5-4518-baa3-7c7c195671bf",
+ "max": 31536000,
+ "min": 1,
+ "name": "wait_timeout",
+ "restart_required": false,
+ "type": "integer"
+} \ No newline at end of file
diff --git a/api-ref/source/samples/datastore-version-parameter-update-request.json b/api-ref/source/samples/datastore-version-parameter-update-request.json
new file mode 100644
index 00000000..0cf92754
--- /dev/null
+++ b/api-ref/source/samples/datastore-version-parameter-update-request.json
@@ -0,0 +1,9 @@
+{
+ "configuration-parameter": {
+ "name": "connect_timeout",
+ "data_type": "integer",
+ "min_size": 64,
+ "max_size": 65535,
+ "restart_required": 1
+ }
+} \ No newline at end of file
diff --git a/api-ref/source/samples/datastore-version-parameter-update-response.json b/api-ref/source/samples/datastore-version-parameter-update-response.json
new file mode 100644
index 00000000..18802512
--- /dev/null
+++ b/api-ref/source/samples/datastore-version-parameter-update-response.json
@@ -0,0 +1,10 @@
+{
+ "datastore_version_id": "4eb0179d-fe11-4556-9422-5267d2fc7625",
+ "deleted": 0,
+ "deleted_at": null,
+ "max_size": 65535,
+ "min_size": 64,
+ "name": "connect_timeout",
+ "restart_required": true,
+ "type": "integer"
+} \ No newline at end of file
diff --git a/api-ref/source/samples/datastore-version-show-response.json b/api-ref/source/samples/datastore-version-show-response.json
new file mode 100644
index 00000000..f1798820
--- /dev/null
+++ b/api-ref/source/samples/datastore-version-show-response.json
@@ -0,0 +1,17 @@
+{
+ "version": {
+ "datastore": "cc9ee471-e781-43bf-a796-423c5d549997",
+ "id": "4eb0179d-fe11-4556-9422-5267d2fc7625",
+ "links": [
+ {
+ "href": "https://127.0.0.1:8779/v1.0/9f8dd5eacb074c9f87d2d822c9092aa5/datastores/versions/4eb0179d-fe11-4556-9422-5267d2fc7625",
+ "rel": "self"
+ },
+ {
+ "href": "https://127.0.0.1:8779/datastores/versions/4eb0179d-fe11-4556-9422-5267d2fc7625",
+ "rel": "bookmark"
+ }
+ ],
+ "name": "12"
+ }
+} \ No newline at end of file
diff --git a/api-ref/source/samples/db-attach-config-group-request-json-http.txt b/api-ref/source/samples/db-attach-config-group-request-json-http.txt
deleted file mode 100644
index 478e0493..00000000
--- a/api-ref/source/samples/db-attach-config-group-request-json-http.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-PUT /v1.0/1234/instances/4c93c73b-d6d0-47d7-b8c6-b699d19d7de9 HTTP/1.1
-User-Agent: python-example-client
-Host: openstack.example.com
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
diff --git a/api-ref/source/samples/db-attach-config-group-response-json-http.txt b/api-ref/source/samples/db-attach-config-group-response-json-http.txt
deleted file mode 100644
index c7fabb46..00000000
--- a/api-ref/source/samples/db-attach-config-group-response-json-http.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.1 202 OK
-Content-Type: application/json
-Content-Length: 0
-Date: Mon, 13 Jul 2015 19:53:04 GMT
-
diff --git a/api-ref/source/samples/db-backup-create-incremental-request-json-http.txt b/api-ref/source/samples/db-backup-create-incremental-request-json-http.txt
deleted file mode 100644
index 3af4ac8f..00000000
--- a/api-ref/source/samples/db-backup-create-incremental-request-json-http.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-POST /v1.0/1234/backups HTTP/1.1
-User-Agent: python-troveclient
-Host: troveapi.org
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
diff --git a/api-ref/source/samples/db-backup-create-incremental-request.json b/api-ref/source/samples/db-backup-create-incremental-request.json
deleted file mode 100644
index a95513d9..00000000
--- a/api-ref/source/samples/db-backup-create-incremental-request.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "backup": {
- "description": "My Incremental Backup",
- "incremental": 0,
- "instance": "44b277eb-39be-4921-be31-3d61b43651d7",
- "name": "Incremental Snapshot",
- "parent_id": "a9832168-7541-4536-b8d9-a8a9b79cf1b4"
- }
-}
diff --git a/api-ref/source/samples/db-backup-create-incremental-response-json-http.txt b/api-ref/source/samples/db-backup-create-incremental-response-json-http.txt
deleted file mode 100644
index a55a2e69..00000000
--- a/api-ref/source/samples/db-backup-create-incremental-response-json-http.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.1 202 Accepted
-Content-Type: application/json
-Content-Length: 462
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-
diff --git a/api-ref/source/samples/db-backup-create-incremental-response.json b/api-ref/source/samples/db-backup-create-incremental-response.json
deleted file mode 100644
index 1520e866..00000000
--- a/api-ref/source/samples/db-backup-create-incremental-response.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "backup": {
- "created": "2014-10-30T12:30:00",
- "datastore": {
- "type": "mysql",
- "version": "5.5",
- "version_id": "b00000b0-00b0-0b00-00b0-000b000000bb"
- },
- "description": "My Incremental Backup",
- "id": "2e351a71-dd28-4bcb-a7d6-d36a5b487173",
- "instance_id": "44b277eb-39be-4921-be31-3d61b43651d7",
- "locationRef": null,
- "name": "Incremental Snapshot",
- "parent_id": "a9832168-7541-4536-b8d9-a8a9b79cf1b4",
- "size": null,
- "status": "NEW",
- "updated": "2014-10-30T12:30:00"
- }
-}
diff --git a/api-ref/source/samples/db-backup-create-request-json-http.txt b/api-ref/source/samples/db-backup-create-request-json-http.txt
deleted file mode 100644
index 3af4ac8f..00000000
--- a/api-ref/source/samples/db-backup-create-request-json-http.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-POST /v1.0/1234/backups HTTP/1.1
-User-Agent: python-troveclient
-Host: troveapi.org
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
diff --git a/api-ref/source/samples/db-backup-create-response-json-http.txt b/api-ref/source/samples/db-backup-create-response-json-http.txt
deleted file mode 100644
index 1d4a7ab0..00000000
--- a/api-ref/source/samples/db-backup-create-response-json-http.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.1 202 Accepted
-Content-Type: application/json
-Content-Length: 404
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-
diff --git a/api-ref/source/samples/db-backup-delete-request-json-http.txt b/api-ref/source/samples/db-backup-delete-request-json-http.txt
deleted file mode 100644
index ecefa809..00000000
--- a/api-ref/source/samples/db-backup-delete-request-json-http.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-DELETE /v1.0/1234/backups/a9832168-7541-4536-b8d9-a8a9b79cf1b4 HTTP/1.1
-User-Agent: python-troveclient
-Host: troveapi.org
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
diff --git a/api-ref/source/samples/db-backup-delete-response-json-http.txt b/api-ref/source/samples/db-backup-delete-response-json-http.txt
deleted file mode 100644
index 96905c86..00000000
--- a/api-ref/source/samples/db-backup-delete-response-json-http.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.1 202 Accepted
-Content-Type: application/json
-Content-Length: 0
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-
diff --git a/api-ref/source/samples/db-backup-get-request-json-http.txt b/api-ref/source/samples/db-backup-get-request-json-http.txt
deleted file mode 100644
index 609ce7d1..00000000
--- a/api-ref/source/samples/db-backup-get-request-json-http.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-GET /v1.0/1234/backups/a9832168-7541-4536-b8d9-a8a9b79cf1b4 HTTP/1.1
-User-Agent: python-troveclient
-Host: troveapi.org
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
diff --git a/api-ref/source/samples/db-backup-get-response-json-http.txt b/api-ref/source/samples/db-backup-get-response-json-http.txt
deleted file mode 100644
index 2a0f8c6c..00000000
--- a/api-ref/source/samples/db-backup-get-response-json-http.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Content-Length: 439
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-
diff --git a/api-ref/source/samples/db-backup-list-request-json-http.txt b/api-ref/source/samples/db-backup-list-request-json-http.txt
deleted file mode 100644
index 8eaf288a..00000000
--- a/api-ref/source/samples/db-backup-list-request-json-http.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-GET /v1.0/1234/backups HTTP/1.1
-User-Agent: python-troveclient
-Host: troveapi.org
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
diff --git a/api-ref/source/samples/db-backup-list-response-json-http.txt b/api-ref/source/samples/db-backup-list-response-json-http.txt
deleted file mode 100644
index 8a69dd1b..00000000
--- a/api-ref/source/samples/db-backup-list-response-json-http.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Content-Length: 929
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-
diff --git a/api-ref/source/samples/db-backup-restore-request-json-http.txt b/api-ref/source/samples/db-backup-restore-request-json-http.txt
deleted file mode 100644
index 4db3472a..00000000
--- a/api-ref/source/samples/db-backup-restore-request-json-http.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-POST /v1.0/1234/instances HTTP/1.1
-User-Agent: python-troveclient
-Host: troveapi.org
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
diff --git a/api-ref/source/samples/db-backup-restore-request.json b/api-ref/source/samples/db-backup-restore-request.json
deleted file mode 100644
index 105b9037..00000000
--- a/api-ref/source/samples/db-backup-restore-request.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "instance": {
- "flavorRef": 1,
- "name": "backup_instance",
- "restorePoint": {
- "backupRef": "a9832168-7541-4536-b8d9-a8a9b79cf1b4"
- },
- "volume": {
- "size": 2
- }
- }
-}
diff --git a/api-ref/source/samples/db-backup-restore-response-json-http.txt b/api-ref/source/samples/db-backup-restore-response-json-http.txt
deleted file mode 100644
index ce9bfb08..00000000
--- a/api-ref/source/samples/db-backup-restore-response-json-http.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Content-Length: 717
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-
diff --git a/api-ref/source/samples/db-backup-restore-response.json b/api-ref/source/samples/db-backup-restore-response.json
deleted file mode 100644
index cafd6197..00000000
--- a/api-ref/source/samples/db-backup-restore-response.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
- "instance": {
- "created": "2014-10-30T12:30:00",
- "datastore": {
- "type": "mysql",
- "version": "5.5"
- },
- "flavor": {
- "id": "1",
- "links": [
- {
- "href": "https://troveapi.org/v1.0/1234/flavors/1",
- "rel": "self"
- },
- {
- "href": "https://troveapi.org/flavors/1",
- "rel": "bookmark"
- }
- ]
- },
- "hostname": "e09ad9a3f73309469cf1f43d11e79549caf9acf2.troveexampledb.com",
- "id": "d5a9db64-7ef7-41c5-8e1e-4013166874bc",
- "links": [
- {
- "href": "https://troveapi.org/v1.0/1234/instances/d5a9db64-7ef7-41c5-8e1e-4013166874bc",
- "rel": "self"
- },
- {
- "href": "https://troveapi.org/instances/d5a9db64-7ef7-41c5-8e1e-4013166874bc",
- "rel": "bookmark"
- }
- ],
- "name": "backup_instance",
- "region": "RegionOne",
- "status": "BUILD",
- "updated": "2014-10-30T12:30:00",
- "volume": {
- "size": 2
- }
- }
-}
diff --git a/api-ref/source/samples/db-backups-by-instance-request-json-http.txt b/api-ref/source/samples/db-backups-by-instance-request-json-http.txt
deleted file mode 100644
index a3209286..00000000
--- a/api-ref/source/samples/db-backups-by-instance-request-json-http.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-GET /v1.0/1234/instances/44b277eb-39be-4921-be31-3d61b43651d7/backups HTTP/1.1
-User-Agent: python-troveclient
-Host: troveapi.org
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
diff --git a/api-ref/source/samples/db-backups-by-instance-response-json-http.txt b/api-ref/source/samples/db-backups-by-instance-response-json-http.txt
deleted file mode 100644
index 8a69dd1b..00000000
--- a/api-ref/source/samples/db-backups-by-instance-response-json-http.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Content-Length: 929
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-
diff --git a/api-ref/source/samples/db-backups-by-instance-response.json b/api-ref/source/samples/db-backups-by-instance-response.json
deleted file mode 100644
index 0ede6314..00000000
--- a/api-ref/source/samples/db-backups-by-instance-response.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
- "backups": [
- {
- "created": "2014-10-30T12:30:00",
- "datastore": {
- "type": "mysql",
- "version": "5.5",
- "version_id": "b00000b0-00b0-0b00-00b0-000b000000bb"
- },
- "description": "My Backup",
- "id": "a9832168-7541-4536-b8d9-a8a9b79cf1b4",
- "instance_id": "44b277eb-39be-4921-be31-3d61b43651d7",
- "locationRef": "http://localhost/path/to/backup",
- "name": "snapshot",
- "parent_id": null,
- "size": 0.14,
- "status": "COMPLETED",
- "updated": "2014-10-30T12:30:00"
- },
- {
- "created": "2014-10-30T12:30:00",
- "datastore": {
- "type": "mysql",
- "version": "5.5",
- "version_id": "b00000b0-00b0-0b00-00b0-000b000000bb"
- },
- "description": "My Incremental Backup",
- "id": "2e351a71-dd28-4bcb-a7d6-d36a5b487173",
- "instance_id": "44b277eb-39be-4921-be31-3d61b43651d7",
- "locationRef": "http://localhost/path/to/backup",
- "name": "Incremental Snapshot",
- "parent_id": "a9832168-7541-4536-b8d9-a8a9b79cf1b4",
- "size": 0.14,
- "status": "COMPLETED",
- "updated": "2014-10-30T12:30:00"
- }
- ]
-}
diff --git a/api-ref/source/samples/db-change-user-attributes-request-json-http.txt b/api-ref/source/samples/db-change-user-attributes-request-json-http.txt
deleted file mode 100644
index 03afde06..00000000
--- a/api-ref/source/samples/db-change-user-attributes-request-json-http.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-PUT /v1.0/1234/instances/44b277eb-39be-4921-be31-3d61b43651d7/users/dbuser1 HTTP/1.1
-User-Agent: python-troveclient
-Host: troveapi.org
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
diff --git a/api-ref/source/samples/db-change-user-attributes-request.json b/api-ref/source/samples/db-change-user-attributes-request.json
deleted file mode 100644
index 47510060..00000000
--- a/api-ref/source/samples/db-change-user-attributes-request.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "user": {
- "name": "new_username",
- "password": "new_password"
- }
-}
diff --git a/api-ref/source/samples/db-change-user-attributes-response-json-http.txt b/api-ref/source/samples/db-change-user-attributes-response-json-http.txt
deleted file mode 100644
index 96905c86..00000000
--- a/api-ref/source/samples/db-change-user-attributes-response-json-http.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.1 202 Accepted
-Content-Type: application/json
-Content-Length: 0
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-
diff --git a/api-ref/source/samples/db-change-users-password-request-json-http.txt b/api-ref/source/samples/db-change-users-password-request-json-http.txt
deleted file mode 100644
index c42ecdff..00000000
--- a/api-ref/source/samples/db-change-users-password-request-json-http.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-PUT /v1.0/1234/instances/692d8418-7a8f-47f1-8060-59846c6e024f/users HTTP/1.1
-User-Agent: python-example-client
-Host: ord.databases.api.rackspacecloud.com
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json \ No newline at end of file
diff --git a/api-ref/source/samples/db-change-users-password-request.json b/api-ref/source/samples/db-change-users-password-request.json
deleted file mode 100644
index d03c9568..00000000
--- a/api-ref/source/samples/db-change-users-password-request.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "users": [
- {
- "name": "dbuser1",
- "password": "newpassword"
- },
- {
- "name": "dbuser2",
- "password": "anotherpassword"
- }
- ]
-}
diff --git a/api-ref/source/samples/db-change-users-password-response-json-http.txt b/api-ref/source/samples/db-change-users-password-response-json-http.txt
deleted file mode 100644
index c4d2e8c6..00000000
--- a/api-ref/source/samples/db-change-users-password-response-json-http.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-HTTP/1.1 202 Accepted
-Content-Type: application/json
-Content-Length: 152
-Date: Wed, 21 Mar 2012 17:46:46 GMT \ No newline at end of file
diff --git a/api-ref/source/samples/db-check-root-user-request-json-http.txt b/api-ref/source/samples/db-check-root-user-request-json-http.txt
deleted file mode 100644
index 7079f259..00000000
--- a/api-ref/source/samples/db-check-root-user-request-json-http.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-GET /v1.0/1234/instances/44b277eb-39be-4921-be31-3d61b43651d7/root HTTP/1.1
-User-Agent: python-troveclient
-Host: troveapi.org
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
diff --git a/api-ref/source/samples/db-check-root-user-response-json-http.txt b/api-ref/source/samples/db-check-root-user-response-json-http.txt
deleted file mode 100644
index 168a99b0..00000000
--- a/api-ref/source/samples/db-check-root-user-response-json-http.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Content-Length: 21
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-
diff --git a/api-ref/source/samples/db-config-group-details-request-json-http.txt b/api-ref/source/samples/db-config-group-details-request-json-http.txt
deleted file mode 100644
index 8ee791ec..00000000
--- a/api-ref/source/samples/db-config-group-details-request-json-http.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-GET /v1.0/1234/configurations/5678 HTTP/1.1
-User-Agent: python-example-client
-Host: openstack.example.com
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
diff --git a/api-ref/source/samples/db-config-group-details-response-json-http.txt b/api-ref/source/samples/db-config-group-details-response-json-http.txt
deleted file mode 100644
index 41f9a3b5..00000000
--- a/api-ref/source/samples/db-config-group-details-response-json-http.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Content-Length: 138
-Date: Fri, 20 Nov 2015 19:53:04 GMT
diff --git a/api-ref/source/samples/db-config-group-instances-request-json-http.txt b/api-ref/source/samples/db-config-group-instances-request-json-http.txt
deleted file mode 100644
index e4840a5b..00000000
--- a/api-ref/source/samples/db-config-group-instances-request-json-http.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-GET /v1.0/1234/configurations/5678/instances HTTP/1.1
-User-Agent: python-example-client
-Host: openstack.example.com
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
diff --git a/api-ref/source/samples/db-config-group-instances-response-json-http.txt b/api-ref/source/samples/db-config-group-instances-response-json-http.txt
deleted file mode 100644
index 41f9a3b5..00000000
--- a/api-ref/source/samples/db-config-group-instances-response-json-http.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Content-Length: 138
-Date: Fri, 20 Nov 2015 19:53:04 GMT
diff --git a/api-ref/source/samples/db-configuration-attach-to-instance-request-json-http.txt b/api-ref/source/samples/db-configuration-attach-to-instance-request-json-http.txt
deleted file mode 100644
index 91b74784..00000000
--- a/api-ref/source/samples/db-configuration-attach-to-instance-request-json-http.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-PUT /v1.0/1234/instances/44b277eb-39be-4921-be31-3d61b43651d7 HTTP/1.1
-User-Agent: python-troveclient
-Host: troveapi.org
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
diff --git a/api-ref/source/samples/db-configuration-attach-to-instance-request.json b/api-ref/source/samples/db-configuration-attach-to-instance-request.json
deleted file mode 100644
index 633cbfd5..00000000
--- a/api-ref/source/samples/db-configuration-attach-to-instance-request.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "instance": {
- "configuration": "43a6ea86-e959-4735-9e46-a6a5d4a2d80f"
- }
-}
diff --git a/api-ref/source/samples/db-configuration-attach-to-instance-response-json-http.txt b/api-ref/source/samples/db-configuration-attach-to-instance-response-json-http.txt
deleted file mode 100644
index 96905c86..00000000
--- a/api-ref/source/samples/db-configuration-attach-to-instance-response-json-http.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.1 202 Accepted
-Content-Type: application/json
-Content-Length: 0
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-
diff --git a/api-ref/source/samples/db-configuration-create-request-json-http.txt b/api-ref/source/samples/db-configuration-create-request-json-http.txt
deleted file mode 100644
index 767a3f22..00000000
--- a/api-ref/source/samples/db-configuration-create-request-json-http.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-POST /v1.0/1234/configurations HTTP/1.1
-User-Agent: python-troveclient
-Host: troveapi.org
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
diff --git a/api-ref/source/samples/db-configuration-create-request.json b/api-ref/source/samples/db-configuration-create-request.json
deleted file mode 100644
index 43ae748d..00000000
--- a/api-ref/source/samples/db-configuration-create-request.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "configuration": {
- "datastore": {
- "type": "a00000a0-00a0-0a00-00a0-000a000000aa",
- "version": "b00000b0-00b0-0b00-00b0-000b000000bb"
- },
- "description": "example description",
- "name": "example-configuration-name",
- "values": {
- "collation_server": "latin1_swedish_ci",
- "connect_timeout": 120
- }
- }
-}
diff --git a/api-ref/source/samples/db-configuration-create-response-json-http.txt b/api-ref/source/samples/db-configuration-create-response-json-http.txt
deleted file mode 100644
index 84a6495b..00000000
--- a/api-ref/source/samples/db-configuration-create-response-json-http.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Content-Length: 431
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-
diff --git a/api-ref/source/samples/db-configuration-create-response.json b/api-ref/source/samples/db-configuration-create-response.json
deleted file mode 100644
index a63cd231..00000000
--- a/api-ref/source/samples/db-configuration-create-response.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "configuration": {
- "created": "2014-10-30T12:30:00",
- "datastore_name": "mysql",
- "datastore_version_id": "b00000b0-00b0-0b00-00b0-000b000000bb",
- "datastore_version_name": "5.5",
- "description": "example description",
- "id": "43a6ea86-e959-4735-9e46-a6a5d4a2d80f",
- "instance_count": 0,
- "name": "example-configuration-name",
- "updated": "2014-10-30T12:30:00",
- "values": {
- "collation_server": "latin1_swedish_ci",
- "connect_timeout": 120
- }
- }
-}
diff --git a/api-ref/source/samples/db-configuration-delete-request-json-http.txt b/api-ref/source/samples/db-configuration-delete-request-json-http.txt
deleted file mode 100644
index 3769e97c..00000000
--- a/api-ref/source/samples/db-configuration-delete-request-json-http.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-DELETE /v1.0/1234/configurations/43a6ea86-e959-4735-9e46-a6a5d4a2d80f HTTP/1.1
-User-Agent: python-troveclient
-Host: troveapi.org
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
diff --git a/api-ref/source/samples/db-configuration-delete-response-json-http.txt b/api-ref/source/samples/db-configuration-delete-response-json-http.txt
deleted file mode 100644
index 96905c86..00000000
--- a/api-ref/source/samples/db-configuration-delete-response-json-http.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.1 202 Accepted
-Content-Type: application/json
-Content-Length: 0
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-
diff --git a/api-ref/source/samples/db-configuration-detach-from-instance-request-json-http.txt b/api-ref/source/samples/db-configuration-detach-from-instance-request-json-http.txt
deleted file mode 100644
index 91b74784..00000000
--- a/api-ref/source/samples/db-configuration-detach-from-instance-request-json-http.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-PUT /v1.0/1234/instances/44b277eb-39be-4921-be31-3d61b43651d7 HTTP/1.1
-User-Agent: python-troveclient
-Host: troveapi.org
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
diff --git a/api-ref/source/samples/db-configuration-detach-from-instance-request.json b/api-ref/source/samples/db-configuration-detach-from-instance-request.json
deleted file mode 100644
index 587075fc..00000000
--- a/api-ref/source/samples/db-configuration-detach-from-instance-request.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "instance": {
- "configuration": ""
- }
-}
diff --git a/api-ref/source/samples/db-configuration-detach-from-instance-response-json-http.txt b/api-ref/source/samples/db-configuration-detach-from-instance-response-json-http.txt
deleted file mode 100644
index 96905c86..00000000
--- a/api-ref/source/samples/db-configuration-detach-from-instance-response-json-http.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.1 202 Accepted
-Content-Type: application/json
-Content-Length: 0
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-
diff --git a/api-ref/source/samples/db-configuration-details-request-json-http.txt b/api-ref/source/samples/db-configuration-details-request-json-http.txt
deleted file mode 100644
index 5a5ee2ac..00000000
--- a/api-ref/source/samples/db-configuration-details-request-json-http.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-GET /v1.0/1234/configurations/43a6ea86-e959-4735-9e46-a6a5d4a2d80f HTTP/1.1
-User-Agent: python-troveclient
-Host: troveapi.org
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
diff --git a/api-ref/source/samples/db-configuration-details-response-json-http.txt b/api-ref/source/samples/db-configuration-details-response-json-http.txt
deleted file mode 100644
index 84a6495b..00000000
--- a/api-ref/source/samples/db-configuration-details-response-json-http.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Content-Length: 431
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-
diff --git a/api-ref/source/samples/db-configuration-details-response.json b/api-ref/source/samples/db-configuration-details-response.json
deleted file mode 100644
index a63cd231..00000000
--- a/api-ref/source/samples/db-configuration-details-response.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "configuration": {
- "created": "2014-10-30T12:30:00",
- "datastore_name": "mysql",
- "datastore_version_id": "b00000b0-00b0-0b00-00b0-000b000000bb",
- "datastore_version_name": "5.5",
- "description": "example description",
- "id": "43a6ea86-e959-4735-9e46-a6a5d4a2d80f",
- "instance_count": 0,
- "name": "example-configuration-name",
- "updated": "2014-10-30T12:30:00",
- "values": {
- "collation_server": "latin1_swedish_ci",
- "connect_timeout": 120
- }
- }
-}
diff --git a/api-ref/source/samples/db-configuration-edit-parameters-request-json-http.txt b/api-ref/source/samples/db-configuration-edit-parameters-request-json-http.txt
deleted file mode 100644
index b0ea4846..00000000
--- a/api-ref/source/samples/db-configuration-edit-parameters-request-json-http.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-PATCH /v1.0/1234/configurations/43a6ea86-e959-4735-9e46-a6a5d4a2d80f HTTP/1.1
-User-Agent: python-troveclient
-Host: troveapi.org
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
diff --git a/api-ref/source/samples/db-configuration-edit-parameters-request.json b/api-ref/source/samples/db-configuration-edit-parameters-request.json
deleted file mode 100644
index 026cdc0a..00000000
--- a/api-ref/source/samples/db-configuration-edit-parameters-request.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "configuration": {
- "values": {
- "connect_timeout": 300
- }
- }
-}
diff --git a/api-ref/source/samples/db-configuration-edit-parameters-response-json-http.txt b/api-ref/source/samples/db-configuration-edit-parameters-response-json-http.txt
deleted file mode 100644
index 031611ac..00000000
--- a/api-ref/source/samples/db-configuration-edit-parameters-response-json-http.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Content-Length: 0
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-
diff --git a/api-ref/source/samples/db-configuration-list-instances-request-json-http.txt b/api-ref/source/samples/db-configuration-list-instances-request-json-http.txt
deleted file mode 100644
index d8534b1a..00000000
--- a/api-ref/source/samples/db-configuration-list-instances-request-json-http.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-GET /v1.0/1234/configurations/43a6ea86-e959-4735-9e46-a6a5d4a2d80f/instances HTTP/1.1
-User-Agent: python-troveclient
-Host: troveapi.org
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
diff --git a/api-ref/source/samples/db-configuration-list-instances-response-json-http.txt b/api-ref/source/samples/db-configuration-list-instances-response-json-http.txt
deleted file mode 100644
index dbe71af2..00000000
--- a/api-ref/source/samples/db-configuration-list-instances-response-json-http.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Content-Length: 93
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-
diff --git a/api-ref/source/samples/db-configuration-list-instances-response.json b/api-ref/source/samples/db-configuration-list-instances-response.json
deleted file mode 100644
index 69ca083a..00000000
--- a/api-ref/source/samples/db-configuration-list-instances-response.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "instances": [
- {
- "id": "44b277eb-39be-4921-be31-3d61b43651d7",
- "name": "json_rack_instance"
- }
- ]
-}
diff --git a/api-ref/source/samples/db-configuration-list-request-json-http.txt b/api-ref/source/samples/db-configuration-list-request-json-http.txt
deleted file mode 100644
index 6f12a9ef..00000000
--- a/api-ref/source/samples/db-configuration-list-request-json-http.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-GET /v1.0/1234/configurations HTTP/1.1
-User-Agent: python-troveclient
-Host: troveapi.org
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
diff --git a/api-ref/source/samples/db-configuration-list-response-json-http.txt b/api-ref/source/samples/db-configuration-list-response-json-http.txt
deleted file mode 100644
index 599ba127..00000000
--- a/api-ref/source/samples/db-configuration-list-response-json-http.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Content-Length: 336
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-
diff --git a/api-ref/source/samples/db-configuration-list-response.json b/api-ref/source/samples/db-configuration-list-response.json
deleted file mode 100644
index d1ece42b..00000000
--- a/api-ref/source/samples/db-configuration-list-response.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "configurations": [
- {
- "created": "2014-10-30T12:30:00",
- "datastore_name": "mysql",
- "datastore_version_id": "b00000b0-00b0-0b00-00b0-000b000000bb",
- "datastore_version_name": "5.5",
- "description": "example description",
- "id": "43a6ea86-e959-4735-9e46-a6a5d4a2d80f",
- "name": "example-configuration-name",
- "updated": "2014-10-30T12:30:00"
- }
- ]
-}
diff --git a/api-ref/source/samples/db-configuration-parameter-for-datastore-version-request-json-http.txt b/api-ref/source/samples/db-configuration-parameter-for-datastore-version-request-json-http.txt
deleted file mode 100644
index d09ffb77..00000000
--- a/api-ref/source/samples/db-configuration-parameter-for-datastore-version-request-json-http.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-GET /v1.0/1234/datastores/a00000a0-00a0-0a00-00a0-000a000000aa/versions/b00000b0-00b0-0b00-00b0-000b000000bb/parameters/collation_server HTTP/1.1
-User-Agent: python-troveclient
-Host: troveapi.org
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
diff --git a/api-ref/source/samples/db-configuration-parameter-for-datastore-version-response-json-http.txt b/api-ref/source/samples/db-configuration-parameter-for-datastore-version-response-json-http.txt
deleted file mode 100644
index 60fde3a3..00000000
--- a/api-ref/source/samples/db-configuration-parameter-for-datastore-version-response-json-http.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Content-Length: 147
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-
diff --git a/api-ref/source/samples/db-configuration-parameter-for-datastore-version-response.json b/api-ref/source/samples/db-configuration-parameter-for-datastore-version-response.json
deleted file mode 100644
index 882f6600..00000000
--- a/api-ref/source/samples/db-configuration-parameter-for-datastore-version-response.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "datastore_version_id": "b00000b0-00b0-0b00-00b0-000b000000bb",
- "min": 0,
- "name": "collation_server",
- "restart_required": false,
- "type": "string"
-}
diff --git a/api-ref/source/samples/db-configuration-parameter-without-datastore-version-request-json-http.txt b/api-ref/source/samples/db-configuration-parameter-without-datastore-version-request-json-http.txt
deleted file mode 100644
index abfb174b..00000000
--- a/api-ref/source/samples/db-configuration-parameter-without-datastore-version-request-json-http.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-GET /v1.0/1234/datastores/versions/b00000b0-00b0-0b00-00b0-000b000000bb/parameters/collation_server HTTP/1.1
-User-Agent: python-troveclient
-Host: troveapi.org
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
diff --git a/api-ref/source/samples/db-configuration-parameter-without-datastore-version-response-json-http.txt b/api-ref/source/samples/db-configuration-parameter-without-datastore-version-response-json-http.txt
deleted file mode 100644
index 60fde3a3..00000000
--- a/api-ref/source/samples/db-configuration-parameter-without-datastore-version-response-json-http.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Content-Length: 147
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-
diff --git a/api-ref/source/samples/db-configuration-parameter-without-datastore-version-response.json b/api-ref/source/samples/db-configuration-parameter-without-datastore-version-response.json
deleted file mode 100644
index 882f6600..00000000
--- a/api-ref/source/samples/db-configuration-parameter-without-datastore-version-response.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "datastore_version_id": "b00000b0-00b0-0b00-00b0-000b000000bb",
- "min": 0,
- "name": "collation_server",
- "restart_required": false,
- "type": "string"
-}
diff --git a/api-ref/source/samples/db-configuration-parameters-for-datastore-version-request-json-http.txt b/api-ref/source/samples/db-configuration-parameters-for-datastore-version-request-json-http.txt
deleted file mode 100644
index f45a23dd..00000000
--- a/api-ref/source/samples/db-configuration-parameters-for-datastore-version-request-json-http.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-GET /v1.0/1234/datastores/a00000a0-00a0-0a00-00a0-000a000000aa/versions/b00000b0-00b0-0b00-00b0-000b000000bb/parameters HTTP/1.1
-User-Agent: python-troveclient
-Host: troveapi.org
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
diff --git a/api-ref/source/samples/db-configuration-parameters-for-datastore-version-response-json-http.txt b/api-ref/source/samples/db-configuration-parameters-for-datastore-version-response-json-http.txt
deleted file mode 100644
index c5f57eff..00000000
--- a/api-ref/source/samples/db-configuration-parameters-for-datastore-version-response-json-http.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Content-Length: 1008
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-
diff --git a/api-ref/source/samples/db-configuration-parameters-for-datastore-version-response.json b/api-ref/source/samples/db-configuration-parameters-for-datastore-version-response.json
deleted file mode 100644
index b5d8663c..00000000
--- a/api-ref/source/samples/db-configuration-parameters-for-datastore-version-response.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
- "configuration-parameters": [
- {
- "datastore_version_id": "b00000b0-00b0-0b00-00b0-000b000000bb",
- "min": 0,
- "name": "collation_server",
- "restart_required": false,
- "type": "string"
- },
- {
- "datastore_version_id": "b00000b0-00b0-0b00-00b0-000b000000bb",
- "max": 65535,
- "min": 0,
- "name": "connect_timeout",
- "restart_required": false,
- "type": "integer"
- },
- {
- "datastore_version_id": "b00000b0-00b0-0b00-00b0-000b000000bb",
- "max": 57671680,
- "min": 0,
- "name": "innodb_buffer_pool_size",
- "restart_required": true,
- "type": "integer"
- },
- {
- "datastore_version_id": "b00000b0-00b0-0b00-00b0-000b000000bb",
- "max": 4294967296,
- "min": 0,
- "name": "join_buffer_size",
- "restart_required": false,
- "type": "integer"
- },
- {
- "datastore_version_id": "b00000b0-00b0-0b00-00b0-000b000000bb",
- "max": 4294967296,
- "min": 0,
- "name": "key_buffer_size",
- "restart_required": false,
- "type": "integer"
- },
- {
- "datastore_version_id": "b00000b0-00b0-0b00-00b0-000b000000bb",
- "max": 1,
- "min": 0,
- "name": "local_infile",
- "restart_required": false,
- "type": "integer"
- }
- ]
-}
diff --git a/api-ref/source/samples/db-configuration-parameters-without-datastore-version-request-json-http.txt b/api-ref/source/samples/db-configuration-parameters-without-datastore-version-request-json-http.txt
deleted file mode 100644
index 6fc95b06..00000000
--- a/api-ref/source/samples/db-configuration-parameters-without-datastore-version-request-json-http.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-GET /v1.0/1234/datastores/versions/b00000b0-00b0-0b00-00b0-000b000000bb/parameters HTTP/1.1
-User-Agent: python-troveclient
-Host: troveapi.org
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
diff --git a/api-ref/source/samples/db-configuration-parameters-without-datastore-version-response-json-http.txt b/api-ref/source/samples/db-configuration-parameters-without-datastore-version-response-json-http.txt
deleted file mode 100644
index c5f57eff..00000000
--- a/api-ref/source/samples/db-configuration-parameters-without-datastore-version-response-json-http.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Content-Length: 1008
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-
diff --git a/api-ref/source/samples/db-configuration-parameters-without-datastore-version-response.json b/api-ref/source/samples/db-configuration-parameters-without-datastore-version-response.json
deleted file mode 100644
index b5d8663c..00000000
--- a/api-ref/source/samples/db-configuration-parameters-without-datastore-version-response.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
- "configuration-parameters": [
- {
- "datastore_version_id": "b00000b0-00b0-0b00-00b0-000b000000bb",
- "min": 0,
- "name": "collation_server",
- "restart_required": false,
- "type": "string"
- },
- {
- "datastore_version_id": "b00000b0-00b0-0b00-00b0-000b000000bb",
- "max": 65535,
- "min": 0,
- "name": "connect_timeout",
- "restart_required": false,
- "type": "integer"
- },
- {
- "datastore_version_id": "b00000b0-00b0-0b00-00b0-000b000000bb",
- "max": 57671680,
- "min": 0,
- "name": "innodb_buffer_pool_size",
- "restart_required": true,
- "type": "integer"
- },
- {
- "datastore_version_id": "b00000b0-00b0-0b00-00b0-000b000000bb",
- "max": 4294967296,
- "min": 0,
- "name": "join_buffer_size",
- "restart_required": false,
- "type": "integer"
- },
- {
- "datastore_version_id": "b00000b0-00b0-0b00-00b0-000b000000bb",
- "max": 4294967296,
- "min": 0,
- "name": "key_buffer_size",
- "restart_required": false,
- "type": "integer"
- },
- {
- "datastore_version_id": "b00000b0-00b0-0b00-00b0-000b000000bb",
- "max": 1,
- "min": 0,
- "name": "local_infile",
- "restart_required": false,
- "type": "integer"
- }
- ]
-}
diff --git a/api-ref/source/samples/db-configuration-update-parameters-request-json-http.txt b/api-ref/source/samples/db-configuration-update-parameters-request-json-http.txt
deleted file mode 100644
index 1cc6c28f..00000000
--- a/api-ref/source/samples/db-configuration-update-parameters-request-json-http.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-PUT /v1.0/1234/configurations/43a6ea86-e959-4735-9e46-a6a5d4a2d80f HTTP/1.1
-User-Agent: python-troveclient
-Host: troveapi.org
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
diff --git a/api-ref/source/samples/db-configuration-update-parameters-request.json b/api-ref/source/samples/db-configuration-update-parameters-request.json
deleted file mode 100644
index 08a51cdd..00000000
--- a/api-ref/source/samples/db-configuration-update-parameters-request.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "configuration": {
- "description": "example updated description",
- "name": "example-updated-name",
- "values": {
- "collation_server": "utf8_unicode_ci",
- "connect_timeout": 150
- }
- }
-}
diff --git a/api-ref/source/samples/db-configuration-update-parameters-response-json-http.txt b/api-ref/source/samples/db-configuration-update-parameters-response-json-http.txt
deleted file mode 100644
index 96905c86..00000000
--- a/api-ref/source/samples/db-configuration-update-parameters-response-json-http.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.1 202 Accepted
-Content-Type: application/json
-Content-Length: 0
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-
diff --git a/api-ref/source/samples/db-create-config-group-request-json-http.txt b/api-ref/source/samples/db-create-config-group-request-json-http.txt
deleted file mode 100644
index a346a2d6..00000000
--- a/api-ref/source/samples/db-create-config-group-request-json-http.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-POST /v1.0/1234/configurations HTTP/1.1
-User-Agent: python-example-client
-Host: openstack.example.com
-X-Auth-Token: d6cafa5b-e0c7-4ab8-948e-7c95f2acd031
-Accept: application/json
-Content-Type: application/json
-
diff --git a/api-ref/source/samples/db-create-config-group-response-json-http.txt b/api-ref/source/samples/db-create-config-group-response-json-http.txt
deleted file mode 100644
index 4033d898..00000000
--- a/api-ref/source/samples/db-create-config-group-response-json-http.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Content-Length: 360
-Date: Mon, 6 Jul 2015 21:53:10 GMT
-
diff --git a/api-ref/source/samples/db-create-databases-request-json-http.txt b/api-ref/source/samples/db-create-databases-request-json-http.txt
deleted file mode 100644
index 3ee1184d..00000000
--- a/api-ref/source/samples/db-create-databases-request-json-http.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-POST /v1.0/1234/instances/44b277eb-39be-4921-be31-3d61b43651d7/databases HTTP/1.1
-User-Agent: python-troveclient
-Host: troveapi.org
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
diff --git a/api-ref/source/samples/db-create-databases-response-json-http.txt b/api-ref/source/samples/db-create-databases-response-json-http.txt
deleted file mode 100644
index 96905c86..00000000
--- a/api-ref/source/samples/db-create-databases-response-json-http.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.1 202 Accepted
-Content-Type: application/json
-Content-Length: 0
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-
diff --git a/api-ref/source/samples/db-create-instance-request-json-http.txt b/api-ref/source/samples/db-create-instance-request-json-http.txt
deleted file mode 100644
index 4db3472a..00000000
--- a/api-ref/source/samples/db-create-instance-request-json-http.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-POST /v1.0/1234/instances HTTP/1.1
-User-Agent: python-troveclient
-Host: troveapi.org
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
diff --git a/api-ref/source/samples/db-create-instance-response-json-http.txt b/api-ref/source/samples/db-create-instance-response-json-http.txt
deleted file mode 100644
index 646d02a6..00000000
--- a/api-ref/source/samples/db-create-instance-response-json-http.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Content-Length: 720
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-
diff --git a/api-ref/source/samples/db-create-instance-response.json b/api-ref/source/samples/db-create-instance-response.json
deleted file mode 100644
index 47e75bfe..00000000
--- a/api-ref/source/samples/db-create-instance-response.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
- "instance": {
- "created": "2014-10-30T12:30:00",
- "datastore": {
- "type": "mysql",
- "version": "5.5"
- },
- "flavor": {
- "id": "1",
- "links": [
- {
- "href": "https://troveapi.org/v1.0/1234/flavors/1",
- "rel": "self"
- },
- {
- "href": "https://troveapi.org/flavors/1",
- "rel": "bookmark"
- }
- ]
- },
- "hostname": "e09ad9a3f73309469cf1f43d11e79549caf9acf2.troveexampledb.com",
- "id": "44b277eb-39be-4921-be31-3d61b43651d7",
- "links": [
- {
- "href": "https://troveapi.org/v1.0/1234/instances/44b277eb-39be-4921-be31-3d61b43651d7",
- "rel": "self"
- },
- {
- "href": "https://troveapi.org/instances/44b277eb-39be-4921-be31-3d61b43651d7",
- "rel": "bookmark"
- }
- ],
- "name": "json_rack_instance",
- "region": "RegionOne",
- "status": "BUILD",
- "updated": "2014-10-30T12:30:00",
- "volume": {
- "size": 2
- }
- }
-}
diff --git a/api-ref/source/samples/db-create-users-request-json-http.txt b/api-ref/source/samples/db-create-users-request-json-http.txt
deleted file mode 100644
index 9e15d7ac..00000000
--- a/api-ref/source/samples/db-create-users-request-json-http.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-POST /v1.0/1234/instances/44b277eb-39be-4921-be31-3d61b43651d7/users HTTP/1.1
-User-Agent: python-troveclient
-Host: troveapi.org
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
diff --git a/api-ref/source/samples/db-create-users-response-json-http.txt b/api-ref/source/samples/db-create-users-response-json-http.txt
deleted file mode 100644
index 96905c86..00000000
--- a/api-ref/source/samples/db-create-users-response-json-http.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.1 202 Accepted
-Content-Type: application/json
-Content-Length: 0
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-
diff --git a/api-ref/source/samples/db-datastore-by-id-request-json-http.txt b/api-ref/source/samples/db-datastore-by-id-request-json-http.txt
deleted file mode 100644
index 4f40c304..00000000
--- a/api-ref/source/samples/db-datastore-by-id-request-json-http.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-GET /v1.0/1234/datastores/a00000a0-00a0-0a00-00a0-000a000000aa HTTP/1.1
-User-Agent: python-troveclient
-Host: troveapi.org
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
diff --git a/api-ref/source/samples/db-datastore-by-id-response-json-http.txt b/api-ref/source/samples/db-datastore-by-id-response-json-http.txt
deleted file mode 100644
index 90f5d047..00000000
--- a/api-ref/source/samples/db-datastore-by-id-response-json-http.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Content-Length: 678
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-
diff --git a/api-ref/source/samples/db-datastore-by-id-response.json b/api-ref/source/samples/db-datastore-by-id-response.json
deleted file mode 100644
index fb69c160..00000000
--- a/api-ref/source/samples/db-datastore-by-id-response.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
- "datastore": {
- "default_version": "b00000b0-00b0-0b00-00b0-000b000000bb",
- "id": "a00000a0-00a0-0a00-00a0-000a000000aa",
- "links": [
- {
- "href": "https://troveapi.org/v1.0/1234/datastores/a00000a0-00a0-0a00-00a0-000a000000aa",
- "rel": "self"
- },
- {
- "href": "https://troveapi.org/datastores/a00000a0-00a0-0a00-00a0-000a000000aa",
- "rel": "bookmark"
- }
- ],
- "name": "mysql",
- "versions": [
- {
- "id": "b00000b0-00b0-0b00-00b0-000b000000bb",
- "links": [
- {
- "href": "https://troveapi.org/v1.0/1234/datastores/versions/b00000b0-00b0-0b00-00b0-000b000000bb",
- "rel": "self"
- },
- {
- "href": "https://troveapi.org/datastores/versions/b00000b0-00b0-0b00-00b0-000b000000bb",
- "rel": "bookmark"
- }
- ],
- "name": "5.5"
- }
- ]
- }
-}
diff --git a/api-ref/source/samples/db-datastore-parameters-response.json b/api-ref/source/samples/db-datastore-parameters-response.json
deleted file mode 100644
index 7f9153c8..00000000
--- a/api-ref/source/samples/db-datastore-parameters-response.json
+++ /dev/null
@@ -1,258 +0,0 @@
-{
- "configuration-parameters": [
- {
- "name": "myisam_sort_buffer_size",
- "min": 4096,
- "max": 18446744073709552000,
- "restart_required": false,
- "type": "integer",
- "datastore_version_id": "f597f709-70ef-474d-ac18-2c6abd35a758"
- },
- {
- "name": "sync_binlog",
- "min": 0,
- "max": 4294967295,
- "restart_required": false,
- "type": "integer",
- "datastore_version_id": "f597f709-70ef-474d-ac18-2c6abd35a758"
- },
- {
- "name": "max_allowed_packet",
- "min": 1024,
- "max": 1073741824,
- "restart_required": false,
- "type": "integer",
- "datastore_version_id": "f597f709-70ef-474d-ac18-2c6abd35a758"
- },
- {
- "type": "string",
- "name": "character_set_connection",
- "datastore_version_id": "f597f709-70ef-474d-ac18-2c6abd35a758",
- "restart_required": false
- },
- {
- "name": "autocommit",
- "min": 0,
- "max": 1,
- "restart_required": false,
- "type": "integer",
- "datastore_version_id": "f597f709-70ef-474d-ac18-2c6abd35a758"
- },
- {
- "type": "string",
- "name": "character_set_client",
- "datastore_version_id": "f597f709-70ef474d-ac18-2c6abd35a758",
- "restart_required": false
- },
- {
- "name": "join_buffer_size",
- "min": 128,
- "max": 18446744073709548000,
- "restart_required": false,
- "type": "integer",
- "datastore_version_id": "f597f709-70ef-474d-ac18-2c6abd35a758"
- },
- {
- "name": "local_infile",
- "min": 0,
- "max": 1,
- "restart_required": false,
- "type": "integer",
- "datastore_version_id": "f597f709-70ef-474d-ac18-2c6abd35a758"
- },
- {
- "name": "auto_increment_offset",
- "min": 1,
- "max": 65535,
- "restart_required": false,
- "type": "integer",
- "datastore_version_id": "f597f709-70ef-474d-ac18-2c6abd35a758"
- },
- {
- "name": "max_connections",
- "min": 1,
- "max": 100000,
- "restart_required": false,
- "type": "integer",
- "datastore_version_id": "f597f709-70ef-474d-ac18-2c6abd35a758"
- },
- {
- "name": "bulk_insert_buffer_size",
- "min": 0,
- "max": 18446744073709552000,
- "restart_required": false,
- "type": "integer",
- "datastore_version_id": "f597f709-70ef474dac18-2c6abd35a758"
- },
- {
- "name": "sort_buffer_size",
- "min": 32768,
- "max": 18446744073709552000,
- "restart_required": false,
- "type": "integer",
- "datastore_version_id": "f597f709-70ef-474d-ac18-2c6abd35a758"
- },
- {
- "name": "innodb_log_buffer_size",
- "min": 262144,
- "max": 4294967295,
- "restart_required": true,
- "type": "integer",
- "datastore_version_id": "f597f709-70ef-474d-ac18-2c6abd35a758"
- },
- {
- "name": "innodb_file_per_table",
- "min": 0,
- "max": 1,
- "restart_required": false,
- "type": "integer",
- "datastore_version_id": "f597f709-70ef-474d-ac18-2c6abd35a758"
- },
- {
- "type": "string",
- "name": "character_set_server",
- "datastore_version_id": "f597f709-70ef-474d-ac18-2c6abd35a758",
- "restart_required": false
- },
- {
- "name": "innodb_buffer_pool_size",
- "min": 5242880,
- "max": 18446744073709552000,
- "restart_required": true,
- "type": "integer",
- "datastore_version_id": "f597f709-70ef474dac18-2c6abd35a758"
- },
- {
- "type": "string",
- "name": "collation_server",
- "datastore_version_id": "f597f709-70ef-474d-ac18-2c6abd35a758",
- "restart_required": false
- },
- {
- "type": "string",
- "name": "character_set_filesystem",
- "datastore_version_id": "f597f709-70ef-474d-ac18-2c6abd35a758",
- "restart_required": false
- },
- {
- "type": "string",
- "name": "collation_database",
- "datastore_version_id": "f597f709-70ef474d-ac18-2c6abd35a758",
- "restart_required": false
- },
- {
- "name": "innodb_flush_log_at_trx_commit",
- "min": 0,
- "max": 2,
- "restart_required": false,
- "type": "integer",
- "datastore_version_id": "f597f709-70ef-474d-ac18-2c6abd35a758"
- },
- {
- "name": "interactive_timeout",
- "min": 1,
- "max": 65535,
- "restart_required": false,
- "type": "integer",
- "datastore_version_id": "f597f709-70ef-474d-ac18-2c6abd35a758"
- },
- {
- "name": "max_user_connections",
- "min": 0,
- "max": 4294967295,
- "restart_required": false,
- "type": "integer",
- "datastore_version_id": "f597f709-70ef-474d-ac18-2c6abd35a758"
- },
- {
- "name": "innodb_thread_concurrency",
- "min": 0,
- "max": 1000,
- "restart_required": false,
- "type": "integer",
- "datastore_version_id": "f597f709-70ef-474d-ac18-2c6abd35a758"
- },
- {
- "name": "innodb_open_files",
- "min": 10,
- "max": 4294967295,
- "restart_required": true,
- "type": "integer",
- "datastore_version_id": "f597f709-70ef-474d-ac18-2c6abd35a758"
- },
- {
- "name": "key_buffer_size",
- "min": 8,
- "max": 4294967295,
- "restart_required": false,
- "type": "integer",
- "datastore_version_id": "f597f709-70ef474d-ac18-2c6abd35a758"
- },
- {
- "name": "connect_timeout",
- "min": 2,
- "max": 31536000,
- "restart_required": false,
- "type": "integer",
- "datastore_version_id": "f597f709-70ef474d-ac18-2c6abd35a758"
- },
- {
- "type": "string",
- "name": "collation_connection",
- "datastore_version_id": "f597f709-70ef-474d-ac18-2c6abd35a758",
- "restart_required": false
- },
- {
- "type": "string",
- "name": "character_set_database",
- "datastore_version_id": "f597f709-70ef-474d-ac18-2c6abd35a758",
- "restart_required": false
- },
- {
- "name": "auto_increment_increment",
- "min": 1,
- "max": 65535,
- "restart_required": false,
- "type": "integer",
- "datastore_version_id": "f597f709-70ef-474d-ac18-2c6abd35a758"
- },
- {
- "name": "max_connect_errors",
- "min": 1,
- "max": 18446744073709552000,
- "restart_required": false,
- "type": "integer",
- "datastore_version_id": "f597f709-70ef-474d-ac18-2c6abd35a758"
- },
- {
- "type": "string",
- "name": "character_set_results",
- "datastore_version_id": "f597f709-70ef-474d-ac18-2c6abd35a758",
- "restart_required": false
- },
- {
- "name": "expire_logs_days",
- "min": 0,
- "max": 99,
- "restart_required": false,
- "type": "integer",
- "datastore_version_id": "f597f709-70ef-474d-ac18-2c6abd35a758"
- },
- {
- "name": "wait_timeout",
- "min": 1,
- "max": 31536000,
- "restart_required": false,
- "type": "integer",
- "datastore_version_id": "f597f709-70ef474d-ac18-2c6abd35a758"
- },
- {
- "name": "server_id",
- "min": 0,
- "max": 4294967295,
- "restart_required": false,
- "type": "integer",
- "datastore_version_id": "f597f709-70ef-474d-ac18-2c6abd35a758"
- }
- ]
-}
diff --git a/api-ref/source/samples/db-datastore-version-by-id-request-json-http.txt b/api-ref/source/samples/db-datastore-version-by-id-request-json-http.txt
deleted file mode 100644
index 35214c24..00000000
--- a/api-ref/source/samples/db-datastore-version-by-id-request-json-http.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-GET /v1.0/1234/datastores/a00000a0-00a0-0a00-00a0-000a000000aa/versions/b00000b0-00b0-0b00-00b0-000b000000bb HTTP/1.1
-User-Agent: python-troveclient
-Host: troveapi.org
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
diff --git a/api-ref/source/samples/db-datastore-version-by-id-response-json-http.txt b/api-ref/source/samples/db-datastore-version-by-id-response-json-http.txt
deleted file mode 100644
index 1274d93d..00000000
--- a/api-ref/source/samples/db-datastore-version-by-id-response-json-http.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Content-Length: 368
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-
diff --git a/api-ref/source/samples/db-datastore-version-by-id-response.json b/api-ref/source/samples/db-datastore-version-by-id-response.json
deleted file mode 100644
index 109204a8..00000000
--- a/api-ref/source/samples/db-datastore-version-by-id-response.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "version": {
- "datastore": "a00000a0-00a0-0a00-00a0-000a000000aa",
- "id": "b00000b0-00b0-0b00-00b0-000b000000bb",
- "links": [
- {
- "href": "https://troveapi.org/v1.0/1234/datastores/versions/b00000b0-00b0-0b00-00b0-000b000000bb",
- "rel": "self"
- },
- {
- "href": "https://troveapi.org/datastores/versions/b00000b0-00b0-0b00-00b0-000b000000bb",
- "rel": "bookmark"
- }
- ],
- "name": "5.5"
- }
-}
diff --git a/api-ref/source/samples/db-datastore-versions-list-request-json-http.txt b/api-ref/source/samples/db-datastore-versions-list-request-json-http.txt
deleted file mode 100644
index 4f6a1038..00000000
--- a/api-ref/source/samples/db-datastore-versions-list-request-json-http.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-GET /v1.0/1234/datastores/a00000a0-00a0-0a00-00a0-000a000000aa/versions HTTP/1.1
-User-Agent: python-troveclient
-Host: troveapi.org
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
diff --git a/api-ref/source/samples/db-datastore-versions-list-response-json-http.txt b/api-ref/source/samples/db-datastore-versions-list-response-json-http.txt
deleted file mode 100644
index c7a65337..00000000
--- a/api-ref/source/samples/db-datastore-versions-list-response-json-http.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Content-Length: 371
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-
diff --git a/api-ref/source/samples/db-datastore-versions-list-response.json b/api-ref/source/samples/db-datastore-versions-list-response.json
deleted file mode 100644
index a29e8412..00000000
--- a/api-ref/source/samples/db-datastore-versions-list-response.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "versions": [
- {
- "datastore": "a00000a0-00a0-0a00-00a0-000a000000aa",
- "id": "b00000b0-00b0-0b00-00b0-000b000000bb",
- "links": [
- {
- "href": "https://troveapi.org/v1.0/1234/datastores/versions/b00000b0-00b0-0b00-00b0-000b000000bb",
- "rel": "self"
- },
- {
- "href": "https://troveapi.org/datastores/versions/b00000b0-00b0-0b00-00b0-000b000000bb",
- "rel": "bookmark"
- }
- ],
- "name": "5.5"
- }
- ]
-}
diff --git a/api-ref/source/samples/db-datastores-list-request-json-http.txt b/api-ref/source/samples/db-datastores-list-request-json-http.txt
deleted file mode 100644
index 0ec55cb4..00000000
--- a/api-ref/source/samples/db-datastores-list-request-json-http.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-GET /v1.0/1234/datastores HTTP/1.1
-User-Agent: python-troveclient
-Host: troveapi.org
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
diff --git a/api-ref/source/samples/db-datastores-list-response-json-http.txt b/api-ref/source/samples/db-datastores-list-response-json-http.txt
deleted file mode 100644
index 18dbd95b..00000000
--- a/api-ref/source/samples/db-datastores-list-response-json-http.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Content-Length: 681
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-
diff --git a/api-ref/source/samples/db-datastores-list-response.json b/api-ref/source/samples/db-datastores-list-response.json
deleted file mode 100644
index 58da3cbd..00000000
--- a/api-ref/source/samples/db-datastores-list-response.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
- "datastores": [
- {
- "default_version": "b00000b0-00b0-0b00-00b0-000b000000bb",
- "id": "a00000a0-00a0-0a00-00a0-000a000000aa",
- "links": [
- {
- "href": "https://troveapi.org/v1.0/1234/datastores/a00000a0-00a0-0a00-00a0-000a000000aa",
- "rel": "self"
- },
- {
- "href": "https://troveapi.org/datastores/a00000a0-00a0-0a00-00a0-000a000000aa",
- "rel": "bookmark"
- }
- ],
- "name": "mysql",
- "versions": [
- {
- "id": "b00000b0-00b0-0b00-00b0-000b000000bb",
- "links": [
- {
- "href": "https://troveapi.org/v1.0/1234/datastores/versions/b00000b0-00b0-0b00-00b0-000b000000bb",
- "rel": "self"
- },
- {
- "href": "https://troveapi.org/datastores/versions/b00000b0-00b0-0b00-00b0-000b000000bb",
- "rel": "bookmark"
- }
- ],
- "name": "5.5"
- }
- ]
- }
- ]
-}
diff --git a/api-ref/source/samples/db-delete-config-group-request-json-http.txt b/api-ref/source/samples/db-delete-config-group-request-json-http.txt
deleted file mode 100644
index a4d2f0cf..00000000
--- a/api-ref/source/samples/db-delete-config-group-request-json-http.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-DELETE /v1.0/1234/configurations/692d8418-7a8f-47f1-8060-59846c6e024f HTTP/1.1
-User-Agent: python-example-client
-Host: openstack.example.com
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
diff --git a/api-ref/source/samples/db-delete-databases-request-json-http.txt b/api-ref/source/samples/db-delete-databases-request-json-http.txt
deleted file mode 100644
index 53885386..00000000
--- a/api-ref/source/samples/db-delete-databases-request-json-http.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-DELETE /v1.0/1234/instances/44b277eb-39be-4921-be31-3d61b43651d7/databases/testingdb HTTP/1.1
-User-Agent: python-troveclient
-Host: troveapi.org
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
diff --git a/api-ref/source/samples/db-delete-databases-response-json-http.txt b/api-ref/source/samples/db-delete-databases-response-json-http.txt
deleted file mode 100644
index 96905c86..00000000
--- a/api-ref/source/samples/db-delete-databases-response-json-http.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.1 202 Accepted
-Content-Type: application/json
-Content-Length: 0
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-
diff --git a/api-ref/source/samples/db-delete-instance-request-json-http.txt b/api-ref/source/samples/db-delete-instance-request-json-http.txt
deleted file mode 100644
index a16fdea6..00000000
--- a/api-ref/source/samples/db-delete-instance-request-json-http.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-DELETE /v1.0/1234/instances/44b277eb-39be-4921-be31-3d61b43651d7 HTTP/1.1
-User-Agent: python-troveclient
-Host: troveapi.org
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
diff --git a/api-ref/source/samples/db-delete-instance-response-json-http.txt b/api-ref/source/samples/db-delete-instance-response-json-http.txt
deleted file mode 100644
index 96905c86..00000000
--- a/api-ref/source/samples/db-delete-instance-response-json-http.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.1 202 Accepted
-Content-Type: application/json
-Content-Length: 0
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-
diff --git a/api-ref/source/samples/db-delete-root-request-json-http.txt b/api-ref/source/samples/db-delete-root-request-json-http.txt
deleted file mode 100644
index ab9ce8e2..00000000
--- a/api-ref/source/samples/db-delete-root-request-json-http.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-DELETE /v1.0/1234/instances/692d8418-7a8f-47f1-8060-59846c6e024f/root HTTP/1.1
-User-Agent: python-example-client
-Host: openstack.example.com
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
diff --git a/api-ref/source/samples/db-delete-users-request-json-http.txt b/api-ref/source/samples/db-delete-users-request-json-http.txt
deleted file mode 100644
index dde52446..00000000
--- a/api-ref/source/samples/db-delete-users-request-json-http.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-DELETE /v1.0/1234/instances/44b277eb-39be-4921-be31-3d61b43651d7/users/demouser HTTP/1.1
-User-Agent: python-troveclient
-Host: troveapi.org
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
diff --git a/api-ref/source/samples/db-delete-users-response-json-http.txt b/api-ref/source/samples/db-delete-users-response-json-http.txt
deleted file mode 100644
index 96905c86..00000000
--- a/api-ref/source/samples/db-delete-users-response-json-http.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.1 202 Accepted
-Content-Type: application/json
-Content-Length: 0
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-
diff --git a/api-ref/source/samples/db-detach-config-group-request-json-http.txt b/api-ref/source/samples/db-detach-config-group-request-json-http.txt
deleted file mode 100644
index 478e0493..00000000
--- a/api-ref/source/samples/db-detach-config-group-request-json-http.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-PUT /v1.0/1234/instances/4c93c73b-d6d0-47d7-b8c6-b699d19d7de9 HTTP/1.1
-User-Agent: python-example-client
-Host: openstack.example.com
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
diff --git a/api-ref/source/samples/db-detach-config-group-request.json b/api-ref/source/samples/db-detach-config-group-request.json
deleted file mode 100644
index 24b79afa..00000000
--- a/api-ref/source/samples/db-detach-config-group-request.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "instance": {}
-}
diff --git a/api-ref/source/samples/db-detach-config-group-response-json-http.txt b/api-ref/source/samples/db-detach-config-group-response-json-http.txt
deleted file mode 100644
index c7fabb46..00000000
--- a/api-ref/source/samples/db-detach-config-group-response-json-http.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.1 202 OK
-Content-Type: application/json
-Content-Length: 0
-Date: Mon, 13 Jul 2015 19:53:04 GMT
-
diff --git a/api-ref/source/samples/db-detach-replica-request-json-http.txt b/api-ref/source/samples/db-detach-replica-request-json-http.txt
deleted file mode 100644
index cea1a907..00000000
--- a/api-ref/source/samples/db-detach-replica-request-json-http.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-PATCH /v1.0/1234/instances/4c93c73b-d6d0-47d7-b8c6-b699d19d7de9 HTTP/1.1
-User-Agent: python-example-client
-Host: openstack.example.com
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
diff --git a/api-ref/source/samples/db-detach-replica-response-json-http.txt b/api-ref/source/samples/db-detach-replica-response-json-http.txt
deleted file mode 100644
index c7fabb46..00000000
--- a/api-ref/source/samples/db-detach-replica-response-json-http.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.1 202 OK
-Content-Type: application/json
-Content-Length: 0
-Date: Mon, 13 Jul 2015 19:53:04 GMT
-
diff --git a/api-ref/source/samples/db-disable-root-user-request-json-http.txt b/api-ref/source/samples/db-disable-root-user-request-json-http.txt
deleted file mode 100644
index 04702abe..00000000
--- a/api-ref/source/samples/db-disable-root-user-request-json-http.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-DELETE /v1.0/1234/instances/44b277eb-39be-4921-be31-3d61b43651d7/root HTTP/1.1
-User-Agent: python-troveclient
-Host: troveapi.org
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
diff --git a/api-ref/source/samples/db-disable-root-user-response-json-http.txt b/api-ref/source/samples/db-disable-root-user-response-json-http.txt
deleted file mode 100644
index 17632f6a..00000000
--- a/api-ref/source/samples/db-disable-root-user-response-json-http.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.1 204 No Content
-Content-Type: application/json
-Content-Length: 0
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-
diff --git a/api-ref/source/samples/db-enable-root-user-request-json-http.txt b/api-ref/source/samples/db-enable-root-user-request-json-http.txt
deleted file mode 100644
index c8bb697f..00000000
--- a/api-ref/source/samples/db-enable-root-user-request-json-http.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-POST /v1.0/1234/instances/44b277eb-39be-4921-be31-3d61b43651d7/root HTTP/1.1
-User-Agent: python-troveclient
-Host: troveapi.org
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
diff --git a/api-ref/source/samples/db-enable-root-user-response-json-http.txt b/api-ref/source/samples/db-enable-root-user-response-json-http.txt
deleted file mode 100644
index 918ea7f6..00000000
--- a/api-ref/source/samples/db-enable-root-user-response-json-http.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Content-Length: 47
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-
diff --git a/api-ref/source/samples/db-enable-root-user-response.json b/api-ref/source/samples/db-enable-root-user-response.json
deleted file mode 100644
index 4be60a59..00000000
--- a/api-ref/source/samples/db-enable-root-user-response.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "user": {
- "name": "root",
- "password": "12345"
- }
-}
diff --git a/api-ref/source/samples/db-faults-badRequest.json b/api-ref/source/samples/db-faults-badRequest.json
deleted file mode 100644
index 2b04f07d..00000000
--- a/api-ref/source/samples/db-faults-badRequest.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "badRequest": {
- "code": 400,
- "message": "Volume 'size' needs to be a positive integer value, -1.0 cannot be accepted."
- }
-}
diff --git a/api-ref/source/samples/db-faults-instanceFault.json b/api-ref/source/samples/db-faults-instanceFault.json
deleted file mode 100644
index e9b42d5c..00000000
--- a/api-ref/source/samples/db-faults-instanceFault.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "instanceFault": {
- "code": 500,
- "message": "The server has either erred or is incapable of performing the requested operation."
- }
-}
diff --git a/api-ref/source/samples/db-faults-itemNotFound.json b/api-ref/source/samples/db-faults-itemNotFound.json
deleted file mode 100644
index 6c731839..00000000
--- a/api-ref/source/samples/db-faults-itemNotFound.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "itemNotFound": {
- "code": 404,
- "message": "The resource could not be found."
- }
-}
diff --git a/api-ref/source/samples/db-get-default-instance-configuration-request-json-http.txt b/api-ref/source/samples/db-get-default-instance-configuration-request-json-http.txt
deleted file mode 100644
index 1ea97324..00000000
--- a/api-ref/source/samples/db-get-default-instance-configuration-request-json-http.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-GET /v1.0/1234/instances/44b277eb-39be-4921-be31-3d61b43651d7/configuration HTTP/1.1
-User-Agent: python-troveclient
-Host: troveapi.org
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
diff --git a/api-ref/source/samples/db-get-default-instance-configuration-response-json-http.txt b/api-ref/source/samples/db-get-default-instance-configuration-response-json-http.txt
deleted file mode 100644
index fc7243ce..00000000
--- a/api-ref/source/samples/db-get-default-instance-configuration-response-json-http.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Content-Length: 1135
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-
diff --git a/api-ref/source/samples/db-grant-user-access-request-json-http.txt b/api-ref/source/samples/db-grant-user-access-request-json-http.txt
deleted file mode 100644
index 32c7ac06..00000000
--- a/api-ref/source/samples/db-grant-user-access-request-json-http.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-PUT /v1.0/1234/instances/692d8418-7a8f-47f1-8060-59846c6e024f/users/exampleuser/databases HTTP/1.1
-User-Agent: python-example-client
-Host: ord.databases.api.rackspacecloud.com
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json \ No newline at end of file
diff --git a/api-ref/source/samples/db-grant-user-access-response-json-http.txt b/api-ref/source/samples/db-grant-user-access-response-json-http.txt
deleted file mode 100644
index af725ba3..00000000
--- a/api-ref/source/samples/db-grant-user-access-response-json-http.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-HTTP/1.1 202 Accepted
-Content-Type: application/json
-Content-Length: 0
-Date: Wed, 27 Jun 2012 23:11:19 GMT \ No newline at end of file
diff --git a/api-ref/source/samples/db-instance-disable-log-response.json b/api-ref/source/samples/db-instance-disable-log-response.json
deleted file mode 100644
index b17d61de..00000000
--- a/api-ref/source/samples/db-instance-disable-log-response.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "log": {
- "name": "general",
- "type": "USER",
- "status": "Disabled",
- "published": "4096",
- "pending": "0",
- "container": "data_logs",
- "prefix": "5e9e616c-1827-45f5-a487-679084d82f7e/mysql-general/",
- "metafile": "5e9e616c-1827-45f5-a487-679084d82f7e/mysql-general_metafile"
- }
-}
diff --git a/api-ref/source/samples/db-instance-discard-log-response.json b/api-ref/source/samples/db-instance-discard-log-response.json
deleted file mode 100644
index 965d7c13..00000000
--- a/api-ref/source/samples/db-instance-discard-log-response.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "log": {
- "name": "general",
- "type": "USER",
- "status": "Ready",
- "published": "0",
- "pending": "128",
- "container": "None",
- "prefix": "None",
- "metafile": "5e9e616c-1827-45f5-a487-679084d82f7e/mysql-general_metafile"
- }
-}
diff --git a/api-ref/source/samples/db-instance-eject-replica-request-json-http.txt b/api-ref/source/samples/db-instance-eject-replica-request-json-http.txt
deleted file mode 100644
index cf3652d1..00000000
--- a/api-ref/source/samples/db-instance-eject-replica-request-json-http.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-POST /v1.0/1234/instances/13d940c4-70bb-4ff4-8866-6ee9ab5e5cae/action HTTP/1.1
-User-Agent: python-example-client
-Host: openstack.example.com
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json \ No newline at end of file
diff --git a/api-ref/source/samples/db-instance-enable-log-response.json b/api-ref/source/samples/db-instance-enable-log-response.json
deleted file mode 100644
index db73af9c..00000000
--- a/api-ref/source/samples/db-instance-enable-log-response.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "log": {
- "name": "general",
- "type": "USER",
- "status": "Eanbled",
- "published": "0",
- "pending": "0",
- "container": "None",
- "prefix": "None",
- "metafile": "5e9e616c-1827-45f5-a487-679084d82f7e/mysql-general_metafile"
- }
-}
diff --git a/api-ref/source/samples/db-instance-promote-replica-request-json-http.txt b/api-ref/source/samples/db-instance-promote-replica-request-json-http.txt
deleted file mode 100644
index cf3652d1..00000000
--- a/api-ref/source/samples/db-instance-promote-replica-request-json-http.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-POST /v1.0/1234/instances/13d940c4-70bb-4ff4-8866-6ee9ab5e5cae/action HTTP/1.1
-User-Agent: python-example-client
-Host: openstack.example.com
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json \ No newline at end of file
diff --git a/api-ref/source/samples/db-instance-publish-log-response.json b/api-ref/source/samples/db-instance-publish-log-response.json
deleted file mode 100644
index b9cfdfb0..00000000
--- a/api-ref/source/samples/db-instance-publish-log-response.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "log": {
- "name": "general",
- "type": "USER",
- "status": "Published",
- "published": "128",
- "pending": "0",
- "container": "data_logs",
- "prefix": "5e9e616c-1827-45f5-a487-679084d82f7e/mysql-general/",
- "metafile": "5e9e616c-1827-45f5-a487-679084d82f7e/mysql-general_metafile"
- }
-}
diff --git a/api-ref/source/samples/db-instance-reboot-request-json-http.txt b/api-ref/source/samples/db-instance-reboot-request-json-http.txt
deleted file mode 100644
index bf8f24d3..00000000
--- a/api-ref/source/samples/db-instance-reboot-request-json-http.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-POST /v1.0/1234/mgmt/instances/44b277eb-39be-4921-be31-3d61b43651d7/action HTTP/1.1
-User-Agent: python-troveclient
-Host: troveapi.org
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
diff --git a/api-ref/source/samples/db-instance-reboot-response-json-http.txt b/api-ref/source/samples/db-instance-reboot-response-json-http.txt
deleted file mode 100644
index 96905c86..00000000
--- a/api-ref/source/samples/db-instance-reboot-response-json-http.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.1 202 Accepted
-Content-Type: application/json
-Content-Length: 0
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-
diff --git a/api-ref/source/samples/db-instance-resize-flavor-request-json-http.txt b/api-ref/source/samples/db-instance-resize-flavor-request-json-http.txt
deleted file mode 100644
index 715157bb..00000000
--- a/api-ref/source/samples/db-instance-resize-flavor-request-json-http.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-POST /v1.0/1234/instances/44b277eb-39be-4921-be31-3d61b43651d7/action HTTP/1.1
-User-Agent: python-troveclient
-Host: troveapi.org
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
diff --git a/api-ref/source/samples/db-instance-resize-flavor-response-json-http.txt b/api-ref/source/samples/db-instance-resize-flavor-response-json-http.txt
deleted file mode 100644
index 96905c86..00000000
--- a/api-ref/source/samples/db-instance-resize-flavor-response-json-http.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.1 202 Accepted
-Content-Type: application/json
-Content-Length: 0
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-
diff --git a/api-ref/source/samples/db-instance-resize-instance-request-json-http.txt b/api-ref/source/samples/db-instance-resize-instance-request-json-http.txt
deleted file mode 100644
index c1dd4c53..00000000
--- a/api-ref/source/samples/db-instance-resize-instance-request-json-http.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-POST /v1.0/1234/instances/23a3d4fb-3731-497b-afd4-bf25bde2b5fc/action HTTP/1.1
-User-Agent: python-example-client
-Host: ord.databases.api.rackspacecloud.com
-X-Auth-Token: 2eeb3252-0164-40f5-8fb7-85df5faa2698
-Accept: application/json
-Content-Type: application/json \ No newline at end of file
diff --git a/api-ref/source/samples/db-instance-resize-instance-request.json b/api-ref/source/samples/db-instance-resize-instance-request.json
deleted file mode 100644
index 010daa79..00000000
--- a/api-ref/source/samples/db-instance-resize-instance-request.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "resize": {
- "flavorRef": "https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/2"
- }
-}
diff --git a/api-ref/source/samples/db-instance-resize-instance-response-json-http.txt b/api-ref/source/samples/db-instance-resize-instance-response-json-http.txt
deleted file mode 100644
index 3e755720..00000000
--- a/api-ref/source/samples/db-instance-resize-instance-response-json-http.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-HTTP/1.1 202 Accepted
-Content-Type: text/plain; charset=UTF-8
-Content-Length: 58
-Date: Mon, 06 Feb 2012 21:28:10 GMT \ No newline at end of file
diff --git a/api-ref/source/samples/db-instance-resize-volume-request-json-http.txt b/api-ref/source/samples/db-instance-resize-volume-request-json-http.txt
deleted file mode 100644
index 715157bb..00000000
--- a/api-ref/source/samples/db-instance-resize-volume-request-json-http.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-POST /v1.0/1234/instances/44b277eb-39be-4921-be31-3d61b43651d7/action HTTP/1.1
-User-Agent: python-troveclient
-Host: troveapi.org
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
diff --git a/api-ref/source/samples/db-instance-resize-volume-response-json-http.txt b/api-ref/source/samples/db-instance-resize-volume-response-json-http.txt
deleted file mode 100644
index 96905c86..00000000
--- a/api-ref/source/samples/db-instance-resize-volume-response-json-http.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.1 202 Accepted
-Content-Type: application/json
-Content-Length: 0
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-
diff --git a/api-ref/source/samples/db-instance-restart-request-json-http.txt b/api-ref/source/samples/db-instance-restart-request-json-http.txt
deleted file mode 100644
index 715157bb..00000000
--- a/api-ref/source/samples/db-instance-restart-request-json-http.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-POST /v1.0/1234/instances/44b277eb-39be-4921-be31-3d61b43651d7/action HTTP/1.1
-User-Agent: python-troveclient
-Host: troveapi.org
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
diff --git a/api-ref/source/samples/db-instance-restart-response-json-http.txt b/api-ref/source/samples/db-instance-restart-response-json-http.txt
deleted file mode 100644
index 96905c86..00000000
--- a/api-ref/source/samples/db-instance-restart-response-json-http.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.1 202 Accepted
-Content-Type: application/json
-Content-Length: 0
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-
diff --git a/api-ref/source/samples/db-instance-show-log-response.json b/api-ref/source/samples/db-instance-show-log-response.json
deleted file mode 100644
index 23ac0128..00000000
--- a/api-ref/source/samples/db-instance-show-log-response.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "log": {
- "name": "general",
- "type": "USER",
- "status": "Partial",
- "published": "128",
- "pending": "4096",
- "container": "data_logs",
- "prefix": "5e9e616c-1827-45f5-a487-679084d82f7e/mysql-general/",
- "metafile": "5e9e616c-1827-45f5-a487-679084d82f7e/mysql-general_metafile"
- }
-}
diff --git a/api-ref/source/samples/db-instance-status-detail-request-json-http.txt b/api-ref/source/samples/db-instance-status-detail-request-json-http.txt
deleted file mode 100644
index 271e1174..00000000
--- a/api-ref/source/samples/db-instance-status-detail-request-json-http.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-GET /v1.0/1234/instances/44b277eb-39be-4921-be31-3d61b43651d7 HTTP/1.1
-User-Agent: python-troveclient
-Host: troveapi.org
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
diff --git a/api-ref/source/samples/db-instance-status-detail-response-json-http.txt b/api-ref/source/samples/db-instance-status-detail-response-json-http.txt
deleted file mode 100644
index ab457b30..00000000
--- a/api-ref/source/samples/db-instance-status-detail-response-json-http.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Content-Length: 735
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-
diff --git a/api-ref/source/samples/db-instance-status-detail-response.json b/api-ref/source/samples/db-instance-status-detail-response.json
deleted file mode 100644
index 64828e80..00000000
--- a/api-ref/source/samples/db-instance-status-detail-response.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
- "instance": {
- "created": "2019-12-14T08:08:22",
- "datastore": {
- "type": "mysql",
- "version": "5.5"
- },
- "flavor": {
- "id": "1",
- "links": [
- {
- "href": "https://troveapi.org/v1.0/1234/flavors/1",
- "rel": "self"
- },
- {
- "href": "https://troveapi.org/flavors/1",
- "rel": "bookmark"
- }
- ]
- },
- "hostname": "e09ad9a3f73309469cf1f43d11e79549caf9acf2.troveexampledb.com",
- "id": "44b277eb-39be-4921-be31-3d61b43651d7",
- "links": [
- {
- "href": "https://troveapi.org/v1.0/1234/instances/44b277eb-39be-4921-be31-3d61b43651d7",
- "rel": "self"
- },
- {
- "href": "https://troveapi.org/instances/44b277eb-39be-4921-be31-3d61b43651d7",
- "rel": "bookmark"
- }
- ],
- "name": "json_rack_instance",
- "region": "RegionOne",
- "service_status_updated": "2019-12-14T08:51:58",
- "status": "HEALTHY",
- "updated": "2019-12-14T08:08:30",
- "volume": {
- "size": 2,
- "used": 0.16
- }
- }
-}
diff --git a/api-ref/source/samples/db-instances-index-pagination-request-json-http.txt b/api-ref/source/samples/db-instances-index-pagination-request-json-http.txt
deleted file mode 100644
index e22951cf..00000000
--- a/api-ref/source/samples/db-instances-index-pagination-request-json-http.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-GET /v1.0/1234/instances?limit=2 HTTP/1.1
-User-Agent: python-troveclient
-Host: troveapi.org
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
diff --git a/api-ref/source/samples/db-instances-index-pagination-response-json-http.txt b/api-ref/source/samples/db-instances-index-pagination-response-json-http.txt
deleted file mode 100644
index b1c87ce6..00000000
--- a/api-ref/source/samples/db-instances-index-pagination-response-json-http.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Content-Length: 1297
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-
diff --git a/api-ref/source/samples/db-instances-index-pagination-response.json b/api-ref/source/samples/db-instances-index-pagination-response.json
deleted file mode 100644
index 85569350..00000000
--- a/api-ref/source/samples/db-instances-index-pagination-response.json
+++ /dev/null
@@ -1,78 +0,0 @@
-{
- "instances": [
- {
- "datastore": {
- "type": "mysql",
- "version": "5.5"
- },
- "flavor": {
- "id": "1",
- "links": [
- {
- "href": "https://troveapi.org/v1.0/1234/flavors/1",
- "rel": "self"
- },
- {
- "href": "https://troveapi.org/flavors/1",
- "rel": "bookmark"
- }
- ]
- },
- "hostname": "e09ad9a3f73309469cf1f43d11e79549caf9acf2.troveexampledb.com",
- "id": "43a6ea86-e959-4735-9e46-a6a5d4a2d80f",
- "links": [
- {
- "href": "https://troveapi.org/v1.0/1234/instances/43a6ea86-e959-4735-9e46-a6a5d4a2d80f",
- "rel": "self"
- },
- {
- "href": "https://troveapi.org/instances/43a6ea86-e959-4735-9e46-a6a5d4a2d80f",
- "rel": "bookmark"
- }
- ],
- "name": "The Third Instance",
- "region": "RegionOne",
- "status": "ACTIVE",
- "volume": {
- "size": 2
- }
- },
- {
- "datastore": {
- "type": "mysql",
- "version": "5.5"
- },
- "flavor": {
- "id": "1",
- "links": [
- {
- "href": "https://troveapi.org/v1.0/1234/flavors/1",
- "rel": "self"
- },
- {
- "href": "https://troveapi.org/flavors/1",
- "rel": "bookmark"
- }
- ]
- },
- "hostname": "e09ad9a3f73309469cf1f43d11e79549caf9acf2.troveexampledb.com",
- "id": "44b277eb-39be-4921-be31-3d61b43651d7",
- "links": [
- {
- "href": "https://troveapi.org/v1.0/1234/instances/44b277eb-39be-4921-be31-3d61b43651d7",
- "rel": "self"
- },
- {
- "href": "https://troveapi.org/instances/44b277eb-39be-4921-be31-3d61b43651d7",
- "rel": "bookmark"
- }
- ],
- "name": "json_rack_instance",
- "region": "RegionOne",
- "status": "ACTIVE",
- "volume": {
- "size": 2
- }
- }
- ]
-}
diff --git a/api-ref/source/samples/db-instances-index-request-json-http.txt b/api-ref/source/samples/db-instances-index-request-json-http.txt
deleted file mode 100644
index b8cc0613..00000000
--- a/api-ref/source/samples/db-instances-index-request-json-http.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-GET /v1.0/1234/instances HTTP/1.1
-User-Agent: python-troveclient
-Host: troveapi.org
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
diff --git a/api-ref/source/samples/db-instances-index-response-json-http.txt b/api-ref/source/samples/db-instances-index-response-json-http.txt
deleted file mode 100644
index dd2cde67..00000000
--- a/api-ref/source/samples/db-instances-index-response-json-http.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Content-Length: 656
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-
diff --git a/api-ref/source/samples/db-instances-index-response.json b/api-ref/source/samples/db-instances-index-response.json
deleted file mode 100644
index ed401281..00000000
--- a/api-ref/source/samples/db-instances-index-response.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
- "instances": [
- {
- "datastore": {
- "type": "mysql",
- "version": "5.5"
- },
- "flavor": {
- "id": "1",
- "links": [
- {
- "href": "https://troveapi.org/v1.0/1234/flavors/1",
- "rel": "self"
- },
- {
- "href": "https://troveapi.org/flavors/1",
- "rel": "bookmark"
- }
- ]
- },
- "hostname": "e09ad9a3f73309469cf1f43d11e79549caf9acf2.troveexampledb.com",
- "id": "44b277eb-39be-4921-be31-3d61b43651d7",
- "links": [
- {
- "href": "https://troveapi.org/v1.0/1234/instances/44b277eb-39be-4921-be31-3d61b43651d7",
- "rel": "self"
- },
- {
- "href": "https://troveapi.org/instances/44b277eb-39be-4921-be31-3d61b43651d7",
- "rel": "bookmark"
- }
- ],
- "name": "json_rack_instance",
- "region": "RegionOne",
- "status": "HEALTHY",
- "volume": {
- "size": 2
- }
- }
- ]
-}
diff --git a/api-ref/source/samples/db-list-cfg-defaults-request-json-http.txt b/api-ref/source/samples/db-list-cfg-defaults-request-json-http.txt
deleted file mode 100644
index bb84c098..00000000
--- a/api-ref/source/samples/db-list-cfg-defaults-request-json-http.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-GET /v1.0/1234/instances/instance_1 HTTP/1.1
-User-Agent: python-example-client
-Host: openstack.example.com
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
diff --git a/api-ref/source/samples/db-list-cfg-defaults-response-json-http.txt b/api-ref/source/samples/db-list-cfg-defaults-response-json-http.txt
deleted file mode 100644
index dd38b48f..00000000
--- a/api-ref/source/samples/db-list-cfg-defaults-response-json-http.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Content-Length: 1559
-Date: Wed, 08 Jul 2015 19:53:04 GMT
-
diff --git a/api-ref/source/samples/db-list-cfg-defaults-response.json b/api-ref/source/samples/db-list-cfg-defaults-response.json
deleted file mode 100644
index c506d3aa..00000000
--- a/api-ref/source/samples/db-list-cfg-defaults-response.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
- "instance": {
- "configuration": {
- "basedir": "/usr",
- "connect_timeout": 15,
- "datadir": "/var/lib/mysql/data",
- "default_storage_engine": "innodb",
- "innodb_buffer_pool_size": "150M",
- "innodb_data_file_path": "ibdata1:10M:autoextend",
- "innodb_file_per_table": 1,
- "innodb_log_buffer_size": "25M",
- "innodb_log_file_size": "50M",
- "innodb_log_files_in_group": 2,
- "join_buffer_size": "1M",
- "key_buffer_size": "50M",
- "local-infile": 0,
- "max_allowed_packet": "1024K",
- "max_connections": 100,
- "max_heap_table_size": "16M",
- "max_user_connections": 100,
- "myisam-recover-options": "BACKUP,FORCE",
- "open_files_limit": 512,
- "performance_schema": "ON",
- "pid_file": "/var/run/mysqld/mysqld.pid",
- "socket": "/var/run/mysqld/mysqld.sock",
- "port": "3306",
- "query_cache_limit": "1M",
- "query_cache_size": "8M",
- "query_cache_type": 1,
- "read_buffer_size": "512K",
- "read_rnd_buffer_size": "512K",
- "server_id": 271898715,
- "skip-external-locking": 1,
- "sort_buffer_size": "1M",
- "table_definition_cache": 256,
- "table_open_cache": 256,
- "thread_cache_size": "4",
- "thread_stack": "192K",
- "tmp_table_size": "16M",
- "tmpdir": "/var/tmp",
- "user": "mysql",
- "wait_timeout": "120"
- }
- }
-}
diff --git a/api-ref/source/samples/db-list-cfg-groups-request-json-http.txt b/api-ref/source/samples/db-list-cfg-groups-request-json-http.txt
deleted file mode 100644
index f7812e9e..00000000
--- a/api-ref/source/samples/db-list-cfg-groups-request-json-http.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-GET /v1.0/1234/configurations HTTP/1.1
-User-Agent: python-example-client
-Host: openstack.example.com
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
diff --git a/api-ref/source/samples/db-list-cfg-groups-response-json-http.txt b/api-ref/source/samples/db-list-cfg-groups-response-json-http.txt
deleted file mode 100644
index 22bba6af..00000000
--- a/api-ref/source/samples/db-list-cfg-groups-response-json-http.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Content-Length: 426
-Date: Tue, 07 Jul 2012 19:53:04 GMT
-
diff --git a/api-ref/source/samples/db-list-databases-pagination-request-json-http.txt b/api-ref/source/samples/db-list-databases-pagination-request-json-http.txt
deleted file mode 100644
index fffc8b94..00000000
--- a/api-ref/source/samples/db-list-databases-pagination-request-json-http.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-GET /v1.0/1234/instances/44b277eb-39be-4921-be31-3d61b43651d7/databases?limit=1 HTTP/1.1
-User-Agent: python-troveclient
-Host: troveapi.org
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
diff --git a/api-ref/source/samples/db-list-databases-pagination-response-json-http.txt b/api-ref/source/samples/db-list-databases-pagination-response-json-http.txt
deleted file mode 100644
index 6f0f401b..00000000
--- a/api-ref/source/samples/db-list-databases-pagination-response-json-http.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Content-Length: 192
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-
diff --git a/api-ref/source/samples/db-list-databases-pagination-response.json b/api-ref/source/samples/db-list-databases-pagination-response.json
deleted file mode 100644
index 072e43ee..00000000
--- a/api-ref/source/samples/db-list-databases-pagination-response.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "databases": [
- {
- "name": "anotherdb"
- }
- ],
- "links": [
- {
- "href": "https://troveapi.org/v1.0/1234/instances/44b277eb-39be-4921-be31-3d61b43651d7/databases?limit=1&marker=anotherdb",
- "rel": "next"
- }
- ]
-}
diff --git a/api-ref/source/samples/db-list-databases-request-json-http.txt b/api-ref/source/samples/db-list-databases-request-json-http.txt
deleted file mode 100644
index 9eafdb20..00000000
--- a/api-ref/source/samples/db-list-databases-request-json-http.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-GET /v1.0/1234/instances/44b277eb-39be-4921-be31-3d61b43651d7/databases HTTP/1.1
-User-Agent: python-troveclient
-Host: troveapi.org
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
diff --git a/api-ref/source/samples/db-list-databases-response-json-http.txt b/api-ref/source/samples/db-list-databases-response-json-http.txt
deleted file mode 100644
index 3a6576af..00000000
--- a/api-ref/source/samples/db-list-databases-response-json-http.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Content-Length: 129
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-
diff --git a/api-ref/source/samples/db-list-databases-response.json b/api-ref/source/samples/db-list-databases-response.json
deleted file mode 100644
index f2d6ffd8..00000000
--- a/api-ref/source/samples/db-list-databases-response.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "databases": [
- {
- "name": "anotherdb"
- },
- {
- "name": "nextround"
- },
- {
- "name": "oneMoreDB"
- },
- {
- "name": "sampledb"
- },
- {
- "name": "testingdb"
- }
- ]
-}
diff --git a/api-ref/source/samples/db-list-datastore-versions-request-json-http.txt b/api-ref/source/samples/db-list-datastore-versions-request-json-http.txt
deleted file mode 100644
index 0763e521..00000000
--- a/api-ref/source/samples/db-list-datastore-versions-request-json-http.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-GET /v1.0/1234/datastores/mysql/versions HTTP/1.1
-User-Agent: python-example-client
-Host: openstack.example.com
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
diff --git a/api-ref/source/samples/db-list-datastore-versions-response-json-http.txt b/api-ref/source/samples/db-list-datastore-versions-response-json-http.txt
deleted file mode 100644
index 519dfba1..00000000
--- a/api-ref/source/samples/db-list-datastore-versions-response-json-http.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Content-Length: 580
-Date: Tue, 23 Jun 2015 21:58:13 GMT
diff --git a/api-ref/source/samples/db-list-datastore-versions.json b/api-ref/source/samples/db-list-datastore-versions.json
deleted file mode 100644
index c1fc53de..00000000
--- a/api-ref/source/samples/db-list-datastore-versions.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
- "name": "5.7",
- "links": [
- {
- "href": "https://10.240.28.38:8779/v1.0/27bee406abb5486e81ef3ff4382aabaf/datastores/versions/2dc7faa0-efff-4c2b-8cff-bcd949c518a5",
- "rel": "self"
- },
- {
- "href": "https://10.240.28.38:8779/datastores/versions/2dc7faa0-efff-4c2b-8cff-bcd949c518a5",
- "rel": "bookmark"
- }
- ],
- "image": "b69fbd9e-b31d-46ff-8afb-cbf452f6f835",
- "active": 1,
- "datastore": "3a8968d8-e5f5-4452-83ca-f6c90b5de06a",
- "packages": "mysql-server-5.7",
- "id": "2dc7faa0-efff-4c2b-8cff-bcd949c518a5"
-}
diff --git a/api-ref/source/samples/db-list-parameters-request-json-http.txt b/api-ref/source/samples/db-list-parameters-request-json-http.txt
deleted file mode 100644
index 8a07a796..00000000
--- a/api-ref/source/samples/db-list-parameters-request-json-http.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-GET /v1.0/1234/datastores/versions/692d8418-7a8f-47f1-8060-59846c6e024f/parameters HTTP/1.1
-User-Agent: python-example-client
-Host: openstack.example.com
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
diff --git a/api-ref/source/samples/db-list-parameters-response-json-http.txt b/api-ref/source/samples/db-list-parameters-response-json-http.txt
deleted file mode 100644
index 2f37db26..00000000
--- a/api-ref/source/samples/db-list-parameters-response-json-http.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Content-Length: 8454
-Date: Fri, 12 Jun 2015 21:58:13 GMT
diff --git a/api-ref/source/samples/db-list-parameters-response.json b/api-ref/source/samples/db-list-parameters-response.json
deleted file mode 100644
index 7f9153c8..00000000
--- a/api-ref/source/samples/db-list-parameters-response.json
+++ /dev/null
@@ -1,258 +0,0 @@
-{
- "configuration-parameters": [
- {
- "name": "myisam_sort_buffer_size",
- "min": 4096,
- "max": 18446744073709552000,
- "restart_required": false,
- "type": "integer",
- "datastore_version_id": "f597f709-70ef-474d-ac18-2c6abd35a758"
- },
- {
- "name": "sync_binlog",
- "min": 0,
- "max": 4294967295,
- "restart_required": false,
- "type": "integer",
- "datastore_version_id": "f597f709-70ef-474d-ac18-2c6abd35a758"
- },
- {
- "name": "max_allowed_packet",
- "min": 1024,
- "max": 1073741824,
- "restart_required": false,
- "type": "integer",
- "datastore_version_id": "f597f709-70ef-474d-ac18-2c6abd35a758"
- },
- {
- "type": "string",
- "name": "character_set_connection",
- "datastore_version_id": "f597f709-70ef-474d-ac18-2c6abd35a758",
- "restart_required": false
- },
- {
- "name": "autocommit",
- "min": 0,
- "max": 1,
- "restart_required": false,
- "type": "integer",
- "datastore_version_id": "f597f709-70ef-474d-ac18-2c6abd35a758"
- },
- {
- "type": "string",
- "name": "character_set_client",
- "datastore_version_id": "f597f709-70ef474d-ac18-2c6abd35a758",
- "restart_required": false
- },
- {
- "name": "join_buffer_size",
- "min": 128,
- "max": 18446744073709548000,
- "restart_required": false,
- "type": "integer",
- "datastore_version_id": "f597f709-70ef-474d-ac18-2c6abd35a758"
- },
- {
- "name": "local_infile",
- "min": 0,
- "max": 1,
- "restart_required": false,
- "type": "integer",
- "datastore_version_id": "f597f709-70ef-474d-ac18-2c6abd35a758"
- },
- {
- "name": "auto_increment_offset",
- "min": 1,
- "max": 65535,
- "restart_required": false,
- "type": "integer",
- "datastore_version_id": "f597f709-70ef-474d-ac18-2c6abd35a758"
- },
- {
- "name": "max_connections",
- "min": 1,
- "max": 100000,
- "restart_required": false,
- "type": "integer",
- "datastore_version_id": "f597f709-70ef-474d-ac18-2c6abd35a758"
- },
- {
- "name": "bulk_insert_buffer_size",
- "min": 0,
- "max": 18446744073709552000,
- "restart_required": false,
- "type": "integer",
- "datastore_version_id": "f597f709-70ef474dac18-2c6abd35a758"
- },
- {
- "name": "sort_buffer_size",
- "min": 32768,
- "max": 18446744073709552000,
- "restart_required": false,
- "type": "integer",
- "datastore_version_id": "f597f709-70ef-474d-ac18-2c6abd35a758"
- },
- {
- "name": "innodb_log_buffer_size",
- "min": 262144,
- "max": 4294967295,
- "restart_required": true,
- "type": "integer",
- "datastore_version_id": "f597f709-70ef-474d-ac18-2c6abd35a758"
- },
- {
- "name": "innodb_file_per_table",
- "min": 0,
- "max": 1,
- "restart_required": false,
- "type": "integer",
- "datastore_version_id": "f597f709-70ef-474d-ac18-2c6abd35a758"
- },
- {
- "type": "string",
- "name": "character_set_server",
- "datastore_version_id": "f597f709-70ef-474d-ac18-2c6abd35a758",
- "restart_required": false
- },
- {
- "name": "innodb_buffer_pool_size",
- "min": 5242880,
- "max": 18446744073709552000,
- "restart_required": true,
- "type": "integer",
- "datastore_version_id": "f597f709-70ef474dac18-2c6abd35a758"
- },
- {
- "type": "string",
- "name": "collation_server",
- "datastore_version_id": "f597f709-70ef-474d-ac18-2c6abd35a758",
- "restart_required": false
- },
- {
- "type": "string",
- "name": "character_set_filesystem",
- "datastore_version_id": "f597f709-70ef-474d-ac18-2c6abd35a758",
- "restart_required": false
- },
- {
- "type": "string",
- "name": "collation_database",
- "datastore_version_id": "f597f709-70ef474d-ac18-2c6abd35a758",
- "restart_required": false
- },
- {
- "name": "innodb_flush_log_at_trx_commit",
- "min": 0,
- "max": 2,
- "restart_required": false,
- "type": "integer",
- "datastore_version_id": "f597f709-70ef-474d-ac18-2c6abd35a758"
- },
- {
- "name": "interactive_timeout",
- "min": 1,
- "max": 65535,
- "restart_required": false,
- "type": "integer",
- "datastore_version_id": "f597f709-70ef-474d-ac18-2c6abd35a758"
- },
- {
- "name": "max_user_connections",
- "min": 0,
- "max": 4294967295,
- "restart_required": false,
- "type": "integer",
- "datastore_version_id": "f597f709-70ef-474d-ac18-2c6abd35a758"
- },
- {
- "name": "innodb_thread_concurrency",
- "min": 0,
- "max": 1000,
- "restart_required": false,
- "type": "integer",
- "datastore_version_id": "f597f709-70ef-474d-ac18-2c6abd35a758"
- },
- {
- "name": "innodb_open_files",
- "min": 10,
- "max": 4294967295,
- "restart_required": true,
- "type": "integer",
- "datastore_version_id": "f597f709-70ef-474d-ac18-2c6abd35a758"
- },
- {
- "name": "key_buffer_size",
- "min": 8,
- "max": 4294967295,
- "restart_required": false,
- "type": "integer",
- "datastore_version_id": "f597f709-70ef474d-ac18-2c6abd35a758"
- },
- {
- "name": "connect_timeout",
- "min": 2,
- "max": 31536000,
- "restart_required": false,
- "type": "integer",
- "datastore_version_id": "f597f709-70ef474d-ac18-2c6abd35a758"
- },
- {
- "type": "string",
- "name": "collation_connection",
- "datastore_version_id": "f597f709-70ef-474d-ac18-2c6abd35a758",
- "restart_required": false
- },
- {
- "type": "string",
- "name": "character_set_database",
- "datastore_version_id": "f597f709-70ef-474d-ac18-2c6abd35a758",
- "restart_required": false
- },
- {
- "name": "auto_increment_increment",
- "min": 1,
- "max": 65535,
- "restart_required": false,
- "type": "integer",
- "datastore_version_id": "f597f709-70ef-474d-ac18-2c6abd35a758"
- },
- {
- "name": "max_connect_errors",
- "min": 1,
- "max": 18446744073709552000,
- "restart_required": false,
- "type": "integer",
- "datastore_version_id": "f597f709-70ef-474d-ac18-2c6abd35a758"
- },
- {
- "type": "string",
- "name": "character_set_results",
- "datastore_version_id": "f597f709-70ef-474d-ac18-2c6abd35a758",
- "restart_required": false
- },
- {
- "name": "expire_logs_days",
- "min": 0,
- "max": 99,
- "restart_required": false,
- "type": "integer",
- "datastore_version_id": "f597f709-70ef-474d-ac18-2c6abd35a758"
- },
- {
- "name": "wait_timeout",
- "min": 1,
- "max": 31536000,
- "restart_required": false,
- "type": "integer",
- "datastore_version_id": "f597f709-70ef474d-ac18-2c6abd35a758"
- },
- {
- "name": "server_id",
- "min": 0,
- "max": 4294967295,
- "restart_required": false,
- "type": "integer",
- "datastore_version_id": "f597f709-70ef-474d-ac18-2c6abd35a758"
- }
- ]
-}
diff --git a/api-ref/source/samples/db-list-user-access-request-json-http.txt b/api-ref/source/samples/db-list-user-access-request-json-http.txt
deleted file mode 100644
index 1e0f1df6..00000000
--- a/api-ref/source/samples/db-list-user-access-request-json-http.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-GET /v1.0/1234/instances/692d8418-7a8f-47f1-8060-59846c6e024f/users/exampleuser/databases HTTP/1.1
-User-Agent: python-example-client
-Host: ord.databases.api.rackspacecloud.com
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json \ No newline at end of file
diff --git a/api-ref/source/samples/db-list-user-access-response-json-http.txt b/api-ref/source/samples/db-list-user-access-response-json-http.txt
deleted file mode 100644
index 54cba76d..00000000
--- a/api-ref/source/samples/db-list-user-access-response-json-http.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Content-Length: 0
-Date: Wed, 27 Jun 2012 23:11:19 GMT \ No newline at end of file
diff --git a/api-ref/source/samples/db-list-user-access-response.json b/api-ref/source/samples/db-list-user-access-response.json
deleted file mode 100644
index 38c6b9db..00000000
--- a/api-ref/source/samples/db-list-user-access-response.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "databases": [
- {
- "name": "databaseA"
- },
- {
- "name": "databaseB"
- }
- ]
-}
diff --git a/api-ref/source/samples/db-list-user-dbs-request-json-http.txt b/api-ref/source/samples/db-list-user-dbs-request-json-http.txt
deleted file mode 100644
index f6b1108c..00000000
--- a/api-ref/source/samples/db-list-user-dbs-request-json-http.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-GET /v1.0/1234/instances/692d8418-7a8f-47f1-8060-59846c6e024f/users/exampleuser HTTP/1.1
-User-Agent: python-example-client
-Host: ord.databases.api.rackspacecloud.com
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json \ No newline at end of file
diff --git a/api-ref/source/samples/db-list-user-dbs-response-json-http.txt b/api-ref/source/samples/db-list-user-dbs-response-json-http.txt
deleted file mode 100644
index 54cba76d..00000000
--- a/api-ref/source/samples/db-list-user-dbs-response-json-http.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Content-Length: 0
-Date: Wed, 27 Jun 2012 23:11:19 GMT \ No newline at end of file
diff --git a/api-ref/source/samples/db-list-users-pagination-request-json-http.txt b/api-ref/source/samples/db-list-users-pagination-request-json-http.txt
deleted file mode 100644
index 36837fbd..00000000
--- a/api-ref/source/samples/db-list-users-pagination-request-json-http.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-GET /v1.0/1234/instances/44b277eb-39be-4921-be31-3d61b43651d7/users?limit=2 HTTP/1.1
-User-Agent: python-troveclient
-Host: troveapi.org
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
diff --git a/api-ref/source/samples/db-list-users-pagination-response-json-http.txt b/api-ref/source/samples/db-list-users-pagination-response-json-http.txt
deleted file mode 100644
index 599ba127..00000000
--- a/api-ref/source/samples/db-list-users-pagination-response-json-http.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Content-Length: 336
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-
diff --git a/api-ref/source/samples/db-list-users-request-json-http.txt b/api-ref/source/samples/db-list-users-request-json-http.txt
deleted file mode 100644
index e8589256..00000000
--- a/api-ref/source/samples/db-list-users-request-json-http.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-GET /v1.0/1234/instances/44b277eb-39be-4921-be31-3d61b43651d7/users HTTP/1.1
-User-Agent: python-troveclient
-Host: troveapi.org
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
diff --git a/api-ref/source/samples/db-list-users-response-json-http.txt b/api-ref/source/samples/db-list-users-response-json-http.txt
deleted file mode 100644
index 17040eb9..00000000
--- a/api-ref/source/samples/db-list-users-response-json-http.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Content-Length: 322
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-
diff --git a/api-ref/source/samples/db-list-users-response.json b/api-ref/source/samples/db-list-users-response.json
deleted file mode 100644
index 80318d2c..00000000
--- a/api-ref/source/samples/db-list-users-response.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
- "users": [
- {
- "databases": [
- {
- "name": "databaseA"
- }
- ],
- "host": "%",
- "name": "dbuser1"
- },
- {
- "databases": [
- {
- "name": "databaseB"
- },
- {
- "name": "databaseC"
- }
- ],
- "host": "%",
- "name": "dbuser2"
- },
- {
- "databases": [
- {
- "name": "databaseD"
- }
- ],
- "host": "%",
- "name": "dbuser3"
- },
- {
- "databases": [
- {
- "name": "sampledb"
- }
- ],
- "host": "%",
- "name": "demouser"
- }
- ]
-}
diff --git a/api-ref/source/samples/db-mgmt-get-account-details-request-json-http.txt b/api-ref/source/samples/db-mgmt-get-account-details-request-json-http.txt
deleted file mode 100644
index 494ddc97..00000000
--- a/api-ref/source/samples/db-mgmt-get-account-details-request-json-http.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-GET /v1.0/1234/mgmt/accounts/3000 HTTP/1.1
-User-Agent: python-troveclient
-Host: troveapi.org
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
diff --git a/api-ref/source/samples/db-mgmt-get-account-details-response-json-http.txt b/api-ref/source/samples/db-mgmt-get-account-details-response-json-http.txt
deleted file mode 100644
index 126dff69..00000000
--- a/api-ref/source/samples/db-mgmt-get-account-details-response-json-http.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Content-Length: 85
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-
diff --git a/api-ref/source/samples/db-mgmt-get-account-details-response.json b/api-ref/source/samples/db-mgmt-get-account-details-response.json
deleted file mode 100644
index ff0294a9..00000000
--- a/api-ref/source/samples/db-mgmt-get-account-details-response.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "account": {
- "id": "3000",
- "instance_ids": [
- "44b277eb-39be-4921-be31-3d61b43651d7"
- ]
- }
-}
diff --git a/api-ref/source/samples/db-mgmt-get-host-detail-request-json-http.txt b/api-ref/source/samples/db-mgmt-get-host-detail-request-json-http.txt
deleted file mode 100644
index 633e0c25..00000000
--- a/api-ref/source/samples/db-mgmt-get-host-detail-request-json-http.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-GET /v1.0/1234/mgmt/hosts/hostname_1 HTTP/1.1
-User-Agent: python-troveclient
-Host: troveapi.org
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
diff --git a/api-ref/source/samples/db-mgmt-get-host-detail-response-json-http.txt b/api-ref/source/samples/db-mgmt-get-host-detail-response-json-http.txt
deleted file mode 100644
index b7e78239..00000000
--- a/api-ref/source/samples/db-mgmt-get-host-detail-response-json-http.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Content-Length: 302
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-
diff --git a/api-ref/source/samples/db-mgmt-get-host-detail-response.json b/api-ref/source/samples/db-mgmt-get-host-detail-response.json
deleted file mode 100644
index f5b50c04..00000000
--- a/api-ref/source/samples/db-mgmt-get-host-detail-response.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "host": {
- "instances": [
- {
- "id": "44b277eb-39be-4921-be31-3d61b43651d7",
- "name": "44b277eb-39be-4921-be31-3d61b43651d7-lay",
- "server_id": "44b277eb-39be-4921-be31-3d61b43651d7",
- "status": "ACTIVE",
- "tenant_id": "3000"
- }
- ],
- "name": "hostname_1",
- "percentUsed": 12,
- "totalRAM": 32000,
- "usedRAM": 4096
- }
-}
diff --git a/api-ref/source/samples/db-mgmt-get-instance-details-request-json-http.txt b/api-ref/source/samples/db-mgmt-get-instance-details-request-json-http.txt
deleted file mode 100644
index b97d1f8e..00000000
--- a/api-ref/source/samples/db-mgmt-get-instance-details-request-json-http.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-GET /v1.0/1234/mgmt/instances/44b277eb-39be-4921-be31-3d61b43651d7 HTTP/1.1
-User-Agent: python-troveclient
-Host: troveapi.org
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
diff --git a/api-ref/source/samples/db-mgmt-get-instance-details-response-json-http.txt b/api-ref/source/samples/db-mgmt-get-instance-details-response-json-http.txt
deleted file mode 100644
index 6580c3b8..00000000
--- a/api-ref/source/samples/db-mgmt-get-instance-details-response-json-http.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Content-Length: 1709
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-
diff --git a/api-ref/source/samples/db-mgmt-get-instance-details-response.json b/api-ref/source/samples/db-mgmt-get-instance-details-response.json
deleted file mode 100644
index ef8b7efc..00000000
--- a/api-ref/source/samples/db-mgmt-get-instance-details-response.json
+++ /dev/null
@@ -1,84 +0,0 @@
-{
- "instance": {
- "created": "2014-10-30T12:30:00",
- "datastore": {
- "type": "mysql",
- "version": "5.5"
- },
- "deleted": false,
- "deleted_at": null,
- "encrypted_rpc_messaging": true,
- "flavor": {
- "id": "3",
- "links": [
- {
- "href": "https://troveapi.org/v1.0/1234/flavors/3",
- "rel": "self"
- },
- {
- "href": "https://troveapi.org/flavors/3",
- "rel": "bookmark"
- }
- ]
- },
- "guest_status": {
- "state_description": "running"
- },
- "hostname": "e09ad9a3f73309469cf1f43d11e79549caf9acf2.troveexampledb.com",
- "id": "44b277eb-39be-4921-be31-3d61b43651d7",
- "links": [
- {
- "href": "https://troveapi.org/v1.0/1234/instances/44b277eb-39be-4921-be31-3d61b43651d7",
- "rel": "self"
- },
- {
- "href": "https://troveapi.org/instances/44b277eb-39be-4921-be31-3d61b43651d7",
- "rel": "bookmark"
- }
- ],
- "name": "json_rack_instance",
- "region": "RegionOne",
- "root_enabled": "2014-10-30T12:30:00",
- "root_enabled_by": "3000",
- "server": {
- "addresses": {
- "private": [
- {
- "addr": "123.123.123.123"
- }
- ]
- },
- "deleted": false,
- "deleted_at": null,
- "host": "hostname_1",
- "id": "44b277eb-39be-4921-be31-3d61b43651d7",
- "local_id": 0,
- "name": "44b277eb-39be-4921-be31-3d61b43651d7-lay",
- "status": "ACTIVE",
- "tenant_id": "3000"
- },
- "server_id": "44b277eb-39be-4921-be31-3d61b43651d7",
- "service_status": "ACTIVE",
- "status": "ACTIVE",
- "task_description": "No tasks for the instance.",
- "tenant_id": "3000",
- "updated": "2014-10-30T12:30:00",
- "volume": {
- "attachments": [
- {
- "device": "vdb",
- "server_id": "44b277eb-39be-4921-be31-3d61b43651d7"
- }
- ],
- "availability_zone": "fake-availability-zone",
- "created_at": "2001-01-01-12:30:30",
- "id": "VOL_44b277eb-39be-4921-be31-3d61b43651d7",
- "size": 4,
- "status": "in-use",
- "total": 4.0,
- "used": 0.16
- },
- "volume_id": "VOL_44b277eb-39be-4921-be31-3d61b43651d7"
- }
-}
-
diff --git a/api-ref/source/samples/db-mgmt-get-root-details-request-json-http.txt b/api-ref/source/samples/db-mgmt-get-root-details-request-json-http.txt
deleted file mode 100644
index f82751f7..00000000
--- a/api-ref/source/samples/db-mgmt-get-root-details-request-json-http.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-GET /v1.0/1234/mgmt/instances/44b277eb-39be-4921-be31-3d61b43651d7/root HTTP/1.1
-User-Agent: python-troveclient
-Host: troveapi.org
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
diff --git a/api-ref/source/samples/db-mgmt-get-root-details-response-json-http.txt b/api-ref/source/samples/db-mgmt-get-root-details-response-json-http.txt
deleted file mode 100644
index 0d34dce8..00000000
--- a/api-ref/source/samples/db-mgmt-get-root-details-response-json-http.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Content-Length: 114
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-
diff --git a/api-ref/source/samples/db-mgmt-get-root-details-response.json b/api-ref/source/samples/db-mgmt-get-root-details-response.json
deleted file mode 100644
index 6238286f..00000000
--- a/api-ref/source/samples/db-mgmt-get-root-details-response.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "root_history": {
- "enabled": "2014-10-30T12:30:00",
- "id": "44b277eb-39be-4921-be31-3d61b43651d7",
- "user": "3000"
- }
-}
diff --git a/api-ref/source/samples/db-mgmt-get-storage-request-json-http.txt b/api-ref/source/samples/db-mgmt-get-storage-request-json-http.txt
deleted file mode 100644
index e74af814..00000000
--- a/api-ref/source/samples/db-mgmt-get-storage-request-json-http.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-GET /v1.0/1234/mgmt/storage HTTP/1.1
-User-Agent: python-troveclient
-Host: troveapi.org
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
diff --git a/api-ref/source/samples/db-mgmt-get-storage-response-json-http.txt b/api-ref/source/samples/db-mgmt-get-storage-response-json-http.txt
deleted file mode 100644
index b5efcbeb..00000000
--- a/api-ref/source/samples/db-mgmt-get-storage-response-json-http.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Content-Length: 177
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-
diff --git a/api-ref/source/samples/db-mgmt-get-storage-response.json b/api-ref/source/samples/db-mgmt-get-storage-response.json
deleted file mode 100644
index 7e634d92..00000000
--- a/api-ref/source/samples/db-mgmt-get-storage-response.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
- "devices": [
- {
- "capacity": {
- "available": 90,
- "total": 100
- },
- "name": "fake_storage",
- "provision": {
- "available": 40,
- "percent": 10,
- "total": 50
- },
- "type": "test_type",
- "used": 10
- }
- ]
-}
diff --git a/api-ref/source/samples/db-mgmt-instance-diagnostics-request-json-http.txt b/api-ref/source/samples/db-mgmt-instance-diagnostics-request-json-http.txt
deleted file mode 100644
index a75db875..00000000
--- a/api-ref/source/samples/db-mgmt-instance-diagnostics-request-json-http.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-GET /v1.0/1234/mgmt/instances/44b277eb-39be-4921-be31-3d61b43651d7/diagnostics HTTP/1.1
-User-Agent: python-troveclient
-Host: troveapi.org
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
diff --git a/api-ref/source/samples/db-mgmt-instance-diagnostics-response-json-http.txt b/api-ref/source/samples/db-mgmt-instance-diagnostics-response-json-http.txt
deleted file mode 100644
index 3ab6bbc1..00000000
--- a/api-ref/source/samples/db-mgmt-instance-diagnostics-response-json-http.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Content-Length: 125
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-
diff --git a/api-ref/source/samples/db-mgmt-instance-diagnostics-response.json b/api-ref/source/samples/db-mgmt-instance-diagnostics-response.json
deleted file mode 100644
index 7e618429..00000000
--- a/api-ref/source/samples/db-mgmt-instance-diagnostics-response.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "diagnostics": {
- "fdSize": 64,
- "threads": 2,
- "version": "1",
- "vmHwm": 2872,
- "vmPeak": 29160,
- "vmRss": 2872,
- "vmSize": 29096
- }
-}
diff --git a/api-ref/source/samples/db-mgmt-instance-index-request-json-http.txt b/api-ref/source/samples/db-mgmt-instance-index-request-json-http.txt
deleted file mode 100644
index a46559ab..00000000
--- a/api-ref/source/samples/db-mgmt-instance-index-request-json-http.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-GET /v1.0/1234/mgmt/instances?deleted=false HTTP/1.1
-User-Agent: python-troveclient
-Host: troveapi.org
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
diff --git a/api-ref/source/samples/db-mgmt-instance-index-response-json-http.txt b/api-ref/source/samples/db-mgmt-instance-index-response-json-http.txt
deleted file mode 100644
index 3994d592..00000000
--- a/api-ref/source/samples/db-mgmt-instance-index-response-json-http.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Content-Length: 1258
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-
diff --git a/api-ref/source/samples/db-mgmt-instance-index-response.json b/api-ref/source/samples/db-mgmt-instance-index-response.json
deleted file mode 100644
index 6b26254a..00000000
--- a/api-ref/source/samples/db-mgmt-instance-index-response.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
- "instances": [
- {
- "created": "2014-10-30T12:30:00",
- "datastore": {
- "type": "mysql",
- "version": "5.5"
- },
- "deleted": false,
- "deleted_at": null,
- "encrypted_rpc_messaging": true,
- "flavor": {
- "id": "3",
- "links": [
- {
- "href": "https://troveapi.org/v1.0/1234/flavors/3",
- "rel": "self"
- },
- {
- "href": "https://troveapi.org/flavors/3",
- "rel": "bookmark"
- }
- ]
- },
- "hostname": "e09ad9a3f73309469cf1f43d11e79549caf9acf2.troveexampledb.com",
- "id": "44b277eb-39be-4921-be31-3d61b43651d7",
- "links": [
- {
- "href": "https://troveapi.org/v1.0/1234/instances/44b277eb-39be-4921-be31-3d61b43651d7",
- "rel": "self"
- },
- {
- "href": "https://troveapi.org/instances/44b277eb-39be-4921-be31-3d61b43651d7",
- "rel": "bookmark"
- }
- ],
- "name": "json_rack_instance",
- "region": "RegionOne",
- "server": {
- "deleted": false,
- "deleted_at": null,
- "host": "hostname_1",
- "id": "44b277eb-39be-4921-be31-3d61b43651d7",
- "local_id": 0,
- "name": "44b277eb-39be-4921-be31-3d61b43651d7-lay",
- "status": "ACTIVE",
- "tenant_id": "3000"
- },
- "server_id": "44b277eb-39be-4921-be31-3d61b43651d7",
- "service_status": "ACTIVE",
- "status": "ACTIVE",
- "task_description": "No tasks for the instance.",
- "tenant_id": "3000",
- "updated": "2014-10-30T12:30:00",
- "volume": {
- "size": 4
- },
- "volume_id": "VOL_44b277eb-39be-4921-be31-3d61b43651d7"
- }
- ]
-}
-
diff --git a/api-ref/source/samples/db-mgmt-list-accounts-request-json-http.txt b/api-ref/source/samples/db-mgmt-list-accounts-request-json-http.txt
deleted file mode 100644
index 6a0d6d10..00000000
--- a/api-ref/source/samples/db-mgmt-list-accounts-request-json-http.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-GET /v1.0/1234/mgmt/accounts HTTP/1.1
-User-Agent: python-troveclient
-Host: troveapi.org
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
diff --git a/api-ref/source/samples/db-mgmt-list-accounts-response-json-http.txt b/api-ref/source/samples/db-mgmt-list-accounts-response-json-http.txt
deleted file mode 100644
index ca7a5627..00000000
--- a/api-ref/source/samples/db-mgmt-list-accounts-response-json-http.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Content-Length: 50
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-
diff --git a/api-ref/source/samples/db-mgmt-list-accounts-response.json b/api-ref/source/samples/db-mgmt-list-accounts-response.json
deleted file mode 100644
index 099a6a50..00000000
--- a/api-ref/source/samples/db-mgmt-list-accounts-response.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "accounts": [
- {
- "id": "3000",
- "num_instances": 1
- }
- ]
-}
diff --git a/api-ref/source/samples/db-mgmt-list-hosts-request-json-http.txt b/api-ref/source/samples/db-mgmt-list-hosts-request-json-http.txt
deleted file mode 100644
index 0f90ede5..00000000
--- a/api-ref/source/samples/db-mgmt-list-hosts-request-json-http.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-GET /v1.0/1234/mgmt/hosts HTTP/1.1
-User-Agent: python-troveclient
-Host: troveapi.org
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
diff --git a/api-ref/source/samples/db-mgmt-list-hosts-response-json-http.txt b/api-ref/source/samples/db-mgmt-list-hosts-response-json-http.txt
deleted file mode 100644
index 054e436d..00000000
--- a/api-ref/source/samples/db-mgmt-list-hosts-response-json-http.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Content-Length: 101
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-
diff --git a/api-ref/source/samples/db-mgmt-list-hosts-response.json b/api-ref/source/samples/db-mgmt-list-hosts-response.json
deleted file mode 100644
index 6972dcd6..00000000
--- a/api-ref/source/samples/db-mgmt-list-hosts-response.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "hosts": [
- {
- "instanceCount": 1,
- "name": "hostname_1"
- },
- {
- "instanceCount": 0,
- "name": "hostname_2"
- }
- ]
-}
diff --git a/api-ref/source/samples/db-patch-config-group-request-json-http.txt b/api-ref/source/samples/db-patch-config-group-request-json-http.txt
deleted file mode 100644
index 3606caef..00000000
--- a/api-ref/source/samples/db-patch-config-group-request-json-http.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-PATCH /v1.0/1234/configurations/5678 HTTP/1.1
-User-Agent: python-example-client
-Host: openstack.example.com
-X-Auth-Token: d6cafa5b-e0c7-4ab8-948e-7c95f2acd031
-Accept: application/json
-Content-Type: application/json
-
diff --git a/api-ref/source/samples/db-patch-config-group-response-json-http.txt b/api-ref/source/samples/db-patch-config-group-response-json-http.txt
deleted file mode 100644
index 244b32fb..00000000
--- a/api-ref/source/samples/db-patch-config-group-response-json-http.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Content-Length: 0
-Date: Mon, 6 Jul 2015 21:53:10 GMT
-
diff --git a/api-ref/source/samples/db-restore-delete-request-json-http.txt b/api-ref/source/samples/db-restore-delete-request-json-http.txt
deleted file mode 100644
index 76af78aa..00000000
--- a/api-ref/source/samples/db-restore-delete-request-json-http.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-DELETE /v1.0/1234/instances/d5a9db64-7ef7-41c5-8e1e-4013166874bc HTTP/1.1
-User-Agent: python-troveclient
-Host: troveapi.org
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
diff --git a/api-ref/source/samples/db-restore-delete-response-json-http.txt b/api-ref/source/samples/db-restore-delete-response-json-http.txt
deleted file mode 100644
index 96905c86..00000000
--- a/api-ref/source/samples/db-restore-delete-response-json-http.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.1 202 Accepted
-Content-Type: application/json
-Content-Length: 0
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-
diff --git a/api-ref/source/samples/db-revoke-user-access-request-json-http.txt b/api-ref/source/samples/db-revoke-user-access-request-json-http.txt
deleted file mode 100644
index 20f10657..00000000
--- a/api-ref/source/samples/db-revoke-user-access-request-json-http.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-DELETE /v1.0/1234/instances/692d8418-7a8f-47f1-8060-59846c6e024f/users/exampleuser/databases/databaseC HTTP/1.1
-User-Agent: python-example-client
-Host: ord.databases.api.rackspacecloud.com
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json \ No newline at end of file
diff --git a/api-ref/source/samples/db-revoke-user-access-response-json-http.txt b/api-ref/source/samples/db-revoke-user-access-response-json-http.txt
deleted file mode 100644
index af725ba3..00000000
--- a/api-ref/source/samples/db-revoke-user-access-response-json-http.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-HTTP/1.1 202 Accepted
-Content-Type: application/json
-Content-Length: 0
-Date: Wed, 27 Jun 2012 23:11:19 GMT \ No newline at end of file
diff --git a/api-ref/source/samples/db-show-parameter-details-request-json-http.txt b/api-ref/source/samples/db-show-parameter-details-request-json-http.txt
deleted file mode 100644
index a5e30777..00000000
--- a/api-ref/source/samples/db-show-parameter-details-request-json-http.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-GET /v1.0/1234/datastores/versions/f8e67741-e767-4137-b394-3fb8a3fafd2f/parameters/connect_timeout HTTP/1.1
-User-Agent: python-example-client
-Host: openstack.example.com
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
diff --git a/api-ref/source/samples/db-show-parameter-details-response-json-http.txt b/api-ref/source/samples/db-show-parameter-details-response-json-http.txt
deleted file mode 100644
index 35d4ca06..00000000
--- a/api-ref/source/samples/db-show-parameter-details-response-json-http.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Content-Length: 180
-Date: Tue, 16 Jun 2015 21:58:13 GMT
diff --git a/api-ref/source/samples/db-show-parameter-details.json b/api-ref/source/samples/db-show-parameter-details.json
deleted file mode 100644
index 6da77f15..00000000
--- a/api-ref/source/samples/db-show-parameter-details.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "name": "connect_timeout",
- "min": 2,
- "max": 31536000,
- "restart_required": false,
- "type": "integer",
- "datastore_version_id": "f8e67741-e767-4137-b394-3fb8a3fafd2f"
-}
diff --git a/api-ref/source/samples/db-update-config-group-request-json-http.txt b/api-ref/source/samples/db-update-config-group-request-json-http.txt
deleted file mode 100644
index c9549a2c..00000000
--- a/api-ref/source/samples/db-update-config-group-request-json-http.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-PUT /v1.0/1234/configurations/5678 HTTP/1.1
-User-Agent: python-example-client
-Host: openstack.example.com
-X-Auth-Token: d6cafa5b-e0c7-4ab8-948e-7c95f2acd031
-Accept: application/json
-Content-Type: application/json
-
diff --git a/api-ref/source/samples/db-update-config-group-response-json-http.txt b/api-ref/source/samples/db-update-config-group-response-json-http.txt
deleted file mode 100644
index 13027ba4..00000000
--- a/api-ref/source/samples/db-update-config-group-response-json-http.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.1 202 OK
-Content-Type: application/json
-Content-Length: 0
-Date: Mon, 6 Jul 2015 21:53:10 GMT
-
diff --git a/api-ref/source/samples/db-version-request-json-http.txt b/api-ref/source/samples/db-version-request-json-http.txt
deleted file mode 100644
index ec5bec35..00000000
--- a/api-ref/source/samples/db-version-request-json-http.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-GET /v1.0/ HTTP/1.1
-User-Agent: python-example-client
-Host: ord.databases.api.rackspacecloud.com
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json \ No newline at end of file
diff --git a/api-ref/source/samples/db-version-response-json-http.txt b/api-ref/source/samples/db-version-response-json-http.txt
deleted file mode 100644
index 61dfc6a3..00000000
--- a/api-ref/source/samples/db-version-response-json-http.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Content-Length: 150
-Date: Wed, 25 Jan 2012 21:53:04 GMT \ No newline at end of file
diff --git a/api-ref/source/samples/db-version-response.json b/api-ref/source/samples/db-version-response.json
deleted file mode 100644
index fb1e7acb..00000000
--- a/api-ref/source/samples/db-version-response.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "version": {
- "id": "v1.0",
- "links": [
- {
- "href": "https://ord.databases.api.rackspacecloud.com/v1.0/",
- "rel": "self"
- }
- ],
- "status": "CURRENT",
- "updated": "2012-01-01T00:00:00Z"
- }
-}
diff --git a/api-ref/source/samples/db-versions-request-json-http.txt b/api-ref/source/samples/db-versions-request-json-http.txt
deleted file mode 100644
index 21dd65f4..00000000
--- a/api-ref/source/samples/db-versions-request-json-http.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-GET / HTTP/1.1
-User-Agent: python-example-client
-Host: ord.databases.api.rackspacecloud.com
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json \ No newline at end of file
diff --git a/api-ref/source/samples/db-versions-response-json-http.txt b/api-ref/source/samples/db-versions-response-json-http.txt
deleted file mode 100644
index 314c6835..00000000
--- a/api-ref/source/samples/db-versions-response-json-http.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Content-Length: 153
-Date: Wed, 25 Jan 2012 21:53:04 GMT \ No newline at end of file
diff --git a/api-ref/source/samples/db-instance-eject-replica-request.json b/api-ref/source/samples/instance-action-eject-replica-request.json
index e0d425ad..e0d425ad 100644
--- a/api-ref/source/samples/db-instance-eject-replica-request.json
+++ b/api-ref/source/samples/instance-action-eject-replica-request.json
diff --git a/api-ref/source/samples/db-instance-promote-replica-request.json b/api-ref/source/samples/instance-action-promote-replica-request.json
index f2803b79..f2803b79 100644
--- a/api-ref/source/samples/db-instance-promote-replica-request.json
+++ b/api-ref/source/samples/instance-action-promote-replica-request.json
diff --git a/api-ref/source/samples/instance-action-reset-status-request.json b/api-ref/source/samples/instance-action-reset-status-request.json
new file mode 100644
index 00000000..b7e8f392
--- /dev/null
+++ b/api-ref/source/samples/instance-action-reset-status-request.json
@@ -0,0 +1,3 @@
+{
+ "reset_status": {}
+} \ No newline at end of file
diff --git a/api-ref/source/samples/db-instance-resize-flavor-request.json b/api-ref/source/samples/instance-action-resize-request.json
index 167d8f1f..52bc9aff 100644
--- a/api-ref/source/samples/db-instance-resize-flavor-request.json
+++ b/api-ref/source/samples/instance-action-resize-request.json
@@ -1,5 +1,5 @@
{
"resize": {
- "flavorRef": 3
+ "flavorRef": "2"
}
}
diff --git a/api-ref/source/samples/db-instance-resize-volume-request.json b/api-ref/source/samples/instance-action-resize-volume-request.json
index 949bbba8..949bbba8 100644
--- a/api-ref/source/samples/db-instance-resize-volume-request.json
+++ b/api-ref/source/samples/instance-action-resize-volume-request.json
diff --git a/api-ref/source/samples/db-instance-restart-request.json b/api-ref/source/samples/instance-action-restart-request.json
index 1c92835c..1c92835c 100644
--- a/api-ref/source/samples/db-instance-restart-request.json
+++ b/api-ref/source/samples/instance-action-restart-request.json
diff --git a/api-ref/source/samples/instance-backup-list-response.json b/api-ref/source/samples/instance-backup-list-response.json
new file mode 100644
index 00000000..0f5699f7
--- /dev/null
+++ b/api-ref/source/samples/instance-backup-list-response.json
@@ -0,0 +1,21 @@
+{
+ "backups": [
+ {
+ "created": "2019-12-23T22:38:42",
+ "datastore": {
+ "type": "mysql",
+ "version": "5.7",
+ "version_id": "b3d5c099-dbd5-4518-baa3-7c7c195671bf"
+ },
+ "description": null,
+ "id": "71557643-2245-43ac-b871-3d5a50af21d3",
+ "instance_id": "7de1bed8-6983-4d46-9a52-0abfbb0d27a2",
+ "locationRef": "http://127.0.0.1:8080/v1/AUTH_9f8dd5eacb074c9f87d2d822c9092aa5/database_backups/71557643-2245-43ac-b871-3d5a50af21d3.xbstream.gz.enc",
+ "name": "backup-full",
+ "parent_id": null,
+ "size": 0.12,
+ "status": "COMPLETED",
+ "updated": "2019-12-23T22:38:45"
+ }
+ ]
+} \ No newline at end of file
diff --git a/api-ref/source/samples/db-get-default-instance-configuration-response.json b/api-ref/source/samples/instance-configuration-list-response.json
index d0c8b2fe..0db91498 100644
--- a/api-ref/source/samples/db-get-default-instance-configuration-response.json
+++ b/api-ref/source/samples/instance-configuration-list-response.json
@@ -5,41 +5,41 @@
"connect_timeout": 15,
"datadir": "/var/lib/mysql/data",
"default_storage_engine": "innodb",
- "innodb_buffer_pool_size": "150M",
+ "innodb_buffer_pool_size": "2401M",
"innodb_data_file_path": "ibdata1:10M:autoextend",
"innodb_file_per_table": 1,
"innodb_log_buffer_size": "25M",
"innodb_log_file_size": "50M",
"innodb_log_files_in_group": 2,
"join_buffer_size": "1M",
- "key_buffer_size": "50M",
+ "key_buffer_size": "800M",
"local-infile": 0,
- "max_allowed_packet": "1024K",
- "max_connections": 100,
- "max_heap_table_size": "16M",
- "max_user_connections": 100,
+ "max_allowed_packet": "16392K",
+ "max_connections": 1600,
+ "max_heap_table_size": "256M",
+ "max_user_connections": 1600,
"myisam-recover-options": "BACKUP,FORCE",
- "open_files_limit": 512,
+ "open_files_limit": 8196,
"performance_schema": "ON",
"pid-file": "/var/run/mysqld/mysqld.pid",
"port": 3306,
"query_cache_limit": "1M",
- "query_cache_size": "8M",
+ "query_cache_size": "128M",
"query_cache_type": 1,
"read_buffer_size": "512K",
"read_rnd_buffer_size": "512K",
- "server_id": 271898715,
+ "server_id": 1468542390,
"skip-external-locking": 1,
"socket": "/var/run/mysqld/mysqld.sock",
"sort_buffer_size": "1M",
- "table_definition_cache": 256,
- "table_open_cache": 256,
- "thread_cache_size": 4,
+ "table_definition_cache": 4098,
+ "table_open_cache": 4098,
+ "thread_cache_size": 64,
"thread_stack": "192K",
- "tmp_table_size": "16M",
+ "tmp_table_size": "256M",
"tmpdir": "/var/tmp",
"user": "mysql",
"wait_timeout": 120
}
}
-}
+} \ No newline at end of file
diff --git a/api-ref/source/samples/db-create-instance-request.json b/api-ref/source/samples/instance-create-request.json
index 7e4b3e85..7e4b3e85 100644
--- a/api-ref/source/samples/db-create-instance-request.json
+++ b/api-ref/source/samples/instance-create-request.json
diff --git a/api-ref/source/samples/instance-create-response.json b/api-ref/source/samples/instance-create-response.json
new file mode 100644
index 00000000..3a7c6ca0
--- /dev/null
+++ b/api-ref/source/samples/instance-create-response.json
@@ -0,0 +1,41 @@
+{
+ "instance": {
+ "created": "2019-12-23T20:53:38",
+ "datastore": {
+ "type": "mysql",
+ "version": "5.7"
+ },
+ "flavor": {
+ "id": "6",
+ "links": [
+ {
+ "href": "https://127.0.0.1:8779/v1.0/9f8dd5eacb074c9f87d2d822c9092aa5/flavors/6",
+ "rel": "self"
+ },
+ {
+ "href": "https://127.0.0.1:8779/flavors/6",
+ "rel": "bookmark"
+ }
+ ]
+ },
+ "id": "b76a6a76-748b-4064-adec-4c9e6c9abd68",
+ "links": [
+ {
+ "href": "https://127.0.0.1:8779/v1.0/9f8dd5eacb074c9f87d2d822c9092aa5/instances/b76a6a76-748b-4064-adec-4c9e6c9abd68",
+ "rel": "self"
+ },
+ {
+ "href": "https://127.0.0.1:8779/instances/b76a6a76-748b-4064-adec-4c9e6c9abd68",
+ "rel": "bookmark"
+ }
+ ],
+ "name": "test",
+ "region": "RegionOne",
+ "service_status_updated": "2019-12-23T20:53:38",
+ "status": "BUILD",
+ "updated": "2019-12-23T20:53:38",
+ "volume": {
+ "size": 1
+ }
+ }
+} \ No newline at end of file
diff --git a/api-ref/source/samples/instance-list-detail-response.json b/api-ref/source/samples/instance-list-detail-response.json
new file mode 100644
index 00000000..fd785b99
--- /dev/null
+++ b/api-ref/source/samples/instance-list-detail-response.json
@@ -0,0 +1,91 @@
+{
+ "instances": [
+ {
+ "created": "2019-12-23T20:58:35",
+ "datastore": {
+ "type": "mysql",
+ "version": "5.7"
+ },
+ "flavor": {
+ "id": "6",
+ "links": [
+ {
+ "href": "https://127.0.0.1:8779/v1.0/9f8dd5eacb074c9f87d2d822c9092aa5/flavors/6",
+ "rel": "self"
+ },
+ {
+ "href": "https://127.0.0.1:8779/flavors/6",
+ "rel": "bookmark"
+ }
+ ]
+ },
+ "id": "7de1bed8-6983-4d46-9a52-0abfbb0d27a2",
+ "ip": [
+ "10.1.0.62",
+ "172.24.5.114"
+ ],
+ "links": [
+ {
+ "href": "https://127.0.0.1:8779/v1.0/9f8dd5eacb074c9f87d2d822c9092aa5/instances/7de1bed8-6983-4d46-9a52-0abfbb0d27a2",
+ "rel": "self"
+ },
+ {
+ "href": "https://127.0.0.1:8779/instances/7de1bed8-6983-4d46-9a52-0abfbb0d27a2",
+ "rel": "bookmark"
+ }
+ ],
+ "name": "test",
+ "region": "RegionOne",
+ "service_status_updated": "2019-12-23T21:01:11",
+ "status": "HEALTHY",
+ "updated": "2019-12-23T20:58:45",
+ "volume": {
+ "size": 1
+ }
+ },
+ {
+ "created": "2019-12-23T20:53:38",
+ "datastore": {
+ "type": "mysql",
+ "version": "5.7"
+ },
+ "fault": {
+ "created": "2019-12-23T20:53:41",
+ "details": null,
+ "message": "Failed to create User port for instance b76a6a76-748b-4064-adec-4c9e6c9abd68"
+ },
+ "flavor": {
+ "id": "6",
+ "links": [
+ {
+ "href": "https://127.0.0.1:8779/v1.0/9f8dd5eacb074c9f87d2d822c9092aa5/flavors/6",
+ "rel": "self"
+ },
+ {
+ "href": "https://127.0.0.1:8779/flavors/6",
+ "rel": "bookmark"
+ }
+ ]
+ },
+ "id": "b76a6a76-748b-4064-adec-4c9e6c9abd68",
+ "links": [
+ {
+ "href": "https://127.0.0.1:8779/v1.0/9f8dd5eacb074c9f87d2d822c9092aa5/instances/b76a6a76-748b-4064-adec-4c9e6c9abd68",
+ "rel": "self"
+ },
+ {
+ "href": "https://127.0.0.1:8779/instances/b76a6a76-748b-4064-adec-4c9e6c9abd68",
+ "rel": "bookmark"
+ }
+ ],
+ "name": "test",
+ "region": "RegionOne",
+ "service_status_updated": "2019-12-23T20:53:38",
+ "status": "ERROR",
+ "updated": "2019-12-23T20:53:41",
+ "volume": {
+ "size": 1
+ }
+ }
+ ]
+} \ No newline at end of file
diff --git a/api-ref/source/samples/instance-list-response.json b/api-ref/source/samples/instance-list-response.json
new file mode 100644
index 00000000..35b1964a
--- /dev/null
+++ b/api-ref/source/samples/instance-list-response.json
@@ -0,0 +1,44 @@
+{
+ "instances": [
+ {
+ "datastore": {
+ "type": "mysql",
+ "version": "5.7"
+ },
+ "flavor": {
+ "id": "6",
+ "links": [
+ {
+ "href": "https://127.0.0.1:8779/v1.0/9f8dd5eacb074c9f87d2d822c9092aa5/flavors/6",
+ "rel": "self"
+ },
+ {
+ "href": "https://127.0.0.1:8779/flavors/6",
+ "rel": "bookmark"
+ }
+ ]
+ },
+ "id": "7de1bed8-6983-4d46-9a52-0abfbb0d27a2",
+ "ip": [
+ "10.1.0.62",
+ "172.24.5.114"
+ ],
+ "links": [
+ {
+ "href": "https://127.0.0.1:8779/v1.0/9f8dd5eacb074c9f87d2d822c9092aa5/instances/7de1bed8-6983-4d46-9a52-0abfbb0d27a2",
+ "rel": "self"
+ },
+ {
+ "href": "https://127.0.0.1:8779/instances/7de1bed8-6983-4d46-9a52-0abfbb0d27a2",
+ "rel": "bookmark"
+ }
+ ],
+ "name": "test",
+ "region": "RegionOne",
+ "status": "ACTIVE",
+ "volume": {
+ "size": 1
+ }
+ }
+ ]
+}
diff --git a/api-ref/source/samples/db-instance-disable-log-request.json b/api-ref/source/samples/instance-log-disable-request.json
index 5f199474..5f199474 100644
--- a/api-ref/source/samples/db-instance-disable-log-request.json
+++ b/api-ref/source/samples/instance-log-disable-request.json
diff --git a/api-ref/source/samples/instance-log-disable-response.json b/api-ref/source/samples/instance-log-disable-response.json
new file mode 100644
index 00000000..2004fa5a
--- /dev/null
+++ b/api-ref/source/samples/instance-log-disable-response.json
@@ -0,0 +1,12 @@
+{
+ "log": {
+ "name": "general",
+ "type": "USER",
+ "status": "Disabled",
+ "published": "4096",
+ "pending": "0",
+ "container": "data_logs",
+ "prefix": "5e9e616c-1827-45f5-a487-679084d82f7e/mysql-general/",
+ "metafile": "5e9e616c-1827-45f5-a487-679084d82f7e/mysql-general_metafile"
+ }
+}
diff --git a/api-ref/source/samples/db-instance-discard-log-request.json b/api-ref/source/samples/instance-log-discard-request.json
index c2fd2fe2..c2fd2fe2 100644
--- a/api-ref/source/samples/db-instance-discard-log-request.json
+++ b/api-ref/source/samples/instance-log-discard-request.json
diff --git a/api-ref/source/samples/instance-log-discard-response.json b/api-ref/source/samples/instance-log-discard-response.json
new file mode 100644
index 00000000..eed48b60
--- /dev/null
+++ b/api-ref/source/samples/instance-log-discard-response.json
@@ -0,0 +1,12 @@
+{
+ "log": {
+ "name": "general",
+ "type": "USER",
+ "status": "Ready",
+ "published": "0",
+ "pending": "128",
+ "container": "None",
+ "prefix": "None",
+ "metafile": "5e9e616c-1827-45f5-a487-679084d82f7e/mysql-general_metafile"
+ }
+}
diff --git a/api-ref/source/samples/db-instance-enable-log-request.json b/api-ref/source/samples/instance-log-enable-request.json
index bbeafc0a..bbeafc0a 100644
--- a/api-ref/source/samples/db-instance-enable-log-request.json
+++ b/api-ref/source/samples/instance-log-enable-request.json
diff --git a/api-ref/source/samples/instance-log-enable-response.json b/api-ref/source/samples/instance-log-enable-response.json
new file mode 100644
index 00000000..92467a23
--- /dev/null
+++ b/api-ref/source/samples/instance-log-enable-response.json
@@ -0,0 +1,12 @@
+{
+ "log": {
+ "name": "general",
+ "type": "USER",
+ "status": "Eanbled",
+ "published": "0",
+ "pending": "0",
+ "container": "None",
+ "prefix": "None",
+ "metafile": "5e9e616c-1827-45f5-a487-679084d82f7e/mysql-general_metafile"
+ }
+}
diff --git a/api-ref/source/samples/db-instance-list-logs-response.json b/api-ref/source/samples/instance-log-list-response.json
index 103d6d05..103d6d05 100644
--- a/api-ref/source/samples/db-instance-list-logs-response.json
+++ b/api-ref/source/samples/instance-log-list-response.json
diff --git a/api-ref/source/samples/db-instance-publish-log-request.json b/api-ref/source/samples/instance-log-publish-request.json
index f56de2d0..f56de2d0 100644
--- a/api-ref/source/samples/db-instance-publish-log-request.json
+++ b/api-ref/source/samples/instance-log-publish-request.json
diff --git a/api-ref/source/samples/instance-log-publish-response.json b/api-ref/source/samples/instance-log-publish-response.json
new file mode 100644
index 00000000..38b64a9a
--- /dev/null
+++ b/api-ref/source/samples/instance-log-publish-response.json
@@ -0,0 +1,12 @@
+{
+ "log": {
+ "name": "general",
+ "type": "USER",
+ "status": "Published",
+ "published": "128",
+ "pending": "0",
+ "container": "data_logs",
+ "prefix": "5e9e616c-1827-45f5-a487-679084d82f7e/mysql-general/",
+ "metafile": "5e9e616c-1827-45f5-a487-679084d82f7e/mysql-general_metafile"
+ }
+}
diff --git a/api-ref/source/samples/db-instance-show-log-request.json b/api-ref/source/samples/instance-log-show-request.json
index 79a2020e..79a2020e 100644
--- a/api-ref/source/samples/db-instance-show-log-request.json
+++ b/api-ref/source/samples/instance-log-show-request.json
diff --git a/api-ref/source/samples/instance-log-show-response.json b/api-ref/source/samples/instance-log-show-response.json
new file mode 100644
index 00000000..415893f9
--- /dev/null
+++ b/api-ref/source/samples/instance-log-show-response.json
@@ -0,0 +1,12 @@
+{
+ "log": {
+ "name": "general",
+ "type": "USER",
+ "status": "Partial",
+ "published": "128",
+ "pending": "4096",
+ "container": "data_logs",
+ "prefix": "5e9e616c-1827-45f5-a487-679084d82f7e/mysql-general/",
+ "metafile": "5e9e616c-1827-45f5-a487-679084d82f7e/mysql-general_metafile"
+ }
+}
diff --git a/api-ref/source/samples/instance-mgmt-action-migrate-request.json b/api-ref/source/samples/instance-mgmt-action-migrate-request.json
new file mode 100644
index 00000000..286c1dc2
--- /dev/null
+++ b/api-ref/source/samples/instance-mgmt-action-migrate-request.json
@@ -0,0 +1,5 @@
+{
+ "migrate": {
+ "host": "compute-001"
+ }
+} \ No newline at end of file
diff --git a/api-ref/source/samples/db-instance-reboot-request.json b/api-ref/source/samples/instance-mgmt-action-reboot-request.json
index 363d866f..973be613 100644
--- a/api-ref/source/samples/db-instance-reboot-request.json
+++ b/api-ref/source/samples/instance-mgmt-action-reboot-request.json
@@ -1,3 +1,3 @@
{
"reboot": {}
-}
+} \ No newline at end of file
diff --git a/api-ref/source/samples/instance-mgmt-action-reset-task-status-request.json b/api-ref/source/samples/instance-mgmt-action-reset-task-status-request.json
new file mode 100644
index 00000000..f706509e
--- /dev/null
+++ b/api-ref/source/samples/instance-mgmt-action-reset-task-status-request.json
@@ -0,0 +1,3 @@
+{
+ "reset-task-status": {}
+} \ No newline at end of file
diff --git a/api-ref/source/samples/instance-mgmt-action-stop-request.json b/api-ref/source/samples/instance-mgmt-action-stop-request.json
new file mode 100644
index 00000000..4b0b26b7
--- /dev/null
+++ b/api-ref/source/samples/instance-mgmt-action-stop-request.json
@@ -0,0 +1,3 @@
+{
+ "stop": {}
+} \ No newline at end of file
diff --git a/api-ref/source/samples/instance-mgmt-list-response.json b/api-ref/source/samples/instance-mgmt-list-response.json
new file mode 100644
index 00000000..706fdf79
--- /dev/null
+++ b/api-ref/source/samples/instance-mgmt-list-response.json
@@ -0,0 +1,114 @@
+{
+ "instances": [
+ {
+ "created": "2019-12-23T20:58:35",
+ "datastore": {
+ "type": "mysql",
+ "version": "5.7"
+ },
+ "deleted": false,
+ "deleted_at": null,
+ "encrypted_rpc_messaging": true,
+ "flavor": {
+ "id": "d2",
+ "links": [
+ {
+ "href": "https://127.0.0.1:8779/v1.0/2afa58fd5db34fd8b7b659d997a5341f/flavors/d2",
+ "rel": "self"
+ },
+ {
+ "href": "https://127.0.0.1:8779/flavors/d2",
+ "rel": "bookmark"
+ }
+ ]
+ },
+ "id": "7de1bed8-6983-4d46-9a52-0abfbb0d27a2",
+ "ip": [
+ "10.1.0.62",
+ "172.24.5.114"
+ ],
+ "links": [
+ {
+ "href": "https://127.0.0.1:8779/v1.0/2afa58fd5db34fd8b7b659d997a5341f/instances/7de1bed8-6983-4d46-9a52-0abfbb0d27a2",
+ "rel": "self"
+ },
+ {
+ "href": "https://127.0.0.1:8779/instances/7de1bed8-6983-4d46-9a52-0abfbb0d27a2"
+ }
+ ],
+ "name": "test",
+ "region": "RegionOne",
+ "server": {
+ "host": "bdfe3275004d2a98d38d494fd7adfcd0c6d5d5198e86fa0d6ec5d588",
+ "id": "710a84e5-6adf-4a4c-9167-8bade67a5a1c",
+ "name": "test",
+ "status": "ACTIVE",
+ "tenant_id": "27ac4b83e9d045eb8c373bacaa994eb7"
+ },
+ "server_id": "710a84e5-6adf-4a4c-9167-8bade67a5a1c",
+ "service_status": "HEALTHY",
+ "service_status_updated": "2019-12-24T00:02:55",
+ "status": "HEALTHY",
+ "task_description": "No tasks for the instance.",
+ "tenant_id": "9f8dd5eacb074c9f87d2d822c9092aa5",
+ "updated": "2019-12-23T23:53:46",
+ "volume": {
+ "size": 1
+ },
+ "volume_id": "ccb62e29-73ea-4859-b206-3b3a4e30a991"
+ },
+ {
+ "created": "2019-12-23T20:53:38",
+ "datastore": {
+ "type": "mysql",
+ "version": "5.7"
+ },
+ "deleted": false,
+ "deleted_at": null,
+ "encrypted_rpc_messaging": true,
+ "fault": {
+ "created": "2019-12-23T20:53:41",
+ "details": "Failed to create User port for instance b76a6a76-748b-4064-adec-4c9e6c9abd68",
+ "message": "Failed to create User port for instance b76a6a76-748b-4064-adec-4c9e6c9abd68"
+ },
+ "flavor": {
+ "id": "6",
+ "links": [
+ {
+ "href": "https://127.0.0.1:8779/v1.0/2afa58fd5db34fd8b7b659d997a5341f/flavors/6",
+ "rel": "self"
+ },
+ {
+ "href": "https://127.0.0.1:8779/flavors/6",
+ "rel": "bookmark"
+ }
+ ]
+ },
+ "id": "b76a6a76-748b-4064-adec-4c9e6c9abd68",
+ "links": [
+ {
+ "href": "https://127.0.0.1:8779/v1.0/2afa58fd5db34fd8b7b659d997a5341f/instances/b76a6a76-748b-4064-adec-4c9e6c9abd68",
+ "rel": "self"
+ },
+ {
+ "href": "https://127.0.0.1:8779/instances/b76a6a76-748b-4064-adec-4c9e6c9abd68",
+ "rel": "bookmark"
+ }
+ ],
+ "name": "test",
+ "region": "RegionOne",
+ "server": null,
+ "server_id": null,
+ "service_status": "NEW",
+ "service_status_updated": "2019-12-23T20:53:38",
+ "status": "ERROR",
+ "task_description": "Build error: Port.",
+ "tenant_id": "9f8dd5eacb074c9f87d2d822c9092aa5",
+ "updated": "2019-12-23T20:53:41",
+ "volume": {
+ "size": 1
+ },
+ "volume_id": null
+ }
+ ]
+} \ No newline at end of file
diff --git a/api-ref/source/samples/instance-mgmt-show-response.json b/api-ref/source/samples/instance-mgmt-show-response.json
new file mode 100644
index 00000000..649f0b58
--- /dev/null
+++ b/api-ref/source/samples/instance-mgmt-show-response.json
@@ -0,0 +1,104 @@
+{
+ "instance": {
+ "created": "2019-12-23T20:58:35",
+ "datastore": {
+ "type": "mysql",
+ "version": "5.7"
+ },
+ "deleted": false,
+ "deleted_at": null,
+ "encrypted_rpc_messaging": true,
+ "flavor": {
+ "id": "d2",
+ "links": [
+ {
+ "href": "https://127.0.0.1:8779/v1.0/2afa58fd5db34fd8b7b659d997a5341f/flavors/d2",
+ "rel": "self"
+ },
+ {
+ "href": "https://127.0.0.1:8779/flavors/d2",
+ "rel": "bookmark"
+ }
+ ]
+ },
+ "guest_status": {
+ "state_description": "healthy"
+ },
+ "id": "7de1bed8-6983-4d46-9a52-0abfbb0d27a2",
+ "ip": [
+ "10.1.0.62",
+ "172.24.5.114"
+ ],
+ "links": [
+ {
+ "href": "https://127.0.0.1:8779/v1.0/2afa58fd5db34fd8b7b659d997a5341f/instances/7de1bed8-6983-4d46-9a52-0abfbb0d27a2",
+ "rel": "self"
+ },
+ {
+ "href": "https://127.0.0.1:8779/instances/7de1bed8-6983-4d46-9a52-0abfbb0d27a2",
+ "rel": "bookmark"
+ }
+ ],
+ "name": "test",
+ "region": "RegionOne",
+ "server": {
+ "addresses": {
+ "private": [
+ {
+ "OS-EXT-IPS-MAC:mac_addr": "fa:16:3e:fc:eb:4a",
+ "OS-EXT-IPS:type": "fixed",
+ "addr": "10.1.0.62",
+ "version": 4
+ },
+ {
+ "OS-EXT-IPS-MAC:mac_addr": "fa:16:3e:fc:eb:4a",
+ "OS-EXT-IPS:type": "floating",
+ "addr": "172.24.5.114",
+ "version": 4
+ }
+ ],
+ "trove-mgmt": [
+ {
+ "OS-EXT-IPS-MAC:mac_addr": "fa:16:3e:f9:0f:6a",
+ "OS-EXT-IPS:type": "fixed",
+ "addr": "192.168.254.125",
+ "version": 4
+ }
+ ]
+ },
+ "host": "bdfe3275004d2a98d38d494fd7adfcd0c6d5d5198e86fa0d6ec5d588",
+ "id": "710a84e5-6adf-4a4c-9167-8bade67a5a1c",
+ "name": "test",
+ "status": "ACTIVE",
+ "tenant_id": "27ac4b83e9d045eb8c373bacaa994eb7"
+ },
+ "server_id": "710a84e5-6adf-4a4c-9167-8bade67a5a1c",
+ "service_status": "HEALTHY",
+ "service_status_updated": "2019-12-24T00:08:55",
+ "status": "HEALTHY",
+ "task_description": "No tasks for the instance.",
+ "tenant_id": "9f8dd5eacb074c9f87d2d822c9092aa5",
+ "updated": "2019-12-23T23:53:46",
+ "volume": {
+ "attachments": [
+ {
+ "attached_at": "2019-12-23T23:11:39.000000",
+ "attachment_id": "a31526ba-884a-4e1f-8c64-4dc4b987ba4e",
+ "device": "/dev/vdb",
+ "host_name": "node.trove.magnum-pg0.utah.cloudlab.us",
+ "id": "ccb62e29-73ea-4859-b206-3b3a4e30a991",
+ "server_id": "710a84e5-6adf-4a4c-9167-8bade67a5a1c",
+ "volume_id": "ccb62e29-73ea-4859-b206-3b3a4e30a991"
+ }
+ ],
+ "availability_zone": "nova",
+ "created_at": "2019-12-23T20:58:39.000000",
+ "id": "ccb62e29-73ea-4859-b206-3b3a4e30a991",
+ "size": 1,
+ "status": "in-use",
+ "total": 0.95,
+ "used": 0.12
+ },
+ "volume_id": "ccb62e29-73ea-4859-b206-3b3a4e30a991"
+ }
+} \ No newline at end of file
diff --git a/api-ref/source/samples/db-detach-replica-request.json b/api-ref/source/samples/instance-patch-detach-replica-request.json
index f61219c8..f61219c8 100644
--- a/api-ref/source/samples/db-detach-replica-request.json
+++ b/api-ref/source/samples/instance-patch-detach-replica-request.json
diff --git a/api-ref/source/samples/db-update-instance-name-request.json b/api-ref/source/samples/instance-patch-update-name-request.json
index 3d9a07d0..3d9a07d0 100644
--- a/api-ref/source/samples/db-update-instance-name-request.json
+++ b/api-ref/source/samples/instance-patch-update-name-request.json
diff --git a/api-ref/source/samples/db-upgrade-instance-datastore-version-request.json b/api-ref/source/samples/instance-patch-upgrade-datastore-version-request.json
index 00a66a48..00a66a48 100644
--- a/api-ref/source/samples/db-upgrade-instance-datastore-version-request.json
+++ b/api-ref/source/samples/instance-patch-upgrade-datastore-version-request.json
diff --git a/api-ref/source/samples/db-attach-config-group-request.json b/api-ref/source/samples/instance-put-attach-config-group-request.json
index d5708d91..d5708d91 100644
--- a/api-ref/source/samples/db-attach-config-group-request.json
+++ b/api-ref/source/samples/instance-put-attach-config-group-request.json
diff --git a/api-ref/source/samples/instance-show-response.json b/api-ref/source/samples/instance-show-response.json
new file mode 100644
index 00000000..4a162db3
--- /dev/null
+++ b/api-ref/source/samples/instance-show-response.json
@@ -0,0 +1,46 @@
+{
+ "instance": {
+ "created": "2019-12-23T20:58:35",
+ "datastore": {
+ "type": "mysql",
+ "version": "5.7"
+ },
+ "flavor": {
+ "id": "6",
+ "links": [
+ {
+ "href": "https://127.0.0.1:8779/v1.0/9f8dd5eacb074c9f87d2d822c9092aa5/flavors/6",
+ "rel": "self"
+ },
+ {
+ "href": "https://127.0.0.1:8779/flavors/6",
+ "rel": "bookmark"
+ }
+ ]
+ },
+ "id": "7de1bed8-6983-4d46-9a52-0abfbb0d27a2",
+ "ip": [
+ "10.1.0.62",
+ "172.24.5.114"
+ ],
+ "links": [
+ {
+ "href": "https://127.0.0.1:8779/v1.0/9f8dd5eacb074c9f87d2d822c9092aa5/instances/7de1bed8-6983-4d46-9a52-0abfbb0d27a2",
+ "rel": "self"
+ },
+ {
+ "href": "https://127.0.0.1:8779/instances/7de1bed8-6983-4d46-9a52-0abfbb0d27a2",
+ "rel": "bookmark"
+ }
+ ],
+ "name": "test",
+ "region": "RegionOne",
+ "service_status_updated": "2019-12-23T22:15:11",
+ "status": "HEALTHY",
+ "updated": "2019-12-23T20:58:45",
+ "volume": {
+ "size": 1,
+ "used": 0.12
+ }
+ }
+} \ No newline at end of file
diff --git a/api-ref/source/samples/limit-show-response.json b/api-ref/source/samples/limit-show-response.json
new file mode 100644
index 00000000..f2cab005
--- /dev/null
+++ b/api-ref/source/samples/limit-show-response.json
@@ -0,0 +1,55 @@
+{
+ "limits": [
+ {
+ "max_backups": 50,
+ "max_instances": 10,
+ "max_volumes": 40,
+ "verb": "ABSOLUTE"
+ },
+ {
+ "nextAvailable": "2019-12-23T22:38:41Z",
+ "regex": ".*",
+ "remaining": 199,
+ "unit": "MINUTE",
+ "uri": "*",
+ "value": 200,
+ "verb": "POST"
+ },
+ {
+ "nextAvailable": "2019-12-24T02:49:24Z",
+ "regex": ".*",
+ "remaining": 199,
+ "unit": "MINUTE",
+ "uri": "*",
+ "value": 200,
+ "verb": "PUT"
+ },
+ {
+ "nextAvailable": "2019-12-24T03:42:19Z",
+ "regex": ".*",
+ "remaining": 200,
+ "unit": "MINUTE",
+ "uri": "*",
+ "value": 200,
+ "verb": "DELETE"
+ },
+ {
+ "nextAvailable": "2019-12-24T03:42:19Z",
+ "regex": ".*",
+ "remaining": 199,
+ "unit": "MINUTE",
+ "uri": "*",
+ "value": 200,
+ "verb": "GET"
+ },
+ {
+ "nextAvailable": "2019-12-24T03:42:19Z",
+ "regex": "^/mgmt",
+ "remaining": 200,
+ "unit": "MINUTE",
+ "uri": "*/mgmt",
+ "value": 200,
+ "verb": "POST"
+ }
+ ]
+} \ No newline at end of file
diff --git a/api-ref/source/samples/db-check-root-user-response.json b/api-ref/source/samples/user-check-root-response.json
index f3990b45..f3990b45 100644
--- a/api-ref/source/samples/db-check-root-user-response.json
+++ b/api-ref/source/samples/user-check-root-response.json
diff --git a/api-ref/source/samples/db-create-users-request.json b/api-ref/source/samples/user-create-request.json
index c737d390..be51f5dd 100644
--- a/api-ref/source/samples/db-create-users-request.json
+++ b/api-ref/source/samples/user-create-request.json
@@ -22,13 +22,8 @@
"password": "password"
},
{
- "databases": [
- {
- "name": "databaseD"
- }
- ],
"name": "dbuser3",
"password": "password"
}
]
-}
+} \ No newline at end of file
diff --git a/api-ref/source/samples/user-enable-root-response.json b/api-ref/source/samples/user-enable-root-response.json
new file mode 100644
index 00000000..9da5154c
--- /dev/null
+++ b/api-ref/source/samples/user-enable-root-response.json
@@ -0,0 +1,6 @@
+{
+ "user": {
+ "name": "root",
+ "password": "q5BXXMUMbc8XBf5kkVToKZW4Kx3Egv5VjY0P"
+ }
+}
diff --git a/api-ref/source/samples/user-grant-databases-access-request.json b/api-ref/source/samples/user-grant-databases-access-request.json
new file mode 100644
index 00000000..c696ed0b
--- /dev/null
+++ b/api-ref/source/samples/user-grant-databases-access-request.json
@@ -0,0 +1,7 @@
+{
+ "databases":[
+ {
+ "name": "test"
+ }
+ ]
+} \ No newline at end of file
diff --git a/api-ref/source/samples/db-list-users-pagination-response.json b/api-ref/source/samples/user-list-response.json
index d211c90f..e6a1260b 100644
--- a/api-ref/source/samples/db-list-users-pagination-response.json
+++ b/api-ref/source/samples/user-list-response.json
@@ -1,10 +1,4 @@
{
- "links": [
- {
- "href": "https://troveapi.org/v1.0/1234/instances/44b277eb-39be-4921-be31-3d61b43651d7/users?limit=2&marker=dbuser2%2540%2525",
- "rel": "next"
- }
- ],
"users": [
{
"databases": [
@@ -26,6 +20,11 @@
],
"host": "%",
"name": "dbuser2"
+ },
+ {
+ "databases": [],
+ "host": "%",
+ "name": "dbuser3"
}
]
-}
+} \ No newline at end of file
diff --git a/api-ref/source/samples/user-put-request.json b/api-ref/source/samples/user-put-request.json
new file mode 100644
index 00000000..76b8ebaf
--- /dev/null
+++ b/api-ref/source/samples/user-put-request.json
@@ -0,0 +1,7 @@
+{
+ "user": {
+ "name": "new_name",
+ "password": "new_password",
+ "host": "192.168.30.98"
+ }
+} \ No newline at end of file
diff --git a/api-ref/source/samples/db-list-user-dbs-response.json b/api-ref/source/samples/user-show-response.json
index e303ad02..85a0f06f 100644
--- a/api-ref/source/samples/db-list-user-dbs-response.json
+++ b/api-ref/source/samples/user-show-response.json
@@ -1,13 +1,11 @@
{
"user": {
- "name": "exampleuser",
"databases": [
{
"name": "databaseA"
- },
- {
- "name": "databaseB"
}
- ]
+ ],
+ "host": "%",
+ "name": "dbuser1"
}
-}
+} \ No newline at end of file
diff --git a/api-ref/source/samples/user-show-root-history-response.json b/api-ref/source/samples/user-show-root-history-response.json
new file mode 100644
index 00000000..1d25326a
--- /dev/null
+++ b/api-ref/source/samples/user-show-root-history-response.json
@@ -0,0 +1,7 @@
+{
+ "root_history": {
+ "enabled": "2019-12-24T03:10:16",
+ "id": "7de1bed8-6983-4d46-9a52-0abfbb0d27a2",
+ "user": "7578487d3cc843dca904d2f4eced7dd2"
+ }
+} \ No newline at end of file
diff --git a/api-ref/source/samples/users-put-request.json b/api-ref/source/samples/users-put-request.json
new file mode 100644
index 00000000..c291c818
--- /dev/null
+++ b/api-ref/source/samples/users-put-request.json
@@ -0,0 +1,9 @@
+{
+ "users": [
+ {
+ "name": "new_name",
+ "password": "another_password",
+ "host": "192.168.30.98"
+ }
+ ]
+} \ No newline at end of file
diff --git a/api-ref/source/samples/db-versions-response.json b/api-ref/source/samples/versions-response.json
index 4cd81df9..083ac1c7 100644
--- a/api-ref/source/samples/db-versions-response.json
+++ b/api-ref/source/samples/versions-response.json
@@ -4,12 +4,12 @@
"id": "v1.0",
"links": [
{
- "href": "https://ord.databases.api.rackspacecloud.com/v1.0/",
+ "href": "http://127.0.0.1:8779/v1.0/",
"rel": "self"
}
],
"status": "CURRENT",
- "updated": "2012-01-01T00:00:00Z"
+ "updated": "2012-08-01T00:00:00Z"
}
]
}
diff --git a/api-ref/source/user-management.inc b/api-ref/source/user-management.inc
deleted file mode 100644
index 44579878..00000000
--- a/api-ref/source/user-management.inc
+++ /dev/null
@@ -1,303 +0,0 @@
-.. -*- rst -*-
-
-=============
-Users (users)
-=============
-
-Creates, lists all, and deletes users.
-
-
-Enable root user
-~~~~~~~~~~~~~~~~
-
-.. rest_method:: POST /v1.0/{project_id}/instances/{instanceId}/root
-
-Enables the root user for a database instance and returns the root password.
-
-This operation generates a root password for the root user and
-enables the root user to log in from any host.
-
-Changes that you make as a root user can impact the database instance
-and API operations in unpredictable and detrimental ways. When you
-enable the root user, you accept the possibility that we cannot
-support your database instance. We might not be able to assist you if
-you change core database settings. These changes can be, but are not
-limited to, turning off bin logs, removing users that we use to access
-your instance, and so on.
-
-Normal response codes: 200
-
-Error response codes: badRequest(400), unauthorized(401), forbidden(403),
-itemNotFound(404), badMethod(405), overLimit(413), unprocessableEntity(422),
-instanceFault(500), notImplemented(501), serviceUnavailable(503)
-
-
-Request
--------
-
-.. rest_parameters:: parameters.yaml
-
- - instanceId: instanceId
- - project_id: project_id
-
-
-Response Example
-----------------
-
-.. literalinclude:: samples/db-enable-root-user-response.json
- :language: javascript
-
-
-
-
-Show root-enabled status for database instance
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. rest_method:: GET /v1.0/{project_id}/instances/{instanceId}/root
-
-Shows root-enabled status for a database instance.
-
-Returns ``true`` if root user is enabled for a database instance.
-Otherwise, returns ``false``.
-
-Normal response codes: 200
-
-Error response codes: badRequest(400), unauthorized(401), forbidden(403),
-itemNotFound(404), badMethod(405), overLimit(413), unprocessableEntity(422),
-instanceFault(500), notImplemented(501), serviceUnavailable(503)
-
-
-Request
--------
-
-.. rest_parameters:: parameters.yaml
-
- - instanceId: instanceId
- - project_id: project_id
-
-
-Response Example
-----------------
-
-.. literalinclude:: samples/db-check-root-user-response.json
- :language: javascript
-
-
-
-
-Disable root user
-~~~~~~~~~~~~~~~~~
-
-.. rest_method:: DELETE /v1.0/{project_id}/instances/{instanceId}/root
-
-Disables the root user.
-
-Normal response codes: 204
-
-Error response codes: badRequest(400), unauthorized(401), forbidden(403),
-itemNotFound(404), badMethod(405), overLimit(413), unprocessableEntity(422),
-instanceFault(500), notImplemented(501), serviceUnavailable(503)
-
-
-Request
--------
-
-.. rest_parameters:: parameters.yaml
-
- - instanceId: instanceId
- - project_id: project_id
-
-
-
-
-Delete user
-~~~~~~~~~~~
-
-.. rest_method:: DELETE /v1.0/{project_id}/instances/{instanceId}/users/{name}
-
-Deletes a user for a database instance.
-
-Normal response codes: 202
-
-Error response codes: badRequest(400), unauthorized(401), forbidden(403),
-itemNotFound(404), badMethod(405), overLimit(413), unprocessableEntity(422),
-instanceFault(500), notImplemented(501), serviceUnavailable(503)
-
-
-Request
--------
-
-.. rest_parameters:: parameters.yaml
-
- - instanceId: instanceId
- - project_id: project_id
- - name: user_name
-
-
-
-
-Create user
-~~~~~~~~~~~
-
-.. rest_method:: POST /v1.0/{project_id}/instances/{instanceId}/users
-
-Creates a user for a database instance.
-
-Asynchronously provisions a new user for the database instance by
-using the configuration that you define in the request object.
-After the API validates the request and starts progress on the
-provisioning process, the call returns the ``Accepted (202)``
-response code.
-
-If the API cannot fulfill the corresponding request due to
-insufficient data or data that is not valid, the API returns the
-``Bad Request (400)`` response code with information about the
-nature of the failure. You cannot recover from validation errors.
-You must correct the cause of the failure and the request again.
-
-This table lists the required attributes for creating users:
-
-**Required attributes for user**
-
-+-----------------+------+------------------------------------+----------+
-| Applies to | Name | Description | Required |
-+-----------------+------+------------------------------------+----------+
-| User | name | Name of the user for the database. | Yes |
-+-----------------+------+------------------------------------+----------+
-| password | | User password for database access. | Yes |
-+-----------------+------+-------------------------+----------+----------+
-| (database) name | | Name of the database(s) that the | |
-| | | user can access. You can specify | No |
-| | | one or more database names. | |
-+-----------------+------+------------------------------------+----------+
-
-Name of the database that the user can access. You can specify one or more
-database names.
-
- **Notes**
-
-- The operation grants the user all privileges on the databases.
-
-- Do not use the ``root`` user name, which is reserved.
-
-These tables list the valid characters for database names, user
-names, and passwords.
-
-**Valid characters in database name, user name, and password**
-
-+---------------------------------------------------------------------------------------------------------------------------------+
-| Character |
-+---------------------------------------------------------------------------------------------------------------------------------+
-| Letters (upper and lower cases allowed) |
-+---------------------------------------------------------------------------------------------------------------------------------+
-| Numbers |
-+---------------------------------------------------------------------------------------------------------------------------------+
-| ``@``, ``?``, ``#``, and spaces are allowed, but **not** at the beginning and end of the database name, user name, and password |
-+---------------------------------------------------------------------------------------------------------------------------------+
-| ``_`` is allowed anywhere in the database name, user name, and password |
-+---------------------------------------------------------------------------------------------------------------------------------+
-
-**Characters that are not allowed in database name, user name, and password**
-
-+---------------------------------------------------------+
-| Character |
-+---------------------------------------------------------+
-| Single quotes |
-+---------------------------------------------------------+
-| Double quotes |
-+---------------------------------------------------------+
-| Back quotes |
-+---------------------------------------------------------+
-| Semicolons |
-+---------------------------------------------------------+
-| Commas |
-+---------------------------------------------------------+
-| Back slashes |
-+---------------------------------------------------------+
-| Forward slashes |
-+---------------------------------------------------------+
-| Spaces at the front or end of the user name or password |
-+---------------------------------------------------------+
-
-**Length restrictions for database name, user name, and password**
-
-+------------------------------+-----------------------------+
-| Restriction | Value |
-+------------------------------+-----------------------------+
-| Database name maximum length | 64 |
-+------------------------------+-----------------------------+
-| User name maximum length | 16 |
-+------------------------------+-----------------------------+
-| Password maximum length | unlimited (no restrictions) |
-+------------------------------+-----------------------------+
-
-Normal response codes: 202
-
-Error response codes: badRequest(400), unauthorized(401), forbidden(403),
-itemNotFound(404), badMethod(405), overLimit(413), unprocessableEntity(422),
-instanceFault(500), notImplemented(501), serviceUnavailable(503)
-
-
-Request
--------
-
-.. rest_parameters:: parameters.yaml
-
- - instanceId: instanceId
- - project_id: project_id
-
-Request Example
----------------
-
-.. literalinclude:: samples/db-create-users-request.json
- :language: javascript
-
-
-
-
-List database instance users
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. rest_method:: GET /v1.0/{project_id}/instances/{instanceId}/users
-
-Lists the users in a database instance and the associated databases for that
-user.
-
-This operation does not return system users. A system user is a
-database administrator who administers the health of the database.
-Also, this operation returns the ``root`` user only if it is
-enabled.
-
-The following notes apply to MySQL users:
-
-- User names can be up to 16 characters long.
-
-- When you create accounts with INSERT, you must use FLUSH
- PRIVILEGES to tell the server to reload the grant tables.
-
-- For additional information, See:
- `http://dev.mysql.com/doc/refman/5.1/en/user-account-
- management.html <http://dev.mysql.com/doc/refman/5.1/en/user-
- account-management.html>`_
-
-Normal response codes: 200
-
-Error response codes: badRequest(400), unauthorized(401), forbidden(403),
-itemNotFound(404), badMethod(405), overLimit(413), unprocessableEntity(422),
-instanceFault(500), notImplemented(501), serviceUnavailable(503)
-
-
-Request
--------
-
-.. rest_parameters:: parameters.yaml
-
- - instanceId: instanceId
- - project_id: project_id
-
-
-Response Example
-----------------
-
-.. literalinclude:: samples/db-list-users-response.json
- :language: javascript
diff --git a/api-ref/source/users.inc b/api-ref/source/users.inc
new file mode 100644
index 00000000..686a84fd
--- /dev/null
+++ b/api-ref/source/users.inc
@@ -0,0 +1,289 @@
+.. -*- rst -*-
+
+=====
+Users
+=====
+
+
+
+Create user
+~~~~~~~~~~~
+
+.. rest_method:: POST /v1.0/{project_id}/instances/{instanceId}/users
+
+Creates users for a database instance.
+
+When specifying user name and password, you can also specify databases that the user can access.
+
+Normal response codes: 202
+
+
+Request
+-------
+
+.. rest_parameters:: parameters.yaml
+
+ - project_id: project_id
+ - instanceId: instanceId
+
+Request Example
+---------------
+
+.. literalinclude:: samples/user-create-request.json
+ :language: javascript
+
+
+
+
+List database instance users
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. rest_method:: GET /v1.0/{project_id}/instances/{instanceId}/users
+
+Lists the users in a database instance and the associated databases for that
+user.
+
+This operation does not return system users. A system user is a
+database administrator who administers the health of the database.
+Also, this operation returns the ``root`` user only if it is
+enabled.
+
+Normal response codes: 200
+
+
+Request
+-------
+
+.. rest_parameters:: parameters.yaml
+
+ - project_id: project_id
+ - instanceId: instanceId
+
+
+Response Example
+----------------
+
+.. literalinclude:: samples/user-list-response.json
+ :language: javascript
+
+
+
+
+Show database instance user
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. rest_method:: GET /v1.0/{project_id}/instances/{instanceId}/users/{user_name}
+
+Get a specific user information in an instance.
+
+Normal response codes: 200
+
+
+Request
+-------
+
+.. rest_parameters:: parameters.yaml
+
+ - project_id: project_id
+ - instanceId: instanceId
+ - user_name: user_name
+
+
+Response Example
+----------------
+
+.. literalinclude:: samples/user-show-response.json
+ :language: javascript
+
+
+
+
+Delete user
+~~~~~~~~~~~
+
+.. rest_method:: DELETE /v1.0/{project_id}/instances/{instanceId}/users/{user_name}
+
+Deletes a user for a database instance.
+
+Normal response codes: 202
+
+
+Request
+-------
+
+.. rest_parameters:: parameters.yaml
+
+ - project_id: project_id
+ - instanceId: instanceId
+ - user_name: user_name
+
+
+
+
+Update a user
+~~~~~~~~~~~~~
+
+.. rest_method:: PUT /v1.0/{project_id}/instances/{instanceId}/users/{user_name}
+
+Modify attributes(e.g. user name, allowed host, password) for a specific user.
+
+Normal response codes: 202
+
+
+Request
+-------
+
+.. rest_parameters:: parameters.yaml
+
+ - project_id: project_id
+ - instanceId: instanceId
+ - user_name: user_name
+
+Request Example
+---------------
+
+.. literalinclude:: samples/user-put-request.json
+ :language: javascript
+
+
+
+
+Update users passwords
+~~~~~~~~~~~~~~~~~~~~~~
+
+.. rest_method:: PUT /v1.0/{project_id}/instances/{instanceId}/users
+
+Modify passwords for users.
+
+Normal response codes: 202
+
+
+Request
+-------
+
+.. rest_parameters:: parameters.yaml
+
+ - project_id: project_id
+ - instanceId: instanceId
+
+Request Example
+---------------
+
+.. literalinclude:: samples/users-put-request.json
+ :language: javascript
+
+
+
+
+Show root-enabled status for database instance
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. rest_method:: GET /v1.0/{project_id}/instances/{instanceId}/root
+
+Shows root-enabled status for a database instance.
+
+Returns ``true`` if root user is enabled for a database instance.
+Otherwise, returns ``false``.
+
+Normal response codes: 200
+
+
+Request
+-------
+
+.. rest_parameters:: parameters.yaml
+
+ - project_id: project_id
+ - instanceId: instanceId
+
+
+Response Example
+----------------
+
+.. literalinclude:: samples/user-check-root-response.json
+ :language: javascript
+
+
+
+
+Enable root user
+~~~~~~~~~~~~~~~~
+
+.. rest_method:: POST /v1.0/{project_id}/instances/{instanceId}/root
+
+Enables the root user for a database instance and returns the root password.
+
+This operation generates a root password for the root user and
+enables the root user to log in from any host.
+
+Enabling root user should only be restricted to admin user, as with root user,
+the cloud user can change the database settings, e.g. remove users which
+bypassing the Trove API.
+
+Normal response codes: 200
+
+
+Request
+-------
+
+.. rest_parameters:: parameters.yaml
+
+ - project_id: project_id
+ - instanceId: instanceId
+
+
+Response Example
+----------------
+
+.. literalinclude:: samples/user-enable-root-response.json
+ :language: javascript
+
+
+
+
+Disable root user
+~~~~~~~~~~~~~~~~~
+
+.. rest_method:: DELETE /v1.0/{project_id}/instances/{instanceId}/root
+
+Disables the root user.
+
+Normal response codes: 204
+
+
+Request
+-------
+
+.. rest_parameters:: parameters.yaml
+
+ - project_id: project_id
+ - instanceId: instanceId
+
+
+
+
+Show root-enabled history for database instance
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. rest_method:: GET /v1.0/{project_id}/mgmt/instances/{instanceId}/root
+
+Admin only API. Show the date and time that root user was enabled(if ever) for
+an instance.
+
+Normal response codes: 200
+
+
+Request
+-------
+
+.. rest_parameters:: parameters.yaml
+
+ - project_id: project_id
+ - instanceId: instanceId
+
+
+Response Example
+----------------
+
+.. literalinclude:: samples/user-show-root-history-response.json
+ :language: javascript \ No newline at end of file
diff --git a/trove/common/api.py b/trove/common/api.py
index 5ff5ef7d..eee7a9a3 100644
--- a/trove/common/api.py
+++ b/trove/common/api.py
@@ -215,10 +215,6 @@ class API(wsgi.Router):
conditions={'method': ['GET']})
mapper.connect("/{tenant_id}/backups/{id}",
controller=backups_resource,
- action="action",
- conditions={'method': ['POST']})
- mapper.connect("/{tenant_id}/backups/{id}",
- controller=backups_resource,
action="delete",
conditions={'method': ['DELETE']})
diff --git a/trove/extensions/mgmt/instances/models.py b/trove/extensions/mgmt/instances/models.py
index e5255d78..35102c44 100644
--- a/trove/extensions/mgmt/instances/models.py
+++ b/trove/extensions/mgmt/instances/models.py
@@ -34,10 +34,7 @@ def load_mgmt_instances(context, deleted=None, client=None,
client = clients.create_nova_client(
context, CONF.service_credentials.region_name
)
- try:
- mgmt_servers = client.rdservers.list()
- except AttributeError:
- mgmt_servers = client.servers.list(search_opts={'all_tenants': 1})
+ mgmt_servers = client.servers.list(search_opts={'all_tenants': 1})
LOG.info("Found %d servers in Nova",
len(mgmt_servers if mgmt_servers else []))
args = {}