From f1499e715da9ac20b3c95da73cdef79d9350cd62 Mon Sep 17 00:00:00 2001 From: Chris Yeoh Date: Thu, 5 Feb 2015 11:43:23 +1030 Subject: [PATCH] Add missing setup.cfg entry for os-user-data plugin Although os-user-data has an entry in nova.api.v3.extensions.server.create in setup.cfg it is missing one in the general nova.api.v3.extensions list. Without an entry the plugin does not appear in the extension list so this patch adds an entry for it. Partially implements blueprint v2-on-v3-api Change-Id: I13fa049539b07ff901b36ae18eca59fbb1354794 --- .../all_extensions/extensions-list-resp.json | 58 +++++++++++-------- .../extensions-list-resp.json.tpl | 58 +++++++++++-------- setup.cfg | 1 + 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,13 +1,5 @@ { "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.", @@ -16,22 +8,6 @@ "namespace": "http://docs.openstack.org/compute/ext/fake_xml", "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.", @@ -208,6 +184,14 @@ "namespace": "http://docs.openstack.org/compute/ext/fake_xml", "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.", @@ -288,6 +272,22 @@ "namespace": "http://docs.openstack.org/compute/ext/fake_xml", "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.", @@ -608,6 +608,14 @@ "namespace": "http://docs.openstack.org/compute/ext/fake_xml", "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.", @@ -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,13 +1,5 @@ { "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.", @@ -16,22 +8,6 @@ "namespace": "http://docs.openstack.org/compute/ext/fake_xml", "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.", @@ -208,6 +184,14 @@ "namespace": "http://docs.openstack.org/compute/ext/fake_xml", "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.", @@ -288,6 +272,22 @@ "namespace": "http://docs.openstack.org/compute/ext/fake_xml", "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.", @@ -608,6 +608,14 @@ "namespace": "http://docs.openstack.org/compute/ext/fake_xml", "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.", @@ -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