From 737e6c7323b47ed47f0781c93c7b473b1308be6b Mon Sep 17 00:00:00 2001
From: cdiep <cdiep@us.ibm.com>
Date: Fri, 16 Jan 2015 16:39:47 -0800
Subject: [PATCH] Add tests to the "volume" section in havanacore.json

Add tests to "volume" capability section and fix the core flag
of this section.  Also remove the compute-servers-metadata
section because the tests in this section was merged to
compute-servers as defined in http://goo.gl/AwaJYU

Change-Id: Ic4c7aeff71d1f50e4ed2357e0486e088ea99e9c3
---
 havanacore.json | 34 +++++++++++-----------------------
 1 file changed, 11 insertions(+), 23 deletions(-)

diff --git a/havanacore.json b/havanacore.json
index f1f46261..00475f6d 100644
--- a/havanacore.json
+++ b/havanacore.json
@@ -807,26 +807,6 @@
                 "tempest.api.compute.servers.test_servers_negative.ServersNegativeTestJSON.test_delete_server_pass_id_exceeding_length_limit"
             ]
         },
-        "compute-servers-metadata": {
-            "achievements": [
-                "deployed",
-                "tools",
-                "clients",
-                "future",
-                "complete",
-                "stable",
-                "discover",
-                "doc",
-                "sticky",
-                "foundation"
-            ],
-            "admin": false,
-            "core": true,
-            "description": "Manage the access to ip extended attribute for servers through the Compute API",
-            "flagged": [],
-            "name": "compute-servers-metadata",
-            "tests": []
-        },
         "compute-servers-personality": {
             "achievements": [
                 "deployed",
@@ -1595,12 +1575,20 @@
                 "atomic",
                 "proximity"
             ],
-            "admin": false,
-            "core": true,
+            "admin": true,
+            "core": false,
             "description": "CRUD operations for volumes management in Block Storage API",
             "flagged": [],
             "name": "volume",
-            "tests": []
+            "tests": [
+                "tempest.api.volume.admin.test_volume_types.VolumeTypesTest.test_create_get_delete_volume_with_volume_type_and_extra_specs",
+                "tempest.api.volume.admin.test_volume_types.VolumeTypesTest.test_volume_type_list",
+                "tempest.api.volume.admin.test_volume_types_extra_specs.VolumeTypesExtraSpecsTest.test_volume_type_extra_spec_create_get_delete",
+                "tempest.api.volume.admin.test_volume_types_negative.VolumeTypesNegativeTest.test_create_with_empty_name",
+                "tempest.api.volume.admin.test_volume_types_negative.VolumeTypesNegativeTest.test_create_with_nonexistent_volume_type",
+                "tempest.api.volume.admin.test_volume_types_negative.VolumeTypesNegativeTest.test_delete_nonexistent_type_id",
+                "tempest.api.volume.admin.test_volume_types_negative.VolumeTypesNegativeTest.test_get_nonexistent_type_id"
+            ]
         },
         "volume-extra-specs": {
             "achievements": [