Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: openstack/nova
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: savi-dev/nova
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: silver
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
Loading
Showing with 23,245 additions and 29,550 deletions.
  1. +1 −0 .gitreview
  2. +1 −1 bin/nova-manage
  3. +9 −0 bin/nova-rootwrap
  4. +53 −0 doc/api_samples/os-rescue/server-get-resp-rescue.json
  5. +19 −0 doc/api_samples/os-rescue/server-get-resp-rescue.xml
  6. +54 −0 doc/api_samples/os-rescue/server-get-resp-unrescue.json
  7. +19 −0 doc/api_samples/os-rescue/server-get-resp-unrescue.xml
  8. +16 −0 doc/api_samples/os-rescue/server-post-req.json
  9. +19 −0 doc/api_samples/os-rescue/server-post-req.xml
  10. +16 −0 doc/api_samples/os-rescue/server-post-resp.json
  11. +6 −0 doc/api_samples/os-rescue/server-post-resp.xml
  12. +5 −0 doc/api_samples/os-rescue/server-rescue-req.json
  13. +3 −0 doc/api_samples/os-rescue/server-rescue-req.xml
  14. +3 −0 doc/api_samples/os-rescue/server-rescue.json
  15. +2 −0 doc/api_samples/os-rescue/server-rescue.xml
  16. +3 −0 doc/api_samples/os-rescue/server-unrescue-req.json
  17. +2 −0 doc/api_samples/os-rescue/server-unrescue-req.xml
  18. +16 −0 doc/api_samples/os-virtual-interfaces/server-post-req.json
  19. +19 −0 doc/api_samples/os-virtual-interfaces/server-post-req.xml
  20. +16 −0 doc/api_samples/os-virtual-interfaces/server-post-resp.json
  21. +6 −0 doc/api_samples/os-virtual-interfaces/server-post-resp.xml
  22. +8 −0 doc/api_samples/os-virtual-interfaces/vifs-list-resp.json
  23. +4 −0 doc/api_samples/os-virtual-interfaces/vifs-list-resp.xml
  24. +25 −0 doc/source/devref/filter_scheduler.rst
  25. +2 −1 etc/nova/policy.json
  26. +1 −0 etc/nova/rootwrap.d/volume.filters
  27. +0 −5 nova/__init__.py
  28. +10 −1 nova/api/ec2/cloud.py
  29. +8 −3 nova/api/metadata/base.py
  30. +9 −9 nova/api/openstack/compute/contrib/aggregates.py
  31. +10 −4 nova/api/openstack/compute/contrib/cloudpipe.py
  32. +39 −3 nova/api/openstack/compute/servers.py
  33. +4 −2 nova/api/openstack/wsgi.py
  34. +7 −4 nova/compute/api.py
  35. +86 −29 nova/compute/manager.py
  36. +280 −183 nova/compute/resource_tracker.py
  37. +16 −6 nova/compute/rpcapi.py
  38. +17 −0 nova/compute/utils.py
  39. +29 −12 nova/db/sqlalchemy/api.py
  40. +1 −2 nova/db/sqlalchemy/migrate_repo/versions/111_general_aggregates.py
  41. +48 −0 nova/db/sqlalchemy/migrate_repo/versions/133_aggregate_delete_fix.py
  42. +1 −1 nova/db/sqlalchemy/models.py
  43. +10 −4 nova/exception.py
  44. +959 −1,505 nova/locale/bs/LC_MESSAGES/nova.po
  45. +983 −1,385 nova/locale/cs/LC_MESSAGES/nova.po
  46. +958 −1,505 nova/locale/da/LC_MESSAGES/nova.po
  47. +960 −1,495 nova/locale/de/LC_MESSAGES/nova.po
  48. +968 −1,462 nova/locale/en_AU/LC_MESSAGES/nova.po
  49. +966 −1,476 nova/locale/en_GB/LC_MESSAGES/nova.po
  50. +978 −795 nova/locale/en_US/LC_MESSAGES/nova.po
  51. +967 −1,455 nova/locale/es/LC_MESSAGES/nova.po
  52. +977 −1,460 nova/locale/fr/LC_MESSAGES/nova.po
  53. +964 −1,492 nova/locale/it/LC_MESSAGES/nova.po
  54. +968 −1,456 nova/locale/ja/LC_MESSAGES/nova.po
  55. +964 −1,501 nova/locale/ko/LC_MESSAGES/nova.po
  56. +960 −782 nova/locale/nb/LC_MESSAGES/nova.po
  57. +958 −783 nova/locale/nova.pot
  58. +968 −1,463 nova/locale/pt_BR/LC_MESSAGES/nova.po
  59. +976 −1,413 nova/locale/ru/LC_MESSAGES/nova.po
  60. +958 −1,505 nova/locale/tl/LC_MESSAGES/nova.po
  61. +958 −1,505 nova/locale/tr/LC_MESSAGES/nova.po
  62. +958 −1,505 nova/locale/uk/LC_MESSAGES/nova.po
  63. +983 −1,349 nova/locale/zh_CN/LC_MESSAGES/nova.po
  64. +962 −1,499 nova/locale/zh_TW/LC_MESSAGES/nova.po
  65. +2 −1 nova/network/api.py
  66. +20 −6 nova/network/manager.py
  67. +1 −0 nova/network/quantumv2/__init__.py
  68. +24 −7 nova/network/quantumv2/api.py
  69. +6 −0 nova/scheduler/filter_scheduler.py
  70. +6 −0 nova/scheduler/filters/core_filter.py
  71. +54 −0 nova/scheduler/filters/disk_filter.py
  72. +4 −6 nova/scheduler/filters/ram_filter.py
  73. +8 −16 nova/scheduler/host_manager.py
  74. +41 −34 nova/scheduler/manager.py
  75. +20 −4 nova/tests/api/ec2/test_cloud.py
  76. +5 −6 nova/tests/api/openstack/compute/contrib/test_cloudpipe.py
  77. +9 −1 nova/tests/api/openstack/compute/test_limits.py
  78. +23 −18 nova/tests/api/openstack/compute/test_server_actions.py
  79. +40 −0 nova/tests/api/openstack/compute/test_servers.py
  80. +1 −1 nova/tests/api/openstack/fakes.py
  81. +1 −2 nova/tests/compute/fake_resource_tracker.py
  82. +193 −16 nova/tests/compute/test_compute.py
  83. +68 −36 nova/tests/compute/test_compute_utils.py
  84. +229 −110 nova/tests/compute/test_resource_tracker.py
  85. +3 −2 nova/tests/compute/test_rpcapi.py
  86. +9 −0 nova/tests/fakelibvirt.py
  87. +53 −0 nova/tests/integrated/api_samples/os-rescue/server-get-resp-rescue.json.tpl
  88. +19 −0 nova/tests/integrated/api_samples/os-rescue/server-get-resp-rescue.xml.tpl
  89. +54 −0 nova/tests/integrated/api_samples/os-rescue/server-get-resp-unrescue.json.tpl
  90. +19 −0 nova/tests/integrated/api_samples/os-rescue/server-get-resp-unrescue.xml.tpl
  91. +16 −0 nova/tests/integrated/api_samples/os-rescue/server-post-req.json.tpl
  92. +19 −0 nova/tests/integrated/api_samples/os-rescue/server-post-req.xml.tpl
  93. +16 −0 nova/tests/integrated/api_samples/os-rescue/server-post-resp.json.tpl
  94. +6 −0 nova/tests/integrated/api_samples/os-rescue/server-post-resp.xml.tpl
  95. +5 −0 nova/tests/integrated/api_samples/os-rescue/server-rescue-req.json.tpl
  96. +3 −0 nova/tests/integrated/api_samples/os-rescue/server-rescue-req.xml.tpl
  97. +3 −0 nova/tests/integrated/api_samples/os-rescue/server-rescue.json.tpl
  98. +2 −0 nova/tests/integrated/api_samples/os-rescue/server-rescue.xml.tpl
  99. +3 −0 nova/tests/integrated/api_samples/os-rescue/server-unrescue-req.json.tpl
  100. +2 −0 nova/tests/integrated/api_samples/os-rescue/server-unrescue-req.xml.tpl
  101. +16 −0 nova/tests/integrated/api_samples/os-virtual-interfaces/server-post-req.json.tpl
  102. +19 −0 nova/tests/integrated/api_samples/os-virtual-interfaces/server-post-req.xml.tpl
  103. +16 −0 nova/tests/integrated/api_samples/os-virtual-interfaces/server-post-resp.json.tpl
  104. +6 −0 nova/tests/integrated/api_samples/os-virtual-interfaces/server-post-resp.xml.tpl
  105. +8 −0 nova/tests/integrated/api_samples/os-virtual-interfaces/vifs-list-resp.json.tpl
  106. +4 −0 nova/tests/integrated/api_samples/os-virtual-interfaces/vifs-list-resp.xml.tpl
  107. +71 −0 nova/tests/integrated/test_api_samples.py
  108. +33 −0 nova/tests/network/test_manager.py
  109. +33 −5 nova/tests/network/test_quantumv2.py
  110. +8 −4 nova/tests/scheduler/fakes.py
  111. +3 −3 nova/tests/scheduler/test_filter_scheduler.py
  112. +60 −10 nova/tests/scheduler/test_host_filters.py
  113. +8 −10 nova/tests/scheduler/test_host_manager.py
  114. +34 −19 nova/tests/scheduler/test_scheduler.py
  115. +1 −1 nova/tests/test_api.py
  116. +19 −3 nova/tests/test_db_api.py
  117. +0 −1 nova/tests/test_exception.py
  118. +3 −4 nova/tests/test_iscsi.py
  119. +23 −1 nova/tests/test_libvirt.py
  120. +47 −0 nova/tests/test_migrations.py
  121. +5 −4 nova/tests/test_nfs.py
  122. +18 −0 nova/tests/test_nova_manage.py
  123. +13 −0 nova/tests/test_quota.py
  124. +190 −15 nova/tests/test_xenapi.py
  125. +1 −1 nova/tests/volume/test_HpSanISCSIDriver.py
  126. +8 −0 nova/utils.py
  127. +1 −1 nova/version.py
  128. +1 −1 nova/virt/fake.py
  129. +17 −9 nova/virt/firewall.py
  130. +22 −17 nova/virt/libvirt/driver.py
  131. +6 −6 nova/virt/libvirt/vif.py
  132. +2 −2 nova/virt/libvirt/volume.py
  133. +25 −2 nova/virt/xenapi/driver.py
  134. +19 −0 nova/virt/xenapi/host.py
  135. +48 −40 nova/virt/xenapi/pool.py
  136. +46 −27 nova/virt/xenapi/vm_utils.py
  137. +18 −2 nova/virt/xenapi/vmops.py
  138. +3 −1 nova/virt/xenapi/volumeops.py
  139. +63 −5 nova/volume/driver.py
  140. +18 −10 nova/volume/iscsi.py
  141. +6 −1 nova/volume/manager.py
  142. +1 −1 nova/volume/netapp.py
  143. +2 −2 nova/volume/nfs.py
  144. +10 −8 nova/volume/san.py
  145. +3 −3 nova/volume/solidfire.py
  146. +3 −1 plugins/xenserver/xenapi/etc/xapi.d/plugins/xenhost
  147. +8 −1 smoketests/test_sysadmin.py
  148. +12 −1 tools/conf/README
  149. +80 −0 tools/conf/analyze_opts.py
  150. +1 −1 tools/pip-requires
1 change: 1 addition & 0 deletions .gitreview
Original file line number Diff line number Diff line change
@@ -2,3 +2,4 @@
host=review.openstack.org
port=29418
project=openstack/nova.git
defaultbranch=stable/folsom
2 changes: 1 addition & 1 deletion bin/nova-manage
Original file line number Diff line number Diff line change
@@ -227,7 +227,7 @@ class ProjectCommands(object):
ctxt = context.get_admin_context()
if key:
if value.lower() == 'unlimited':
value = None
value = -1
try:
db.quota_update(ctxt, project_id, key, value)
except exception.ProjectQuotaNotFound:
9 changes: 9 additions & 0 deletions bin/nova-rootwrap
Original file line number Diff line number Diff line change
@@ -34,6 +34,7 @@

import ConfigParser
import os
import signal
import subprocess
import sys

@@ -42,6 +43,13 @@ RC_UNAUTHORIZED = 99
RC_NOCOMMAND = 98
RC_BADCONFIG = 97


def _subprocess_setup():
# Python installs a SIGPIPE handler by default. This is usually not what
# non-Python subprocesses expect.
signal.signal(signal.SIGPIPE, signal.SIG_DFL)


if __name__ == '__main__':
# Split arguments, require at least a command
execname = sys.argv.pop(0)
@@ -77,6 +85,7 @@ if __name__ == '__main__':
stdin=sys.stdin,
stdout=sys.stdout,
stderr=sys.stderr,
preexec_fn=_subprocess_setup,
env=filtermatch.get_environment(userargs))
obj.wait()
sys.exit(obj.returncode)
53 changes: 53 additions & 0 deletions doc/api_samples/os-rescue/server-get-resp-rescue.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
{
"server": {
"accessIPv4": "",
"accessIPv6": "",
"addresses": {
"private": [
{
"addr": "192.168.0.3",
"version": 4
}
]
},
"created": "2012-09-19T09:22:27Z",
"flavor": {
"id": "1",
"links": [
{
"href": "http://openstack.example.com/openstack/flavors/1",
"rel": "bookmark"
}
]
},
"hostId": "c02c15d17499304e9893d9fc41c415f5096f8aa880bc651cac092650",
"id": "7e21a264-6cc1-4d90-b7b5-f9f49cec3a85",
"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/7e21a264-6cc1-4d90-b7b5-f9f49cec3a85",
"rel": "self"
},
{
"href": "http://openstack.example.com/openstack/servers/7e21a264-6cc1-4d90-b7b5-f9f49cec3a85",
"rel": "bookmark"
}
],
"metadata": {
"My Server Name": "Apache1"
},
"name": "new-server-test",
"status": "RESCUE",
"tenant_id": "openstack",
"updated": "2012-09-19T09:22:27Z",
"user_id": "fake"
}
}
19 changes: 19 additions & 0 deletions doc/api_samples/os-rescue/server-get-resp-rescue.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?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" status="RESCUE" updated="2012-09-19T11:44:22Z" hostId="8eb4062a49009f6ee8066fbe1ed4c60d67b0a4ebd4434f51d8f03293" name="new-server-test" created="2012-09-19T11:44:22Z" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" id="eb2b2fbb-a6f8-4363-9007-e9a9098ea080">
<image id="70a599e0-31e7-49b7-b260-868f441e862b">
<atom:link href="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
</image>
<flavor id="1">
<atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/>
</flavor>
<metadata>
<meta key="My Server Name">Apache1</meta>
</metadata>
<addresses>
<network id="private">
<ip version="4" addr="192.168.0.3"/>
</network>
</addresses>
<atom:link href="http://openstack.example.com/v2/openstack/servers/eb2b2fbb-a6f8-4363-9007-e9a9098ea080" rel="self"/>
<atom:link href="http://openstack.example.com/openstack/servers/eb2b2fbb-a6f8-4363-9007-e9a9098ea080" rel="bookmark"/>
</server>
54 changes: 54 additions & 0 deletions doc/api_samples/os-rescue/server-get-resp-unrescue.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
{
"server": {
"accessIPv4": "",
"accessIPv6": "",
"addresses": {
"private": [
{
"addr": "192.168.0.3",
"version": 4
}
]
},
"created": "2012-09-19T09:22:28Z",
"flavor": {
"id": "1",
"links": [
{
"href": "http://openstack.example.com/openstack/flavors/1",
"rel": "bookmark"
}
]
},
"hostId": "a9410a6a8cb87328b1c43cda5c5a15fc860e977d14feb2c9528a2450",
"id": "f1ec6ac3-5379-4cdc-af9a-6ddc29656e4f",
"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/f1ec6ac3-5379-4cdc-af9a-6ddc29656e4f",
"rel": "self"
},
{
"href": "http://openstack.example.com/openstack/servers/f1ec6ac3-5379-4cdc-af9a-6ddc29656e4f",
"rel": "bookmark"
}
],
"metadata": {
"My Server Name": "Apache1"
},
"name": "new-server-test",
"progress": 0,
"status": "ACTIVE",
"tenant_id": "openstack",
"updated": "2012-09-19T09:22:28Z",
"user_id": "fake"
}
}
19 changes: 19 additions & 0 deletions doc/api_samples/os-rescue/server-get-resp-unrescue.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?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" status="ACTIVE" updated="2012-09-19T11:44:23Z" hostId="40fdb0f0760c536d8c2bc816c39a8997b80ddcc6368bb8470c009015" name="new-server-test" created="2012-09-19T11:44:23Z" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="70b4263f-bae1-4ac4-a1c5-e5bb193767bc">
<image id="70a599e0-31e7-49b7-b260-868f441e862b">
<atom:link href="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
</image>
<flavor id="1">
<atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/>
</flavor>
<metadata>
<meta key="My Server Name">Apache1</meta>
</metadata>
<addresses>
<network id="private">
<ip version="4" addr="192.168.0.3"/>
</network>
</addresses>
<atom:link href="http://openstack.example.com/v2/openstack/servers/70b4263f-bae1-4ac4-a1c5-e5bb193767bc" rel="self"/>
<atom:link href="http://openstack.example.com/openstack/servers/70b4263f-bae1-4ac4-a1c5-e5bb193767bc" rel="bookmark"/>
</server>
16 changes: 16 additions & 0 deletions doc/api_samples/os-rescue/server-post-req.json
Original file line number Diff line number Diff line change
@@ -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=="
}
]
}
}
19 changes: 19 additions & 0 deletions doc/api_samples/os-rescue/server-post-req.xml
Original file line number Diff line number Diff line change
@@ -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>
16 changes: 16 additions & 0 deletions doc/api_samples/os-rescue/server-post-resp.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"server": {
"adminPass": "xjDVAYHmc34s",
"id": "784f5005-bec9-4c22-8c42-5a7dcba88d82",
"links": [
{
"href": "http://openstack.example.com/v2/openstack/servers/784f5005-bec9-4c22-8c42-5a7dcba88d82",
"rel": "self"
},
{
"href": "http://openstack.example.com/openstack/servers/784f5005-bec9-4c22-8c42-5a7dcba88d82",
"rel": "bookmark"
}
]
}
}
6 changes: 6 additions & 0 deletions doc/api_samples/os-rescue/server-post-resp.xml
Original file line number Diff line number Diff line change
@@ -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="70b4263f-bae1-4ac4-a1c5-e5bb193767bc" adminPass="ttv8YPD3tRPm">
<metadata/>
<atom:link href="http://openstack.example.com/v2/openstack/servers/70b4263f-bae1-4ac4-a1c5-e5bb193767bc" rel="self"/>
<atom:link href="http://openstack.example.com/openstack/servers/70b4263f-bae1-4ac4-a1c5-e5bb193767bc" rel="bookmark"/>
</server>
5 changes: 5 additions & 0 deletions doc/api_samples/os-rescue/server-rescue-req.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"rescue": {
"adminPass": "MySecretPass"
}
}
3 changes: 3 additions & 0 deletions doc/api_samples/os-rescue/server-rescue-req.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<?xml version="1.0" encoding="UTF-8"?>
<rescue xmlns="http://docs.openstack.org/compute/api/v1.1"
adminPass="MySecretPass"/>
3 changes: 3 additions & 0 deletions doc/api_samples/os-rescue/server-rescue.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"adminPass": "MySecretPass"
}
2 changes: 2 additions & 0 deletions doc/api_samples/os-rescue/server-rescue.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<adminPass>MySecretPass</adminPass>
3 changes: 3 additions & 0 deletions doc/api_samples/os-rescue/server-unrescue-req.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"unrescue": null
}
2 changes: 2 additions & 0 deletions doc/api_samples/os-rescue/server-unrescue-req.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
<unrescue xmlns="http://docs.openstack.org/compute/api/v1.1"/>
16 changes: 16 additions & 0 deletions doc/api_samples/os-virtual-interfaces/server-post-req.json
Original file line number Diff line number Diff line change
@@ -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=="
}
]
}
}
19 changes: 19 additions & 0 deletions doc/api_samples/os-virtual-interfaces/server-post-req.xml
Original file line number Diff line number Diff line change
@@ -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>
16 changes: 16 additions & 0 deletions doc/api_samples/os-virtual-interfaces/server-post-resp.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"server": {
"adminPass": "m62Pu3gkXXV2",
"id": "a98dd3ae-5feb-4b4b-afa4-25e830ad3305",
"links": [
{
"href": "http://openstack.example.com/v2/openstack/servers/a98dd3ae-5feb-4b4b-afa4-25e830ad3305",
"rel": "self"
},
{
"href": "http://openstack.example.com/openstack/servers/a98dd3ae-5feb-4b4b-afa4-25e830ad3305",
"rel": "bookmark"
}
]
}
}
6 changes: 6 additions & 0 deletions doc/api_samples/os-virtual-interfaces/server-post-resp.xml
Original file line number Diff line number Diff line change
@@ -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="37443b33-eb80-4eea-90d8-f90778f53dea" adminPass="ffV6E5gsNPpi">
<metadata/>
<atom:link href="http://openstack.example.com/v2/openstack/servers/37443b33-eb80-4eea-90d8-f90778f53dea" rel="self"/>
<atom:link href="http://openstack.example.com/openstack/servers/37443b33-eb80-4eea-90d8-f90778f53dea" rel="bookmark"/>
</server>
8 changes: 8 additions & 0 deletions doc/api_samples/os-virtual-interfaces/vifs-list-resp.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"virtual_interfaces": [
{
"id": "cec8b9bb-5d22-4104-b3c8-4c35db3210a6",
"mac_address": "fa:16:3e:3c:ce:6f"
}
]
}
4 changes: 4 additions & 0 deletions doc/api_samples/os-virtual-interfaces/vifs-list-resp.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version='1.0' encoding='UTF-8'?>
<virtual_interfaces xmlns="http://docs.openstack.org/compute/api/v1.1">
<virtual_interface id="94edf7aa-565a-469a-8f45-656b4acf8229" mac_address="fa:16:3e:7d:31:9a"/>
</virtual_interfaces>
Loading