Fix capabilities listed twice

In an earlier patch[1], a bad rebase caused some capabilities to
accidentally be listed both as advisory and as required.  This
patch fixes the problem by putting those Capabilities to rights.
It should include the intent of several recent patches [2][3][4][5][6].

[1] https://review.openstack.org/290271
[2] https://review.openstack.org/289071
[3] https://review.openstack.org/290592
[4] https://review.openstack.org/305269
[5] https://review.openstack.org/297847
[6] https://review.openstack.org/294287

Change-Id: I84bd453164241698d6faf5bf6ad7ed90f4babbf7
This commit is contained in:
Mark T. Voelker 2016-04-23 12:26:02 -04:00
parent 53647dea96
commit ccb7c1e3f0

View File

@ -17,8 +17,6 @@
"components": {
"compute": {
"required": [
"identity-v3-tokens-create",
"identity-v3-api-discovery",
"compute-images-create",
"compute-images-delete",
"compute-images-get",
@ -44,16 +42,15 @@
"compute-volume-attach",
"compute-volume-get",
"compute-volume-list",
"images-v2-index",
"compute-servers-metadata-delete",
"compute-servers-metadata-get",
"compute-servers-metadata-list",
"compute-servers-metadata-set",
"compute-servers-metadata-update",
"networks-floating-ips-CRUD-and-associate",
"networks-l2-CRUD",
"networks-security-groups-CRUD",
"compute-list-api-versions",
"identity-v3-api-discovery",
"identity-v3-tokens-create",
"images-v2-index",
"images-v2-remove",
"images-v2-update",
"images-v2-share",
@ -61,6 +58,8 @@
"images-v2-list",
"images-v2-delete",
"images-v2-get",
"networks-l2-CRUD",
"networks-security-groups-CRUD",
"volumes-v2-create-delete",
"volumes-v2-attach-detach",
"volumes-v2-snapshot-create-delete",
@ -76,12 +75,8 @@
"volumes-v2-readonly"
],
"advisory": [
"networks-floating-ips-CRUD-and-associate",
"networks-l3-router",
"networks-l2-CRUD",
"networks-l3-CRUD",
"networks-security-groups-CRUD",
"compute-list-api-versions",
"images-v2-remove",
"images-v2-update",
"images-v2-share",
@ -92,7 +87,6 @@
"volumes-v2-upload",
"volumes-v2-qos",
"volumes-v2-transfer",
"identity-v3-api-discovery"
],
"deprecated": [
"compute-auth-create",
@ -2127,49 +2121,6 @@
"tests": {
}
},
"networks-floating-ips-CRUD-and-associate": {
"achievements": [
"complete",
"doc",
"proximity",
"clients",
"future",
"atomic",
"stable",
"tools",
"deployed"
],
"admin": false,
"description": "Basic CRUD (and associate) operations on floating IP addresses",
"project": "neutron",
"required-since": "2016.08",
"tests": {
"tempest.api.network.test_floating_ips_negative.FloatingIPNegativeTestJSON.test_associate_floatingip_port_ext_net_unreachable": {
"idempotent_id": "id-6b3b8797-6d43-4191-985c-c48b773eb429"
},
"tempest.api.network.test_floating_ips.FloatingIPTestJSON.test_create_floating_ip_specifying_a_fixed_ip_address": {
"idempotent_id": "id-36de4bd0-f09c-43e3-a8e1-1decc1ffd3a5"
},
"tempest.api.network.test_floating_ips.FloatingIPTestJSON.test_create_list_show_update_delete_floating_ip": {
"idempotent_id": "id-62595970-ab1c-4b7f-8fcc-fddfe55e8718"
},
"tempest.api.network.test_floating_ips.FloatingIPTestJSON.test_create_update_floatingip_with_port_multiple_ip_address": {
"idempotent_id": "id-45c4c683-ea97-41ef-9c51-5e9802f2f3d7"
},
"tempest.api.network.test_floating_ips_negative.FloatingIPNegativeTestJSON.test_create_floatingip_in_private_network": {
"idempotent_id": "id-50b9aeb4-9f0b-48ee-aa31-fa955a48ff54"
},
"tempest.api.network.test_floating_ips_negative.FloatingIPNegativeTestJSON.test_create_floatingip_with_port_ext_net_unreachable": {
"idempotent_id": "id-22996ea8-4a81-4b27-b6e1-fa5df92fa5e8"
},
"tempest.api.network.test_floating_ips.FloatingIPTestJSON.test_floating_ip_delete_port": {
"idempotent_id": "id-e1f6bffd-442f-4668-b30e-df13f2705e77"
},
"tempest.api.network.test_floating_ips.FloatingIPTestJSON.test_floating_ip_update_different_router": {
"idempotent_id": "id-1bb2f731-fe5a-4b8c-8409-799ade1bed4d"
}
}
},
"networks-l2-CRUD": {
"achievements": [
"foundation",