Skip to content

Commit d078f0e

Browse files
Daniel Cabero BarriosDaniel Cabero Barrios
authored andcommitted
fix the Christopehr code review comments
1 parent d8552ba commit d078f0e

File tree

4 files changed

+16
-16
lines changed

4 files changed

+16
-16
lines changed

SoftLayer/CLI/hardware/edit.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
help="Public port speed. -1 is best speed available")
2323
@click.option('--private-speed', default=None, type=click.Choice(['0', '10', '100', '1000', '10000', '-1']),
2424
help="Private port speed. -1 is best speed available")
25-
@click.option('--rebundant', is_flag=True, default=False, help="The desired state of redundancy for the interface(s)")
25+
@click.option('--redundant', is_flag=True, default=False, help="The desired state of redundancy for the interface(s)")
2626
@click.option('--degraded', is_flag=True, default=False, help="The desired state of degraded for the interface(s)")
2727
@environment.pass_env
28-
def cli(env, identifier, domain, userfile, tag, hostname, userdata, public_speed, private_speed, rebundant, degraded):
28+
def cli(env, identifier, domain, userfile, tag, hostname, userdata, public_speed, private_speed, redundant, degraded):
2929
"""Edit hardware details."""
3030

3131
if userdata and userfile:
@@ -53,17 +53,17 @@ def cli(env, identifier, domain, userfile, tag, hostname, userdata, public_speed
5353
raise exceptions.CLIAbort("Failed to update hardware")
5454

5555
if public_speed is not None:
56-
if rebundant:
57-
mgr.change_port_speed(hw_id, True, int(public_speed), 'rebundant')
56+
if redundant:
57+
mgr.change_port_speed(hw_id, True, int(public_speed), 'redundant')
5858
if degraded:
5959
mgr.change_port_speed(hw_id, True, int(public_speed), 'degraded')
60-
if not rebundant and not degraded:
60+
if not redundant and not degraded:
6161
raise exceptions.CLIAbort("Failed to update hardwar")
6262

6363
if private_speed is not None:
64-
if rebundant:
65-
mgr.change_port_speed(hw_id, False, int(private_speed), 'rebundant')
64+
if redundant:
65+
mgr.change_port_speed(hw_id, False, int(private_speed), 'redundant')
6666
if degraded:
6767
mgr.change_port_speed(hw_id, False, int(private_speed), 'degraded')
68-
if not rebundant and not degraded:
68+
if not redundant and not degraded:
6969
raise exceptions.CLIAbort("Failed to update hardware")

SoftLayer/managers/hardware.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ def rescue(self, hardware_id):
297297
"""
298298
return self.hardware.bootToRescueLayer(id=hardware_id)
299299

300-
def change_port_speed(self, hardware_id, public, speed, rebundant):
300+
def change_port_speed(self, hardware_id, public, speed, redundant=None):
301301
"""Allows you to change the port speed of a server's NICs.
302302
303303
:param int hardware_id: The ID of the server
@@ -319,11 +319,11 @@ def change_port_speed(self, hardware_id, public, speed, rebundant):
319319
if public:
320320
return self.client.call('Hardware_Server',
321321
'setPublicNetworkInterfaceSpeed',
322-
[rebundant, speed], id=hardware_id)
322+
[speed, redundant], id=hardware_id)
323323
else:
324324
return self.client.call('Hardware_Server',
325325
'setPrivateNetworkInterfaceSpeed',
326-
[rebundant, speed], id=hardware_id)
326+
[speed, redundant], id=hardware_id)
327327

328328
def place_order(self, **kwargs):
329329
"""Places an order for a piece of hardware.

tests/CLI/modules/server_tests.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -526,7 +526,7 @@ def test_edit(self):
526526
'--tag=dev',
527527
'--tag=green',
528528
'--public-speed=10',
529-
'--rebundant',
529+
'--redundant',
530530
'--private-speed=100',
531531
'--degraded',
532532
'100'])
@@ -546,12 +546,12 @@ def test_edit(self):
546546
)
547547
self.assert_called_with(
548548
'SoftLayer_Hardware_Server', 'setPublicNetworkInterfaceSpeed',
549-
args=(['rebundant', 10],),
549+
args=([10, 'redundant'],),
550550
identifier=100,
551551
)
552552
self.assert_called_with(
553553
'SoftLayer_Hardware_Server', 'setPrivateNetworkInterfaceSpeed',
554-
args=(['degraded', 100],),
554+
args=([100, 'degraded'],),
555555
identifier=100,
556556
)
557557

tests/managers/hardware_tests.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -343,12 +343,12 @@ def test_change_port_speed_public(self):
343343
args=(['degraded', 100],))
344344

345345
def test_change_port_speed_private(self):
346-
self.hardware.change_port_speed(2, False, 10, 'rebundant')
346+
self.hardware.change_port_speed(2, False, 10, 'redundant')
347347

348348
self.assert_called_with('SoftLayer_Hardware_Server',
349349
'setPrivateNetworkInterfaceSpeed',
350350
identifier=2,
351-
args=(['rebundant', 10],))
351+
args=([10,'redundant'],))
352352

353353
def test_edit_meta(self):
354354
# Test editing user data

0 commit comments

Comments
 (0)