summaryrefslogtreecommitdiff
path: root/novaclient/tests/v1_1/test_shell.py
diff options
context:
space:
mode:
Diffstat (limited to 'novaclient/tests/v1_1/test_shell.py')
-rw-r--r--novaclient/tests/v1_1/test_shell.py28
1 files changed, 6 insertions, 22 deletions
diff --git a/novaclient/tests/v1_1/test_shell.py b/novaclient/tests/v1_1/test_shell.py
index feeba487..a4c4ca19 100644
--- a/novaclient/tests/v1_1/test_shell.py
+++ b/novaclient/tests/v1_1/test_shell.py
@@ -1149,42 +1149,26 @@ class ShellTest(utils.TestCase):
self.assert_called('DELETE', '/os-aggregates/1')
def test_aggregate_update_by_id(self):
- self.run_command('aggregate-update 1 --name new_name')
+ self.run_command('aggregate-update 1 new_name')
body = {"aggregate": {"name": "new_name"}}
self.assert_called('PUT', '/os-aggregates/1', body, pos=-2)
self.assert_called('GET', '/os-aggregates/1', pos=-1)
def test_aggregate_update_by_name(self):
- self.run_command('aggregate-update test --name new_name')
+ self.run_command('aggregate-update test new_name')
body = {"aggregate": {"name": "new_name"}}
self.assert_called('PUT', '/os-aggregates/1', body, pos=-2)
self.assert_called('GET', '/os-aggregates/1', pos=-1)
def test_aggregate_update_with_availability_zone_by_id(self):
- self.run_command('aggregate-update 1 --availability_zone new_zone')
- body = {"aggregate": {"availability_zone": "new_zone"}}
+ self.run_command('aggregate-update 1 foo new_zone')
+ body = {"aggregate": {"name": "foo", "availability_zone": "new_zone"}}
self.assert_called('PUT', '/os-aggregates/1', body, pos=-2)
self.assert_called('GET', '/os-aggregates/1', pos=-1)
def test_aggregate_update_with_availability_zone_by_name(self):
- self.run_command('aggregate-update test --availability_zone new_zone')
- body = {"aggregate": {"availability_zone": "new_zone"}}
- self.assert_called('PUT', '/os-aggregates/1', body, pos=-2)
- self.assert_called('GET', '/os-aggregates/1', pos=-1)
-
- def test_aggregate_update_all_parameters_by_id(self):
- self.run_command('aggregate-update 1 --name new_name '
- '--availability_zone new_zone')
- body = {"aggregate": {"name": "new_name",
- "availability_zone": "new_zone"}}
- self.assert_called('PUT', '/os-aggregates/1', body, pos=-2)
- self.assert_called('GET', '/os-aggregates/1', pos=-1)
-
- def test_aggregate_update_all_parameters_by_name(self):
- self.run_command('aggregate-update test --name new_name '
- '--availability_zone new_zone')
- body = {"aggregate": {"name": "new_name",
- "availability_zone": "new_zone"}}
+ self.run_command('aggregate-update test foo new_zone')
+ body = {"aggregate": {"name": "foo", "availability_zone": "new_zone"}}
self.assert_called('PUT', '/os-aggregates/1', body, pos=-2)
self.assert_called('GET', '/os-aggregates/1', pos=-1)