From f57bf579fc7f21ffa92e73f02582a227e037986f Mon Sep 17 00:00:00 2001
From: Lakshmi N Sampath <lakshmi.sampath@hp.com>
Date: Tue, 6 May 2014 11:20:53 -0700
Subject: [PATCH] JSON format for property modified

Change-Id: I2ae07043a5da8ffb67b671542187c63cc33c6df5
---
 graffiti/api/model/v1/capability.py           |  4 +--
 graffiti/api/model/v1/resource.py             |  3 +-
 .../api/tests/samples/resource_2014-1.json    | 34 ++++++-------------
 3 files changed, 13 insertions(+), 28 deletions(-)

diff --git a/graffiti/api/model/v1/capability.py b/graffiti/api/model/v1/capability.py
index 70ec434..84ba796 100644
--- a/graffiti/api/model/v1/capability.py
+++ b/graffiti/api/model/v1/capability.py
@@ -16,11 +16,9 @@
 import wsme
 from wsme import types
 
-from graffiti.api.model.v1.property import Property
-
 
 class Capability(types.Base):
-    properties = wsme.wsattr([Property], mandatory=True)
+    properties = wsme.wsattr({types.text: types.text}, mandatory=True)
     capability_type = wsme.wsattr(types.text, mandatory=True)
     capability_type_namespace = wsme.wsattr(types.text, mandatory=True)
 
diff --git a/graffiti/api/model/v1/resource.py b/graffiti/api/model/v1/resource.py
index 7c2038b..76c2aed 100644
--- a/graffiti/api/model/v1/resource.py
+++ b/graffiti/api/model/v1/resource.py
@@ -17,7 +17,6 @@ import wsme
 from wsme import types
 
 from graffiti.api.model.v1.capability import Capability
-from graffiti.api.model.v1.property import Property
 from graffiti.api.model.v1.provider import Provider
 from graffiti.api.model.v1.requirement import Requirement
 
@@ -28,7 +27,7 @@ class Resource(types.Base):
     name = wsme.wsattr(types.text, mandatory=True)
     description = wsme.wsattr(types.text, mandatory=False)
     provider = wsme.wsattr(Provider, mandatory=True)
-    properties = wsme.wsattr([Property], mandatory=False)
+    properties = wsme.wsattr({types.text: types.text}, mandatory=False)
     capabilities = wsme.wsattr([Capability], mandatory=True)
     requirements = wsme.wsattr([Requirement], mandatory=True)
 
diff --git a/graffiti/api/tests/samples/resource_2014-1.json b/graffiti/api/tests/samples/resource_2014-1.json
index c76d1e4..1fe72b9 100644
--- a/graffiti/api/tests/samples/resource_2014-1.json
+++ b/graffiti/api/tests/samples/resource_2014-1.json
@@ -10,38 +10,26 @@
         {
             "capability_type": "StandardCapability1",
             "capability_type_namespace": "TEST:RESOURCE:2014-1",
-            "properties": [
+            "properties":
             {
-                "name": "StandardCapabilityProperty1",
-                "value": "SCP1"
-            },
-            {
-                "name": "StandardCapabilityProperty2",
-                "value": "SCP2"
-            }]
+                "StandardCapabilityProperty1": "SCP1",
+                "StandardCapabilityProperty2": "SCP2"
+            }
         },
         {
             "capability_type": "StandardCapability2",
             "capability_type_namespace": "TEST:RESOURCE:2014-1",
-            "properties": [
+            "properties":
             {
-                "name": "StandardCapabilityProperty3",
-                "value": "SCP3"
-            },
-            {
-                "name": "StandardCapabilityProperty4",
-                "value": "SCP4"
-            }]
+                "StandardCapabilityProperty3": "SCP3",
+                "StandardCapabilityProperty4": "SCP4"
+            }
         }],
-        "properties": [
+        "properties":
         {
-            "name": "StandardResourceProperty1",
-            "value": "SRP1"
+            "StandardResourceProperty1": "SRP1",
+            "StandardResourceProperty2": "SRP2"
         },
-        {
-            "name": "StandardResourceProperty2",
-            "value": "SRP2"
-        }],
         "requirements": [
         {
             "capability_type": "StandardRequirement1",