Merge "Add os-assisted-volume-snapshots extension"

doc/api_samples/all_extensions/extensions-get-resp.json

@@ -128,6 +128,14 @@
             "namespace": "http://docs.openstack.org/compute/ext/aggregates/api/v1.1",
             "updated": "2012-01-12T00:00:00+00:00"
         },
+        {
+            "alias": "os-assisted-volume-snapshots",
+            "description": "Assisted volume snapshots.",
+            "links": [],
+            "name": "AssistedVolumeSnapshots",
+            "namespace": "http://docs.openstack.org/compute/ext/assisted-volume-snapshots/api/v2",
+            "updated": "2013-08-15T00:00:00-00:00"
+        },
         {
             "alias": "os-attach-interfaces",
             "description": "Attach interface support.",
@@ -472,14 +480,6 @@
             "namespace": "http://docs.openstack.org/compute/ext/quotas-sets/api/v1.1",
             "updated": "2011-08-08T00:00:00+00:00"
         },
-        {
-            "alias": "os-user-quotas",
-            "description": "Project user quota support.",
-            "links": [],
-            "name": "UserQuotas",
-            "namespace": "http://docs.openstack.org/compute/ext/user_quotas/api/v1.1",
-            "updated": "2013-07-18T00:00:00+00:00"
-        },
         {
             "alias": "os-rescue",
             "description": "Instance rescue mode.",
@@ -584,6 +584,14 @@
             "namespace": "http://docs.openstack.org/compute/ext/userdata/api/v1.1",
             "updated": "2012-08-07T00:00:00+00:00"
         },
+        {
+            "alias": "os-user-quotas",
+            "description": "Project user quota support.",
+            "links": [],
+            "name": "UserQuotas",
+            "namespace": "http://docs.openstack.org/compute/ext/user_quotas/api/v1.1",
+            "updated": "2013-07-18T00:00:00+00:00"
+        },
         {
             "alias": "os-virtual-interfaces",
             "description": "Virtual interface support.",
@@ -609,4 +617,4 @@
             "updated": "2011-03-25T00:00:00+00:00"
         }
     ]
-}
+}

doc/api_samples/all_extensions/extensions-get-resp.xml

@@ -52,6 +52,9 @@
   <extension alias="os-aggregates" updated="2012-01-12T00:00:00+00:00" namespace="http://docs.openstack.org/compute/ext/aggregates/api/v1.1" name="Aggregates">
     <description>Admin-only aggregate administration.</description>
   </extension>
+  <extension alias="os-assisted-volume-snapshots" updated="2013-08-15T00:00:00-00:00" namespace="http://docs.openstack.org/compute/ext/assisted-volume-snapshots/api/v2" name="AssistedVolumeSnapshots">
+    <description>Assisted volume snapshots.</description>
+  </extension>
   <extension alias="os-attach-interfaces" updated="2012-07-22T00:00:00+00:00" namespace="http://docs.openstack.org/compute/ext/interfaces/api/v1.1" name="AttachInterfaces">
     <description>Attach interface support.</description>
   </extension>
@@ -197,9 +200,6 @@
   <extension alias="os-quota-sets" updated="2011-08-08T00:00:00+00:00" namespace="http://docs.openstack.org/compute/ext/quotas-sets/api/v1.1" name="Quotas">
     <description>Quotas management support.</description>
   </extension>
-  <extension alias="os-user-quotas" updated="2013-07-18T00:00:00+00:00" namespace="http://docs.openstack.org/compute/ext/user_quotas/api/v1.1" name="UserQuotas">
-    <description>Project user quota support.</description>
-  </extension>
   <extension alias="os-rescue" updated="2011-08-18T00:00:00+00:00" namespace="http://docs.openstack.org/compute/ext/rescue/api/v1.1" name="Rescue">
     <description>Instance rescue mode.</description>
   </extension>
@@ -239,6 +239,9 @@
   <extension alias="os-user-data" updated="2012-08-07T00:00:00+00:00" namespace="http://docs.openstack.org/compute/ext/userdata/api/v1.1" name="UserData">
     <description>Add user_data to the Create Server v1.1 API.</description>
   </extension>
+  <extension alias="os-user-quotas" updated="2013-07-18T00:00:00+00:00" namespace="http://docs.openstack.org/compute/ext/user_quotas/api/v1.1" name="UserQuotas">
+    <description>Project user quota support.</description>
+  </extension>
   <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>
@@ -248,4 +251,4 @@
   <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>
-</extensions>
+</extensions>

doc/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-req.json

@@ -0,0 +1,10 @@
+{
+    "snapshot": {
+        "display_name": "snap-001",
+        "display_description": "Daily backup",
+        "volume_id": "521752a6-acf6-4b2d-bc7a-119f9148cd8c",
+        "force": false,
+        "assisted": true,
+        "create_info": {}
+     }
+}

doc/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-req.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+  <snapshot>
+    <display_name>snap-001</display_name>
+    <display_description>Daily backup</display_description>
+    <volume_id>521752a6-acf6-4b2d-bc7a-119f9148cd8c</volume_id>
+    <force>false</force>
+    <assisted>true</assisted>
+    <create_info/>
+  </snapshot>

doc/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-resp.json

@@ -0,0 +1,6 @@
+{
+    "snapshot": {
+        "id": 100,
+        "volumeId": "521752a6-acf6-4b2d-bc7a-119f9148cd8c"
+    }
+}

doc/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-resp.xml

@@ -0,0 +1,2 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<snapshot volumeId="521752a6-acf6-4b2d-bc7a-119f9148cd8c" id="100"/>