Bringing in samples for os-admin-actions.

Clarifies wording around volume API and os-volumes extensions.

Change-Id: Ieaa46191e7cd7ba2e2b9c94995dee90cd4cd3f69
This commit is contained in:
annegentle
2012-11-14 14:44:01 -06:00
parent 26f09e393b
commit 419cc39208
62 changed files with 486 additions and 67 deletions

View File

@@ -54,7 +54,7 @@
<configuration>
<highlightSource>false</highlightSource>
<enableGoogleAnalytics>1</enableGoogleAnalytics>
<googleAnalyticsId>UA-17511903-8</googleAnalyticsId>
<googleAnalyticsId>UA-17511903-1</googleAnalyticsId>
</configuration>
</execution>
</executions>

View File

@@ -304,14 +304,14 @@
<section xml:id="volume">
<title>Volume</title>
<para>Allows you to manage volumes and snapshots that can be
used with the Compute API.</para>
used with the Volume API (nova-volume or cinder services).</para>
<wadl:resources href="../wadls/volume-api/src/volume-api.wadl"
xmlns:wadl="http://wadl.dev.java.net/2009/02"/>
</section>
<section xml:id="os-volume">
<title>Volume Extension to the Compute API</title>
<para>Allows you to manage volumes and snapshots that can be
used with the Compute API through an extension to the API.</para>
used with the Compute API through extensions to the Compute API.</para>
<wadl:resources href="../wadls/compute-api/src/ext/os-volume.wadl"
xmlns:wadl="http://wadl.dev.java.net/2009/02"/>
</section>

View File

@@ -328,14 +328,6 @@
"namespace": "http://docs.openstack.org/compute/ext/virtual_interfaces/api/v1.1",
"updated": "2011-08-17T00:00:00+00:00"
},
{
"alias": "os-volume-types",
"description": "Volume types support",
"links": [],
"name": "VolumeTypes",
"namespace": "http://docs.openstack.org/compute/ext/volume_types/api/v1.1",
"updated": "2011-08-24T00:00:00+00:00"
},
{
"alias": "os-volumes",
"description": "Volumes support",

View File

@@ -137,9 +137,6 @@
<extension alias="os-virtual-interfaces" updated="2011-08-17T00:00:00+00:00" namespace="http://docs.openstack.org/compute/ext/virtual_interfaces/api/v1.1" name="VirtualInterfaces">
<description>Virtual interface support</description>
</extension>
<extension alias="os-volume-types" updated="2011-08-24T00:00:00+00:00" namespace="http://docs.openstack.org/compute/ext/volume_types/api/v1.1" name="VolumeTypes">
<description>Volume types support</description>
</extension>
<extension alias="os-volumes" updated="2011-03-25T00:00:00+00:00" namespace="http://docs.openstack.org/compute/ext/volumes/api/v1.1" name="Volumes">
<description>Volumes support</description>
</extension>

View File

@@ -10,8 +10,6 @@
"maxTotalInstances": 10,
"maxTotalKeypairs": 100,
"maxTotalRAMSize": 51200,
"maxTotalVolumeGigabytes": 1000,
"maxTotalVolumes": 10,
"maxSecurityGroups": 10,
"maxSecurityGroupRules": 20
},

View File

@@ -20,10 +20,8 @@
<limit name="maxImageMeta" value="128"/>
<limit name="maxPersonalitySize" value="10240"/>
<limit name="maxTotalKeypairs" value="100"/>
<limit name="maxTotalVolumes" value="10"/>
<limit name="maxTotalCores" value="20"/>
<limit name="maxTotalFloatingIps" value="10"/>
<limit name="maxTotalVolumeGigabytes" value="1000"/>
<limit name="maxTotalRAMSize" value="51200"/>
<limit name="maxSecurityGroups" value="10"/>
<limit name="maxSecurityGroupRules" value="20"/>

View File

@@ -0,0 +1,7 @@
{
"createBackup": {
"name": "Backup 1",
"backup_type": "daily",
"rotation": 1
}
}

View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<createBackup>
<name>Backup 1</name>
<backup_type>daily</backup_type>
<rotation>1</rotation>
</createBackup>

View File

@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
<injectNetworkInfo />

View File

@@ -0,0 +1,7 @@
{
"os-migrateLive": {
"host": "0443e9a1254044d8b99f35eace132080",
"block_migration": false,
"disk_over_commit": false
}
}

View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<os-migrateLive>
<host>6217bf142bb3491995f966af999f9f23</host>
<block_migration>false</block_migration>
<disk_over_commit>false</disk_over_commit>
</os-migrateLive>

View File

@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
<lock />

View File

@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
<migrate />

View File

@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
<pause/>

View File

@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
<resetNetwork />

View File

@@ -0,0 +1,5 @@
{
"os-resetState": {
"state": "active"
}
}

View File

@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<os-resetState>
<state>active</state>
</os-resetState>

View File

@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
<resume />

View File

@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
<suspend />

View File

@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
<unlock />

View File

@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
<unpause />

View File

@@ -0,0 +1,16 @@
{
"server" : {
"name" : "new-server-test",
"imageRef" : "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b",
"flavorRef" : "http://openstack.example.com/openstack/flavors/1",
"metadata" : {
"My Server Name" : "Apache1"
},
"personality" : [
{
"path" : "/etc/banner.txt",
"contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
}
]
}
}

View File

@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<server xmlns="http://docs.openstack.org/compute/api/v1.1" imageRef="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" flavorRef="http://openstack.example.com/openstack/flavors/1" name="new-server-test">
<metadata>
<meta key="My Server Name">Apache1</meta>
</metadata>
<personality>
<file path="/etc/banner.txt">
ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
</file>
</personality>
</server>

View File

@@ -0,0 +1,16 @@
{
"server": {
"adminPass": "GrsuNLsSKd5N",
"id": "b63a8fc6-2977-4a11-a611-3ec45f839c4c",
"links": [
{
"href": "http://openstack.example.com/v2/openstack/servers/b63a8fc6-2977-4a11-a611-3ec45f839c4c",
"rel": "self"
},
{
"href": "http://openstack.example.com/openstack/servers/b63a8fc6-2977-4a11-a611-3ec45f839c4c",
"rel": "bookmark"
}
]
}
}

View File

@@ -0,0 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" id="491bb5e9-068e-4fcd-a468-8638ceeffbe9" adminPass="4jXS888UQScr">
<metadata/>
<atom:link href="http://openstack.example.com/v2/openstack/servers/491bb5e9-068e-4fcd-a468-8638ceeffbe9" rel="self"/>
<atom:link href="http://openstack.example.com/openstack/servers/491bb5e9-068e-4fcd-a468-8638ceeffbe9" rel="bookmark"/>
</server>

View File

@@ -0,0 +1,17 @@
{
"server" : {
"name" : "new-server-test",
"imageRef" : "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b",
"flavorRef" : "http://openstack.example.com/openstack/flavors/1",
"metadata" : {
"My Server Name" : "Apache1"
},
"availability_zone": "nova",
"personality" : [
{
"path" : "/etc/banner.txt",
"contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
}
]
}
}

View File

@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<server xmlns="http://docs.openstack.org/compute/api/v1.1"
imageRef="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b"
flavorRef="http://openstack.example.com/openstack/flavors/1"
name="new-server-test"
availability_zone="nova">
<metadata>
<meta key="My Server Name">Apache1</meta>
</metadata>
<personality>
<file path="/etc/banner.txt">
ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
</file>
</personality>
</server>

View File

@@ -0,0 +1,16 @@
{
"server": {
"adminPass": "k4pKvTfcA4gY",
"id": "3e45fa2a-5204-466f-a684-c2a8e1c82d7f",
"links": [
{
"href": "http://openstack.example.com/v2/openstack/servers/3e45fa2a-5204-466f-a684-c2a8e1c82d7f",
"rel": "self"
},
{
"href": "http://openstack.example.com/openstack/servers/3e45fa2a-5204-466f-a684-c2a8e1c82d7f",
"rel": "bookmark"
}
]
}
}

View File

@@ -0,0 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" id="9196924a-9646-41e9-852a-77b39d7af053" adminPass="a4UHSHEwLeJk">
<metadata/>
<atom:link href="http://openstack.example.com/v2/openstack/servers/9196924a-9646-41e9-852a-77b39d7af053" rel="self"/>
<atom:link href="http://openstack.example.com/openstack/servers/9196924a-9646-41e9-852a-77b39d7af053" rel="bookmark"/>
</server>

View File

@@ -0,0 +1,17 @@
{
"cpu0_time": 17300000000,
"memory": 524288,
"vda_errors": -1,
"vda_read": 262144,
"vda_read_req": 112,
"vda_write": 5778432,
"vda_write_req": 488,
"vnet1_rx": 2070139,
"vnet1_rx_drop": 0,
"vnet1_rx_errors": 0,
"vnet1_rx_packets": 26701,
"vnet1_tx": 140208,
"vnet1_tx_drop": 0,
"vnet1_tx_errors": 0,
"vnet1_tx_packets": 662
}

View File

@@ -0,0 +1,18 @@
<?xml version='1.0' encoding='UTF-8'?>
<diagnostics xmlns="http://docs.openstack.org/compute/api/v1.1">
<memory>524288</memory>
<vda_write>5778432</vda_write>
<vnet1_rx_packets>26701</vnet1_rx_packets>
<vnet1_rx_drop>0</vnet1_rx_drop>
<vnet1_tx_drop>0</vnet1_tx_drop>
<vnet1_rx>2070139</vnet1_rx>
<vda_read>262144</vda_read>
<vda_write_req>488</vda_write_req>
<vnet1_tx>140208</vnet1_tx>
<vnet1_tx_errors>0</vnet1_tx_errors>
<vnet1_tx_packets>662</vnet1_tx_packets>
<vnet1_rx_errors>0</vnet1_rx_errors>
<cpu0_time>17300000000</cpu0_time>
<vda_read_req>112</vda_read_req>
<vda_errors>-1</vda_errors>
</diagnostics>

View File

@@ -0,0 +1,16 @@
{
"server" : {
"name" : "new-server-test",
"imageRef" : "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b",
"flavorRef" : "http://openstack.example.com/openstack/flavors/1",
"metadata" : {
"My Server Name" : "Apache1"
},
"personality" : [
{
"path" : "/etc/banner.txt",
"contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
}
]
}
}

View File

@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<server xmlns="http://docs.openstack.org/compute/api/v1.1" imageRef="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" flavorRef="http://openstack.example.com/openstack/flavors/1" name="new-server-test">
<metadata>
<meta key="My Server Name">Apache1</meta>
</metadata>
<personality>
<file path="/etc/banner.txt">
ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
</file>
</personality>
</server>

View File

@@ -0,0 +1,16 @@
{
"server": {
"adminPass": "gSLumCiGg3V9",
"id": "b10a33d1-6fb5-45d4-876d-4e68962db878",
"links": [
{
"href": "http://openstack.example.com/v2/openstack/servers/b10a33d1-6fb5-45d4-876d-4e68962db878",
"rel": "self"
},
{
"href": "http://openstack.example.com/openstack/servers/b10a33d1-6fb5-45d4-876d-4e68962db878",
"rel": "bookmark"
}
]
}
}

View File

@@ -0,0 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" id="1d946791-e7c9-41fc-9b03-550c94b7216a" adminPass="km2Dr44vFMaK">
<metadata/>
<atom:link href="http://openstack.example.com/v2/openstack/servers/1d946791-e7c9-41fc-9b03-550c94b7216a" rel="self"/>
<atom:link href="http://openstack.example.com/openstack/servers/1d946791-e7c9-41fc-9b03-550c94b7216a" rel="bookmark"/>
</server>

View File

@@ -0,0 +1,16 @@
{
"server" : {
"name" : "new-server-test",
"imageRef" : "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b",
"flavorRef" : "http://openstack.example.com/openstack/flavors/1",
"metadata" : {
"My Server Name" : "Apache1"
},
"personality" : [
{
"path" : "/etc/banner.txt",
"contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
}
]
}
}

View File

@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<server xmlns="http://docs.openstack.org/compute/api/v1.1" imageRef="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" flavorRef="http://openstack.example.com/openstack/flavors/1" name="new-server-test">
<metadata>
<meta key="My Server Name">Apache1</meta>
</metadata>
<personality>
<file path="/etc/banner.txt">
ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
</file>
</personality>
</server>

View File

@@ -0,0 +1,16 @@
{
"server": {
"adminPass": "tpKL9n5BHKFv",
"id": "3edb83e6-2c90-41c1-bf80-0b61472b4c19",
"links": [
{
"href": "http://openstack.example.com/v2/openstack/servers/3edb83e6-2c90-41c1-bf80-0b61472b4c19",
"rel": "self"
},
{
"href": "http://openstack.example.com/openstack/servers/3edb83e6-2c90-41c1-bf80-0b61472b4c19",
"rel": "bookmark"
}
]
}
}

View File

@@ -0,0 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" id="df5f4368-be09-47cc-a84f-c1382459284d" adminPass="foPQHkv8H66R">
<metadata/>
<atom:link href="http://openstack.example.com/v2/openstack/servers/df5f4368-be09-47cc-a84f-c1382459284d" rel="self"/>
<atom:link href="http://openstack.example.com/openstack/servers/df5f4368-be09-47cc-a84f-c1382459284d" rel="bookmark"/>
</server>

View File

@@ -0,0 +1,27 @@
{
"tenant_usage": {
"server_usages": [
{
"ended_at": null,
"flavor": "m1.tiny",
"hours": 1.0,
"instance_id": "1f1deceb-17b5-4c04-84c7-e0d4499c8fe0",
"local_gb": 0,
"memory_mb": 512,
"name": "new-server-test",
"started_at": "2012-10-08T20:10:44.541277",
"state": "active",
"tenant_id": "openstack",
"uptime": 3600,
"vcpus": 1
}
],
"start": "2012-10-08T20:10:44.587336",
"stop": "2012-10-08T21:10:44.587336",
"tenant_id": "openstack",
"total_hours": 1.0,
"total_local_gb_usage": 0.0,
"total_memory_mb_usage": 512.0,
"total_vcpus_usage": 1.0
}
}

View File

@@ -0,0 +1,26 @@
<?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_vcpus_usage>1.0</total_vcpus_usage>
<total_memory_mb_usage>512.0</total_memory_mb_usage>
<total_hours>1.0</total_hours>
<start>2012-10-08 20:10:51.902640</start>
<stop>2012-10-08 21:10:51.902640</stop>
<server_usages>
<server_usage>
<instance_id>e4521f3b-d9ad-4454-be8a-e2732f0630ef</instance_id>
<name>new-server-test</name>
<hours>1.0</hours>
<memory_mb>512</memory_mb>
<local_gb>0</local_gb>
<vcpus>1</vcpus>
<tenant_id>openstack</tenant_id>
<flavor>m1.tiny</flavor>
<started_at>2012-10-08 20:10:51.854331</started_at>
<ended_at>None</ended_at>
<state>active</state>
<uptime>3600</uptime>
</server_usage>
</server_usages>
</tenant_usage>

View File

@@ -0,0 +1,13 @@
{
"tenant_usages": [
{
"start": "2012-10-08T21:10:44.587336",
"stop": "2012-10-08T22:10:44.587336",
"tenant_id": "openstack",
"total_hours": 1.0,
"total_local_gb_usage": 0.0,
"total_memory_mb_usage": 512.0,
"total_vcpus_usage": 1.0
}
]
}

View File

@@ -0,0 +1,13 @@
<?xml version='1.0' encoding='UTF-8'?>
<tenant_usages>
<tenant_usage>
<tenant_id>openstack</tenant_id>
<total_local_gb_usage>0.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>
<start>2012-10-08 21:10:51.902640</start>
<stop>2012-10-08 22:10:51.902640</stop>
<server_usages/>
</tenant_usage>
</tenant_usages>

View File

@@ -12,15 +12,11 @@
"maxTotalInstances": 10,
"maxTotalKeypairs": 100,
"maxTotalRAMSize": 51200,
"maxTotalVolumeGigabytes": 1000,
"maxTotalVolumes": 10,
"totalCoresUsed": 0,
"totalInstancesUsed": 0,
"totalKeyPairsUsed": 0,
"totalRAMUsed": 0,
"totalSecurityGroupsUsed": 0,
"totalVolumeGigabytesUsed": 0,
"totalVolumesUsed": 0
"totalSecurityGroupsUsed": 0
},
"rate": [
{
@@ -78,4 +74,4 @@
}
]
}
}
}

View File

@@ -19,20 +19,16 @@
<limit name="maxPersonality" value="5"/>
<limit name="maxImageMeta" value="128"/>
<limit name="maxPersonalitySize" value="10240"/>
<limit name="totalVolumesUsed" value="0"/>
<limit name="maxSecurityGroupRules" value="20"/>
<limit name="maxTotalKeypairs" value="100"/>
<limit name="totalCoresUsed" value="0"/>
<limit name="maxTotalVolumes" value="10"/>
<limit name="totalRAMUsed" value="0"/>
<limit name="totalInstancesUsed" value="0"/>
<limit name="maxSecurityGroups" value="10"/>
<limit name="totalVolumeGigabytesUsed" value="0"/>
<limit name="maxTotalCores" value="20"/>
<limit name="totalSecurityGroupsUsed" value="0"/>
<limit name="maxTotalFloatingIps" value="10"/>
<limit name="totalKeyPairsUsed" value="0"/>
<limit name="maxTotalVolumeGigabytes" value="1000"/>
<limit name="maxTotalRAMSize" value="51200"/>
</absolute>
</limits>
</limits>

View File

@@ -53,7 +53,12 @@
<request>
<representation mediaType="application/json">
<doc xml:lang="EN">
<xsdxt:code href="samples/admin_pause.json" />
<xsdxt:code href="../api_samples/os-admin-actions/admin-actions-pause.json" />
</doc>
</representation>
<representation mediaType="application/xml">
<doc xml:lang="EN">
<xsdxt:code href="../api_samples/os-admin-actions/admin-actions-pause.xml" />
</doc>
</representation>
</request>
@@ -69,7 +74,12 @@
<request>
<representation mediaType="application/json">
<doc xml:lang="EN">
<xsdxt:code href="samples/admin_unpause.json" />
<xsdxt:code href="../api_samples/os-admin-actions/admin-actions-unpause.json" />
</doc>
</representation>
<representation mediaType="application/xml">
<doc xml:lang="EN">
<xsdxt:code href="../api_samples/os-admin-actions/admin-actions-unpause.xml" />
</doc>
</representation>
</request>
@@ -85,7 +95,12 @@
<request>
<representation mediaType="application/json">
<doc xml:lang="EN">
<xsdxt:code href="samples/admin_suspend.json" />
<xsdxt:code href="../api_samples/os-admin-actions/admin-actions-suspend.json" />
</doc>
</representation>
<representation mediaType="application/xml">
<doc xml:lang="EN">
<xsdxt:code href="../api_samples/os-admin-actions/admin-actions-suspend.xml" />
</doc>
</representation>
</request>
@@ -101,7 +116,12 @@
<request>
<representation mediaType="application/json">
<doc xml:lang="EN">
<xsdxt:code href="samples/admin_resume.json" />
<xsdxt:code href="../api_samples/os-admin-actions/admin-actions-resume.json" />
</doc>
</representation>
<representation mediaType="application/xml">
<doc xml:lang="EN">
<xsdxt:code href="../api_samples/os-admin-actions/admin-actions-resume.xml" />
</doc>
</representation>
</request>
@@ -117,7 +137,7 @@
<request>
<representation mediaType="application/json">
<doc xml:lang="EN">
<xsdxt:code href="samples/admin_migrate.json" />
<xsdxt:code href="../api_samples/os-admin-actions/admin-actions-migrate.json" />
</doc>
</representation>
</request>
@@ -133,7 +153,12 @@
<request>
<representation mediaType="application/json">
<doc xml:lang="EN">
<xsdxt:code href="samples/admin_resetNetwork.json" />
<xsdxt:code href="../api_samples/os-admin-actions/admin-actions-reset-network.json" />
</doc>
</representation>
<representation mediaType="application/xml">
<doc xml:lang="EN">
<xsdxt:code href="../api_samples/os-admin-actions/admin-actions-reset-network.xml" />
</doc>
</representation>
</request>
@@ -149,7 +174,12 @@
<request>
<representation mediaType="application/json">
<doc xml:lang="EN">
<xsdxt:code href="samples/admin_injectNetworkInfo.json" />
<xsdxt:code href="../api_samples/os-admin-actions/admin-actions-inject-network-info.json" />
</doc>
</representation>
<representation mediaType="application/xml">
<doc xml:lang="EN">
<xsdxt:code href="../api_samples/os-admin-actions/admin-actions-inject-network-info.xml" />
</doc>
</representation>
</request>
@@ -165,7 +195,12 @@
<request>
<representation mediaType="application/json">
<doc xml:lang="EN">
<xsdxt:code href="samples/admin_lock.json" />
<xsdxt:code href="../api_samples/os-admin-actions/admin-actions-lock-server.json" />
</doc>
</representation>
<representation mediaType="application/xml">
<doc xml:lang="EN">
<xsdxt:code href="../api_samples/os-admin-actions/admin-actions-lock-server.xml" />
</doc>
</representation>
</request>
@@ -181,7 +216,12 @@
<request>
<representation mediaType="application/json">
<doc xml:lang="EN">
<xsdxt:code href="samples/admin_unlock.json" />
<xsdxt:code href="../api_samples/os-admin-actions/admin-actions-unlock-server.json" />
</doc>
</representation>
<representation mediaType="application/xml">
<doc xml:lang="EN">
<xsdxt:code href="../api_samples/os-admin-actions/admin-actions-unlock-server.xml" />
</doc>
</representation>
</request>
@@ -206,7 +246,12 @@
</param>
<representation mediaType="application/json">
<doc xml:lang="EN">
<xsdxt:code href="samples/admin_createBackup.json" />
<xsdxt:code href="../api_samples/os-admin-actions/admin-actions-backup-server.json" />
</doc>
</representation>
<representation mediaType="application/xml">
<doc xml:lang="EN">
<xsdxt:code href="../api_samples/os-admin-actions/admin-actions-backup-server.xml" />
</doc>
</representation>
</request>
@@ -231,7 +276,12 @@
</param>
<representation mediaType="application/json">
<doc xml:lang="EN">
<xsdxt:code href="samples/admin_migrateLive.json" />
<xsdxt:code href="../api_samples/os-admin-actions/admin-actions-live-migrate.json" />
</doc>
</representation>
<representation mediaType="application/xml">
<doc xml:lang="EN">
<xsdxt:code href="../api_samples/os-admin-actions/admin-actions-live-migrate.xml" />
</doc>
</representation>
</request>
@@ -250,7 +300,12 @@
</param>
<representation mediaType="application/json">
<doc xml:lang="EN">
<xsdxt:code href="samples/admin_resetState.json" />
<xsdxt:code href="../api_samples/os-admin-actions/admin-actions-reset-server-state.json" />
</doc>
</representation>
<representation mediaType="application/xml">
<doc xml:lang="EN">
<xsdxt:code href="../api_samples/os-admin-actions/admin-actions-reset-server-state.xml" />
</doc>
</representation>
</request>

View File

@@ -1,7 +0,0 @@
{
'createBackup': {
'name': 'Backup 1',
'backup_type': 'daily',
'rotation': 1
}
}

View File

@@ -1,7 +0,0 @@
{
'os-migrateLive': {
'host': 'hostname',
'block_migration': False,
'disk_over_commit': False
}
}

View File

@@ -1,5 +0,0 @@
{
'os-resetState': {
'state': 'active'
}
}