Skip to content

Commit d4aac0d

Browse files
committed
Improved successful response to command - slcli virtual edit
1 parent 1e47c34 commit d4aac0d

File tree

2 files changed

+16
-5
lines changed

2 files changed

+16
-5
lines changed

SoftLayer/CLI/virt/edit.py

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,16 @@ def cli(env, identifier, domain, userfile, tag, hostname, userdata,
5454

5555
vsi = SoftLayer.VSManager(env.client)
5656
vs_id = helpers.resolve_id(vsi.resolve_ids, identifier, 'VS')
57-
if not vsi.edit(vs_id, **data):
58-
raise exceptions.CLIAbort("Failed to update virtual server")
57+
58+
if vsi.edit(vs_id, **data):
59+
for key, value in data.items():
60+
if value is not None:
61+
env.fout("The {} of virtual server instance: {} was updated.".format(key, vs_id))
5962

6063
if public_speed is not None:
61-
vsi.change_port_speed(vs_id, True, int(public_speed))
64+
if vsi.change_port_speed(vs_id, True, int(public_speed)):
65+
env.fout("The public speed of virtual server instance: {} was updated.".format(vs_id))
6266

6367
if private_speed is not None:
64-
vsi.change_port_speed(vs_id, False, int(private_speed))
68+
if vsi.change_port_speed(vs_id, False, int(private_speed)):
69+
env.fout("The private speed of virtual server instance: {} was updated.".format(vs_id))

tests/CLI/modules/vs/vs_tests.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -609,7 +609,13 @@ def test_edit(self):
609609
'100'])
610610

611611
self.assert_no_fail(result)
612-
self.assertEqual(result.output, '')
612+
expected_output = '"The userdata of virtual server instance: 100 was updated."\n' \
613+
+ '"The hostname of virtual server instance: 100 was updated."\n' \
614+
+ '"The domain of virtual server instance: 100 was updated."\n' \
615+
+ '"The tags of virtual server instance: 100 was updated."\n' \
616+
+ '"The public speed of virtual server instance: 100 was updated."\n' \
617+
+ '"The private speed of virtual server instance: 100 was updated."\n'
618+
self.assertEqual(result.output, expected_output)
613619

614620
self.assert_called_with(
615621
'SoftLayer_Virtual_Guest', 'editObject',

0 commit comments

Comments
 (0)