Merge pull request #1420 from caberos/issue1419

add a flags in the report bandwidth

Author: allmightyspiff

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/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.")
 

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'):