x/compass-core
Code Issues Proposed changes

Merge "fix bug thag model name typo" into dev/experimental

Browse Source
This commit is contained in:
Jenkins 2014-09-19 23:29:19 +00:00 committed by Gerrit Code Review
commit fb120a4ca3
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
compass/db/api/cluster.py
View File

@ -685,15 +685,11 @@ def _update_clusterhost(session, updater, clusterhost, **kwargs):
session, clusterhost, **in_kwargs session, clusterhost, **in_kwargs
) )
is_cluster_editable(session, clusterhost.cluster, updater)
return update_internal( return update_internal(
clusterhost, **kwargs clusterhost, **kwargs
) )
is_cluster_editable(session, clusterhost.cluster, updater)
return utils.update_db_object(
session, clusterhost, **kwargs
)
@utils.supported_filters( @utils.supported_filters(
optional_support_keys=UPDATED_CLUSTERHOST_FIELDS optional_support_keys=UPDATED_CLUSTERHOST_FIELDS
@ -738,7 +734,7 @@ def patch_cluster_host(
): ):
"""Update cluster host.""" """Update cluster host."""
clusterhost = utils.get_db_object( clusterhost = utils.get_db_object(
session, models.Cluster, cluster_id=cluster_id, host_id=host_id session, models.ClusterHost, cluster_id=cluster_id, host_id=host_id
) )
return _update_clusterhost(session, updater, clusterhost, **kwargs) return _update_clusterhost(session, updater, clusterhost, **kwargs)