Merge "Correct InvalidAggregateAction reason for Xen"
This commit is contained in:
commit
58b8a68f3c
@ -3072,27 +3072,30 @@ class XenAPIAggregateTestCase(stubs.XenAPITestBase):
|
|||||||
aggregate is not ready.
|
aggregate is not ready.
|
||||||
"""
|
"""
|
||||||
aggregate = self._aggregate_setup(aggr_state=pool_states.CHANGING)
|
aggregate = self._aggregate_setup(aggr_state=pool_states.CHANGING)
|
||||||
self.assertRaises(exception.InvalidAggregateAction,
|
ex = self.assertRaises(exception.InvalidAggregateAction,
|
||||||
self.conn.add_to_aggregate, self.context,
|
self.conn.add_to_aggregate, self.context,
|
||||||
aggregate, 'host')
|
aggregate, 'host')
|
||||||
|
self.assertIn('setup in progress', str(ex))
|
||||||
|
|
||||||
def test_add_host_to_aggregate_invalid_dismissed_status(self):
|
def test_add_host_to_aggregate_invalid_dismissed_status(self):
|
||||||
"""Ensure InvalidAggregateAction is raised when aggregate is
|
"""Ensure InvalidAggregateAction is raised when aggregate is
|
||||||
deleted.
|
deleted.
|
||||||
"""
|
"""
|
||||||
aggregate = self._aggregate_setup(aggr_state=pool_states.DISMISSED)
|
aggregate = self._aggregate_setup(aggr_state=pool_states.DISMISSED)
|
||||||
self.assertRaises(exception.InvalidAggregateAction,
|
ex = self.assertRaises(exception.InvalidAggregateAction,
|
||||||
self.conn.add_to_aggregate, self.context,
|
self.conn.add_to_aggregate, self.context,
|
||||||
aggregate, 'fake_host')
|
aggregate, 'fake_host')
|
||||||
|
self.assertIn('aggregate deleted', str(ex))
|
||||||
|
|
||||||
def test_add_host_to_aggregate_invalid_error_status(self):
|
def test_add_host_to_aggregate_invalid_error_status(self):
|
||||||
"""Ensure InvalidAggregateAction is raised when aggregate is
|
"""Ensure InvalidAggregateAction is raised when aggregate is
|
||||||
in error.
|
in error.
|
||||||
"""
|
"""
|
||||||
aggregate = self._aggregate_setup(aggr_state=pool_states.ERROR)
|
aggregate = self._aggregate_setup(aggr_state=pool_states.ERROR)
|
||||||
self.assertRaises(exception.InvalidAggregateAction,
|
ex = self.assertRaises(exception.InvalidAggregateAction,
|
||||||
self.conn.add_to_aggregate, self.context,
|
self.conn.add_to_aggregate, self.context,
|
||||||
aggregate, 'fake_host')
|
aggregate, 'fake_host')
|
||||||
|
self.assertIn('aggregate in error', str(ex))
|
||||||
|
|
||||||
def test_remove_host_from_aggregate_error(self):
|
def test_remove_host_from_aggregate_error(self):
|
||||||
# Ensure we can remove a host from an aggregate even if in error.
|
# Ensure we can remove a host from an aggregate even if in error.
|
||||||
|
@ -78,7 +78,7 @@ class ResourcePool(object):
|
|||||||
raise exception.InvalidAggregateAction(
|
raise exception.InvalidAggregateAction(
|
||||||
action='add host',
|
action='add host',
|
||||||
aggregate_id=aggregate['id'],
|
aggregate_id=aggregate['id'],
|
||||||
reason=aggregate['metadata'][pool_states.KEY])
|
reason=invalid[aggregate['metadata'][pool_states.KEY]])
|
||||||
|
|
||||||
if (aggregate['metadata'][pool_states.KEY] == pool_states.CREATED):
|
if (aggregate['metadata'][pool_states.KEY] == pool_states.CREATED):
|
||||||
aggregate.update_metadata({pool_states.KEY: pool_states.CHANGING})
|
aggregate.update_metadata({pool_states.KEY: pool_states.CHANGING})
|
||||||
|
Loading…
Reference in New Issue
Block a user