From b3bbd09131e127e7540f4ccdb1376c10bace8b7a Mon Sep 17 00:00:00 2001 From: Jason Kölker Date: Tue, 11 Dec 2012 15:12:29 -0600 Subject: Add extension to allow hiding of addresses * Servers in certain states will have network_info but it may change, (eg. rescheduled build on another host). The extension allows the operator to hide the address information in those states * Fixes bug LP 1089092 Change-Id: Ie843e34a41c77903b201b45c5b67a6f75334cb5e --- .../all_extensions/extensions-get-resp.json | 10 +++- .../all_extensions/extensions-get-resp.xml | 5 +- .../os-hide-server-addresses/server-get-resp.json | 54 +++++++++++++++++++++ .../os-hide-server-addresses/server-get-resp.xml | 19 ++++++++ .../os-hide-server-addresses/server-post-req.json | 0 .../os-hide-server-addresses/server-post-req.xml | 0 .../os-hide-server-addresses/server-post-resp.json | 16 +++++++ .../os-hide-server-addresses/server-post-resp.xml | 6 +++ .../servers-details-resp.json | 56 ++++++++++++++++++++++ .../servers-details-resp.xml | 21 ++++++++ .../servers-list-resp.json | 18 +++++++ .../os-hide-server-addresses/servers-list-resp.xml | 7 +++ 12 files changed, 210 insertions(+), 2 deletions(-) create mode 100644 doc/api_samples/os-hide-server-addresses/server-get-resp.json create mode 100644 doc/api_samples/os-hide-server-addresses/server-get-resp.xml create mode 100644 doc/api_samples/os-hide-server-addresses/server-post-req.json create mode 100644 doc/api_samples/os-hide-server-addresses/server-post-req.xml create mode 100644 doc/api_samples/os-hide-server-addresses/server-post-resp.json create mode 100644 doc/api_samples/os-hide-server-addresses/server-post-resp.xml create mode 100644 doc/api_samples/os-hide-server-addresses/servers-details-resp.json create mode 100644 doc/api_samples/os-hide-server-addresses/servers-details-resp.xml create mode 100644 doc/api_samples/os-hide-server-addresses/servers-list-resp.json create mode 100644 doc/api_samples/os-hide-server-addresses/servers-list-resp.xml (limited to 'doc') diff --git a/doc/api_samples/all_extensions/extensions-get-resp.json b/doc/api_samples/all_extensions/extensions-get-resp.json index b85fae2de..f2ed617bf 100644 --- a/doc/api_samples/all_extensions/extensions-get-resp.json +++ b/doc/api_samples/all_extensions/extensions-get-resp.json @@ -248,6 +248,14 @@ "namespace": "http://docs.openstack.org/compute/ext/fping/api/v1.1", "updated": "2012-07-06T00:00:00+00:00" }, + { + "alias": "os-hide-server-addresses", + "description": "Support hiding server addresses in certain states.", + "links": [], + "name": "HideServerAddresses", + "namespace": "http://docs.openstack.org/compute/ext/hide_server_addresses/api/v1.1", + "updated": "2012-12-11T00:00:00+00:00" + }, { "alias": "os-hosts", "description": "Admin-only host administration", @@ -401,4 +409,4 @@ "updated": "2011-03-25T00:00:00+00:00" } ] -} +} \ No newline at end of file diff --git a/doc/api_samples/all_extensions/extensions-get-resp.xml b/doc/api_samples/all_extensions/extensions-get-resp.xml index 049498fc4..a17f415f5 100644 --- a/doc/api_samples/all_extensions/extensions-get-resp.xml +++ b/doc/api_samples/all_extensions/extensions-get-resp.xml @@ -107,6 +107,9 @@ Fping Management Extension. + + Support hiding server addresses in certain states. + Admin-only host administration @@ -164,4 +167,4 @@ Volumes support - + \ No newline at end of file diff --git a/doc/api_samples/os-hide-server-addresses/server-get-resp.json b/doc/api_samples/os-hide-server-addresses/server-get-resp.json new file mode 100644 index 000000000..b4209f461 --- /dev/null +++ b/doc/api_samples/os-hide-server-addresses/server-get-resp.json @@ -0,0 +1,54 @@ +{ + "server": { + "accessIPv4": "", + "accessIPv6": "", + "addresses": { + "private": [ + { + "addr": "192.168.0.3", + "version": 4 + } + ] + }, + "created": "2012-12-19T20:32:40Z", + "flavor": { + "id": "1", + "links": [ + { + "href": "http://openstack.example.com/openstack/flavors/1", + "rel": "bookmark" + } + ] + }, + "hostId": "d2697421d9869915ee376575508fdba76432f9b3ef451e7a1f86c62e", + "id": "2e9157dc-deea-4ee7-820a-640ecba32b5a", + "image": { + "id": "70a599e0-31e7-49b7-b260-868f441e862b", + "links": [ + { + "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "rel": "bookmark" + } + ] + }, + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/servers/2e9157dc-deea-4ee7-820a-640ecba32b5a", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/servers/2e9157dc-deea-4ee7-820a-640ecba32b5a", + "rel": "bookmark" + } + ], + "metadata": { + "My Server Name": "Apache1" + }, + "name": "new-server-test", + "progress": 0, + "status": "ACTIVE", + "tenant_id": "openstack", + "updated": "2012-12-19T20:32:42Z", + "user_id": "fake" + } +} \ No newline at end of file diff --git a/doc/api_samples/os-hide-server-addresses/server-get-resp.xml b/doc/api_samples/os-hide-server-addresses/server-get-resp.xml new file mode 100644 index 000000000..caa4a2fa5 --- /dev/null +++ b/doc/api_samples/os-hide-server-addresses/server-get-resp.xml @@ -0,0 +1,19 @@ + + + + + + + + + + Apache1 + + + + + + + + + \ No newline at end of file diff --git a/doc/api_samples/os-hide-server-addresses/server-post-req.json b/doc/api_samples/os-hide-server-addresses/server-post-req.json new file mode 100644 index 000000000..e69de29bb diff --git a/doc/api_samples/os-hide-server-addresses/server-post-req.xml b/doc/api_samples/os-hide-server-addresses/server-post-req.xml new file mode 100644 index 000000000..e69de29bb diff --git a/doc/api_samples/os-hide-server-addresses/server-post-resp.json b/doc/api_samples/os-hide-server-addresses/server-post-resp.json new file mode 100644 index 000000000..15282fde4 --- /dev/null +++ b/doc/api_samples/os-hide-server-addresses/server-post-resp.json @@ -0,0 +1,16 @@ +{ + "server": { + "adminPass": "c47PrLGGmARP", + "id": "1130fd6e-4d52-4e2a-848f-89b28fa03a7a", + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/servers/1130fd6e-4d52-4e2a-848f-89b28fa03a7a", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/servers/1130fd6e-4d52-4e2a-848f-89b28fa03a7a", + "rel": "bookmark" + } + ] + } +} \ No newline at end of file diff --git a/doc/api_samples/os-hide-server-addresses/server-post-resp.xml b/doc/api_samples/os-hide-server-addresses/server-post-resp.xml new file mode 100644 index 000000000..446fe5a9c --- /dev/null +++ b/doc/api_samples/os-hide-server-addresses/server-post-resp.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/doc/api_samples/os-hide-server-addresses/servers-details-resp.json b/doc/api_samples/os-hide-server-addresses/servers-details-resp.json new file mode 100644 index 000000000..3787cd707 --- /dev/null +++ b/doc/api_samples/os-hide-server-addresses/servers-details-resp.json @@ -0,0 +1,56 @@ +{ + "servers": [ + { + "accessIPv4": "", + "accessIPv6": "", + "addresses": { + "private": [ + { + "addr": "192.168.0.3", + "version": 4 + } + ] + }, + "created": "2012-12-19T20:32:37Z", + "flavor": { + "id": "1", + "links": [ + { + "href": "http://openstack.example.com/openstack/flavors/1", + "rel": "bookmark" + } + ] + }, + "hostId": "11c1ae0bb109cd0467c62e96917cfa2956a9f3c1dce9a6565d80f5eb", + "id": "625a1d37-3515-49ad-91e2-21075a1b2ccf", + "image": { + "id": "70a599e0-31e7-49b7-b260-868f441e862b", + "links": [ + { + "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "rel": "bookmark" + } + ] + }, + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/servers/625a1d37-3515-49ad-91e2-21075a1b2ccf", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/servers/625a1d37-3515-49ad-91e2-21075a1b2ccf", + "rel": "bookmark" + } + ], + "metadata": { + "My Server Name": "Apache1" + }, + "name": "new-server-test", + "progress": 0, + "status": "ACTIVE", + "tenant_id": "openstack", + "updated": "2012-12-19T20:32:39Z", + "user_id": "fake" + } + ] +} \ No newline at end of file diff --git a/doc/api_samples/os-hide-server-addresses/servers-details-resp.xml b/doc/api_samples/os-hide-server-addresses/servers-details-resp.xml new file mode 100644 index 000000000..0296cc167 --- /dev/null +++ b/doc/api_samples/os-hide-server-addresses/servers-details-resp.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + Apache1 + + + + + + + + + + \ No newline at end of file diff --git a/doc/api_samples/os-hide-server-addresses/servers-list-resp.json b/doc/api_samples/os-hide-server-addresses/servers-list-resp.json new file mode 100644 index 000000000..f0042254b --- /dev/null +++ b/doc/api_samples/os-hide-server-addresses/servers-list-resp.json @@ -0,0 +1,18 @@ +{ + "servers": [ + { + "id": "120eed64-e7db-409c-b565-38ce2bc90021", + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/servers/120eed64-e7db-409c-b565-38ce2bc90021", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/servers/120eed64-e7db-409c-b565-38ce2bc90021", + "rel": "bookmark" + } + ], + "name": "new-server-test" + } + ] +} \ No newline at end of file diff --git a/doc/api_samples/os-hide-server-addresses/servers-list-resp.xml b/doc/api_samples/os-hide-server-addresses/servers-list-resp.xml new file mode 100644 index 000000000..3225a4c36 --- /dev/null +++ b/doc/api_samples/os-hide-server-addresses/servers-list-resp.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file -- cgit