Merge branch 'master' of https://github.com/softlayer/softlayer-python into issue1426

Author: caberos

SoftLayer/CLI/config/setup.py

@@ -12,7 +12,7 @@
 from SoftLayer.CLI import formatting
 
 
-def get_api_key(client, username, secret):
+def get_api_key(client, username, secret):  # pylint: disable=inconsistent-return-statements
     """Attempts API-Key and password auth to get an API key.
 
     This will also generate an API key if one doesn't exist

SoftLayer/CLI/custom_types.py

@@ -9,6 +9,7 @@
 import click
 
 
+# pylint: disable=inconsistent-return-statements
 class NetworkParamType(click.ParamType):
     """Validates a network parameter type and converts to a tuple.
 

SoftLayer/CLI/hardware/create.py

@@ -31,6 +31,10 @@
               help="Exports options to a template file")
 @click.option('--wait', type=click.INT,
               help="Wait until the server is finished provisioning for up to X seconds before returning")
+@click.option('--router-public', type=click.INT,
+              help="The ID of the public ROUTER on which you want the virtual server placed")
+@click.option('--router-private', type=click.INT,
+              help="The ID of the private ROUTER on which you want the virtual server placed")
 @helpers.multi_option('--key', '-k', help="SSH keys to add to the root user")
 @helpers.multi_option('--extra', '-e', help="Extra option Key Names")
 @environment.pass_env
@@ -57,7 +61,9 @@ def cli(env, **args):
         'port_speed': args.get('port_speed'),
         'no_public': args.get('no_public') or False,
         'extras': args.get('extra'),
-        'network': args.get('network')
+        'network': args.get('network'),
+        'public_router': args.get('router_public', None),
+        'private_router': args.get('router_private', None)
     }
 
     # Do not create hardware server with --test or --export

SoftLayer/CLI/report/bandwidth.py

@@ -175,9 +175,8 @@ def _get_virtual_bandwidth(env, start, end):
 @click.option(
     '--start',
     callback=_validate_datetime,
-    default=(
-        datetime.datetime.now() - datetime.timedelta(days=30)
-    ).strftime('%Y-%m-%d'),
+    default=(datetime.datetime.now() - datetime.timedelta(days=30)
+             ).strftime('%Y-%m-%d'),
     help="datetime in the format 'YYYY-MM-DD' or 'YYYY-MM-DD HH:MM:SS'")
 @click.option(
     '--end',
@@ -187,8 +186,14 @@ def _get_virtual_bandwidth(env, start, end):
 @click.option('--sortby', help='Column to sort by',
               default='hostname',
               show_default=True)
+@click.option('--virtual', is_flag=True,
+              help='Show the all bandwidth summary for each virtual server',
+              default=False)
+@click.option('--server', is_flag=True,
+              help='show the all bandwidth summary for each hardware server',
+              default=False)
 @environment.pass_env
-def cli(env, start, end, sortby):
+def cli(env, start, end, sortby, virtual, server):
     """Bandwidth report for every pool/server.
 
     This reports on the total data transfered for each virtual sever, hardware
@@ -213,23 +218,36 @@ def f_type(key, results):
         return (result['counter'] for result in results
                 if result['type'] == key)
 
+    def _input_to_table(item):
+        "Input metric data to table"
+        pub_in = int(sum(f_type('publicIn_net_octet', item['data'])))
+        pub_out = int(sum(f_type('publicOut_net_octet', item['data'])))
+        pri_in = int(sum(f_type('privateIn_net_octet', item['data'])))
+        pri_out = int(sum(f_type('privateOut_net_octet', item['data'])))
+        table.add_row([
+            item['type'],
+            item['name'],
+            formatting.b_to_gb(pub_in),
+            formatting.b_to_gb(pub_out),
+            formatting.b_to_gb(pri_in),
+            formatting.b_to_gb(pri_out),
+            item.get('pool') or formatting.blank(),
+        ])
+
     try:
-        for item in itertools.chain(_get_pooled_bandwidth(env, start, end),
-                                    _get_virtual_bandwidth(env, start, end),
-                                    _get_hardware_bandwidth(env, start, end)):
-            pub_in = int(sum(f_type('publicIn_net_octet', item['data'])))
-            pub_out = int(sum(f_type('publicOut_net_octet', item['data'])))
-            pri_in = int(sum(f_type('privateIn_net_octet', item['data'])))
-            pri_out = int(sum(f_type('privateOut_net_octet', item['data'])))
-            table.add_row([
-                item['type'],
-                item['name'],
-                formatting.b_to_gb(pub_in),
-                formatting.b_to_gb(pub_out),
-                formatting.b_to_gb(pri_in),
-                formatting.b_to_gb(pri_out),
-                item.get('pool') or formatting.blank(),
-            ])
+        if virtual:
+            for item in itertools.chain(_get_pooled_bandwidth(env, start, end),
+                                        _get_virtual_bandwidth(env, start, end)):
+                _input_to_table(item)
+        elif server:
+            for item in itertools.chain(_get_pooled_bandwidth(env, start, end),
+                                        _get_hardware_bandwidth(env, start, end)):
+                _input_to_table(item)
+        else:
+            for item in itertools.chain(_get_pooled_bandwidth(env, start, end),
+                                        _get_hardware_bandwidth(env, start, end),
+                                        _get_virtual_bandwidth(env, start, end)):
+                _input_to_table(item)
     except KeyboardInterrupt:
         env.err("Printing collected results and then aborting.")
 

SoftLayer/CLI/virt/create.py

@@ -95,6 +95,8 @@ def _parse_create_args(client, args):
         "private_vlan": args.get('vlan_private', None),
         "public_subnet": args.get('subnet_public', None),
         "private_subnet": args.get('subnet_private', None),
+        "public_router": args.get('router_public', None),
+        "private_router": args.get('router_private', None),
     }
 
     # The primary disk is included in the flavor and the local_disk flag is not needed
@@ -192,6 +194,10 @@ def _parse_create_args(client, args):
               help="The ID of the public SUBNET on which you want the virtual server placed")
 @click.option('--subnet-private', type=click.INT,
               help="The ID of the private SUBNET on which you want the virtual server placed")
+@click.option('--router-public', type=click.INT,
+              help="The ID of the public ROUTER on which you want the virtual server placed")
+@click.option('--router-private', type=click.INT,
+              help="The ID of the private ROUTER on which you want the virtual server placed")
 @helpers.multi_option('--public-security-group', '-S',
                       help=('Security group ID to associate with the public interface'))
 @helpers.multi_option('--private-security-group', '-s',

SoftLayer/managers/hardware.py

@@ -492,7 +492,9 @@ def _generate_create_dict(self,
                               hourly=True,
                               no_public=False,
                               extras=None,
-                              network=None):
+                              network=None,
+                              public_router=None,
+                              private_router=None):
         """Translates arguments into a dictionary for creating a server."""
 
         extras = extras or []
@@ -535,6 +537,10 @@ def _generate_create_dict(self,
                 'domain': domain,
             }]
         }
+        if private_router:
+            extras['hardware'][0]['primaryBackendNetworkComponent'] = {"router": {"id": int(private_router)}}
+        if public_router:
+            extras['hardware'][0]['primaryNetworkComponent'] = {"router": {"id": int(public_router)}}
         if post_uri:
             extras['provisionScripts'] = [post_uri]
 

SoftLayer/managers/vs.py

@@ -533,10 +533,11 @@ def _generate_create_dict(
         if datacenter:
             data["datacenter"] = {"name": datacenter}
 
-        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)
+        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 public_security_groups:
             secgroups = [{'securityGroup': {'id': int(sg)}}
@@ -581,8 +582,17 @@ def _generate_create_dict(
 
     def _create_network_components(
             self, public_vlan=None, private_vlan=None,
-            private_subnet=None, public_subnet=None):
+            private_subnet=None, public_subnet=None,
+            private_router=None, public_router=None):
         parameters = {}
+        if any([private_router, public_router]) and any([private_vlan, public_vlan, private_subnet, public_subnet]):
+            raise exceptions.SoftLayerError("You have to select network vlan or network vlan with a subnet or "
+                                            "only router, not all options")
+
+        if private_router:
+            parameters['primaryBackendNetworkComponent'] = {"router": {"id": int(private_router)}}
+        if public_router:
+            parameters['primaryNetworkComponent'] = {"router": {"id": int(public_router)}}
         if private_vlan:
             parameters['primaryBackendNetworkComponent'] = {"networkVlan": {"id": int(private_vlan)}}
         if public_vlan:
@@ -685,7 +695,21 @@ def verify_create_instance(self, **kwargs):
         kwargs.pop('tags', None)
         create_options = self._generate_create_dict(**kwargs)
         template = self.guest.generateOrderTemplate(create_options)
-        if 'private_subnet' in kwargs or 'public_subnet' in kwargs:
+        if kwargs.get('public_router') or kwargs.get('private_router'):
+            if kwargs.get('private_vlan') or kwargs.get('public_vlan') or kwargs.get('private_subnet') \
+                    or kwargs.get('public_subnet'):
+                raise exceptions.SoftLayerError("You have to select network vlan or network vlan with a subnet or "
+                                                "only router, not all options")
+            vsi = template['virtualGuests'][0]
+            network_components = self._create_network_components(kwargs.get('public_vlan', None),
+                                                                 kwargs.get('private_vlan', None),
+                                                                 kwargs.get('private_subnet', None),
+                                                                 kwargs.get('public_subnet', None),
+                                                                 kwargs.get('private_router', None),
+                                                                 kwargs.get('public_router', None))
+            vsi.update(network_components)
+
+        if kwargs.get('private_subnet') or kwargs.get('public_subnet'):
             vsi = template['virtualGuests'][0]
             network_components = self._create_network_components(kwargs.get('public_vlan', None),
                                                                  kwargs.get('private_vlan', None),

setup.py

@@ -4,6 +4,8 @@
 
 from setuptools import setup, find_packages
 
+# pylint: disable=inconsistent-return-statements
+
 DESCRIPTION = "A library for SoftLayer's API"
 
 if os.path.exists('README.rst'):