Skip to content

Commit 49d196d

Browse files
author
Fernando Ojeda
committed
Fixed the new feature vlan subnet
1 parent f338c14 commit 49d196d

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

SoftLayer/managers/vs.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -426,12 +426,13 @@ def _create_network_components(
426426
if public_vlan is None:
427427
raise exceptions.SoftLayerError("You need to specify a public_vlan with public_subnet")
428428
else:
429-
parameters['primaryNetworkComponent']['networkVlan']['primarySubnet'] = {'id':int(public_subnet)}
429+
parameters['primaryNetworkComponent']['networkVlan']['primarySubnet'] = {'id': int(public_subnet)}
430430
if private_subnet:
431431
if private_vlan is None:
432432
raise exceptions.SoftLayerError("You need to specify a private_vlan with private_subnet")
433433
else:
434-
parameters['primaryBackendNetworkComponent']['networkVlan']['primarySubnet'] = {"id": int(private_subnet)}
434+
parameters['primaryBackendNetworkComponent']['networkVlan']['primarySubnet'] = {
435+
"id": int(private_subnet)}
435436

436437
return parameters
437438

tests/managers/vs_tests.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@ def test_generate_private_subnet(self):
449449
private_subnet=1,
450450
)
451451

452-
self.assertEquals(str(actual), "You need to specify a private_vlan with private_subnet")
452+
self.assertEqual(str(actual), "You need to specify a private_vlan with private_subnet")
453453

454454
def test_generate_public_subnet(self):
455455
actual = self.assertRaises(
@@ -463,7 +463,7 @@ def test_generate_public_subnet(self):
463463
public_subnet=1,
464464
)
465465

466-
self.assertEquals(str(actual), "You need to specify a public_vlan with public_subnet")
466+
self.assertEqual(str(actual), "You need to specify a public_vlan with public_subnet")
467467

468468
def test_generate_private_vlan(self):
469469
data = self.vs._generate_create_dict(
@@ -539,7 +539,7 @@ def test_create_network_components_private_subnet(self):
539539
private_subnet=1,
540540
)
541541

542-
self.assertEquals(str(actual), "You need to specify a private_vlan with private_subnet")
542+
self.assertEqual(str(actual), "You need to specify a private_vlan with private_subnet")
543543

544544
def test_create_network_components_public_subnet(self):
545545
actual = self.assertRaises(
@@ -548,7 +548,7 @@ def test_create_network_components_public_subnet(self):
548548
public_subnet=1,
549549
)
550550

551-
self.assertEquals(str(actual), "You need to specify a public_vlan with public_subnet")
551+
self.assertEqual(str(actual), "You need to specify a public_vlan with public_subnet")
552552

553553
def test_generate_userdata(self):
554554
data = self.vs._generate_create_dict(

0 commit comments

Comments
 (0)