Skip to content

Commit 80a965d

Browse files
#1181 fixed issue where vs reboot was using the hardware manager, and not the VS manager to resolve ids
1 parent 6b011b5 commit 80a965d

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

SoftLayer/CLI/virt/power.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ def reboot(env, identifier, hard):
3535
"""Reboot an active virtual server."""
3636

3737
virtual_guest = env.client['Virtual_Guest']
38-
mgr = SoftLayer.HardwareManager(env.client)
38+
mgr = SoftLayer.VSManager(env.client)
3939
vs_id = helpers.resolve_id(mgr.resolve_ids, identifier, 'VS')
4040
if not (env.skip_confirmations or
4141
formatting.confirm('This will reboot the VS with id %s. '

tests/CLI/modules/autoscale_tests.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,9 @@ def test_autoscale_edit_userdata(self, manager):
7474

7575
@mock.patch('SoftLayer.managers.autoscale.AutoScaleManager.edit')
7676
def test_autoscale_edit_userfile(self, manager):
77+
# On windows, python cannot edit a NamedTemporaryFile.
78+
if(sys.platform.startswith("win")):
79+
self.skipTest("Test doesn't work in Windows")
7780
group = fixtures.SoftLayer_Scale_Group.getObject
7881
template = {
7982
'virtualGuestMemberTemplate': group['virtualGuestMemberTemplate']

0 commit comments

Comments
 (0)