summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-02-16 07:38:30 +0000
committerGerrit Code Review <review@openstack.org>2013-02-16 07:38:30 +0000
commit29aea13f085ddf7730d4285ceb6e18e385b02f7b (patch)
treef38b9826cce8d579799d6c344f07af64f05c1827 /doc
parent8bd111f9018cd23e16e66ee0cdfb0ad5748ce33d (diff)
parentde56abd4b1ed1c797d20c486eeee8d2a5eba5482 (diff)
downloadnova-29aea13f085ddf7730d4285ceb6e18e385b02f7b.tar.gz
nova-29aea13f085ddf7730d4285ceb6e18e385b02f7b.tar.xz
nova-29aea13f085ddf7730d4285ceb6e18e385b02f7b.zip
Merge "Adds API Sample tests for FlavorAccess extension."
Diffstat (limited to 'doc')
-rw-r--r--doc/api_samples/os-flavor-access/flavor-access-add-tenant-req.json5
-rw-r--r--doc/api_samples/os-flavor-access/flavor-access-add-tenant-req.xml4
-rw-r--r--doc/api_samples/os-flavor-access/flavor-access-add-tenant-resp.json8
-rw-r--r--doc/api_samples/os-flavor-access/flavor-access-add-tenant-resp.xml4
-rw-r--r--doc/api_samples/os-flavor-access/flavor-access-create-req.json10
-rw-r--r--doc/api_samples/os-flavor-access/flavor-access-create-req.xml10
-rw-r--r--doc/api_samples/os-flavor-access/flavor-access-create-resp.json20
-rw-r--r--doc/api_samples/os-flavor-access/flavor-access-create-resp.xml5
-rw-r--r--doc/api_samples/os-flavor-access/flavor-access-detail-resp.json94
-rw-r--r--doc/api_samples/os-flavor-access/flavor-access-detail-resp.xml23
-rw-r--r--doc/api_samples/os-flavor-access/flavor-access-list-resp.json8
-rw-r--r--doc/api_samples/os-flavor-access/flavor-access-list-resp.xml4
-rw-r--r--doc/api_samples/os-flavor-access/flavor-access-remove-tenant-req.json5
-rw-r--r--doc/api_samples/os-flavor-access/flavor-access-remove-tenant-req.xml4
-rw-r--r--doc/api_samples/os-flavor-access/flavor-access-remove-tenant-resp.json3
-rw-r--r--doc/api_samples/os-flavor-access/flavor-access-remove-tenant-resp.xml2
-rw-r--r--doc/api_samples/os-flavor-access/flavor-access-show-resp.json20
-rw-r--r--doc/api_samples/os-flavor-access/flavor-access-show-resp.xml5
18 files changed, 234 insertions, 0 deletions
diff --git a/doc/api_samples/os-flavor-access/flavor-access-add-tenant-req.json b/doc/api_samples/os-flavor-access/flavor-access-add-tenant-req.json
new file mode 100644
index 000000000..dd847d6bc
--- /dev/null
+++ b/doc/api_samples/os-flavor-access/flavor-access-add-tenant-req.json
@@ -0,0 +1,5 @@
+{
+ "addTenantAccess": {
+ "tenant": "fake_tenant"
+ }
+} \ No newline at end of file
diff --git a/doc/api_samples/os-flavor-access/flavor-access-add-tenant-req.xml b/doc/api_samples/os-flavor-access/flavor-access-add-tenant-req.xml
new file mode 100644
index 000000000..ab9ec8ba7
--- /dev/null
+++ b/doc/api_samples/os-flavor-access/flavor-access-add-tenant-req.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<addTenantAccess>
+ <tenant>fake_tenant</tenant>
+</addTenantAccess> \ No newline at end of file
diff --git a/doc/api_samples/os-flavor-access/flavor-access-add-tenant-resp.json b/doc/api_samples/os-flavor-access/flavor-access-add-tenant-resp.json
new file mode 100644
index 000000000..b6c1bc77d
--- /dev/null
+++ b/doc/api_samples/os-flavor-access/flavor-access-add-tenant-resp.json
@@ -0,0 +1,8 @@
+{
+ "flavor_access": [
+ {
+ "flavor_id": "10",
+ "tenant_id": "fake_tenant"
+ }
+ ]
+} \ No newline at end of file
diff --git a/doc/api_samples/os-flavor-access/flavor-access-add-tenant-resp.xml b/doc/api_samples/os-flavor-access/flavor-access-add-tenant-resp.xml
new file mode 100644
index 000000000..1e55ad2f9
--- /dev/null
+++ b/doc/api_samples/os-flavor-access/flavor-access-add-tenant-resp.xml
@@ -0,0 +1,4 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<flavor_access>
+ <access tenant_id="fake_tenant" flavor_id="10"/>
+</flavor_access> \ No newline at end of file
diff --git a/doc/api_samples/os-flavor-access/flavor-access-create-req.json b/doc/api_samples/os-flavor-access/flavor-access-create-req.json
new file mode 100644
index 000000000..77c51d7e4
--- /dev/null
+++ b/doc/api_samples/os-flavor-access/flavor-access-create-req.json
@@ -0,0 +1,10 @@
+{
+ "flavor": {
+ "name": "test_flavor",
+ "ram": 1024,
+ "vcpus": 2,
+ "disk": 10,
+ "id": "10",
+ "os-flavor-access:is_public": false
+ }
+} \ No newline at end of file
diff --git a/doc/api_samples/os-flavor-access/flavor-access-create-req.xml b/doc/api_samples/os-flavor-access/flavor-access-create-req.xml
new file mode 100644
index 000000000..81256cf25
--- /dev/null
+++ b/doc/api_samples/os-flavor-access/flavor-access-create-req.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<flavor xmlns="http://docs.openstack.org/compute/api/v1.1"
+ xmlns:os-flavor-access="http://docs.openstack.org/compute/ext/flavor_access/api/v1.1"
+ name="test_flavor"
+ ram="1024"
+ vcpus="2"
+ disk="10"
+ id="10"
+ os-flavor-access:is_public="False"
+/> \ No newline at end of file
diff --git a/doc/api_samples/os-flavor-access/flavor-access-create-resp.json b/doc/api_samples/os-flavor-access/flavor-access-create-resp.json
new file mode 100644
index 000000000..433c36b34
--- /dev/null
+++ b/doc/api_samples/os-flavor-access/flavor-access-create-resp.json
@@ -0,0 +1,20 @@
+{
+ "flavor": {
+ "disk": 10,
+ "id": "10",
+ "links": [
+ {
+ "href": "http://openstack.example.com/v2/openstack/flavors/10",
+ "rel": "self"
+ },
+ {
+ "href": "http://openstack.example.com/openstack/flavors/10",
+ "rel": "bookmark"
+ }
+ ],
+ "name": "test_flavor",
+ "os-flavor-access:is_public": false,
+ "ram": 1024,
+ "vcpus": 2
+ }
+} \ No newline at end of file
diff --git a/doc/api_samples/os-flavor-access/flavor-access-create-resp.xml b/doc/api_samples/os-flavor-access/flavor-access-create-resp.xml
new file mode 100644
index 000000000..5c40d3aea
--- /dev/null
+++ b/doc/api_samples/os-flavor-access/flavor-access-create-resp.xml
@@ -0,0 +1,5 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<flavor xmlns:os-flavor-access="http://docs.openstack.org/compute/ext/flavor_access/api/v2" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="10" vcpus="2" ram="1024" name="test_flavor" id="10" os-flavor-access:is_public="False">
+ <atom:link href="http://openstack.example.com/v2/openstack/flavors/10" rel="self"/>
+ <atom:link href="http://openstack.example.com/openstack/flavors/10" rel="bookmark"/>
+</flavor> \ No newline at end of file
diff --git a/doc/api_samples/os-flavor-access/flavor-access-detail-resp.json b/doc/api_samples/os-flavor-access/flavor-access-detail-resp.json
new file mode 100644
index 000000000..f5e8a7584
--- /dev/null
+++ b/doc/api_samples/os-flavor-access/flavor-access-detail-resp.json
@@ -0,0 +1,94 @@
+{
+ "flavors": [
+ {
+ "disk": 0,
+ "id": "1",
+ "links": [
+ {
+ "href": "http://openstack.example.com/v2/openstack/flavors/1",
+ "rel": "self"
+ },
+ {
+ "href": "http://openstack.example.com/openstack/flavors/1",
+ "rel": "bookmark"
+ }
+ ],
+ "name": "m1.tiny",
+ "os-flavor-access:is_public": true,
+ "ram": 512,
+ "vcpus": 1
+ },
+ {
+ "disk": 20,
+ "id": "2",
+ "links": [
+ {
+ "href": "http://openstack.example.com/v2/openstack/flavors/2",
+ "rel": "self"
+ },
+ {
+ "href": "http://openstack.example.com/openstack/flavors/2",
+ "rel": "bookmark"
+ }
+ ],
+ "name": "m1.small",
+ "os-flavor-access:is_public": true,
+ "ram": 2048,
+ "vcpus": 1
+ },
+ {
+ "disk": 40,
+ "id": "3",
+ "links": [
+ {
+ "href": "http://openstack.example.com/v2/openstack/flavors/3",
+ "rel": "self"
+ },
+ {
+ "href": "http://openstack.example.com/openstack/flavors/3",
+ "rel": "bookmark"
+ }
+ ],
+ "name": "m1.medium",
+ "os-flavor-access:is_public": true,
+ "ram": 4096,
+ "vcpus": 2
+ },
+ {
+ "disk": 80,
+ "id": "4",
+ "links": [
+ {
+ "href": "http://openstack.example.com/v2/openstack/flavors/4",
+ "rel": "self"
+ },
+ {
+ "href": "http://openstack.example.com/openstack/flavors/4",
+ "rel": "bookmark"
+ }
+ ],
+ "name": "m1.large",
+ "os-flavor-access:is_public": true,
+ "ram": 8192,
+ "vcpus": 4
+ },
+ {
+ "disk": 160,
+ "id": "5",
+ "links": [
+ {
+ "href": "http://openstack.example.com/v2/openstack/flavors/5",
+ "rel": "self"
+ },
+ {
+ "href": "http://openstack.example.com/openstack/flavors/5",
+ "rel": "bookmark"
+ }
+ ],
+ "name": "m1.xlarge",
+ "os-flavor-access:is_public": true,
+ "ram": 16384,
+ "vcpus": 8
+ }
+ ]
+} \ No newline at end of file
diff --git a/doc/api_samples/os-flavor-access/flavor-access-detail-resp.xml b/doc/api_samples/os-flavor-access/flavor-access-detail-resp.xml
new file mode 100644
index 000000000..1cbe69c7d
--- /dev/null
+++ b/doc/api_samples/os-flavor-access/flavor-access-detail-resp.xml
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<flavors xmlns:os-flavor-access="http://docs.openstack.org/compute/ext/flavor_access/api/v2" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
+ <flavor disk="0" vcpus="1" ram="512" name="m1.tiny" id="1" os-flavor-access:is_public="True">
+ <atom:link href="http://openstack.example.com/v2/openstack/flavors/1" rel="self"/>
+ <atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/>
+ </flavor>
+ <flavor disk="20" vcpus="1" ram="2048" name="m1.small" id="2" os-flavor-access:is_public="True">
+ <atom:link href="http://openstack.example.com/v2/openstack/flavors/2" rel="self"/>
+ <atom:link href="http://openstack.example.com/openstack/flavors/2" rel="bookmark"/>
+ </flavor>
+ <flavor disk="40" vcpus="2" ram="4096" name="m1.medium" id="3" os-flavor-access:is_public="True">
+ <atom:link href="http://openstack.example.com/v2/openstack/flavors/3" rel="self"/>
+ <atom:link href="http://openstack.example.com/openstack/flavors/3" rel="bookmark"/>
+ </flavor>
+ <flavor disk="80" vcpus="4" ram="8192" name="m1.large" id="4" os-flavor-access:is_public="True">
+ <atom:link href="http://openstack.example.com/v2/openstack/flavors/4" rel="self"/>
+ <atom:link href="http://openstack.example.com/openstack/flavors/4" rel="bookmark"/>
+ </flavor>
+ <flavor disk="160" vcpus="8" ram="16384" name="m1.xlarge" id="5" os-flavor-access:is_public="True">
+ <atom:link href="http://openstack.example.com/v2/openstack/flavors/5" rel="self"/>
+ <atom:link href="http://openstack.example.com/openstack/flavors/5" rel="bookmark"/>
+ </flavor>
+</flavors> \ No newline at end of file
diff --git a/doc/api_samples/os-flavor-access/flavor-access-list-resp.json b/doc/api_samples/os-flavor-access/flavor-access-list-resp.json
new file mode 100644
index 000000000..b6c1bc77d
--- /dev/null
+++ b/doc/api_samples/os-flavor-access/flavor-access-list-resp.json
@@ -0,0 +1,8 @@
+{
+ "flavor_access": [
+ {
+ "flavor_id": "10",
+ "tenant_id": "fake_tenant"
+ }
+ ]
+} \ No newline at end of file
diff --git a/doc/api_samples/os-flavor-access/flavor-access-list-resp.xml b/doc/api_samples/os-flavor-access/flavor-access-list-resp.xml
new file mode 100644
index 000000000..1e55ad2f9
--- /dev/null
+++ b/doc/api_samples/os-flavor-access/flavor-access-list-resp.xml
@@ -0,0 +1,4 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<flavor_access>
+ <access tenant_id="fake_tenant" flavor_id="10"/>
+</flavor_access> \ No newline at end of file
diff --git a/doc/api_samples/os-flavor-access/flavor-access-remove-tenant-req.json b/doc/api_samples/os-flavor-access/flavor-access-remove-tenant-req.json
new file mode 100644
index 000000000..dff6d540a
--- /dev/null
+++ b/doc/api_samples/os-flavor-access/flavor-access-remove-tenant-req.json
@@ -0,0 +1,5 @@
+{
+ "removeTenantAccess": {
+ "tenant": "fake_tenant"
+ }
+} \ No newline at end of file
diff --git a/doc/api_samples/os-flavor-access/flavor-access-remove-tenant-req.xml b/doc/api_samples/os-flavor-access/flavor-access-remove-tenant-req.xml
new file mode 100644
index 000000000..fc296c302
--- /dev/null
+++ b/doc/api_samples/os-flavor-access/flavor-access-remove-tenant-req.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<removeTenantAccess>
+ <tenant>fake_tenant</tenant>
+</removeTenantAccess> \ No newline at end of file
diff --git a/doc/api_samples/os-flavor-access/flavor-access-remove-tenant-resp.json b/doc/api_samples/os-flavor-access/flavor-access-remove-tenant-resp.json
new file mode 100644
index 000000000..5cab03334
--- /dev/null
+++ b/doc/api_samples/os-flavor-access/flavor-access-remove-tenant-resp.json
@@ -0,0 +1,3 @@
+{
+ "flavor_access": []
+} \ No newline at end of file
diff --git a/doc/api_samples/os-flavor-access/flavor-access-remove-tenant-resp.xml b/doc/api_samples/os-flavor-access/flavor-access-remove-tenant-resp.xml
new file mode 100644
index 000000000..862e02872
--- /dev/null
+++ b/doc/api_samples/os-flavor-access/flavor-access-remove-tenant-resp.xml
@@ -0,0 +1,2 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<flavor_access/> \ No newline at end of file
diff --git a/doc/api_samples/os-flavor-access/flavor-access-show-resp.json b/doc/api_samples/os-flavor-access/flavor-access-show-resp.json
new file mode 100644
index 000000000..a60b8cc62
--- /dev/null
+++ b/doc/api_samples/os-flavor-access/flavor-access-show-resp.json
@@ -0,0 +1,20 @@
+{
+ "flavor": {
+ "disk": 0,
+ "id": "1",
+ "links": [
+ {
+ "href": "http://openstack.example.com/v2/openstack/flavors/1",
+ "rel": "self"
+ },
+ {
+ "href": "http://openstack.example.com/openstack/flavors/1",
+ "rel": "bookmark"
+ }
+ ],
+ "name": "m1.tiny",
+ "os-flavor-access:is_public": true,
+ "ram": 512,
+ "vcpus": 1
+ }
+} \ No newline at end of file
diff --git a/doc/api_samples/os-flavor-access/flavor-access-show-resp.xml b/doc/api_samples/os-flavor-access/flavor-access-show-resp.xml
new file mode 100644
index 000000000..ae699cb07
--- /dev/null
+++ b/doc/api_samples/os-flavor-access/flavor-access-show-resp.xml
@@ -0,0 +1,5 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<flavor xmlns:os-flavor-access="http://docs.openstack.org/compute/ext/flavor_access/api/v2" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="0" vcpus="1" ram="512" name="m1.tiny" id="1" os-flavor-access:is_public="True">
+ <atom:link href="http://openstack.example.com/v2/openstack/flavors/1" rel="self"/>
+ <atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/>
+</flavor> \ No newline at end of file