diff options
| author | Ken'ichi Ohmichi <oomichi@mxs.nes.nec.co.jp> | 2015-02-05 07:44:38 +0000 |
|---|---|---|
| committer | Ken'ichi Ohmichi <oomichi@mxs.nes.nec.co.jp> | 2015-02-05 07:44:38 +0000 |
| commit | 569d62716d37e587c03b5c6261899f4f3dda40e8 (patch) | |
| tree | 8e46b421eeb0e51b0a18d4c593a9a86e8165b905 | |
| parent | f1499e715da9ac20b3c95da73cdef79d9350cd62 (diff) | |
| download | nova-569d62716d37e587c03b5c6261899f4f3dda40e8.tar.gz | |
Remove v1.1 from v2.1 extension description
Current v2.1 os-user-data extension only includes "v1.1" in the
description, but it confuses developers/users because of mismatching
versions. In addition, the other extensions doesn't contain version
number in their descriptions.
So this patch removes v1.1 from os-user-data extension's description.
Partially implements blueprint v2-on-v3-api
Change-Id: I6280a0633c0e416e4b1798a708035eaf8c979fba
3 files changed, 5 insertions, 5 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 cc85283836..7d6f9bf535 100644 --- a/doc/v3/api_samples/all_extensions/extensions-list-resp.json +++ b/doc/v3/api_samples/all_extensions/extensions-list-resp.json @@ -610,7 +610,7 @@ }, { "alias": "os-user-data", - "description": "Add user_data to the Create Server v1.1 API.", + "description": "Add user_data to the Create Server API.", "links": [], "name": "UserData", "namespace": "http://docs.openstack.org/compute/ext/fake_xml", @@ -657,4 +657,4 @@ "updated": "2014-12-03T00:00:00Z" } ] -}
\ No newline at end of file +} diff --git a/nova/api/openstack/compute/plugins/v3/user_data.py b/nova/api/openstack/compute/plugins/v3/user_data.py index 45f554a1ee..3ed61e80d1 100644 --- a/nova/api/openstack/compute/plugins/v3/user_data.py +++ b/nova/api/openstack/compute/plugins/v3/user_data.py @@ -21,7 +21,7 @@ ATTRIBUTE_NAME = 'user_data' class UserData(extensions.V3APIExtensionBase): - """Add user_data to the Create Server v1.1 API.""" + """Add user_data to the Create Server API.""" name = "UserData" alias = ALIAS 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 cc85283836..7d6f9bf535 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 @@ -610,7 +610,7 @@ }, { "alias": "os-user-data", - "description": "Add user_data to the Create Server v1.1 API.", + "description": "Add user_data to the Create Server API.", "links": [], "name": "UserData", "namespace": "http://docs.openstack.org/compute/ext/fake_xml", @@ -657,4 +657,4 @@ "updated": "2014-12-03T00:00:00Z" } ] -}
\ No newline at end of file +} |