openstack
/
senlin
Code Issues Proposed changes

Added a new test case for cluster_add_nodes 

Nodes that are already owned by a cluster cannot be added to another
cluster directly.

Change-Id: I2b13f32d647909c4fa4b12056ff1dd25b174842d
This commit is contained in:
tengqm 2015-03-18 21:14:52 +08:00 committed by Qiming Teng
parent 02cb815fd3
commit a4987fcf72
1 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
senlin/tests/engine/test_clusters.py
View File

@ -622,3 +622,36 @@ class ClusterTest(base.SenlinTestCase):
msg = _("Nodes are not ACTIVE: %s") % nodes
self.assertEqual(_("The request is malformed: %(msg)s") % {'msg': msg},
six.text_type(ex.exc_info[1]))
@mock.patch.object(dispatcher, 'notify')
def test_cluster_add_nodes_node_already_owned(self, notify):
c1 = self.eng.cluster_create(self.ctx, 'c-1', 0, self.profile['id'])
cid1 = c1['id']
c2 = self.eng.cluster_create(self.ctx, 'c-2', 0, self.profile['id'])
cid2 = c2['id']
nodes1 = self._prepare_nodes(self.ctx, count=1, cluster_id=cid1)
nodes2 = self._prepare_nodes(self.ctx, count=1, cluster_id=cid2)
ex = self.assertRaises(rpc.ExpectedException,
self.eng.cluster_add_nodes,
self.ctx, cid1, nodes1)
# adding from the same cluster is not allowed
self.assertEqual(exception.SenlinBadRequest, ex.exc_info[0])
msg = _("Nodes %s owned by other cluster, need to delete them from "
"those clusters first.") % nodes1
self.assertEqual(_("The request is malformed: %(msg)s") % {'msg': msg},
six.text_type(ex.exc_info[1]))
ex = self.assertRaises(rpc.ExpectedException,
self.eng.cluster_add_nodes,
self.ctx, cid1, nodes2)
# adding from a different cluster is not allowed either
self.assertEqual(exception.SenlinBadRequest, ex.exc_info[0])
msg = _("Nodes %s owned by other cluster, need to delete them from "
"those clusters first.") % nodes2
self.assertEqual(_("The request is malformed: %(msg)s") % {'msg': msg},
six.text_type(ex.exc_info[1]))