Fix cluster update failed problem

This patch fix cluster update cmd with openstack client

Closes-Bug: #1664885

Change-Id: I972bea595dff4c581ec5374e10aa4ee1042448f1
(cherry picked from commit 46ebf3e195d4a1e1950192ff80945a4e9f52d080)

senlinclient/tests/unit/v1/test_cluster.py

@@ -264,28 +264,6 @@ class TestClusterCreate(TestCluster):
 
 
 class TestClusterUpdate(TestCluster):
-    response = {"cluster": {
-        "created_at": "2015-02-11T15:13:20",
-        "data": {},
-        "desired_capacity": 0,
-        "domain": 'null',
-        "id": "45edadcb-c73b-4920-87e1-518b2f29f54b",
-        "init_time": "2015-02-10T14:26:10",
-        "max_size": -1,
-        "metadata": {},
-        "min_size": 0,
-        "name": "test_cluster",
-        "node_ids": [],
-        "policies": [],
-        "profile_id": "edc63d0a-2ca4-48fa-9854-27926da76a4a",
-        "profile_name": "mystack",
-        "project": "6e18cc2bdbeb48a5b3cad2dc499f6804",
-        "status": "INIT",
-        "status_reason": "Initializing",
-        "timeout": 3600,
-        "updated_at": 'null',
-        "user": "5e5bf8027826429c96af157f68dc9072"
-    }}
 
     defaults = {
         "metadata": {
@@ -300,12 +278,35 @@ class TestClusterUpdate(TestCluster):
     def setUp(self):
         super(TestClusterUpdate, self).setUp()
         self.cmd = osc_cluster.UpdateCluster(self.app, None)
+        self.fake_cluster = mock.Mock(
+            created_at="2015-02-11T15:13:20",
+            data={},
+            desired_capacity=0,
+            domain_id=None,
+            id="7d85f602-a948-4a30-afd4-e84f47471c15",
+            init_time="2015-02-10T14:26:11",
+            max_size=-1,
+            metadata={},
+            min_size=0,
+            node_ids=[],
+            policies=[],
+            profile_id="edc63d0a-2ca4-48fa-9854-27926da76a4a",
+            profile_name="mystack",
+            project_id="6e18cc2bdbeb48a5b3cad2dc499f6804",
+            status="ACTIVE",
+            status_reason="Cluster scale-in succeeded",
+            timeout=3600,
+            updated_at=None,
+            user_id="5e5bf8027826429c96af157f68dc9072"
+        )
+        self.fake_cluster.name = "my_cluster"
+        self.fake_cluster.to_dict = mock.Mock(return_value={})
         self.mock_client.update_cluster = mock.Mock(
-            return_value=sdk_cluster.Cluster(**self.response['cluster']))
+            return_value=self.fake_cluster)
         self.mock_client.get_cluster = mock.Mock(
-            return_value=sdk_cluster.Cluster(**self.response['cluster']))
+            return_value=self.fake_cluster)
         self.mock_client.find_cluster = mock.Mock(
-            return_value=sdk_cluster.Cluster(**self.response['cluster']))
+            return_value=self.fake_cluster)
 
     def test_cluster_update_defaults(self):
         arglist = ['--name', 'new_cluster', '--metadata', 'nk1=nv1;nk2=nv2',
@@ -313,7 +314,7 @@ class TestClusterUpdate(TestCluster):
         parsed_args = self.check_parser(self.cmd, arglist, [])
         self.cmd.take_action(parsed_args)
         self.mock_client.update_cluster.assert_called_with(
-            '45edadcb-c73b-4920-87e1-518b2f29f54b', **self.defaults)
+            self.fake_cluster, **self.defaults)
 
     def test_cluster_update_not_found(self):
         arglist = ['--name', 'new_cluster', '--metadata', 'nk1=nv1;nk2=nv2',

senlinclient/v1/cluster.py

@@ -275,7 +275,7 @@ class UpdateCluster(command.ShowOne):
             'timeout': parsed_args.timeout,
         }
 
-        senlin_client.update_cluster(cluster.id, **attrs)
+        senlin_client.update_cluster(cluster, **attrs)
         return _show_cluster(senlin_client, cluster.id)