diff --git a/api-ref/source/consistency-group-snapshots.inc b/api-ref/source/consistency-group-snapshots.inc deleted file mode 100644 index 33637193ce..0000000000 --- a/api-ref/source/consistency-group-snapshots.inc +++ /dev/null @@ -1,398 +0,0 @@ -.. -*- rst -*- - -================================================== -Consistency group snapshots (versions 2.4 to 2.30) -================================================== - -You can create snapshots of consistency groups. To create a -snapshot, you specify the ID of the consistency group that you want -to snapshot. After you create a consistency group snapshot, you can -create a consistency group from it. - -A consistency group snapshot can have member shares. To add a -member share, include the ``consistency_group_id`` parameter in the -create share request. This ID must match the ID of the consistency -group from which the consistency group snapshot was created. Then, -when you use consistency group snapshots to restore data, you can -easily determine which shares belong to a consistency group. - -As an administrator, you can also reset the state of a consistency -group snapshot and ``force-delete`` a consistency group snapshot in any -state. Use the ``policy.json`` file to grant permissions for these -actions to other roles. - -.. note:: - - Consistency group snapshot APIs are part of the `experimental APIs - `_. - Consistency group snapshot APIs were removed in 2.31 API version. They - were replaced with 'share groups' APIs. - - -List consistency group snapshots -================================ - -.. rest_method:: GET /v2/{tenant_id}/cgsnapshots - -Lists all consistency group snapshots. - - -Normal response codes: 200 -Error response codes: badRequest(400), unauthorized(401), forbidden(403) - - -Request -------- - -.. rest_parameters:: parameters.yaml - - - tenant_id: tenant_id_path - - limit: limit_2 - - offset: offset_2 - - all_tenants: all_tenants_2 - - -Response parameters -------------------- - -.. rest_parameters:: parameters.yaml - - - cgsnapshots: cgsnapshots - - cgsnapshot: cgsnapshot - - id: id_1 - - name: name_8 - - cgsnapshot_links: cgsnapshot_links - - -Response example ----------------- - -.. literalinclude:: samples/consistency-group-snapshot-list-response.json - :language: javascript - - -List consistency group snapshots with details -============================================= - -.. rest_method:: GET /v2/{tenant_id}/cgsnapshots/detail - -Lists all consistency group snapshots with details. - - -Normal response codes: 200 -Error response codes: badRequest(400), unauthorized(401), forbidden(403) - - -Request -------- - -.. rest_parameters:: parameters.yaml - - - tenant_id: tenant_id_path - - limit: limit_2 - - offset: offset_2 - - all_tenants: all_tenants_2 - - -Response parameters -------------------- - -.. rest_parameters:: parameters.yaml - - - cgsnapshots: cgsnapshots - - cgsnapshot: cgsnapshot - - id: id_1 - - status: status - - links: links - - project_id: project_id_1 - - consistency_group_id: consistency_group_id_4 - - name: name_8 - - description: description_7 - - created_at: created_at_1 - - cgsnapshot_links: cgsnapshot_links - - -Response example ----------------- - -.. literalinclude:: samples/consistency-group-snapshot-list-detail-response.json - :language: javascript - - -Show consistency group snapshot details -======================================= - -.. rest_method:: GET /v2/{tenant_id}/cgsnapshots/{cgsnapshot_id} - -Shows details for a consistency group snapshot. - -Normal response codes: 200 -Error response codes: badRequest(400), unauthorized(401), forbidden(403), -itemNotFound(404) - -Request -------- - -.. rest_parameters:: parameters.yaml - - - tenant_id: tenant_id_path - - cgsnapshot_id: cgsnapshot_id - -Response parameters -------------------- - -.. rest_parameters:: parameters.yaml - - - cgsnapshot: cgsnapshot - - id: id_1 - - status: status - - links: links - - project_id: project_id_1 - - consistency_group_id: consistency_group_id_4 - - name: name_8 - - description: description_7 - - created_at: created_at_1 - - cgsnapshot_links: cgsnapshot_links - -Response example ----------------- - -.. literalinclude:: samples/consistency-group-snapshot-show-response.json - :language: javascript - - -List consistency group snapshot members -======================================= - -.. rest_method:: GET /v2/{tenant_id}/cgsnapshots/{cgsnapshot_id}/members - -Shows information about a consistency group snapshot member. - -Normal response codes: 200 -Error response codes: badRequest(400), unauthorized(401), forbidden(403) - -Request -------- - -.. rest_parameters:: parameters.yaml - - - tenant_id: tenant_id_path - - cgsnapshot_id: cgsnapshot_id_1 - - limit: limit_3 - - offset: offset_3 - -Response parameters -------------------- - -.. rest_parameters:: parameters.yaml - - - cgsnapshot_members: cgsnapshot_members - - id: id_10 - - share_id: share_id_1 - - share_type_id: share_type_id_1 - - created_at: created_at_8 - - cgsnapshot_id: cgsnapshot_id_1 - - share_protocol: share_protocol - - project_id: project_id_5 - - size: size_1 - - cgsnapshot_members_links: cgsnapshot_members_links - -Response example ----------------- - -.. literalinclude:: samples/consistency-group-member-list-response.json - :language: javascript - - -Create consistency group snapshot -================================= - -.. rest_method:: POST /v2/{tenant_id}/cgsnapshots - -Creates a consistency group snapshot. - -You can create a consistency group snapshot for a consistency group -in ``available`` state only. - -Normal response codes: 202 -Error response codes: badRequest(400), unauthorized(401), forbidden(403), -itemNotFound(404), conflict(409) - -Request -------- - -.. rest_parameters:: parameters.yaml - - - tenant_id: tenant_id_path - - consistency_group_id: consistency_group_id - - name: name_1 - - description: description_1 - -Request example ---------------- - -.. literalinclude:: samples/consistency-group-snapshot-create-request.json - :language: javascript - -Response parameters -------------------- - -.. rest_parameters:: parameters.yaml - - - cgsnapshot: cgsnapshot - - id: id_1 - - status: status - - links: links - - project_id: project_id_1 - - consistency_group_id: consistency_group_id_4 - - name: name_8 - - description: description_7 - - created_at: created_at_1 - - cgsnapshot_links: cgsnapshot_links - -Response example ----------------- - -.. literalinclude:: samples/consistency-group-snapshot-create-response.json - :language: javascript - -Reset consistency group snapshot state -====================================== - -.. rest_method:: POST /v2/{tenant_id}/cgsnapshots/{cgsnapshot_id}/action - -Administrator only. Explicitly updates the state of a consistency group -snapshot. - -Administrators can use the ``policy.json`` file to permit other -roles to complete this action. - -Normal response codes: 202 -Error response codes: badRequest(400), unauthorized(401), forbidden(403), -itemNotFound(404) - -Request -------- - -.. rest_parameters:: parameters.yaml - - - tenant_id: tenant_id_path - - cgsnapshot_id: cgsnapshot_id - - reset_status: reset_status - - os-reset_status: os-reset_status - - status: status - -Request example ---------------- - -.. literalinclude:: samples/consistency-group-snapshot-reset_status-request.json - :language: javascript - - -Force-delete consistency group snapshot -======================================= - -.. rest_method:: POST /v2/{tenant_id}/cgsnapshots/{cgsnapshot_id}/action - -Administrator only. Force-deletes a consistency group snapshot. - -Use the ``policy.json`` file to grant permissions for this action -to other roles. - -Normal response codes: 202 -Error response codes: badRequest(400), unauthorized(401), forbidden(403), -itemNotFound(404) - - -Request -------- - -.. rest_parameters:: parameters.yaml - - - tenant_id: tenant_id_path - - cgsnapshot_id: cgsnapshot_id_1 - - force_delete: force_delete - -Request example ---------------- - -.. literalinclude:: samples/consistency-group-snapshot-force_delete-request.json - :language: javascript - - -Update consistency group snapshot -================================= - -.. rest_method:: PUT /v2/{tenant_id}/cgsnapshots/{cgsnapshot_id} - -Updates a consistency group snapshot. - -You can update only these attributes: - -- ``name``, which changes the consistency group snapshot name. - -- ``description``, which changes the consistency group snapshot - description. - -Normal response codes: 200 -Error response codes: badRequest(400), unauthorized(401), forbidden(403), -itemNotFound(404) - -Request -------- - -.. rest_parameters:: parameters.yaml - - - tenant_id: tenant_id_path - - cgsnapshot_id: cgsnapshot_id_1 - - name: name_1 - - description: description_1 - -Request example ---------------- - -.. literalinclude:: samples/consistency-group-snapshot-update-request.json - :language: javascript - -Response parameters -------------------- - -.. rest_parameters:: parameters.yaml - - - cgsnapshot: cgsnapshot - - id: id_1 - - status: status - - links: links - - project_id: project_id_1 - - consistency_group_id: consistency_group_id_4 - - name: name_8 - - description: description_7 - - created_at: created_at_1 - - cgsnapshot_links: cgsnapshot_links - -Response example ----------------- - -.. literalinclude:: samples/consistency-group-snapshot-update-response.json - :language: javascript - - -Delete consistency group snapshot -================================= - -.. rest_method:: DELETE /v2/{tenant_id}/cgsnapshots/{cgsnapshot_id} - -Deletes a consistency group snapshot. - -Normal response codes: 202 -Error response codes: badRequest(400), unauthorized(401), forbidden(403), -itemNotFound(404) - -Request -------- - -.. rest_parameters:: parameters.yaml - - - tenant_id: tenant_id_path - - cgsnapshot_id: cgsnapshot_id_1 diff --git a/api-ref/source/consistency-groups.inc b/api-ref/source/consistency-groups.inc deleted file mode 100644 index 99d4d3a515..0000000000 --- a/api-ref/source/consistency-groups.inc +++ /dev/null @@ -1,355 +0,0 @@ -.. -*- rst -*- - -========================================= -Consistency groups (versions 2.4 to 2.30) -========================================= - -Consistency groups enable you to create snapshots at the exact same -point in time from multiple file system shares. For example, a -database might place its tables, logs, and configuration on -separate shares. To restore this database from a previous point in -time, it makes sense to restore the logs, tables, and configuration -together from the exact same point in time. - -As an administrator, you can also reset the state of a consistency -group and force-delete a consistency group in any state. Use the -``policy.json`` file to grant permissions for these actions to -other roles. - -.. note:: - - Consistency groups APIs are part of the `experimental APIs - `_. - Consistency group APIs were removed in 2.31 API version. They were - replaced with 'share groups' APIs. - - -List consistency groups -======================= - -.. rest_method:: GET /v2/{tenant_id}/consistency-groups - -Lists all consistency groups. - -Normal response codes: 200 -Error response codes: badRequest(400), unauthorized(401), forbidden(403) - -Request -------- - -.. rest_parameters:: parameters.yaml - - - tenant_id: tenant_id_path - - all_tenants: cg_all_tenants_query - - limit: cg_limit_query - - offset: cg_offset_query - -Response parameters -------------------- - -.. rest_parameters:: parameters.yaml - - - consistency_groups: consistency_groups - - consistency_group: consistency_group - - id: cg_id_response - - name: cg_name_response - - link: cg_links - -Response example ----------------- - -.. literalinclude:: samples/consistency-group-list-response.json - :language: javascript - - -List consistency groups with details -==================================== - -.. rest_method:: GET /v2/{tenant_id}/consistency-groups/detail - -Lists all consistency groups with details. - -Normal response codes: 200 -Error response codes: badRequest(400), unauthorized(401), forbidden(403) - -Request -------- - -.. rest_parameters:: parameters.yaml - - - tenant_id: tenant_id_path - - all_tenants: cg_all_tenants_query - - limit: cg_limit_query - - offset: cg_offset_query - -Response parameters -------------------- - -.. rest_parameters:: parameters.yaml - - - consistency_groups: consistency_groups - - consistency_group: consistency_group - - id: cg_id_response - - status: cg_status - - links: cg_links - - name: cg_name_response - - description: cg_description_response - - source_cgsnapshot_id: cg_snapshot_id - - created_at: cg_created_at - - share_network_id: cg_share_network_id - - host: cg_host - - project_id: cg_project_id - - share_server_id: cg_share_server_id - - share_types: cg_share_types_response - -Response example ----------------- - -.. literalinclude:: samples/consistency-group-list-detail-response.json - :language: javascript - - -Show consistency group details -============================== - -.. rest_method:: GET /v2/{tenant_id}/consistency-groups/{consistency_group_id} - -Shows details for a consistency group. - -Normal response codes: 200 -Error response codes: badRequest(400), unauthorized(401), forbidden(403), -itemNotFound(404) - -Request -------- - -.. rest_parameters:: parameters.yaml - - - tenant_id: tenant_id_path - - consistency_group_id: cg_id_path - -Response parameters -------------------- - -.. rest_parameters:: parameters.yaml - - - consistency_group: consistency_group - - id: cg_id_response - - status: cg_status - - links: cg_links - - name: cg_name_response - - description: cg_description_response - - source_cgsnapshot_id: cg_snapshot_id - - created_at: cg_created_at - - share_network_id: cg_share_network_id - - host: cg_host - - project_id: cg_project_id - - share_server_id: cg_share_server_id - - share_types: cg_share_types_response - -Response example ----------------- - -.. literalinclude:: samples/consistency-group-show-response.json - :language: javascript - - -Create consistency group -======================== - -.. rest_method:: POST /v2/{tenant_id}/consistency-groups - -Creates a consistency group. - - -Normal response codes: 202 -Error response codes: badRequest(400), unauthorized(401), forbidden(403), -conflict(409) - - -Request -------- - -.. rest_parameters:: parameters.yaml - - - tenant_id: tenant_id_path - - share_types: cg_share_types_request - - name: cg_name_request - - description: cg_description_request - - share_network_id: cg_share_network_id - - source_cgsnapshot_id: cg_snapshot_id - -Request example ---------------- - -.. literalinclude:: samples/consistency-group-create-request.json - :language: javascript - - -Response parameters -------------------- - -.. rest_parameters:: parameters.yaml - - - consistency_group: consistency_group - - id: cg_id_response - - status: cg_status - - links: cg_links - - name: cg_name_response - - description: cg_description_response - - source_cgsnapshot_id: cg_snapshot_id - - created_at: cg_created_at - - share_network_id: cg_share_network_id - - host: cg_host - - project_id: cg_project_id - - share_server_id: cg_share_server_id - - share_types: cg_share_types_response - - -Response example ----------------- - -.. literalinclude:: samples/consistency-group-create-response.json - :language: javascript - - -Update consistency group -======================== - -.. rest_method:: PUT /v2/{tenant_id}/consistency-groups/{consistency_group_id} - -Updates a consistency group. - -You can update only these attributes: - -- ``name``, which changes the consistency group name. - -- ``description``, which changes the consistency group description. - -Normal response codes: 200 -Error response codes: badRequest(400), unauthorized(401), forbidden(403), -itemNotFound(404) - -Request -------- - -.. rest_parameters:: parameters.yaml - - - tenant_id: tenant_id - - consistency_group_id: cg_id_path - - name: cg_name_request - - description: cg_description_request - -Request example ---------------- - -.. literalinclude:: samples/consistency-group-update-request.json - :language: javascript - -Response parameters -------------------- - -.. rest_parameters:: parameters.yaml - - - consistency_group: consistency_group - - id: cg_id_response - - status: cg_status - - links: cg_links - - name: cg_name_response - - description: cg_description_response - - source_cgsnapshot_id: cg_snapshot_id - - created_at: cg_created_at - - share_network_id: share_network_id - - host: cg_host - - project_id: cg_project_id - - share_server_id: cg_share_server_id - - share_types: cg_share_types_response - -Response example ----------------- - -.. literalinclude:: samples/consistency-group-update-response.json - :language: javascript - - -Reset consistency group state -============================= - -.. rest_method:: POST /v2/{tenant_id}/consistency-groups/{consistency_group_id}/action - -Administrator only. Explicitly updates the state of a consistency group. - -Use the ``policy.json`` file to grant permissions for this action -to other roles. - -Normal response codes: 202 -Error response codes: badRequest(400), unauthorized(401), forbidden(403), -itemNotFound(404) - -Request -------- - -.. rest_parameters:: parameters.yaml - - - tenant_id: tenant_id_path - - consistency_group_id: cg_id_path - - reset_status: reset_status - - os-reset_status: os-reset_status - - status: status - -Request example ---------------- - -.. literalinclude:: samples/consistency-group-reset_status-request.json - :language: javascript - - -Force-delete consistency group -============================== - -.. rest_method:: POST /v2/{tenant_id}/consistency-groups/{consistency_group_id}/action - -Administrator only. Force-deletes a consistency group. - -Use the ``policy.json`` file to grant permissions for this action -to other roles. - -Normal response codes: 202 -Error response codes: badRequest(400), unauthorized(401), forbidden(403), -itemNotFound(404) - -Request -------- - -.. rest_parameters:: parameters.yaml - - - tenant_id: tenant_id_path - - consistency_group_id: cg_id_path - - os-force_delete: os-force_delete - - force_delete: force_delete - -Request example ---------------- - -.. literalinclude:: samples/consistency-group-force_delete-request.json - :language: javascript - -Delete consistency group -======================== - -.. rest_method:: DELETE /v2/{tenant_id}/consistency-groups/{consistency_group_id} - -Deletes a consistency group. - -Normal response codes: 202 -Error response codes: badRequest(400), unauthorized(401), forbidden(403), -itemNotFound(404), conflict(409) - -Request -------- - -.. rest_parameters:: parameters.yaml - - - tenant_id: tenant_id_path - - consistency_group_id: cg_id_path diff --git a/api-ref/source/index.rst b/api-ref/source/index.rst index 2cd53e90cf..bcd5a38305 100644 --- a/api-ref/source/index.rst +++ b/api-ref/source/index.rst @@ -36,6 +36,4 @@ Shared File Systems API (EXPERIMENTAL) .. include:: experimental.inc .. include:: share-migration.inc -.. include:: consistency-groups.inc -.. include:: consistency-group-snapshots.inc .. include:: share-replicas.inc diff --git a/api-ref/source/os-share-manage.inc b/api-ref/source/os-share-manage.inc index 3083d5645a..97a862ae78 100644 --- a/api-ref/source/os-share-manage.inc +++ b/api-ref/source/os-share-manage.inc @@ -71,7 +71,6 @@ Response parameters - has_replicas: has_replicas - replication_type: replication_type - export_location: export_location - - consistency_group_id: consistency_group_id_5 - project_id: project_id_8 - metadata: metadata - status: status_8 @@ -83,7 +82,6 @@ Response parameters - created_at: created_at_4 - share_proto: share_proto - volume_type: volume_type - - source_cgsnapshot_member_id: source_cgsnapshot_member_id Response example ---------------- diff --git a/api-ref/source/parameters.yaml b/api-ref/source/parameters.yaml index 4dad0f220c..f04e3f2afc 100644 --- a/api-ref/source/parameters.yaml +++ b/api-ref/source/parameters.yaml @@ -8,42 +8,6 @@ api_version: type: string description: > The API version as returned in the links from the ``GET /`` call. -cg_id_path: - description: | - The UUID of the consistency group. - in: path - required: true - type: string -cg_share_network_id_path: - description: | - The UUID of the share network. - in: path - required: true - type: string -cgsnapshot_id: - description: | - The UUID of the consistency group snapshot. - in: path - required: false - type: string -cgsnapshot_id_1: - description: | - The UUID of the consistency group snapshot. - in: path - required: true - type: string -consistency_group_id_2: - description: | - The UUID of the consistency group. - in: path - required: false - type: string -consistency_group_id_7: - description: | - The UUID of the consistency group. - in: path - required: true - type: string export_location_id_path: description: | The UUID of the export location. @@ -156,15 +120,6 @@ all_tenants: in: query required: false type: boolean -all_tenants_2: - description: | - (Admin only). Defines whether to list consistency group snapshots - for all tenants. Set to ``1`` to list consistency groups for all - tenants. Set to ``0`` to list consistency groups only for the - current tenant. - in: query - required: false - type: boolean backend_capabilities_query: description: | The capabilities for the storage back end. @@ -196,43 +151,6 @@ binary_3: in: query required: false type: string -cg_all_tenants_query: - description: | - (Admin only). Defines whether to list consistency groups for - all tenants. Set to ``1`` to list consistency groups for all - tenants. Set to ``0`` to list consistency groups only for the - current tenant. - in: query - required: false - type: boolean -cg_limit_query: - description: | - The maximum number of consistency groups to return. - in: query - required: false - type: integer -cg_offset_query: - description: | - The offset to define start point of consistency - group listing. - in: query - required: false - type: integer -consistency_group_id_3: - description: | - (Since API v2.4) The UUID of the consistency - group where the share was created. You can omit this parameter if - the share was created without a consistency group. - in: query - required: false - type: string -consistency_group_id_5: - description: | - (Since API v2.4) The UUID of the consistency - group where the share was created. - in: query - required: false - type: string description_inexact_query: description: | The description pattern that can be used to filter shares, @@ -296,20 +214,6 @@ limit: in: query required: false type: integer -limit_2: - description: | - The maximum number of consistency groups snapshots - to return. - in: query - required: false - type: integer -limit_3: - description: | - The maximum number of consistency groups snapshot - members to return. - in: query - required: false - type: integer media_types: description: | Media types supported by the API. @@ -350,20 +254,6 @@ offset: in: query required: false type: integer -offset_2: - description: | - The offset to define start point of consistency - group snapshot listing. - in: query - required: false - type: integer -offset_3: - description: | - The offset to define start point of consistency - group snapshot member listing. - in: query - required: false - type: integer project_id_6: description: | The UUID of the project in which the share was @@ -836,20 +726,6 @@ capabilities: in: body required: true type: object -capability_consistency_group_support: - min_version: 2.4 - description: | - Specifies the level of support for scheduling shares within consistency - groups if the pool supports this feature. Valid values are ``host``, - ``pool`` and ``false``. If ``host``, shares within a consistency group - can span multiple storage pools belonging to a host#backend combination. - If ``pool``, shares created within a given consistency group can only be - scheduled within that pool. If ``false``, the pool cannot accept - scheduling consistency groups, and hence any shares belonging to - consistency groups. - in: body - required: true - type: string capability_driver_handles_share_servers: description: | Share server is usually a storage virtual machine or a lightweight @@ -935,143 +811,6 @@ capability_vendor_name: in: body required: true type: string -cg_created_at: - description: | - The date and time stamp when the consistency group was created. - - The date and time stamp format is `ISO 8601 - `_: - - :: - - CCYY-MM-DDThh:mm:ss±hh:mm - - The ``±hh:mm`` value, if included, returns the time zone as an - offset from UTC. - - For example, ``2015-08-27T09:49:58-05:00``. - in: body - required: true - type: string -cg_description_request: - description: | - The consistency group description. - in: body - required: false - type: string -cg_description_response: - description: | - The consistency group description. - in: body - required: true - type: string -cg_host: - description: | - The consistency group host name. - in: body - required: true - type: string -cg_id_response: - description: | - The UUID of the consistency group. - in: body - required: true - type: string -cg_links: - description: | - The consistency group links. - in: body - required: true - type: array -cg_name_request: - description: | - The consistency group name. - in: body - required: false - type: string -cg_name_response: - description: | - The consistency group name. - in: body - required: true - type: string -cg_project_id: - description: | - The ID of the project in which the consistency - group snapshot was created. - in: body - required: true - type: string -cg_share_network_id: - description: | - The UUID of the share network. - in: body - required: true - type: string -cg_share_server_id: - description: | - The UUID of the share server. - in: body - required: true - type: string -cg_share_types_request: - description: | - A list of share type IDs. - in: body - required: false - type: array -cg_share_types_response: - description: | - A list of share type IDs. - in: body - required: true - type: array -cg_snapshot_id: - description: | - The consistency group snapshot ID. A valid value - is ``null`` or the ID of the consistency group snapshot, if the - consistency group was created from a snapshot. - in: body - required: true - type: string -cg_status: - description: | - The consistency group status. A valid value is - ``creating``, ``available``, ``error``, ``deleting``, or - ``error_deleting``. - in: body - required: true - type: string -cgsnapshot: - description: | - The ``cgsnapshot`` object - in: body - required: true - type: object -cgsnapshot_links: - description: | - The consistency share snapshot links. - in: body - required: false - type: array -cgsnapshot_members: - description: | - The ``cgsnapshot_members`` object - in: body - required: true - type: array -cgsnapshot_members_links: - description: | - The consistency share snapshot member links. - in: body - required: true - type: array -cgsnapshots: - description: | - The ``cgsnapshots`` object - in: body - required: true - type: array cidr: description: | The CIDR. @@ -1087,65 +826,6 @@ cidr_1: in: body required: true type: string -consistency_group: - description: | - The ``consistency_group`` object. - in: body - required: true - type: array -consistency_group_id: - description: | - The ID of the consistency group from which to - create a snapshot. - in: body - required: true - type: string -consistency_group_id_1: - description: | - (Since API v2.4) The UUID of the available - consistency group in which the share will be created. The - consistency group must support the ``share_type`` and - ``share_network_id``. For details, see `Consistency groups `_. - in: body - required: false - type: string -consistency_group_id_4: - description: | - The ID of the consistency group from which the - snapshot was created. - in: body - required: true - type: string -consistency_group_id_6: - description: | - (Since API v2.4) The UUID of the consistency - group where the share was created. - in: body - required: true - type: string -consistency_group_support: - description: | - (Since API v2.4) The consistency group support. - A valid value is: - ``pool`` or ``host``. Consistency groups are - supported. Specifies the level of consistency groups support. - - ``false``. Consistency groups are not supported. - in: body - required: true - type: string -consistency_groups: - description: | - The ``consistency_groups`` object. - in: body - required: true - type: array -created_at_1: - description: | - The date and time stamp when the consistency - group snapshot was created. - in: body - required: true - type: string created_at_11: description: | The date and time stamp when the share server was created. @@ -1164,13 +844,6 @@ created_at_11: in: body required: true type: string -created_at_2: - description: | - The date and time stamp when the consistency - group was created. - in: body - required: true - type: string created_at_4: description: | The date and time stamp when the share was created. @@ -1239,12 +912,6 @@ deny_access: in: body required: true type: object -description_1: - description: | - The consistency group snapshot description. - in: body - required: false - type: string description_10: description: | The snapshot description. @@ -1257,12 +924,6 @@ description_11: in: body required: true type: string -description_2: - description: | - The consistency group description. - in: body - required: false - type: string description_3: description: | The security service description. @@ -1281,18 +942,6 @@ description_5: in: body required: false type: string -description_6: - description: | - The consistency group description. - in: body - required: true - type: string -description_7: - description: | - The consistency group snapshot description. - in: body - required: true - type: string description_8: description: | The extension description. @@ -1602,20 +1251,6 @@ force: in: body required: false type: boolean -force_delete: - description: | - To force-delete a consistency group snapshot, set - this value to ``null``. - in: body - required: true - type: string -force_delete_1: - description: | - To force-delete a consistency group, set this - value to ``null``. - in: body - required: true - type: string force_delete_2: description: | To force-delete a share instance, set this value @@ -1656,12 +1291,6 @@ has_replicas: in: body required: true type: boolean -host: - description: | - The consistency group host name. - in: body - required: true - type: string host_1: description: | The share host name. @@ -1729,18 +1358,6 @@ host_9: in: body required: false type: string -id_1: - description: | - The consistency group snapshot ID. - in: body - required: true - type: string -id_10: - description: | - The consistency group snapshot member ID. - in: body - required: true - type: string id_11: description: | The UUID of the share type. @@ -1963,12 +1580,6 @@ name: in: body required: true type: string -name_1: - description: | - The consistency group snapshot name. - in: body - required: false - type: string name_10: description: | The name of the extension. For example, "Fox In @@ -2004,12 +1615,6 @@ name_16: in: body required: false type: string -name_2: - description: | - The consistency group name. - in: body - required: false - type: string name_3: description: | The security service name. @@ -2028,12 +1633,6 @@ name_5: in: body required: false type: string -name_8: - description: | - The consistency group snapshot name. - in: body - required: true - type: string name_9: description: | The share type name. @@ -2189,20 +1788,6 @@ project_id: in: body required: true type: string -project_id_1: - description: | - The ID of the project in which the consistency - group snapshot was created. - in: body - required: true - type: string -project_id_2: - description: | - The ID of the project in which the consistency - group was created. - in: body - required: true - type: string project_id_4: description: | The UUID of the project in which the share was @@ -2210,13 +1795,6 @@ project_id_4: in: body required: true type: string -project_id_5: - description: | - The ID of the project in which the consistency - group snapshot member was created. - in: body - required: true - type: string project_id_7: description: | The project ID. @@ -2820,13 +2398,6 @@ share_force_delete: in: body required: true type: string -share_id_1: - description: | - The ID of the share that is a consistency group - snapshot member. - in: body - required: true - type: string share_id_2: description: | The UUID of the share from which the share @@ -3406,34 +2977,6 @@ snapshot_unmanage: in: body required: true type: string -source_cgsnapshot_id: - description: | - The ID of the consistency group snapshot from - which to create the consistency group. - in: body - required: false - type: string -source_cgsnapshot_id_1: - description: | - The consistency group snapshot ID. A valid value - is ``null`` or the ID of the consistency group snapshot, if the - consistency group was created from a snapshot. - in: body - required: true - type: string -source_cgsnapshot_member_id: - description: | - (Since API v2.4) If the share was created with - ``consistency_group_id`` attribute, the snapshot member ID. The - corresponding consistency group must be created from a snapshot - with the current share as a member. Consistency groups and - snapshots are the part of the Shared File Systems experimental - API. For details, see `Consistency groups `_ and `Consistency group snapshots `_. - in: body - required: true - type: string state: description: | Prior to versions 2.28, the state of all access rules of a given share @@ -3453,30 +2996,6 @@ state_1: in: body required: true type: string -status: - description: | - The consistency group snapshot status, which is - ``available``, ``creating``, ``error``, ``deleting``, or - ``error_deleting``. - in: body - required: true - type: string -status_1: - description: | - The consistency group status. A valid value is - ``creating``, ``available``, ``error``, ``deleting``, or - ``error_deleting``. - in: body - required: true - type: string -status_10: - description: | - The consistency group status. A valid value is - ``creating``, ``error``, ``available``, ``deleting``, or - ``error_deleting``. - in: body - required: true - type: string status_15: description: | The share server status, which is ``active``, @@ -3543,14 +3062,6 @@ status_8: in: body required: true type: string -status_9: - description: | - The consistency group snapshot status. A valid - value is ``creating``, ``error``, ``available``, ``deleting``, or - ``error_deleting``. - in: body - required: true - type: string storage_protocol: description: | The storage protocol for the back end. For diff --git a/api-ref/source/samples/consistency-group-create-request.json b/api-ref/source/samples/consistency-group-create-request.json deleted file mode 100644 index df1682392a..0000000000 --- a/api-ref/source/samples/consistency-group-create-request.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "consistency_group": { - "share_types": [ - "d2ad4f9d-cae3-4660-b0b6-58c06b385203" - ], - "name": "my-cg1", - "share_network_id": "d8ae6799-2567-4a89-aafb-fa4424350d2b", - "description": "my first consistency group" - } -} \ No newline at end of file diff --git a/api-ref/source/samples/consistency-group-create-response.json b/api-ref/source/samples/consistency-group-create-response.json deleted file mode 100644 index 11cead33be..0000000000 --- a/api-ref/source/samples/consistency-group-create-response.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "consistency_group": { - "status": "creating", - "description": "my first consistency group", - "links": [ - { - "href": "http://172.18.198.54:8786/v2/16e1ab15c35a457e9c2b2aa189f544e1/consistency_groups/6f519a48-3183-46cf-a32f-41815f813986", - "rel": "self" - }, - { - "href": "http://172.18.198.54:8786/16e1ab15c35a457e9c2b2aa189f544e1/consistency_groups/6f519a48-3183-46cf-a32f-41815f813986", - "rel": "bookmark" - } - ], - "source_cgsnapshot_id": null, - "created_at": "2015-09-16T09:28:52.880949", - "share_network_id": "d8ae6799-2567-4a89-aafb-fa4424350d2b", - "host": null, - "project_id": "16e1ab15c35a457e9c2b2aa189f544e1", - "share_types": [ - "d2ad4f9d-cae3-4660-b0b6-58c06b385203" - ], - "id": "6f519a48-3183-46cf-a32f-41815f813986", - "name": "my-cg1" - } -} \ No newline at end of file diff --git a/api-ref/source/samples/consistency-group-force_delete-request.json b/api-ref/source/samples/consistency-group-force_delete-request.json deleted file mode 100644 index e1a585a698..0000000000 --- a/api-ref/source/samples/consistency-group-force_delete-request.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "force_delete": null -} \ No newline at end of file diff --git a/api-ref/source/samples/consistency-group-list-detail-response.json b/api-ref/source/samples/consistency-group-list-detail-response.json deleted file mode 100644 index b65b2a40a8..0000000000 --- a/api-ref/source/samples/consistency-group-list-detail-response.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "consistency_groups": [ - { - "id": "6f519a48-3183-46cf-a32f-41815f813986", - "links": [ - { - "href": "http://172.18.198.54:8786/v2/16e1ab15c35a457e9c2b2aa189f544e1/consistency_groups/6f519a48-3183-46cf-a32f-41815f813986", - "rel": "self" - }, - { - "href": "http://172.18.198.54:8786/16e1ab15c35a457e9c2b2aa189f544e1/consistency_groups/6f519a48-3183-46cf-a32f-41815f813986", - "rel": "bookmark" - } - ], - "name": "my-cg1" - }, - { - "id": "aed36625-a6d7-4681-ba59-c7ba3d18c148", - "links": [ - { - "href": "http://172.18.198.54:8786/v2/16e1ab15c35a457e9c2b2aa189f544e1/consistency_groups/aed36625-a6d7-4681-ba59-c7ba3d18c148", - "rel": "self" - }, - { - "href": "http://172.18.198.54:8786/16e1ab15c35a457e9c2b2aa189f544e1/consistency_groups/aed36625-a6d7-4681-ba59-c7ba3d18c148", - "rel": "bookmark" - } - ], - "name": "my-cg2" - } - ] -} \ No newline at end of file diff --git a/api-ref/source/samples/consistency-group-list-response.json b/api-ref/source/samples/consistency-group-list-response.json deleted file mode 100644 index b65b2a40a8..0000000000 --- a/api-ref/source/samples/consistency-group-list-response.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "consistency_groups": [ - { - "id": "6f519a48-3183-46cf-a32f-41815f813986", - "links": [ - { - "href": "http://172.18.198.54:8786/v2/16e1ab15c35a457e9c2b2aa189f544e1/consistency_groups/6f519a48-3183-46cf-a32f-41815f813986", - "rel": "self" - }, - { - "href": "http://172.18.198.54:8786/16e1ab15c35a457e9c2b2aa189f544e1/consistency_groups/6f519a48-3183-46cf-a32f-41815f813986", - "rel": "bookmark" - } - ], - "name": "my-cg1" - }, - { - "id": "aed36625-a6d7-4681-ba59-c7ba3d18c148", - "links": [ - { - "href": "http://172.18.198.54:8786/v2/16e1ab15c35a457e9c2b2aa189f544e1/consistency_groups/aed36625-a6d7-4681-ba59-c7ba3d18c148", - "rel": "self" - }, - { - "href": "http://172.18.198.54:8786/16e1ab15c35a457e9c2b2aa189f544e1/consistency_groups/aed36625-a6d7-4681-ba59-c7ba3d18c148", - "rel": "bookmark" - } - ], - "name": "my-cg2" - } - ] -} \ No newline at end of file diff --git a/api-ref/source/samples/consistency-group-member-list-response.json b/api-ref/source/samples/consistency-group-member-list-response.json deleted file mode 100644 index 5671465493..0000000000 --- a/api-ref/source/samples/consistency-group-member-list-response.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "cgsnapshot_members": [ - { - "share_type_id": "be27425c-f807-4500-a056-d00721db45cf", - "share_id": "609e4924-f062-45e0-928d-7b739348c4d6", - "created_at": "2015-09-16T17:34:15.000000", - "cgsnapshot_id": "b44c894d-4bec-47aa-b389-cc8c6f0044a5", - "share_protocol": "NFS", - "project_id": "16e1ab15c35a457e9c2b2aa189f544e1", - "id": "84098fde-40ec-4c96-a908-bc532c52b3af", - "size": 1 - }, - { - "share_type_id": "be27425c-f807-4500-a056-d00721db45cf", - "share_id": "c4a2ced4-2c9f-4ae1-adaa-6171833e64df", - "created_at": "2015-09-16T17:34:15.000000", - "cgsnapshot_id": "b44c894d-4bec-47aa-b389-cc8c6f0044a5", - "share_protocol": "NFS", - "project_id": "16e1ab15c35a457e9c2b2aa189f544e1", - "id": "db492d38-dd3a-4d6b-a3b6-e65377990892", - "size": 1 - } - ] -} \ No newline at end of file diff --git a/api-ref/source/samples/consistency-group-reset_status-request.json b/api-ref/source/samples/consistency-group-reset_status-request.json deleted file mode 100644 index 4134830878..0000000000 --- a/api-ref/source/samples/consistency-group-reset_status-request.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "reset_status": { - "status": "available" - } -} \ No newline at end of file diff --git a/api-ref/source/samples/consistency-group-show-response.json b/api-ref/source/samples/consistency-group-show-response.json deleted file mode 100644 index 83616a4289..0000000000 --- a/api-ref/source/samples/consistency-group-show-response.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "consistency_group": { - "status": "available", - "description": "My first CG.", - "links": [ - { - "href": "http://172.18.198.54:8786/v2/16e1ab15c35a457e9c2b2aa189f544e1/consistency_groups/9397c191-8427-4661-a2e8-b23820dc01d4", - "rel": "self" - }, - { - "href": "http://172.18.198.54:8786/16e1ab15c35a457e9c2b2aa189f544e1/consistency_groups/9397c191-8427-4661-a2e8-b23820dc01d4", - "rel": "bookmark" - } - ], - "source_cgsnapshot_id": null, - "created_at": "2015-09-16T16:50:31.000000", - "share_network_id": "f9b2e754-ac01-4466-86e1-5c569424754e", - "share_server_id": null, - "host": "manila2@generic1#GENERIC1", - "project_id": "16e1ab15c35a457e9c2b2aa189f544e1", - "share_types": [ - "be27425c-f807-4500-a056-d00721db45cf" - ], - "id": "9397c191-8427-4661-a2e8-b23820dc01d4", - "name": "cg1" - } -} \ No newline at end of file diff --git a/api-ref/source/samples/consistency-group-snapshot-create-request.json b/api-ref/source/samples/consistency-group-snapshot-create-request.json deleted file mode 100644 index b74c714a98..0000000000 --- a/api-ref/source/samples/consistency-group-snapshot-create-request.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "cgsnapshot": { - "consistency_group_id": "9397c191-8427-4661-a2e8-b23820dc01d4", - "name": "snapshot_cg1", - "description": "Snapshot of cg1" - } -} \ No newline at end of file diff --git a/api-ref/source/samples/consistency-group-snapshot-create-response.json b/api-ref/source/samples/consistency-group-snapshot-create-response.json deleted file mode 100644 index d2f0b94429..0000000000 --- a/api-ref/source/samples/consistency-group-snapshot-create-response.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "cgsnapshot": { - "status": "creating", - "name": "snapshot_cg1", - "links": [ - { - "href": "http://172.18.198.54:8786/v2/16e1ab15c35a457e9c2b2aa189f544e1/cgsnapshot/b44c894d-4bec-47aa-b389-cc8c6f0044a5", - "rel": "self" - }, - { - "href": "http://172.18.198.54:8786/16e1ab15c35a457e9c2b2aa189f544e1/cgsnapshot/b44c894d-4bec-47aa-b389-cc8c6f0044a5", - "rel": "bookmark" - } - ], - "created_at": "2015-09-16T17:34:06.031997", - "consistency_group_id": "9397c191-8427-4661-a2e8-b23820dc01d4", - "project_id": "16e1ab15c35a457e9c2b2aa189f544e1", - "id": "b44c894d-4bec-47aa-b389-cc8c6f0044a5", - "description": "Snapshot of cg1" - } -} \ No newline at end of file diff --git a/api-ref/source/samples/consistency-group-snapshot-force_delete-request.json b/api-ref/source/samples/consistency-group-snapshot-force_delete-request.json deleted file mode 100644 index e1a585a698..0000000000 --- a/api-ref/source/samples/consistency-group-snapshot-force_delete-request.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "force_delete": null -} \ No newline at end of file diff --git a/api-ref/source/samples/consistency-group-snapshot-list-detail-response.json b/api-ref/source/samples/consistency-group-snapshot-list-detail-response.json deleted file mode 100644 index 8be3f45215..0000000000 --- a/api-ref/source/samples/consistency-group-snapshot-list-detail-response.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "cgsnapshots": [ - { - "status": "available", - "name": "snapshot_CG2", - "links": [ - { - "href": "http://172.18.198.54:8786/v2/16e1ab15c35a457e9c2b2aa189f544e1/cgsnapshot/7e5c3ca7-d54b-438d-9a9c-c65ece6bc6c6", - "rel": "self" - }, - { - "href": "http://172.18.198.54:8786/16e1ab15c35a457e9c2b2aa189f544e1/cgsnapshot/7e5c3ca7-d54b-438d-9a9c-c65ece6bc6c6", - "rel": "bookmark" - } - ], - "created_at": "2015-09-16T17:37:40.000000", - "consistency_group_id": "2d5c2600-ae67-4dff-b13c-a1c20b335e8e", - "project_id": "16e1ab15c35a457e9c2b2aa189f544e1", - "id": "7e5c3ca7-d54b-438d-9a9c-c65ece6bc6c6", - "description": "Snapshot of CG2" - }, - { - "status": "available", - "name": "snapshot_cg1", - "links": [ - { - "href": "http://172.18.198.54:8786/v2/16e1ab15c35a457e9c2b2aa189f544e1/cgsnapshot/b44c894d-4bec-47aa-b389-cc8c6f0044a5", - "rel": "self" - }, - { - "href": "http://172.18.198.54:8786/16e1ab15c35a457e9c2b2aa189f544e1/cgsnapshot/b44c894d-4bec-47aa-b389-cc8c6f0044a5", - "rel": "bookmark" - } - ], - "created_at": "2015-09-16T17:34:15.000000", - "consistency_group_id": "9397c191-8427-4661-a2e8-b23820dc01d4", - "project_id": "16e1ab15c35a457e9c2b2aa189f544e1", - "id": "b44c894d-4bec-47aa-b389-cc8c6f0044a5", - "description": "Snapshot of cg1" - } - ] -} \ No newline at end of file diff --git a/api-ref/source/samples/consistency-group-snapshot-list-response.json b/api-ref/source/samples/consistency-group-snapshot-list-response.json deleted file mode 100644 index c884f56e87..0000000000 --- a/api-ref/source/samples/consistency-group-snapshot-list-response.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "cgsnapshots": [ - { - "id": "7e5c3ca7-d54b-438d-9a9c-c65ece6bc6c6", - "links": [ - { - "href": "http://172.18.198.54:8786/v2/16e1ab15c35a457e9c2b2aa189f544e1/cgsnapshot/7e5c3ca7-d54b-438d-9a9c-c65ece6bc6c6", - "rel": "self" - }, - { - "href": "http://172.18.198.54:8786/16e1ab15c35a457e9c2b2aa189f544e1/cgsnapshot/7e5c3ca7-d54b-438d-9a9c-c65ece6bc6c6", - "rel": "bookmark" - } - ], - "name": "snapshot_CG2" - }, - { - "id": "b44c894d-4bec-47aa-b389-cc8c6f0044a5", - "links": [ - { - "href": "http://172.18.198.54:8786/v2/16e1ab15c35a457e9c2b2aa189f544e1/cgsnapshot/b44c894d-4bec-47aa-b389-cc8c6f0044a5", - "rel": "self" - }, - { - "href": "http://172.18.198.54:8786/16e1ab15c35a457e9c2b2aa189f544e1/cgsnapshot/b44c894d-4bec-47aa-b389-cc8c6f0044a5", - "rel": "bookmark" - } - ], - "name": "snapshot_cg1" - } - ] -} \ No newline at end of file diff --git a/api-ref/source/samples/consistency-group-snapshot-reset_status-request.json b/api-ref/source/samples/consistency-group-snapshot-reset_status-request.json deleted file mode 100644 index ff4edc6012..0000000000 --- a/api-ref/source/samples/consistency-group-snapshot-reset_status-request.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "reset_status": { - "status": "error" - } -} \ No newline at end of file diff --git a/api-ref/source/samples/consistency-group-snapshot-show-response.json b/api-ref/source/samples/consistency-group-snapshot-show-response.json deleted file mode 100644 index 8c9d69e1a0..0000000000 --- a/api-ref/source/samples/consistency-group-snapshot-show-response.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "cgsnapshot": { - "status": "available", - "name": "snapshot_cg1", - "links": [ - { - "href": "http://172.18.198.54:8786/v2/16e1ab15c35a457e9c2b2aa189f544e1/cgsnapshot/b44c894d-4bec-47aa-b389-cc8c6f0044a5", - "rel": "self" - }, - { - "href": "http://172.18.198.54:8786/16e1ab15c35a457e9c2b2aa189f544e1/cgsnapshot/b44c894d-4bec-47aa-b389-cc8c6f0044a5", - "rel": "bookmark" - } - ], - "created_at": "2015-09-16T17:34:15.000000", - "consistency_group_id": "9397c191-8427-4661-a2e8-b23820dc01d4", - "project_id": "16e1ab15c35a457e9c2b2aa189f544e1", - "id": "b44c894d-4bec-47aa-b389-cc8c6f0044a5", - "description": "Snapshot of cg1" - } -} \ No newline at end of file diff --git a/api-ref/source/samples/consistency-group-snapshot-update-request.json b/api-ref/source/samples/consistency-group-snapshot-update-request.json deleted file mode 100644 index e9ed9e1647..0000000000 --- a/api-ref/source/samples/consistency-group-snapshot-update-request.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "cgsnapshot": { - "description": "Changed description: there is a snapshot of CG2" - } -} \ No newline at end of file diff --git a/api-ref/source/samples/consistency-group-snapshot-update-response.json b/api-ref/source/samples/consistency-group-snapshot-update-response.json deleted file mode 100644 index 97e8a6f323..0000000000 --- a/api-ref/source/samples/consistency-group-snapshot-update-response.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "cgsnapshot": { - "status": "available", - "name": "snapshot_CG2", - "links": [ - { - "href": "http://172.18.198.54:8786/v2/16e1ab15c35a457e9c2b2aa189f544e1/cgsnapshot/7e5c3ca7-d54b-438d-9a9c-c65ece6bc6c6", - "rel": "self" - }, - { - "href": "http://172.18.198.54:8786/16e1ab15c35a457e9c2b2aa189f544e1/cgsnapshot/7e5c3ca7-d54b-438d-9a9c-c65ece6bc6c6", - "rel": "bookmark" - } - ], - "created_at": "2015-09-16T17:37:40.000000", - "consistency_group_id": "2d5c2600-ae67-4dff-b13c-a1c20b335e8e", - "project_id": "16e1ab15c35a457e9c2b2aa189f544e1", - "id": "7e5c3ca7-d54b-438d-9a9c-c65ece6bc6c6", - "description": "Changed description: there is a snapshot of CG2" - } -} \ No newline at end of file diff --git a/api-ref/source/samples/consistency-group-update-request.json b/api-ref/source/samples/consistency-group-update-request.json deleted file mode 100644 index 3561ceef10..0000000000 --- a/api-ref/source/samples/consistency-group-update-request.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "consistency_group": { - "description": "Edited description" - } -} \ No newline at end of file diff --git a/api-ref/source/samples/consistency-group-update-response.json b/api-ref/source/samples/consistency-group-update-response.json deleted file mode 100644 index 0812c788b0..0000000000 --- a/api-ref/source/samples/consistency-group-update-response.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "consistency_group": { - "status": "error", - "description": "Edited description", - "links": [ - { - "href": "http://172.18.198.54:8786/v2/16e1ab15c35a457e9c2b2aa189f544e1/consistency_groups/aed36625-a6d7-4681-ba59-c7ba3d18c148", - "rel": "self" - }, - { - "href": "http://172.18.198.54:8786/16e1ab15c35a457e9c2b2aa189f544e1/consistency_groups/aed36625-a6d7-4681-ba59-c7ba3d18c148", - "rel": "bookmark" - } - ], - "source_cgsnapshot_id": null, - "created_at": "2015-09-16T09:31:15.000000", - "share_network_id": "713df749-aac0-4a54-af52-10f6c991e80c", - "host": null, - "project_id": "16e1ab15c35a457e9c2b2aa189f544e1", - "share_types": [ - "be27425c-f807-4500-a056-d00721db45cf" - ], - "id": "aed36625-a6d7-4681-ba59-c7ba3d18c148", - "name": "my-cg2" - } -} \ No newline at end of file diff --git a/api-ref/source/samples/pools-list-detailed-response.json b/api-ref/source/samples/pools-list-detailed-response.json index e83f6b80c0..28de53a862 100644 --- a/api-ref/source/samples/pools-list-detailed-response.json +++ b/api-ref/source/samples/pools-list-detailed-response.json @@ -10,7 +10,6 @@ "share_backend_name": "GENERIC1", "total_capacity_gb": "unknown", "driver_handles_share_servers": true, - "consistency_group_support": "pool", "server_pools_mapping": {}, "pools": null, "vendor_name": "Open Source", diff --git a/api-ref/source/samples/share-create-request.json b/api-ref/source/samples/share-create-request.json index c1f55ffbc6..62e6af8bb6 100644 --- a/api-ref/source/samples/share-create-request.json +++ b/api-ref/source/samples/share-create-request.json @@ -5,7 +5,6 @@ "share_proto": "nfs", "share_network_id": "713df749-aac0-4a54-af52-10f6c991e80c", "name": "share_London", - "consistency_group_id": "9397c191-8427-4661-a2e8-b23820dc01d4", "snapshot_id": null, "is_public": true, "size": 1, diff --git a/api-ref/source/samples/share-create-response.json b/api-ref/source/samples/share-create-response.json index 96d56b310f..53c16af78e 100644 --- a/api-ref/source/samples/share-create-response.json +++ b/api-ref/source/samples/share-create-response.json @@ -28,8 +28,6 @@ "replication_type": null, "task_state": null, "snapshot_support": true, - "consistency_group_id": "9397c191-8427-4661-a2e8-b23820dc01d4", - "source_cgsnapshot_member_id": null, "volume_type": "default", "snapshot_id": null, "is_public": true, diff --git a/api-ref/source/samples/share-manage-response.json b/api-ref/source/samples/share-manage-response.json index 45ebd40b7b..a1797b5c37 100644 --- a/api-ref/source/samples/share-manage-response.json +++ b/api-ref/source/samples/share-manage-response.json @@ -20,7 +20,6 @@ "share_type": "14747856-08e5-494f-ab40-a64b9d20d8f7", "share_type_name": "d", "export_location": "10.254.0.5:/shares/share-42033c24-0261-424f-abda-4fef2f6dbfd5", - "consistency_group_id": null, "project_id": "16e1ab15c35a457e9c2b2aa189f544e1", "metadata": {}, "status": "manage_starting", @@ -35,6 +34,5 @@ "created_at": "2015-09-17T16:21:12.000000", "share_proto": "NFS", "volume_type": "d", - "source_cgsnapshot_member_id": null } } diff --git a/api-ref/source/samples/share-show-response.json b/api-ref/source/samples/share-show-response.json index 4aedc8a015..f499e1cad1 100644 --- a/api-ref/source/samples/share-show-response.json +++ b/api-ref/source/samples/share-show-response.json @@ -20,7 +20,6 @@ "share_type": "25747776-08e5-494f-ab40-a64b9d20d8f7", "share_type_name": "default", "export_location": null, - "consistency_group_id": "9397c191-8427-4661-a2e8-b23820dc01d4", "project_id": "16e1ab15c35a457e9c2b2aa189f544e1", "metadata": { "project": "my_app", @@ -39,6 +38,5 @@ "created_at": "2015-09-18T10:25:24.000000", "share_proto": "NFS", "volume_type": "default", - "source_cgsnapshot_member_id": null } } diff --git a/api-ref/source/samples/share-update-response.json b/api-ref/source/samples/share-update-response.json index d7e1a77818..6e45fe0053 100644 --- a/api-ref/source/samples/share-update-response.json +++ b/api-ref/source/samples/share-update-response.json @@ -20,7 +20,6 @@ "share_type": "25747776-08e5-494f-ab40-a64b9d20d8f7", "share_type_name": "default", "export_location": null, - "consistency_group_id": "9397c191-8427-4661-a2e8-b23820dc01d4", "project_id": "16e1ab15c35a457e9c2b2aa189f544e1", "metadata": { "project": "my_app", @@ -36,6 +35,5 @@ "created_at": "2015-09-18T10:25:24.000000", "share_proto": "NFS", "volume_type": "default", - "source_cgsnapshot_member_id": null } } diff --git a/api-ref/source/samples/shares-list-detailed-response.json b/api-ref/source/samples/shares-list-detailed-response.json index a143d5e74e..8e8151b19d 100644 --- a/api-ref/source/samples/shares-list-detailed-response.json +++ b/api-ref/source/samples/shares-list-detailed-response.json @@ -21,7 +21,6 @@ "share_type": "25747776-08e5-494f-ab40-a64b9d20d8f7", "share_type_name": "default", "export_location": null, - "consistency_group_id": "9397c191-8427-4661-a2e8-b23820dc01d4", "project_id": "16e1ab15c35a457e9c2b2aa189f544e1", "metadata": {}, "status": "error", @@ -37,7 +36,6 @@ "created_at": "2015-09-16T18:19:50.000000", "share_proto": "NFS", "volume_type": "default", - "source_cgsnapshot_member_id": null }, { "links": [ @@ -62,7 +60,6 @@ "share_type": "25747776-08e5-494f-ab40-a64b9d20d8f7", "share_type_name": "default", "export_location": "10.254.0.5:/shares/share-50ad5e7b-f6f1-4b78-a651-0812cef2bb67", - "consistency_group_id": "9397c191-8427-4661-a2e8-b23820dc01d4", "project_id": "16e1ab15c35a457e9c2b2aa189f544e1", "metadata": {}, "status": "available", @@ -78,7 +75,6 @@ "created_at": "2015-09-16T17:26:28.000000", "share_proto": "NFS", "volume_type": "default", - "source_cgsnapshot_member_id": null } ] } diff --git a/api-ref/source/scheduler-stats.inc b/api-ref/source/scheduler-stats.inc index 03ccbf620d..21378925b1 100644 --- a/api-ref/source/scheduler-stats.inc +++ b/api-ref/source/scheduler-stats.inc @@ -83,7 +83,6 @@ Response parameters - host: backend_host - capabilities: capabilities - qos: capability_qos - - consistency_group_support: capability_consistency_group_support - timestamp: timestamp - share_backend_name: capability_share_backend_name - server_pools_mapping: capability_server_pools_mapping diff --git a/api-ref/source/shares.inc b/api-ref/source/shares.inc index a1e10b2ddf..5137fd163a 100644 --- a/api-ref/source/shares.inc +++ b/api-ref/source/shares.inc @@ -114,7 +114,6 @@ Request - share_network_id: share_network_id - project_id: project_id_6 - is_public: is_public - - consistency_group_id: consistency_group_id_6 - export_location_id: export_location_id_query - export_location_path: export_location_path_query - name~: name_inexact_query @@ -169,7 +168,6 @@ Request - share_network_id: share_network_id - project_id: project_id_6 - is_public: is_public - - consistency_group_id: consistency_group_id_6 - export_location_id: export_location_id_query - export_location_path: export_location_path_query - name~: name_inexact_query @@ -191,10 +189,9 @@ Response parameters - size: size_2 - share_type: share_type_1 - export_location: export_location - - consistency_group_id: consistency_group_id_3 - project_id: project_id_4 - metadata: metadata - - status: status + - status: status_16 - description: description_5 - host: host_1 - access_rules_status: access_rules_status @@ -207,7 +204,6 @@ Response parameters - created_at: created_at_4 - share_proto: share_proto - volume_type: volume_type - - source_cgsnapshot_member_id: source_cgsnapshot_member_id Response example ---------------- @@ -252,7 +248,6 @@ Response parameters - size: size_2 - share_type: share_type_1 - export_location: export_location - - consistency_group_id: consistency_group_id_6 - project_id: project_id_4 - metadata: metadata - status: status_16 @@ -268,7 +263,6 @@ Response parameters - created_at: created_at_4 - share_proto: share_proto - volume_type: volume_type - - source_cgsnapshot_member_id: source_cgsnapshot_member_id Response example ---------------- @@ -306,7 +300,6 @@ Request - is_public: is_public - metadata: metadata - share_network_id: share_network_id_2 - - consistency_group_id: consistency_group_id_1 - availability_zone: availability_zone Request example @@ -345,9 +338,7 @@ Response parameters - host: host_1 - task_state: task_state - share_server_id: share_server_id - - consistency_group_id: consistency_group_id_6 - snapshot_support: snapshot_support - - source_cgsnapshot_member_id: source_cgsnapshot_member_id - created_at: created_at_4 Response example @@ -410,7 +401,6 @@ Response parameters - has_replicas: has_replicas - replication_type: replication_type - export_location: export_location - - consistency_group_id: consistency_group_id_6 - project_id: project_id_4 - metadata: metadata - status: status_8 @@ -422,7 +412,6 @@ Response parameters - created_at: created_at_4 - share_proto: share_proto - volume_type: volume_type - - source_cgsnapshot_member_id: source_cgsnapshot_member_id Response example ---------------- @@ -487,7 +476,6 @@ Response parameters - size: size_2 - share_type: share_type_1 - export_location: export_location - - consistency_group_id: consistency_group_id_6 - project_id: project_id_4 - metadata: metadata - status: status_16 @@ -503,7 +491,6 @@ Response parameters - created_at: created_at_4 - share_proto: share_proto - volume_type: volume_type - - source_cgsnapshot_member_id: source_cgsnapshot_member_id Response example ---------------- @@ -530,4 +517,3 @@ Request - share_id: share_id - tenant_id: tenant_id_path - - consistency_group_id: consistency_group_id_3 diff --git a/doc/source/admin/shared-file-systems-crud-share.rst b/doc/source/admin/shared-file-systems-crud-share.rst index 3452066b04..407cd5cd40 100644 --- a/doc/source/admin/shared-file-systems-crud-share.rst +++ b/doc/source/admin/shared-file-systems-crud-share.rst @@ -155,8 +155,6 @@ protocol, and size 1 GB: | replication_type | None | | created_at | 2016-03-25T12:02:46.000000 | | share_proto | NFS | - | consistency_group_id | None | - | source_cgsnapshot_member_id | None | | project_id | 907004508ef4447397ce6741a8f037c1 | | metadata | {} | +-----------------------------+--------------------------------------+ @@ -200,8 +198,6 @@ New share ``Share2`` should have a status ``available``: | replication_type | None | | created_at | 2016-03-25T12:02:46.000000 | | share_proto | NFS | - | consistency_group_id | None | - | source_cgsnapshot_member_id | None | | project_id | 907004508ef4447397ce6741a8f037c1 | | metadata | {} | +-----------------------------+----------------------------------------------------------+ @@ -306,8 +302,6 @@ share type, NFS shared file system protocol, and size 1 GB: | replication_type | None | | created_at | 2016-03-25T12:13:40.000000 | | share_proto | NFS | - | consistency_group_id | None | - | source_cgsnapshot_member_id | None | | project_id | 907004508ef4447397ce6741a8f037c1 | | metadata | {u'aim': u'testing'} | +-----------------------------+--------------------------------------+ @@ -367,7 +361,6 @@ status share should have status ``available``: | replication_type | None | | created_at | 2016-03-25T12:13:40.000000 | | share_proto | NFS | - | consistency_group_id | None | | project_id | 907004508ef4447397ce6741a8f037c1 | | metadata | {u'aim': u'testing'} | +----------------------+----------------------------------------------------------------------+ @@ -420,7 +413,6 @@ the share if you need: | replication_type | None | | created_at | 2016-03-25T12:13:40.000000 | | share_proto | NFS | - | consistency_group_id | None | | project_id | 907004508ef4447397ce6741a8f037c1 | | metadata | {u'aim': u'testing'} | +----------------------+----------------------------------------------------------------------+ @@ -553,7 +545,6 @@ include ``available``, ``error``, ``creating``, ``deleting``, | replication_type | None | | created_at | 2016-03-25T12:13:40.000000 | | share_proto | NFS | - | consistency_group_id | None | | project_id | 907004508ef4447397ce6741a8f037c1 | | metadata | {u'deadline': u'01/30/16'} | +----------------------+----------------------------------------------------------------------+ diff --git a/doc/source/admin/shared-file-systems-manage-and-unmanage-share.rst b/doc/source/admin/shared-file-systems-manage-and-unmanage-share.rst index a278573d2d..4fdf2172b7 100644 --- a/doc/source/admin/shared-file-systems-manage-and-unmanage-share.rst +++ b/doc/source/admin/shared-file-systems-manage-and-unmanage-share.rst @@ -111,8 +111,6 @@ To manage share, run: | replication_type | None | | created_at | 2016-03-25T15:22:43.000000 | | share_proto | NFS | - | consistency_group_id | None | - | source_cgsnapshot_member_id | None | | project_id | 907004508ef4447397ce6741a8f037c1 | | metadata | {} | +-----------------------------+--------------------------------------+ @@ -156,7 +154,6 @@ Check that the share is available: | replication_type | None | | created_at | 2016-03-25T15:22:43.000000 | | share_proto | NFS | - | consistency_group_id | None | | project_id | 907004508ef4447397ce6741a8f037c1 | | metadata | {} | +----------------------+--------------------------------------------------------------------------+ diff --git a/doc/source/admin/shared-file-systems-share-replication.rst b/doc/source/admin/shared-file-systems-share-replication.rst index ae82d13fed..5af53bae34 100644 --- a/doc/source/admin/shared-file-systems-share-replication.rst +++ b/doc/source/admin/shared-file-systems-share-replication.rst @@ -207,8 +207,6 @@ protocol, size and the availability zone. | replication_type | readable | | created_at | 2016-03-29T20:22:18.000000 | | share_proto | NFS | - | consistency_group_id | None | - | source_cgsnapshot_member_id | None | | project_id | 48a5ca76ac69405e99dc1c13c5195186 | | metadata | {} | +-----------------------------+--------------------------------------+ @@ -255,8 +253,6 @@ Specify the share ID or name as a parameter. | replication_type | readable | | created_at | 2016-03-29T20:22:18.000000 | | share_proto | NFS | - | consistency_group_id | None | - | source_cgsnapshot_member_id | None | | project_id | 48a5ca76ac69405e99dc1c13c5195186 | | metadata | {} | +-----------------------------+--------------------------------------------------------------------+ diff --git a/doc/source/admin/shared-file-systems-share-resize.rst b/doc/source/admin/shared-file-systems-share-resize.rst index 0f20a68444..d4bdd0c426 100644 --- a/doc/source/admin/shared-file-systems-share-resize.rst +++ b/doc/source/admin/shared-file-systems-share-resize.rst @@ -58,7 +58,6 @@ To extend the share and check the result, run: | replication_type | None | | created_at | 2016-03-25T15:33:18.000000 | | share_proto | NFS | - | consistency_group_id | None | | project_id | 907004508ef4447397ce6741a8f037c1 | | metadata | {} | +----------------------+--------------------------------------------------------------------------+ @@ -105,7 +104,6 @@ check the result, run: | replication_type | None | | created_at | 2016-03-25T15:33:18.000000 | | share_proto | NFS | - | consistency_group_id | None | | project_id | 907004508ef4447397ce6741a8f037c1 | | metadata | {} | +----------------------+--------------------------------------------------------------------------+ diff --git a/doc/source/admin/shared-file-systems-snapshots.rst b/doc/source/admin/shared-file-systems-snapshots.rst index 6aab59aa50..6aa9bad15a 100644 --- a/doc/source/admin/shared-file-systems-snapshots.rst +++ b/doc/source/admin/shared-file-systems-snapshots.rst @@ -92,8 +92,6 @@ it is available: | created_at | 2015-09-25T06:25:50.240417 | | export_location | None | | share_proto | NFS | - | consistency_group_id | None | - | source_cgsnapshot_member_id | None | | project_id | 20787a7ba11946adad976463b57d8a2f | | metadata | {u'source': u'snapshot'} | +-----------------------------+--------------------------------------+ @@ -120,8 +118,6 @@ it is available: | share_type | c0086582-30a6-4060-b096-a42ec9d66b86 | | created_at | 2015-09-25T06:25:50.000000 | | share_proto | NFS | - | consistency_group_id | None | - | source_cgsnapshot_member_id | None | | project_id | 20787a7ba11946adad976463b57d8a2f | | metadata | {u'source': u'snapshot'} | +-----------------------------+-------------------------------------------+ diff --git a/doc/source/contributor/driver_filter_goodness_weigher.rst b/doc/source/contributor/driver_filter_goodness_weigher.rst index 27f3998452..959e8aa07a 100644 --- a/doc/source/contributor/driver_filter_goodness_weigher.rst +++ b/doc/source/contributor/driver_filter_goodness_weigher.rst @@ -135,9 +135,6 @@ thin\_provisioning updated Last time this host's stats were updated -consistency\_group\_support - Whether or not the back end supports creation of consistency groups - dedupe Whether or not dedupe is supported by this host @@ -224,12 +221,6 @@ size share\_proto The protocol of this share -source\_cgsnapshot\_member\_id - The ID of the consistency group snapshot member - -consistency\_group\_id - This share consistency group ID - metadata General share metadata diff --git a/doc/source/contributor/driver_requirements.rst b/doc/source/contributor/driver_requirements.rst index dc914c4e7a..3f41b39049 100644 --- a/doc/source/contributor/driver_requirements.rst +++ b/doc/source/contributor/driver_requirements.rst @@ -196,15 +196,6 @@ migration using an approach that works for any manufacturer, but driver vendors can implement a better optimized migration function for when migration involves backends or pools related to the same vendor. -Consistency Groups ------------------- - -Shares can be created within Consistency Groups in order to guarantee snapshot -consistency of multiple shares. In order to make use of this feature, driver -vendors must report this capability and implement its functions to work -according to the backend, so the feature can be properly invoked through -manila API. - Share Replication ----------------- diff --git a/doc/source/contributor/tempest_tests.rst b/doc/source/contributor/tempest_tests.rst index 73551828e9..2b12c653c3 100644 --- a/doc/source/contributor/tempest_tests.rst +++ b/doc/source/contributor/tempest_tests.rst @@ -47,7 +47,6 @@ Here is a configuration example: run_extend_tests = True run_shrink_tests = True run_snapshot_tests = True - run_consistency_group_tests = True run_replication_tests = True run_migration_tests = True run_manage_unmanage_tests = True diff --git a/doc/source/install/common/dhss-false-mode-using-shared-file-systems.rst b/doc/source/install/common/dhss-false-mode-using-shared-file-systems.rst index e144a2fefb..7eda6fa86d 100644 --- a/doc/source/install/common/dhss-false-mode-using-shared-file-systems.rst +++ b/doc/source/install/common/dhss-false-mode-using-shared-file-systems.rst @@ -81,8 +81,6 @@ Create a share | replication_type | None | | created_at | 2016-03-30T19:10:33.000000 | | share_proto | NFS | - | consistency_group_id | None | - | source_cgsnapshot_member_id | None | | project_id | 3a46a53a377642a284e1d12efabb3b5a | | metadata | {} | +-----------------------------+--------------------------------------+ @@ -130,8 +128,6 @@ Create a share | replication_type | None | | created_at | 2016-03-30T19:10:33.000000 | | share_proto | NFS | - | consistency_group_id | None | - | source_cgsnapshot_member_id | None | | project_id | 3a46a53a377642a284e1d12efabb3b5a | | metadata | {} | +-----------------------------+------------------------------------------------------------------------------------+ diff --git a/doc/source/install/common/dhss-true-mode-using-shared-file-systems.rst b/doc/source/install/common/dhss-true-mode-using-shared-file-systems.rst index 1d629366d5..8b2866bed9 100644 --- a/doc/source/install/common/dhss-true-mode-using-shared-file-systems.rst +++ b/doc/source/install/common/dhss-true-mode-using-shared-file-systems.rst @@ -173,8 +173,6 @@ Create a share | created_at | 2016-01-26T20:08:50.502877 | | export_location | None | | share_proto | NFS | - | consistency_group_id | None | - | source_cgsnapshot_member_id | None | | project_id | 48e8c35b2ac6495d86d4be61658975e7 | | metadata | {} | +-----------------------------+--------------------------------------+ @@ -222,8 +220,6 @@ Create a share | replication_type | None | | created_at | 2016-03-30T19:10:33.000000 | | share_proto | NFS | - | consistency_group_id | None | - | source_cgsnapshot_member_id | None | | project_id | 48e8c35b2ac6495d86d4be61658975e7 | | metadata | {} | +-----------------------------+------------------------------------------------------------------------------------+ diff --git a/doc/source/user/create-and-manage-shares.rst b/doc/source/user/create-and-manage-shares.rst index 150545d59b..46d9e4505b 100644 --- a/doc/source/user/create-and-manage-shares.rst +++ b/doc/source/user/create-and-manage-shares.rst @@ -83,8 +83,6 @@ Create a share | replication_type | None | | created_at | 2016-03-24T14:15:34.000000 | | share_proto | NFS | - | consistency_group_id | None | - | source_cgsnapshot_member_id | None | | project_id | 907004508ef4447397ce6741a8f037c1 | | metadata | {} | +-----------------------------+--------------------------------------+ @@ -128,8 +126,6 @@ Create a share | replication_type | None | | created_at | 2016-03-24T14:15:34.000000 | | share_proto | NFS | - | consistency_group_id | None | - | source_cgsnapshot_member_id | None | | project_id | 907004508ef4447397ce6741a8f037c1 | | metadata | {} | +-----------------------------+---------------------------------------------------------------+ @@ -312,8 +308,6 @@ Create share from snapshot | replication_type | None | | created_at | 2016-03-24T14:41:36.000000 | | share_proto | NFS | - | consistency_group_id | None | - | source_cgsnapshot_member_id | None | | project_id | 907004508ef4447397ce6741a8f037c1 | | metadata | {} | +-----------------------------+--------------------------------------+ @@ -369,8 +363,6 @@ Create share from snapshot | replication_type | None | | created_at | 2016-03-24T14:41:36.000000 | | share_proto | NFS | - | consistency_group_id | None | - | source_cgsnapshot_member_id | None | | project_id | 907004508ef4447397ce6741a8f037c1 | | metadata | {} | +-----------------------------+---------------------------------------------------------------+ @@ -479,8 +471,6 @@ Extend share | replication_type | None | | created_at | 2016-03-24T14:15:34.000000 | | share_proto | NFS | - | consistency_group_id | None | - | source_cgsnapshot_member_id | None | | project_id | 907004508ef4447397ce6741a8f037c1 | | metadata | {} | +-----------------------------+---------------------------------------------------------------+ @@ -524,8 +514,6 @@ Extend share | replication_type | None | | created_at | 2016-03-24T14:15:34.000000 | | share_proto | NFS | - | consistency_group_id | None | - | source_cgsnapshot_member_id | None | | project_id | 907004508ef4447397ce6741a8f037c1 | | metadata | {} | +-----------------------------+---------------------------------------------------------------+ @@ -578,8 +566,6 @@ Shrink share | replication_type | None | | created_at | 2016-03-24T14:15:34.000000 | | share_proto | NFS | - | consistency_group_id | None | - | source_cgsnapshot_member_id | None | | project_id | 907004508ef4447397ce6741a8f037c1 | | metadata | {} | +-----------------------------+---------------------------------------------------------------+ @@ -623,8 +609,6 @@ Shrink share | replication_type | None | | created_at | 2016-03-24T14:15:34.000000 | | share_proto | NFS | - | consistency_group_id | None | - | source_cgsnapshot_member_id | None | | project_id | 907004508ef4447397ce6741a8f037c1 | | metadata | {} | +-----------------------------+---------------------------------------------------------------+