include private subnet flag within VLAN

kramimus · kramimus · commit 64188fa49045 · 2017-06-07T22:09:03.000-07:00
diff --git a/SoftLayer/CLI/virt/create.py b/SoftLayer/CLI/virt/create.py
@@ -123,7 +123,10 @@ def _parse_create_args(client, args):
     
         if args.get('vlan_private'):
             data['private_vlan'] = args['vlan_private']
-    
+
+        if args.get('subnet_private'):
+            data['private_subnet'] = args['subnet_private']
+
         if args.get('tag'):
             data['tags'] = ','.join(args['tag'])
 
@@ -208,6 +211,10 @@ def _parse_create_args(client, args):
               help="The ID of the private VLAN on which you want the virtual "
                    "server placed",
               type=click.INT)
+@click.option('--subnet-private',
+              help="The ID of the private subnet on which you want the virtual "
+                   "server placed",
+              type=click.INT)
 @click.option('--wait',
               type=click.INT,
               help="Wait until VS is finished provisioning for up to X "
diff --git a/SoftLayer/managers/vs.py b/SoftLayer/managers/vs.py
@@ -294,6 +294,7 @@ def _generate_create_dict(
             hostname=None, domain=None, local_disk=True,
             datacenter=None, os_code=None, image_id=None,
             dedicated=False, public_vlan=None, private_vlan=None,
+            private_subnet=None,
             userdata=None, nic_speed=None, disks=None, post_uri=None,
             private=False, ssh_keys=None):
         """Returns a dict appropriate to pass into Virtual_Guest::createObject
@@ -343,9 +344,13 @@ def _generate_create_dict(
                 'primaryNetworkComponent': {
                     "networkVlan": {"id": int(public_vlan)}}})
         if private_vlan:
-            data.update({
+            vlan_component = {
                 "primaryBackendNetworkComponent": {
-                    "networkVlan": {"id": int(private_vlan)}}})
+                    "networkVlan": {"id": int(private_vlan)}}}
+            if private_subnet:
+                vlan_component["primaryBackendNetworkComponent"]["networkVlan"]["primarySubnet"] = \
+                    {"id": int(private_subnet)}
+            data.update(vlan_component)
 
         if userdata:
             data['userData'] = [{'value': userdata}]
