Skip to content

Commit

Permalink
fixed tox errors
Browse files Browse the repository at this point in the history
  • Loading branch information
allmightyspiff committed Apr 15, 2015
1 parent 7958a6e commit 3525b36
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 15 deletions.
11 changes: 1 addition & 10 deletions SoftLayer/managers/hardware.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ def cancel_hardware(self, hardware_id, reason='unneeded', comment='',
# Cancels hardware id 1234
result = mrg.cancel_hardware(hardware_id=1234)
"""
# Check to see if this is actually a pre-configured server (BMC). They
# require a different cancellation call.
Expand Down Expand Up @@ -93,7 +92,7 @@ def cancel_metal(self, hardware_id, immediate=False):
:param int id: The ID of the bare metal instance to be cancelled.
:param bool immediate: If true, the bare metal instance will be
cancelled immediately. Otherwise, it will be
scheduled to cancel on the anniversary date.
scheduled to cancel on the anniversary date.
"""
hw_billing = self.get_hardware(hardware_id,
mask='mask[id, billingItem.id]')
Expand Down Expand Up @@ -132,8 +131,6 @@ def list_hardware(self, tags=None, cpus=None, memory=None, hostname=None,
# These will stem from the SoftLayer_Hardware_Server datatype
object_mask = "mask[hostname,monitoringRobot[robotStatus]]"
result = mgr.list_hardware(mask=object_mask)
"""
if 'mask' not in kwargs:
hw_items = [
Expand Down Expand Up @@ -208,7 +205,6 @@ def get_hardware(self, hardware_id, **kwargs):
object_mask = "mask[id,networkVlans[vlanNumber]]"
# Object masks are optional
result = mrg.get_hardware(hardware_id=1234,mask=object_mask)
"""

if 'mask' not in kwargs:
Expand Down Expand Up @@ -280,7 +276,6 @@ def rescue(self, hardware_id):
Example::
result = mgr.rescue(1234)
"""
return self.hardware.bootToRescueLayer(id=hardware_id)

Expand All @@ -301,7 +296,6 @@ def change_port_speed(self, hardware_id, public, speed):
result = mgr.change_port_speed(hardware_id=12345,
public=True, speed=10)
# result will be True or an Exception
"""
if public:
func = self.hardware.setPublicNetworkInterfaceSpeed
Expand Down Expand Up @@ -550,8 +544,6 @@ def edit(self, hardware_id, userdata=None, hostname=None, domain=None,
# Change the hostname on instance 12345 to 'something'
result = mgr.edit(hardware_id=12345 , hostname="something")
#result will be True or an Exception
"""

obj = {}
Expand Down Expand Up @@ -593,7 +585,6 @@ def update_firmware(self,
# Check the servers active transactions to see progress
result = mgr.update_firmware(hardware_id=1234)
"""

return self.hardware.createFirmwareUpdateTransaction(
Expand Down
2 changes: 0 additions & 2 deletions SoftLayer/managers/ssl.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,6 @@ def remove_certificate(self, cert_id):
# Removes certificate with id 1234
result = mgr.remove_certificate(cert_id = 1234)
"""
return self.ssl.deleteObject(id=cert_id)

Expand Down
3 changes: 0 additions & 3 deletions SoftLayer/managers/vs.py
Original file line number Diff line number Diff line change
Expand Up @@ -586,7 +586,6 @@ def change_port_speed(self, instance_id, public, speed):
result = mgr.change_port_speed(instance_id=12345,
public=True, speed=10)
# result will be True or an Exception
"""
if public:
func = self.guest.setPublicNetworkInterfaceSpeed
Expand Down Expand Up @@ -637,7 +636,6 @@ def edit(self, instance_id, userdata=None, hostname=None, domain=None,
# Change the hostname on instance 12345 to 'something'
result = mgr.edit(instance_id=12345 , hostname="something")
#result will be True or an Exception
"""

obj = {}
Expand Down Expand Up @@ -690,7 +688,6 @@ def capture(self, instance_id, name, additional_disks=False, notes=None):
name = "Testing Images"
notes = "Some notes about this image"
result = mgr.capture(instance_id=12345, name=name, notes=notes)
"""
vsi = self.get_instance(instance_id)

Expand Down

0 comments on commit 3525b36

Please sign in to comment.