Skip to content

Fixed vs reboot unable to resolve vs names #1182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
allmightyspiff merged 2 commits into from
Nov 5, 2019
Merged

Fixed vs reboot unable to resolve vs names #1182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
80a965d
#1181 fixed issue where vs reboot was using the hardware manager, and…
allmightyspiff Nov 4, 2019
f7c5080
tox fixes
allmightyspiff Nov 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion SoftLayer/CLI/virt/power.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ def reboot(env, identifier, hard):
"""Reboot an active virtual server."""

virtual_guest = env.client['Virtual_Guest']
mgr = SoftLayer.HardwareManager(env.client)
mgr = SoftLayer.VSManager(env.client)
vs_id = helpers.resolve_id(mgr.resolve_ids, identifier, 'VS')
if not (env.skip_confirmations or
formatting.confirm('This will reboot the VS with id %s. '
Expand Down
2 changes: 1 addition & 1 deletion SoftLayer/transports.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import json
import logging
import re
from string import Template
import time
import xmlrpc.client

Expand Down Expand Up @@ -256,7 +257,6 @@ def print_reproduceable(self, request):

:param request request: Request object
"""
from string import Template
output = Template('''============= testing.py =============
import requests
from requests.auth import HTTPBasicAuth
Expand Down
4 changes: 4 additions & 0 deletions tests/CLI/modules/autoscale_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
Tests for the autoscale cli command
"""
import mock
import sys

from SoftLayer import fixtures
from SoftLayer import testing
Expand Down Expand Up @@ -74,6 +75,9 @@ def test_autoscale_edit_userdata(self, manager):

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