Fix metadata property of Senlin node resource

yanyanhu · yanyanhu · commit efb8d07d0108 · 2016-10-25T22:29:54.000-04:00
This patch fixes metadata property of Senlin node resource.
The corresponding field name in response body is 'metadata'
rather than 'tags'.

Change-Id: I123421d1b66b90ec6eed8fe987220b7e5b7b2618
diff --git a/openstack/cluster/v1/node.py b/openstack/cluster/v1/node.py
@@ -68,7 +68,7 @@ class Node(resource.Resource):
     #: A string describing why the node entered its current status.
     status_reason = resource.Body('status_reason')
     #: A map containing key-value pairs attached to the node.
-    metadata = resource.Body('tags', type=dict)
+    metadata = resource.Body('metadata', type=dict)
     #: A map containing some runtime data for this node.
     data = resource.Body('data', type=dict)
     #: A map containing the details of the physical object this node
diff --git a/openstack/tests/unit/cluster/v1/test_node.py b/openstack/tests/unit/cluster/v1/test_node.py
@@ -22,7 +22,7 @@
 FAKE = {
     'id': FAKE_ID,
     'cluster_id': 'clusterA',
-    'metadata': {},
+    'metadata': {'key1': 'value1'},
     'name': FAKE_NAME,
     'profile_id': 'myserver',
     'index': 1,
@@ -33,28 +33,6 @@
     'init_at': '2015-10-10T12:46:36.000000',
 }
 
-FAKE_CREATE_RESP = {
-    'node': {
-        'id': FAKE_ID,
-        'name': FAKE_NAME,
-        'cluster_id': '99001122-aabb-ccdd-ffff-efdcab124567',
-        'action': '1122aabb-eeff-7755-2222-00991234dcba',
-        'created_at': '2015-10-10T12:46:36.000000',
-        'updated_at': '2016-10-10T12:46:36.000000',
-        'data': {},
-        'role': 'master',
-        'index': 1,
-        'init_at': '2015-10-10T12:46:36.000000',
-        'metadata': {},
-        'profile_id': '560a8f9d-7596-4a32-85e8-03645fa7be13',
-        'profile_name': 'myserver',
-        'project': '333acb15a43242f4a609a27cb097a8f2',
-        'status': 'INIT',
-        'status_reason': 'Initializing',
-        'dependents': {},
-    }
-}
-
 
 class TestNode(testtools.TestCase):
 
@@ -73,7 +51,6 @@ def test_basic(self):
     def test_instantiate(self):
         sot = node.Node(**FAKE)
         self.assertEqual(FAKE['id'], sot.id)
-        self.assertEqual(FAKE['name'], sot.name)
         self.assertEqual(FAKE['profile_id'], sot.profile_id)
         self.assertEqual(FAKE['cluster_id'], sot.cluster_id)
         self.assertEqual(FAKE['name'], sot.name)
