Fixed vlan subnet issue.

Author: Fernando Ojeda

SoftLayer/CLI/virt/create.py

@@ -65,7 +65,6 @@ def _update_with_like_args(ctx, _, value):
         ctx.default_map = {}
     ctx.default_map.update(like_args)
 
-
 def _parse_create_args(client, args):
     """Converts CLI arguments to args for VSManager.create_instance.
 
@@ -121,10 +120,7 @@ def _parse_create_args(client, args):
     # Get the SSH keys
     if args.get('key'):
         keys = []
-        for key in args.get('key'):
-            resolver = SoftLayer.SshKeyManager(client).resolve_ids
-            key_id = helpers.resolve_id(resolver, key, 'SshKey')
-            keys.append(key_id)
+        _add_keys(args, client, keys)
         data['ssh_keys'] = keys
 
     if args.get('vlan_public'):
@@ -156,6 +152,13 @@ def _parse_create_args(client, args):
     return data
 
 
+def _add_keys(args, client, keys):
+    for key in args.get('key'):
+        resolver = SoftLayer.SshKeyManager(client).resolve_ids
+        key_id = helpers.resolve_id(resolver, key, 'SshKey')
+        keys.append(key_id)
+
+
 @click.command(epilog="See 'slcli vs create-options' for valid options")
 @click.option('--hostname', '-H',
               help="Host portion of the FQDN",
@@ -231,7 +234,7 @@ def _parse_create_args(client, args):
               type=click.Path(exists=True, readable=True, resolve_path=True))
 @click.option('--vlan-public',
               help="The ID of the public VLAN on which you want the virtual "
-              "server placed",
+                   "server placed",
               type=click.INT)
 @click.option('--vlan-private',
               help="The ID of the private VLAN on which you want the virtual "

SoftLayer/managers/vs.py

@@ -16,8 +16,9 @@
 from SoftLayer.managers import ordering
 from SoftLayer import utils
 
-
 LOGGER = logging.getLogger(__name__)
+
+
 # pylint: disable=no-self-use
 
 
@@ -366,27 +367,10 @@ def _generate_create_dict(
         if datacenter:
             data["datacenter"] = {"name": datacenter}
 
-        if 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:
-            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 private_vlan and public_vlan:
+            network_components = self._create_network_components(public_vlan, private_vlan,
+                                                                 private_subnet, public_subnet)
+            data.update(network_components)
 
         if public_security_groups:
             secgroups = [{'securityGroup': {'id': int(sg)}}
@@ -429,6 +413,46 @@ def _generate_create_dict(
 
         return data
 
+    def _create_network_components(
+            self, public_vlan=None, private_vlan=None,
+            private_subnet=None, public_subnet=None, **kwargs):
+
+        if private_vlan and public_vlan:
+            if private_subnet and public_subnet:
+                parameters = {
+                    'primaryNetworkComponent': {
+                        "networkVlan": {"primarySubnet": {"id": int(public_subnet)}}},
+                    'primaryBackendNetworkComponent': {
+                        "networkVlan": {"primarySubnet": {"id": int(private_subnet)}}}}
+            else:
+                if private_subnet:
+                    parameters = {
+                        'primaryNetworkComponent': {
+                            "networkVlan": {"id": int(public_vlan)}},
+                        'primaryBackendNetworkComponent': {
+                            "networkVlan": {"primarySubnet": {"id": int(private_subnet)}}}
+                    }
+                else:
+                    parameters = {
+                        'primaryNetworkComponent': {
+                            "networkVlan": {"primarySubnet": {"id": int(public_subnet)}}},
+                        'primaryBackendNetworkComponent': {
+                            "networkVlan": {"id": int(private_vlan)}}
+                    }
+        else:
+            if private_vlan:
+                parameters = {
+                    'primaryBackendNetworkComponent': {
+                        "networkVlan": {"id": int(private_vlan)}}
+                }
+            else:
+                parameters = {
+                    'primaryNetworkComponent': {
+                        "networkVlan": {"id": int(public_vlan)}}
+                }
+
+        return parameters
+
     @retry(logger=LOGGER)
     def wait_for_transaction(self, instance_id, limit, delay=10):
         """Waits on a VS transaction for the specified amount of time.