Skip to content

Commit e5ddcad

Browse files
Merge pull request #1187 from ATGE/issue1183
#1183 Fixed unable to order VS on subnet
2 parents acf4071 + b2d4f07 commit e5ddcad

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

SoftLayer/managers/vs.py

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,6 @@ def _generate_create_dict(
429429
def _create_network_components(
430430
self, public_vlan=None, private_vlan=None,
431431
private_subnet=None, public_subnet=None):
432-
433432
parameters = {}
434433
if private_vlan:
435434
parameters['primaryBackendNetworkComponent'] = {"networkVlan": {"id": int(private_vlan)}}
@@ -532,7 +531,16 @@ def verify_create_instance(self, **kwargs):
532531
"""
533532
kwargs.pop('tags', None)
534533
create_options = self._generate_create_dict(**kwargs)
535-
return self.guest.generateOrderTemplate(create_options)
534+
template = self.guest.generateOrderTemplate(create_options)
535+
if 'private_subnet' in kwargs or 'public_subnet' in kwargs:
536+
vsi = template['virtualGuests'][0]
537+
network_components = self._create_network_components(kwargs.get('public_vlan', None),
538+
kwargs.get('private_vlan', None),
539+
kwargs.get('private_subnet', None),
540+
kwargs.get('public_subnet', None))
541+
vsi.update(network_components)
542+
543+
return template
536544

537545
def create_instance(self, **kwargs):
538546
"""Creates a new virtual server instance.

0 commit comments

Comments
 (0)