Use real capabilites for all volume type instead of fake ones

Replace fake capabilities requirements in all volume type extra
spec with real capabilites that Cinder/iSCSI driver would report.

Previous fix in I0e226c14df95097cfdf653f0a13a45b8acff39da isn't
complete, this change should cover all.

fix bug: 1098017

Change-Id: Ie59b11de5e8673e0414b08c5570a14f5cf69a246
diff --git a/tempest/tests/volume/admin/test_volume_types.py b/tempest/tests/volume/admin/test_volume_types.py
index 7184f11..6eb3629 100644
--- a/tempest/tests/volume/admin/test_volume_types.py
+++ b/tempest/tests/volume/admin/test_volume_types.py
@@ -56,7 +56,8 @@
             volume = {}
             vol_name = rand_name("volume-")
             vol_type_name = rand_name("volume-type-")
-            extra_specs = {"Spec1": "Val1", "Spec2": "Val2"}
+            extra_specs = {"storage_protocol": "iSCSI",
+                           "vendor_name": "Open Source"}
             body = {}
             resp, body = self.client.create_volume_type(vol_type_name,
                                                         extra_specs=
@@ -105,7 +106,8 @@
         # Create/Delete volume type.
         try:
             name = rand_name("volume-type-")
-            extra_specs = {"Spec1": "Val1", "Spec2": "Val2"}
+            extra_specs = {"storage_protocol": "iSCSI",
+                           "vendor_name": "Open Source"}
             resp, body = self.client.\
             create_volume_type(name, extra_specs=extra_specs)
             self.assertEqual(200, resp.status)