Fix tox analysis.

Author: Fernando Ojeda

SoftLayer/managers/vs.py

@@ -533,20 +533,7 @@ def _generate_create_dict(
         if datacenter:
             data["datacenter"] = {"name": datacenter}
 
-        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 "
-                                                "only router, not all options")
-            network_components = self._create_network_components(public_vlan, private_vlan,
-                                                                 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)
-            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)}}
@@ -589,6 +576,21 @@ def _generate_create_dict(
 
         return data
 
+    def get_network_components(self, data, kwargs, private_subnet, private_vlan, public_subnet, public_vlan):
+        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 "
+                                                "only router, not all options")
+            network_components = self._create_network_components(public_vlan, private_vlan,
+                                                                 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)
+            data.update(network_components)
+
     def _create_network_components(
             self, public_vlan=None, private_vlan=None,
             private_subnet=None, public_subnet=None,
@@ -724,9 +726,6 @@ def verify_create_instance(self, **kwargs):
                                                                  kwargs.get('public_subnet', None))
             vsi.update(network_components)
 
-        print("template")
-        print(template)
-
         return template
 
     def create_instance(self, **kwargs):
@@ -1155,7 +1154,6 @@ def order_guest(self, guest_object, test=False):
         if guest_object.get('placement_id'):
             template['virtualGuests'][0]['placementGroupId'] = guest_object.get('placement_id')
 
-        print(template)
         if test:
             result = self.client.call('Product_Order', 'verifyOrder', template)
         else: