x
/
gantt
Code Issues Proposed changes

Merge "'m1.tiny' now has root_gb=1"

This commit is contained in:
Jenkins 2013-05-20 18:08:41 +00:00 committed by Gerrit Code Review
parent 14f3cdc321 7ad41bb57c
commit 22ca5a3b2c
28 changed files with 57 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/api_samples/OS-FLV-DISABLED/flavor-detail-get-resp.json
View File

@ -2,7 +2,7 @@
"flavors": [
{
"OS-FLV-DISABLED:disabled": false,
"disk": 0,
"disk": 1,
"id": "1",
"links": [
{
@ -91,4 +91,4 @@
"vcpus": 8
}
]
}
}

4
doc/api_samples/OS-FLV-DISABLED/flavor-detail-get-resp.xml
View File

@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<flavors xmlns:OS-FLV-DISABLED="http://docs.openstack.org/compute/ext/flavor_disabled/api/v1.1" 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-FLV-DISABLED:disabled="False">
<flavor disk="1" vcpus="1" ram="512" name="m1.tiny" id="1" OS-FLV-DISABLED:disabled="False">
<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>
@ -20,4 +20,4 @@
<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>
</flavors>

4
doc/api_samples/OS-FLV-DISABLED/flavor-show-get-resp.json
View File

@ -1,7 +1,7 @@
{
"flavor": {
"OS-FLV-DISABLED:disabled": false,
"disk": 0,
"disk": 1,
"id": "1",
"links": [
{
@ -17,4 +17,4 @@
"ram": 512,
"vcpus": 1
}
}
}

4
doc/api_samples/OS-FLV-DISABLED/flavor-show-get-resp.xml
View File

@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<flavor xmlns:OS-FLV-DISABLED="http://docs.openstack.org/compute/ext/flavor_disabled/api/v1.1" 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-FLV-DISABLED:disabled="False">
<flavor xmlns:OS-FLV-DISABLED="http://docs.openstack.org/compute/ext/flavor_disabled/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="1" vcpus="1" ram="512" name="m1.tiny" id="1" OS-FLV-DISABLED:disabled="False">
<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>

4
doc/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-get-resp.json
View File

@ -1,7 +1,7 @@
{
"flavor": {
"OS-FLV-EXT-DATA:ephemeral": 0,
"disk": 0,
"disk": 1,
"id": "1",
"links": [
{
@ -17,4 +17,4 @@
"ram": 512,
"vcpus": 1
}
}
}

4
doc/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-get-resp.xml
View File

@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<flavor xmlns:OS-FLV-EXT-DATA="http://docs.openstack.org/compute/ext/flavor_extra_data/api/v1.1" 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-FLV-EXT-DATA:ephemeral="0">
<flavor xmlns:OS-FLV-EXT-DATA="http://docs.openstack.org/compute/ext/flavor_extra_data/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="1" vcpus="1" ram="512" name="m1.tiny" id="1" OS-FLV-EXT-DATA:ephemeral="0">
<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>

4
doc/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-list-resp.json
View File

@ -2,7 +2,7 @@
"flavors": [
{
"OS-FLV-EXT-DATA:ephemeral": 0,
"disk": 0,
"disk": 1,
"id": "1",
"links": [
{
@ -91,4 +91,4 @@
"vcpus": 8
}
]
}
}

4
doc/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-list-resp.xml
View File

@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<flavors xmlns:OS-FLV-EXT-DATA="http://docs.openstack.org/compute/ext/flavor_extra_data/api/v1.1" 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-FLV-EXT-DATA:ephemeral="0">
<flavor disk="1" vcpus="1" ram="512" name="m1.tiny" id="1" OS-FLV-EXT-DATA:ephemeral="0">
<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>
@ -20,4 +20,4 @@
<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>
</flavors>

2
doc/api_samples/all_extensions/flavor-get-resp.json
View File

@ -2,7 +2,7 @@
"flavor": {
"OS-FLV-DISABLED:disabled": false,
"OS-FLV-EXT-DATA:ephemeral": 0,
"disk": 0,
"disk": 1,
"id": "1",
"links": [
{

4
doc/api_samples/all_extensions/flavor-get-resp.xml
View File

@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<flavor xmlns:OS-FLV-DISABLED="http://docs.openstack.org/compute/ext/flavor_disabled/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:OS-FLV-EXT-DATA="http://docs.openstack.org/compute/ext/flavor_extra_data/api/v1.1" xmlns:os-flavor-access="http://docs.openstack.org/compute/ext/flavor_access/api/v2" xmlns="http://docs.openstack.org/compute/api/v1.1" name="m1.tiny" ram="512" vcpus="1" swap="" rxtx_factor="1.0" disk="0" id="1" os-flavor-access:is_public="True" OS-FLV-EXT-DATA:ephemeral="0" OS-FLV-DISABLED:disabled="False">
<flavor xmlns:OS-FLV-DISABLED="http://docs.openstack.org/compute/ext/flavor_disabled/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:OS-FLV-EXT-DATA="http://docs.openstack.org/compute/ext/flavor_extra_data/api/v1.1" xmlns:os-flavor-access="http://docs.openstack.org/compute/ext/flavor_access/api/v2" xmlns="http://docs.openstack.org/compute/api/v1.1" name="m1.tiny" ram="512" vcpus="1" swap="" rxtx_factor="1.0" disk="1" id="1" os-flavor-access:is_public="True" OS-FLV-EXT-DATA:ephemeral="0" OS-FLV-DISABLED:disabled="False">
<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>

4
doc/api_samples/flavor-get-resp.json
View File

@ -1,6 +1,6 @@
{
"flavor": {
"disk": 0,
"disk": 1,
"id": "1",
"links": [
{
@ -16,4 +16,4 @@
"ram": 512,
"vcpus": 1
}
}
}

4
doc/api_samples/flavor-get-resp.xml
View File

@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<flavor 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">
<flavor xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="1" vcpus="1" ram="512" name="m1.tiny" id="1">
<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>

4
doc/api_samples/os-flavor-access/flavor-access-detail-resp.json
View File

@ -1,7 +1,7 @@
{
"flavors": [
{
"disk": 0,
"disk": 1,
"id": "1",
"links": [
{
@ -91,4 +91,4 @@
"vcpus": 8
}
]
}
}

4
doc/api_samples/os-flavor-access/flavor-access-detail-resp.xml
View File

@ -1,6 +1,6 @@
<?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">
<flavor disk="1" 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>
@ -20,4 +20,4 @@
<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>
</flavors>

4
doc/api_samples/os-flavor-access/flavor-access-show-resp.json
View File

@ -1,6 +1,6 @@
{
"flavor": {
"disk": 0,
"disk": 1,
"id": "1",
"links": [
{
@ -17,4 +17,4 @@
"ram": 512,
"vcpus": 1
}
}
}

4
doc/api_samples/os-flavor-access/flavor-access-show-resp.xml
View File

@ -1,5 +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">
<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="1" 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>

4
doc/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json
View File

@ -1,6 +1,6 @@
{
"flavor": {
"disk": 0,
"disk": 1,
"id": "1",
"links": [
{
@ -17,4 +17,4 @@
"rxtx_factor": 1.0,
"vcpus": 1
}
}
}

4
doc/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.xml
View File

@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<flavor 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" rxtx_factor="1.0">
<flavor xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="1" vcpus="1" ram="512" name="m1.tiny" id="1" rxtx_factor="1.0">
<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>

4
doc/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json
View File

@ -1,7 +1,7 @@
{
"flavors": [
{
"disk": 0,
"disk": 1,
"id": "1",
"links": [
{
@ -91,4 +91,4 @@
"vcpus": 8
}
]
}
}

4
doc/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.xml
View File

@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<flavors 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" rxtx_factor="1.0">
<flavor disk="1" vcpus="1" ram="512" name="m1.tiny" id="1" rxtx_factor="1.0">
<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>
@ -20,4 +20,4 @@
<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>
</flavors>

4
doc/api_samples/os-flavor-swap/flavor-swap-get-resp.json
View File

@ -1,6 +1,6 @@
{
"flavor": {
"disk": 0,
"disk": 1,
"id": "1",
"links": [
{
@ -17,4 +17,4 @@
"swap": "",
"vcpus": 1
}
}
}

4
doc/api_samples/os-flavor-swap/flavor-swap-get-resp.xml
View File

@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<flavor 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" swap="">
<flavor xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="1" vcpus="1" ram="512" name="m1.tiny" id="1" swap="">
<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>

4
doc/api_samples/os-flavor-swap/flavor-swap-list-resp.json
View File

@ -1,7 +1,7 @@
{
"flavors": [
{
"disk": 0,
"disk": 1,
"id": "1",
"links": [
{
@ -91,4 +91,4 @@
"vcpus": 8
}
]
}
}

4
doc/api_samples/os-flavor-swap/flavor-swap-list-resp.xml
View File

@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<flavors 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" swap="">
<flavor disk="1" vcpus="1" ram="512" name="m1.tiny" id="1" swap="">
<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>
@ -20,4 +20,4 @@
<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>
</flavors>

6
doc/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.json
View File

@ -6,7 +6,7 @@
"flavor": "m1.tiny",
"hours": 1.0,
"instance_id": "1f1deceb-17b5-4c04-84c7-e0d4499c8fe0",
"local_gb": 0,
"local_gb": 1,
"memory_mb": 512,
"name": "new-server-test",
"started_at": "2012-10-08T20:10:44.541277",
@ -20,8 +20,8 @@
"stop": "2012-10-08T21:10:44.587336",
"tenant_id": "openstack",
"total_hours": 1.0,
"total_local_gb_usage": 0.0,
"total_local_gb_usage": 1.0,
"total_memory_mb_usage": 512.0,
"total_vcpus_usage": 1.0
}
}
}

6
doc/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.xml
View File

@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?>
<tenant_usage>
<tenant_id>openstack</tenant_id>
<total_local_gb_usage>0.0</total_local_gb_usage>
<total_local_gb_usage>1.0</total_local_gb_usage>
<total_vcpus_usage>1.0</total_vcpus_usage>
<total_memory_mb_usage>512.0</total_memory_mb_usage>
<total_hours>1.0</total_hours>
@ -13,7 +13,7 @@
<name>new-server-test</name>
<hours>1.0</hours>
<memory_mb>512</memory_mb>
<local_gb>0</local_gb>
<local_gb>1</local_gb>
<vcpus>1</vcpus>
<tenant_id>openstack</tenant_id>
<flavor>m1.tiny</flavor>
@ -23,4 +23,4 @@
<uptime>3600</uptime>
</server_usage>
</server_usages>
</tenant_usage>
</tenant_usage>

4
doc/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.json
View File

@ -5,9 +5,9 @@
"stop": "2012-10-08T22:10:44.587336",
"tenant_id": "openstack",
"total_hours": 1.0,
"total_local_gb_usage": 0.0,
"total_local_gb_usage": 1.0,
"total_memory_mb_usage": 512.0,
"total_vcpus_usage": 1.0
}
]
}
}

4
doc/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.xml
View File

@ -2,7 +2,7 @@
<tenant_usages>
<tenant_usage>
<tenant_id>openstack</tenant_id>
<total_local_gb_usage>0.0</total_local_gb_usage>
<total_local_gb_usage>1.0</total_local_gb_usage>
<total_vcpus_usage>1.0</total_vcpus_usage>
<total_memory_mb_usage>512.0</total_memory_mb_usage>
<total_hours>1.0</total_hours>
@ -10,4 +10,4 @@
<stop>2012-10-08 22:10:51.902640</stop>
<server_usages/>
</tenant_usage>
</tenant_usages>
</tenant_usages>