summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-02-13 01:12:40 +0000
committerGerrit Code Review <review@openstack.org>2014-02-13 01:12:40 +0000
commitd96a6ddb86d45f39ba29afa6a58a90e9289014a4 (patch)
tree513d858dcedf8b8f2ce1a88a11cff3b33b651669 /doc
parent094dadfe6f0944236035424ab602d87108cc64ba (diff)
parent830ac0f0654dc989ff27ae9314bd6af4902daf9b (diff)
downloadnova-d96a6ddb86d45f39ba29afa6a58a90e9289014a4.tar.gz
Merge "Adds migrate server extension for V3 API"
Diffstat (limited to 'doc')
-rw-r--r--doc/v3/api_samples/os-migrate-server/live-migrate-server.json (renamed from doc/v3/api_samples/os-admin-actions/admin-actions-live-migrate.json)0
-rw-r--r--doc/v3/api_samples/os-migrate-server/migrate-server.json (renamed from doc/v3/api_samples/os-admin-actions/admin-actions-migrate.json)0
-rw-r--r--doc/v3/api_samples/os-migrate-server/server-post-req.json10
-rw-r--r--doc/v3/api_samples/os-migrate-server/server-post-resp.json16
4 files changed, 26 insertions, 0 deletions
diff --git a/doc/v3/api_samples/os-admin-actions/admin-actions-live-migrate.json b/doc/v3/api_samples/os-migrate-server/live-migrate-server.json
index 10369816aa..10369816aa 100644
--- a/doc/v3/api_samples/os-admin-actions/admin-actions-live-migrate.json
+++ b/doc/v3/api_samples/os-migrate-server/live-migrate-server.json
diff --git a/doc/v3/api_samples/os-admin-actions/admin-actions-migrate.json b/doc/v3/api_samples/os-migrate-server/migrate-server.json
index c42f2c63fb..c42f2c63fb 100644
--- a/doc/v3/api_samples/os-admin-actions/admin-actions-migrate.json
+++ b/doc/v3/api_samples/os-migrate-server/migrate-server.json
diff --git a/doc/v3/api_samples/os-migrate-server/server-post-req.json b/doc/v3/api_samples/os-migrate-server/server-post-req.json
new file mode 100644
index 0000000000..2eedab6147
--- /dev/null
+++ b/doc/v3/api_samples/os-migrate-server/server-post-req.json
@@ -0,0 +1,10 @@
+{
+ "server" : {
+ "name" : "new-server-test",
+ "image_ref" : "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
+ "flavor_ref" : "http://openstack.example.com/flavors/1",
+ "metadata" : {
+ "My Server Name" : "Apache1"
+ }
+ }
+}
diff --git a/doc/v3/api_samples/os-migrate-server/server-post-resp.json b/doc/v3/api_samples/os-migrate-server/server-post-resp.json
new file mode 100644
index 0000000000..270cb84634
--- /dev/null
+++ b/doc/v3/api_samples/os-migrate-server/server-post-resp.json
@@ -0,0 +1,16 @@
+{
+ "server": {
+ "admin_password": "DM3QzjhGTzLB",
+ "id": "bebeec79-497e-4711-a311-d0d2e3dfc73b",
+ "links": [
+ {
+ "href": "http://openstack.example.com/v3/servers/bebeec79-497e-4711-a311-d0d2e3dfc73b",
+ "rel": "self"
+ },
+ {
+ "href": "http://openstack.example.com/servers/bebeec79-497e-4711-a311-d0d2e3dfc73b",
+ "rel": "bookmark"
+ }
+ ]
+ }
+}