Fix tox test issues.

Author: Fernando Ojeda

SoftLayer/managers/vs.py

@@ -533,10 +533,7 @@ def _generate_create_dict(
         if datacenter:
             data["datacenter"] = {"name": datacenter}
 
-        network_components = self.get_network_components(kwargs, private_subnet, private_vlan, public_subnet,
-                                                         public_vlan)
-
-        data.update(network_components)
+        self.get_network_components(data, kwargs, private_subnet, private_vlan, public_subnet, public_vlan)
 
         if public_security_groups:
             secgroups = [{'securityGroup': {'id': int(sg)}}
@@ -579,16 +576,16 @@ def _generate_create_dict(
 
         return data
 
-    def get_network_components(self, kwargs, private_subnet, private_vlan, public_subnet, public_vlan):
+    def get_network_components(self, data, kwargs, private_subnet, private_vlan, public_subnet, public_vlan):
         """Get the network components structure.
 
+        :param data: Array variable to add the network structure.
         :param kwargs: Vs item list.
         :param int private_subnet: Private subnet id.
         :param int private_vlan: Private vlan id.
         :param int public_subnet: Public subnet id.
         :param int public_vlan: Public vlan id.
         """
-        network_components = None
         if kwargs.get('private_router') or kwargs.get('public_router'):
             if private_vlan or public_vlan or private_subnet or public_subnet:
                 raise exceptions.SoftLayerError("You have to select network vlan or network vlan with a subnet or "
@@ -597,12 +594,11 @@ def get_network_components(self, kwargs, private_subnet, private_vlan, public_su
                                                                  private_subnet, public_subnet,
                                                                  kwargs.get('private_router'),
                                                                  kwargs.get('public_router'))
-
+            data.update(network_components)
         if private_vlan or public_vlan or private_subnet or public_subnet:
             network_components = self._create_network_components(public_vlan, private_vlan,
                                                                  private_subnet, public_subnet)
-
-        return network_components
+            data.update(network_components)
 
     def _create_network_components(
             self, public_vlan=None, private_vlan=None,