diff options
Diffstat (limited to 'doc')
9 files changed, 75 insertions, 1 deletions
diff --git a/doc/api_samples/all_extensions/extensions-get-resp.json b/doc/api_samples/all_extensions/extensions-get-resp.json index 3752aedf5..09ede77dc 100644 --- a/doc/api_samples/all_extensions/extensions-get-resp.json +++ b/doc/api_samples/all_extensions/extensions-get-resp.json @@ -497,6 +497,14 @@ "updated": "2012-10-28T00:00:00-00:00" }, { + "alias": "os-extended-services", + "description": "Extended services support.", + "links": [], + "name": "ExtendedServices", + "namespace": "http://docs.openstack.org/compute/ext/extended_services/api/v2", + "updated": "2013-05-17T00:00:00-00:00" + }, + { "alias": "os-simple-tenant-usage", "description": "Simple tenant usage extension.", "links": [], diff --git a/doc/api_samples/all_extensions/extensions-get-resp.xml b/doc/api_samples/all_extensions/extensions-get-resp.xml index 97cfd4abd..1c6a9a58b 100644 --- a/doc/api_samples/all_extensions/extensions-get-resp.xml +++ b/doc/api_samples/all_extensions/extensions-get-resp.xml @@ -204,6 +204,9 @@ <extension alias="os-services" updated="2012-10-28T00:00:00-00:00" namespace="http://docs.openstack.org/compute/ext/services/api/v2" name="Services"> <description>Services support.</description> </extension> + <extension alias="os-extended-services" updated="2013-05-17T00:00:00-00:00" namespace="http://docs.openstack.org/compute/ext/extended_services/api/v2" name="ExtendedServices"> + <description>Extended services support.</description> + </extension> <extension alias="os-simple-tenant-usage" updated="2011-08-19T00:00:00+00:00" namespace="http://docs.openstack.org/compute/ext/os-simple-tenant-usage/api/v1.1" name="SimpleTenantUsage"> <description>Simple tenant usage extension.</description> </extension> diff --git a/doc/api_samples/os-services/service-disable-log-put-req.json b/doc/api_samples/os-services/service-disable-log-put-req.json new file mode 100644 index 000000000..6ccc5524e --- /dev/null +++ b/doc/api_samples/os-services/service-disable-log-put-req.json @@ -0,0 +1,5 @@ +{ + "host": "host1", + "binary": "nova-compute", + "disabled_reason": "test2" +} diff --git a/doc/api_samples/os-services/service-disable-log-put-req.xml b/doc/api_samples/os-services/service-disable-log-put-req.xml new file mode 100644 index 000000000..f8eec8173 --- /dev/null +++ b/doc/api_samples/os-services/service-disable-log-put-req.xml @@ -0,0 +1,2 @@ +<?xml version='1.0' encoding='UTF-8'?> +<service host="host1" binary="nova-compute" disabled_reason="test2"/> diff --git a/doc/api_samples/os-services/service-disable-log-put-resp.json b/doc/api_samples/os-services/service-disable-log-put-resp.json new file mode 100644 index 000000000..c82bc54c3 --- /dev/null +++ b/doc/api_samples/os-services/service-disable-log-put-resp.json @@ -0,0 +1,8 @@ +{ + "service": { + "binary": "nova-compute", + "host": "host1", + "disabled_reason": "test2", + "status": "disabled" + } +} diff --git a/doc/api_samples/os-services/service-disable-log-put-resp.xml b/doc/api_samples/os-services/service-disable-log-put-resp.xml new file mode 100644 index 000000000..1ddf273b1 --- /dev/null +++ b/doc/api_samples/os-services/service-disable-log-put-resp.xml @@ -0,0 +1,2 @@ +<?xml version='1.0' encoding='UTF-8'?> +<service host="host1" binary="nova-compute" status="disabled" disabled_reason="test2" /> diff --git a/doc/api_samples/os-services/service-enable-put-req.json b/doc/api_samples/os-services/service-enable-put-req.json index ffe896999..f96d34536 100644 --- a/doc/api_samples/os-services/service-enable-put-req.json +++ b/doc/api_samples/os-services/service-enable-put-req.json @@ -1,4 +1,4 @@ { "host": "host1", - "service": "nova-compute" + "binary": "nova-compute" } diff --git a/doc/api_samples/os-services/services-get-resp.json b/doc/api_samples/os-services/services-get-resp.json new file mode 100644 index 000000000..4c873d636 --- /dev/null +++ b/doc/api_samples/os-services/services-get-resp.json @@ -0,0 +1,40 @@ +{ + "services": [ + { + "binary": "nova-scheduler", + "host": "host1", + "state": "up", + "status": "disabled", + "updated_at": "2012-10-29T13:42:02.000000", + "zone": "internal", + "disabled_reason": "test1" + }, + { + "binary": "nova-compute", + "host": "host1", + "state": "up", + "status": "disabled", + "updated_at": "2012-10-29T13:42:05.000000", + "zone": "nova", + "disabled_reason": "test2" + }, + { + "binary": "nova-scheduler", + "host": "host2", + "state": "down", + "status": "enabled", + "updated_at": "2012-09-19T06:55:34.000000", + "zone": "internal", + "disabled_reason": "" + }, + { + "binary": "nova-compute", + "host": "host2", + "state": "down", + "status": "disabled", + "updated_at": "2012-09-18T08:03:38.000000", + "zone": "nova", + "disabled_reason": "test4" + } + ] +} diff --git a/doc/api_samples/os-services/services-get-resp.xml b/doc/api_samples/os-services/services-get-resp.xml new file mode 100644 index 000000000..997fc3945 --- /dev/null +++ b/doc/api_samples/os-services/services-get-resp.xml @@ -0,0 +1,6 @@ +<services> + <service status="disabled" binary="nova-scheduler" zone="internal" state="up" host="host1" updated_at="2012-10-29T13:42:02.000000" disabled_reason="test1"/> + <service status="disabled" binary="nova-compute" zone="nova" state="up" host="host1" updated_at="2012-10-29T13:42:05.000000" disabled_reason="test2"/> + <service status="enabled" binary="nova-scheduler" zone="internal" state="down" host="host2" updated_at="2012-09-19T06:55:34.000000" disabled_reason=""/> + <service status="disabled" binary="nova-compute" zone="nova" state="down" host="host2" updated_at="2012-09-18T08:03:38.000000" disabled_reason="test4"/> +</services> |