From 129fd64ef8f29f5e511eb7c72b1bd9856900905a Mon Sep 17 00:00:00 2001 From: Matt Dietz Date: Mon, 17 Dec 2012 18:25:27 +0000 Subject: Adds a new tenant-centric network extension Implements: blueprint tenant-networks Adds a new API extension that supports a more tenant-centric model for interacting with isolated networks. Additionally, the patch renames the existing networks extension as os-admin-networks to more fully fit the self-described implementation. Two new novaclient extensions and a novaclient change accompany this patch. DocImpact Change-Id: Ib90a65c0a92445f86e930fab88ab4495aefff7c7 --- doc/api_samples/all_extensions/extensions-get-resp.json | 14 +++++++++++--- doc/api_samples/all_extensions/extensions-get-resp.xml | 7 +++++-- doc/api_samples/os-networks/networks-list-res.json | 14 ++++++++++++++ doc/api_samples/os-networks/networks-post-res.json | 7 +++++++ .../os-quota-sets/quotas-show-defaults-get-resp.json | 2 +- .../os-quota-sets/quotas-show-defaults-get-resp.xml | 2 +- doc/api_samples/os-quota-sets/quotas-show-get-resp.json | 2 +- doc/api_samples/os-quota-sets/quotas-show-get-resp.xml | 2 +- doc/api_samples/os-quota-sets/quotas-update-post-resp.json | 2 +- doc/api_samples/os-quota-sets/quotas-update-post-resp.xml | 2 +- 10 files changed, 43 insertions(+), 11 deletions(-) create mode 100644 doc/api_samples/os-networks/networks-list-res.json create mode 100644 doc/api_samples/os-networks/networks-post-res.json (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 791830f42..5f92c1366 100644 --- a/doc/api_samples/all_extensions/extensions-get-resp.json +++ b/doc/api_samples/all_extensions/extensions-get-resp.json @@ -296,12 +296,20 @@ "namespace": "http://docs.openstack.org/compute/ext/multiplecreate/api/v1.1", "updated": "2012-08-07T00:00:00+00:00" }, + { + "alias": "os-admin-networks", + "description": "Admin-only Network Management Extension", + "links": [], + "name": "AdminNetworks", + "namespace": "http://docs.openstack.org/compute/ext/os-admin-networks/api/v1.1", + "updated": "2011-12-23T00:00:00+00:00" + }, { "alias": "os-networks", - "description": "Admin-only Network Management Extension.", + "description": "Tenant-based Network Management Extension", "links": [], - "name": "Networks", - "namespace": "http://docs.openstack.org/compute/ext/networks/api/v1.1", + "name": "OSNetworks", + "namespace": "http://docs.openstack.org/compute/ext/os-networks/api/v1.1", "updated": "2011-12-23T00:00:00+00:00" }, { diff --git a/doc/api_samples/all_extensions/extensions-get-resp.xml b/doc/api_samples/all_extensions/extensions-get-resp.xml index 178c8c283..8f92b274b 100644 --- a/doc/api_samples/all_extensions/extensions-get-resp.xml +++ b/doc/api_samples/all_extensions/extensions-get-resp.xml @@ -125,12 +125,15 @@ Allow multiple create in the Create Server v1.1 API. - - Admin-only Network Management Extension. + + Admin-only Network Management Extension Network association support. + + Tenant-based Network Management Extension + Quota classes management support. diff --git a/doc/api_samples/os-networks/networks-list-res.json b/doc/api_samples/os-networks/networks-list-res.json new file mode 100644 index 000000000..b857e8112 --- /dev/null +++ b/doc/api_samples/os-networks/networks-list-res.json @@ -0,0 +1,14 @@ +{ + "networks": [ + { + "cidr": "10.0.0.0/29", + "id": "616fb98f-46ca-475e-917e-2563e5a8cd19", + "label": "test_0" + }, + { + "cidr": "10.0.0.8/29", + "id": "616fb98f-46ca-475e-917e-2563e5a8cd20", + "label": "test_1" + } + ] +} diff --git a/doc/api_samples/os-networks/networks-post-res.json b/doc/api_samples/os-networks/networks-post-res.json new file mode 100644 index 000000000..536a9a0a4 --- /dev/null +++ b/doc/api_samples/os-networks/networks-post-res.json @@ -0,0 +1,7 @@ +{ + "network": { + "cidr": "172.0.0.0/24", + "id": "5bbcc3c4-1da2-4437-a48a-66f15b1b13f9", + "label": "public" + } +} diff --git a/doc/api_samples/os-quota-sets/quotas-show-defaults-get-resp.json b/doc/api_samples/os-quota-sets/quotas-show-defaults-get-resp.json index 70d4b66eb..ee1f6a397 100644 --- a/doc/api_samples/os-quota-sets/quotas-show-defaults-get-resp.json +++ b/doc/api_samples/os-quota-sets/quotas-show-defaults-get-resp.json @@ -13,4 +13,4 @@ "security_group_rules": 20, "security_groups": 10 } -} \ No newline at end of file +} diff --git a/doc/api_samples/os-quota-sets/quotas-show-defaults-get-resp.xml b/doc/api_samples/os-quota-sets/quotas-show-defaults-get-resp.xml index 7dfdddeb2..6a39c8506 100644 --- a/doc/api_samples/os-quota-sets/quotas-show-defaults-get-resp.xml +++ b/doc/api_samples/os-quota-sets/quotas-show-defaults-get-resp.xml @@ -11,4 +11,4 @@ 51200 20 10 - \ No newline at end of file + diff --git a/doc/api_samples/os-quota-sets/quotas-show-get-resp.json b/doc/api_samples/os-quota-sets/quotas-show-get-resp.json index 70d4b66eb..ee1f6a397 100644 --- a/doc/api_samples/os-quota-sets/quotas-show-get-resp.json +++ b/doc/api_samples/os-quota-sets/quotas-show-get-resp.json @@ -13,4 +13,4 @@ "security_group_rules": 20, "security_groups": 10 } -} \ No newline at end of file +} diff --git a/doc/api_samples/os-quota-sets/quotas-show-get-resp.xml b/doc/api_samples/os-quota-sets/quotas-show-get-resp.xml index 7dfdddeb2..6a39c8506 100644 --- a/doc/api_samples/os-quota-sets/quotas-show-get-resp.xml +++ b/doc/api_samples/os-quota-sets/quotas-show-get-resp.xml @@ -11,4 +11,4 @@ 51200 20 10 - \ No newline at end of file + diff --git a/doc/api_samples/os-quota-sets/quotas-update-post-resp.json b/doc/api_samples/os-quota-sets/quotas-update-post-resp.json index 6581c6354..c16dc6bb5 100644 --- a/doc/api_samples/os-quota-sets/quotas-update-post-resp.json +++ b/doc/api_samples/os-quota-sets/quotas-update-post-resp.json @@ -12,4 +12,4 @@ "security_group_rules": 20, "security_groups": 45 } -} \ No newline at end of file +} diff --git a/doc/api_samples/os-quota-sets/quotas-update-post-resp.xml b/doc/api_samples/os-quota-sets/quotas-update-post-resp.xml index aef4761f8..126c3fced 100644 --- a/doc/api_samples/os-quota-sets/quotas-update-post-resp.xml +++ b/doc/api_samples/os-quota-sets/quotas-update-post-resp.xml @@ -11,4 +11,4 @@ 51200 20 45 - \ No newline at end of file + -- cgit