Fixed vlan subnet issue.

Author: Fernando Ojeda

SoftLayer/CLI/virt/create.py

@@ -133,6 +133,12 @@ def _parse_create_args(client, args):
     if args.get('vlan_private'):
         data['private_vlan'] = args['vlan_private']
 
+    if args.get('subnet_public'):
+        data['public_subnet'] = args['subnet_public']
+
+    if args.get('subnet_private'):
+        data['private_subnet'] = args['subnet_private']
+
     if args.get('public_security_group'):
         pub_groups = args.get('public_security_group')
         data['public_security_groups'] = [group for group in pub_groups]
@@ -231,6 +237,12 @@ 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-public',
+              help="The ID of the public SUBNET 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)
 @helpers.multi_option('--public-security-group',
                       '-S',
                       help=('Security group ID to associate with '

SoftLayer/managers/vs.py

@@ -305,6 +305,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, public_subnet=None,
             userdata=None, nic_speed=None, disks=None, post_uri=None,
             private=False, ssh_keys=None, public_security_groups=None,
             private_security_groups=None, boot_mode=None, **kwargs):
@@ -366,13 +367,26 @@ def _generate_create_dict(
             data["datacenter"] = {"name": datacenter}
 
         if public_vlan:
-            data.update({
-                'primaryNetworkComponent': {
-                    "networkVlan": {"id": int(public_vlan)}}})
+            if public_subnet:
+                data.update({
+                    'primaryNetworkComponent': {
+                        "networkVlan": {"id": int(public_vlan),
+                                        "primarySubnet": {"id": int(public_subnet)}}}})
+            else:
+                data.update({
+                    'primaryNetworkComponent': {
+                        "networkVlan": {"id": int(public_vlan)}}})
+
         if private_vlan:
-            data.update({
-                "primaryBackendNetworkComponent": {
-                    "networkVlan": {"id": int(private_vlan)}}})
+            if private_subnet:
+                data.update({
+                    'primaryBackendNetworkComponent': {
+                        "networkVlan": {"id": int(private_vlan),
+                                        "primarySubnet": {"id": int(private_subnet)}}}})
+            else:
+                data.update({
+                    "primaryBackendNetworkComponent": {
+                        "networkVlan": {"id": int(private_vlan)}}})
 
         if public_security_groups:
             secgroups = [{'securityGroup': {'id': int(sg)}}

tests/CLI/modules/vs_tests.py

@@ -337,6 +337,31 @@ def test_create(self, confirm_mock):
         self.assert_called_with('SoftLayer_Virtual_Guest', 'createObject',
                                 args=args)
 
+    @mock.patch('SoftLayer.CLI.formatting.confirm')
+    def test_create_vlan_subnet(self, confirm_mock):
+        confirm_mock.return_value = True
+
+        result = self.run_command(['vs', 'create',
+                                   '--cpu=2',
+                                   '--domain=example.com',
+                                   '--hostname=host',
+                                   '--os=UBUNTU_LATEST',
+                                   '--memory=1',
+                                   '--billing=hourly',
+                                   '--datacenter=dal05',
+                                   '--vlan-private=577940',
+                                   '--subnet-private=478700',
+                                   '--vlan-public=1639255',
+                                   '--subnet-public=297614',
+                                   '--tag=dev',
+                                   '--tag=green'])
+
+        self.assert_no_fail(result)
+        self.assertEqual(json.loads(result.output),
+                         {'guid': '1a2b3c-1701',
+                          'id': 100,
+                          'created': '2013-08-01 15:23:45'})
+
     @mock.patch('SoftLayer.CLI.formatting.confirm')
     def test_create_with_wait_ready(self, confirm_mock):
         mock = self.set_mock('SoftLayer_Virtual_Guest', 'getObject')