Merge "Add missing setup.cfg entry for os-user-data plugin"

3 files changed, 67 insertions, 50 deletions

diff --git a/doc/v3/api_samples/all_extensions/extensions-list-resp.json b/doc/v3/api_samples/all_extensions/extensions-list-resp.json
index e8d6997b31..cc85283836 100644
--- a/doc/v3/api_samples/all_extensions/extensions-list-resp.json
+++ b/doc/v3/api_samples/all_extensions/extensions-list-resp.json
@@ -1,14 +1,6 @@
 {
     "extensions": [
         {
-            "alias": "os-consoles",
-            "description": "Consoles.",
-            "links": [],
-            "name": "Consoles",
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
-            "updated": "2014-12-03T00:00:00Z"
-        },
-        {
             "alias": "extensions",
             "description": "Extension information.",
             "links": [],
@@ -17,22 +9,6 @@
             "updated": "2014-12-03T00:00:00Z"
         },
         {
-            "alias": "os-flavor-extra-specs",
-            "description": "Flavors extra specs support.",
-            "links": [],
-            "name": "FlavorsExtraSpecs",
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
-            "updated": "2014-12-03T00:00:00Z"
-        },
-        {
-            "alias": "os-flavor-manage",
-            "description": "Flavor create/delete API support.",
-            "links": [],
-            "name": "FlavorManage",
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
-            "updated": "2014-12-03T00:00:00Z"
-        },
-        {
             "alias": "flavors",
             "description": "Flavors Extension.",
             "links": [],
@@ -209,6 +185,14 @@
             "updated": "2014-12-03T00:00:00Z"
         },
         {
+            "alias": "os-consoles",
+            "description": "Consoles.",
+            "links": [],
+            "name": "Consoles",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
+        },
+        {
             "alias": "os-create-backup",
             "description": "Create a backup of a server.",
             "links": [],
@@ -289,6 +273,22 @@
             "updated": "2014-12-03T00:00:00Z"
         },
         {
+            "alias": "os-flavor-extra-specs",
+            "description": "Flavors extra specs support.",
+            "links": [],
+            "name": "FlavorsExtraSpecs",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
+        },
+        {
+            "alias": "os-flavor-manage",
+            "description": "Flavor create/delete API support.",
+            "links": [],
+            "name": "FlavorManage",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
+        },
+        {
             "alias": "os-flavor-rxtx",
             "description": "Support to show the rxtx status of a flavor.",
             "links": [],
@@ -609,6 +609,14 @@
             "updated": "2014-12-03T00:00:00Z"
         },
         {
+            "alias": "os-user-data",
+            "description": "Add user_data to the Create Server v1.1 API.",
+            "links": [],
+            "name": "UserData",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
+        },
+        {
             "alias": "os-virtual-interfaces",
             "description": "Virtual interface support.",
             "links": [],
@@ -649,4 +657,4 @@
             "updated": "2014-12-03T00:00:00Z"
         }
     ]
-}
+}
\ No newline at end of file
diff --git a/nova/tests/functional/v3/api_samples/all_extensions/extensions-list-resp.json.tpl b/nova/tests/functional/v3/api_samples/all_extensions/extensions-list-resp.json.tpl
index e8d6997b31..cc85283836 100644
--- a/nova/tests/functional/v3/api_samples/all_extensions/extensions-list-resp.json.tpl
+++ b/nova/tests/functional/v3/api_samples/all_extensions/extensions-list-resp.json.tpl
@@ -1,14 +1,6 @@
 {
     "extensions": [
         {
-            "alias": "os-consoles",
-            "description": "Consoles.",
-            "links": [],
-            "name": "Consoles",
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
-            "updated": "2014-12-03T00:00:00Z"
-        },
-        {
             "alias": "extensions",
             "description": "Extension information.",
             "links": [],
@@ -17,22 +9,6 @@
             "updated": "2014-12-03T00:00:00Z"
         },
         {
-            "alias": "os-flavor-extra-specs",
-            "description": "Flavors extra specs support.",
-            "links": [],
-            "name": "FlavorsExtraSpecs",
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
-            "updated": "2014-12-03T00:00:00Z"
-        },
-        {
-            "alias": "os-flavor-manage",
-            "description": "Flavor create/delete API support.",
-            "links": [],
-            "name": "FlavorManage",
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
-            "updated": "2014-12-03T00:00:00Z"
-        },
-        {
             "alias": "flavors",
             "description": "Flavors Extension.",
             "links": [],
@@ -209,6 +185,14 @@
             "updated": "2014-12-03T00:00:00Z"
         },
         {
+            "alias": "os-consoles",
+            "description": "Consoles.",
+            "links": [],
+            "name": "Consoles",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
+        },
+        {
             "alias": "os-create-backup",
             "description": "Create a backup of a server.",
             "links": [],
@@ -289,6 +273,22 @@
             "updated": "2014-12-03T00:00:00Z"
         },
         {
+            "alias": "os-flavor-extra-specs",
+            "description": "Flavors extra specs support.",
+            "links": [],
+            "name": "FlavorsExtraSpecs",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
+        },
+        {
+            "alias": "os-flavor-manage",
+            "description": "Flavor create/delete API support.",
+            "links": [],
+            "name": "FlavorManage",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
+        },
+        {
             "alias": "os-flavor-rxtx",
             "description": "Support to show the rxtx status of a flavor.",
             "links": [],
@@ -609,6 +609,14 @@
             "updated": "2014-12-03T00:00:00Z"
         },
         {
+            "alias": "os-user-data",
+            "description": "Add user_data to the Create Server v1.1 API.",
+            "links": [],
+            "name": "UserData",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
+        },
+        {
             "alias": "os-virtual-interfaces",
             "description": "Virtual interface support.",
             "links": [],
@@ -649,4 +657,4 @@
             "updated": "2014-12-03T00:00:00Z"
         }
     ]
-}
+}
\ No newline at end of file
diff --git a/setup.cfg b/setup.cfg
index 0efe4bc52a..2df62624ef 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -133,6 +133,7 @@ nova.api.v3.extensions =
     suspend_server = nova.api.openstack.compute.plugins.v3.suspend_server:SuspendServer
     tenant_networks = nova.api.openstack.compute.plugins.v3.tenant_networks:TenantNetworks
     used_limits = nova.api.openstack.compute.plugins.v3.used_limits:UsedLimits
+    user_data = nova.api.openstack.compute.plugins.v3.user_data:UserData
     versions = nova.api.openstack.compute.plugins.v3.versions:Versions
     virtual_interfaces = nova.api.openstack.compute.plugins.v3.virtual_interfaces:VirtualInterfaces
     volumes = nova.api.openstack.compute.plugins.v3.volumes:Volumes