diff --git a/glance/api/v1/images.py b/glance/api/v1/images.py index 45628d9b3b..83777b2d62 100644 --- a/glance/api/v1/images.py +++ b/glance/api/v1/images.py @@ -334,7 +334,7 @@ class Controller(controller.BaseController): :param req: The WSGI/Webob Request object :returns: The response body is a mapping of the following form - .. code-block:: json + :: {'images': [ {'id': , @@ -362,7 +362,7 @@ class Controller(controller.BaseController): :param req: The WSGI/Webob Request object :returns: The response body is a mapping of the following form - .. code-block:: json + :: {'images': [{ diff --git a/glance/api/v1/members.py b/glance/api/v1/members.py index 2e9416cb29..4233ea3233 100644 --- a/glance/api/v1/members.py +++ b/glance/api/v1/members.py @@ -64,7 +64,7 @@ class Controller(controller.BaseController): :param image_id: The opaque image identifier :returns: The response body is a mapping of the following form - .. code-block:: json + :: {'members': [ {'member_id': , @@ -133,7 +133,7 @@ class Controller(controller.BaseController): Adds a membership to the image, or updates an existing one. If a body is present, it is a dict with the following format - .. code-block:: json + :: {'member': { 'can_share': [True|False] @@ -176,7 +176,7 @@ class Controller(controller.BaseController): Replaces the members of the image with those specified in the body. The body is a dict with the following format - .. code-block:: json + :: {'memberships': [ {'member_id': , @@ -216,7 +216,7 @@ class Controller(controller.BaseController): :param id: the opaque member identifier :returns: The response body is a mapping of the following form - .. code-block:: json + :: {'shared_images': [ {'image_id': , diff --git a/glance/api/v2/image_members.py b/glance/api/v2/image_members.py index db5a90fc4e..474fb07257 100644 --- a/glance/api/v2/image_members.py +++ b/glance/api/v2/image_members.py @@ -98,7 +98,7 @@ class ImageMembersController(object): :param member_id: the member identifier :returns: The response body is a mapping of the following form - .. code-block:: json + :: {'member_id': , 'image_id': , @@ -142,7 +142,7 @@ class ImageMembersController(object): :param member_id: the member identifier :returns: The response body is a mapping of the following form - .. code-block:: json + :: {'member_id': , 'image_id': , @@ -177,7 +177,7 @@ class ImageMembersController(object): :param image_id: The image identifier :returns: The response body is a mapping of the following form - .. code-block:: json + :: {'members': [ {'member_id': , @@ -208,7 +208,7 @@ class ImageMembersController(object): :param image_id: The image identifier :returns: The response body is a mapping of the following form - .. code-block:: json + :: {'member_id': , 'image_id': , diff --git a/glance/common/rpc.py b/glance/common/rpc.py index 06f651a377..a60cb3c121 100644 --- a/glance/common/rpc.py +++ b/glance/common/rpc.py @@ -101,7 +101,7 @@ class Controller(object): This is the base controller for RPC based APIs. Commands handled by this controller respect the following form: - .. code-block:: json + :: [{ 'command': 'method_name', @@ -238,7 +238,7 @@ class RPCClient(client.BaseClient): :param commands: List of commands to send. Commands must respect the following form - .. code-block:: json + :: { 'command': 'method_name', diff --git a/glance/registry/api/v1/images.py b/glance/registry/api/v1/images.py index 36151ad364..ea8b57af5a 100644 --- a/glance/registry/api/v1/images.py +++ b/glance/registry/api/v1/images.py @@ -146,7 +146,7 @@ class Controller(object): Where image_list is a sequence of mappings - .. code-block:: json + :: { 'id': , @@ -177,7 +177,7 @@ class Controller(object): :param req: the Request object coming from the wsgi layer :returns: a mapping of the following form - .. code-block:: json + :: {'images': [{