fix the merge conflicts

Author: caberos

CHANGELOG.md

@@ -1,5 +1,18 @@
 # Change Log
 
+
+## [5.9.9] - 2021-12-07
+
+https://github.com/softlayer/softlayer-python/compare/v5.9.8...v5.9.9
+
+#### Improvements
+- Add loadbalancer timeout values #1576
+- Add pricing date to slcli order preset-list #1578
+
+#### New Commands
+- `slcli vlan create-options` add new feature on vlan #1572
+- `slcli account bandwidth-pools` Bandwidth pool features #1579
+
 ## [5.9.8] - 2021-12-07
 
 https://github.com/softlayer/softlayer-python/compare/v5.9.7...v5.9.8

SoftLayer/CLI/account/bandwidth_pools.py

@@ -0,0 +1,41 @@
+"""Displays information about the accounts bandwidth pools"""
+# :license: MIT, see LICENSE for more details.
+import click
+
+from SoftLayer.CLI import environment
+from SoftLayer.CLI import formatting
+from SoftLayer.managers.account import AccountManager as AccountManager
+from SoftLayer import utils
+
+
+@click.command()
+@environment.pass_env
+def cli(env):
+    """Displays bandwidth pool information
+
+    Similiar to https://cloud.ibm.com/classic/network/bandwidth/vdr
+    """
+
+    manager = AccountManager(env.client)
+    items = manager.get_bandwidth_pools()
+
+    table = formatting.Table([
+        "Pool Name",
+        "Region",
+        "Servers",
+        "Allocation",
+        "Current Usage",
+        "Projected Usage"
+    ], title="Bandwidth Pools")
+    table.align = 'l'
+
+    for item in items:
+        name = item.get('name')
+        region = utils.lookup(item, 'locationGroup', 'name')
+        servers = manager.get_bandwidth_pool_counts(identifier=item.get('id'))
+        allocation = "{} GB".format(item.get('totalBandwidthAllocated', 0))
+        current = "{} GB".format(utils.lookup(item, 'billingCyclePublicBandwidthUsage', 'amountOut'))
+        projected = "{} GB".format(item.get('projectedPublicBandwidthUsage', 0))
+
+        table.add_row([name, region, servers, allocation, current, projected])
+    env.fout(table)

SoftLayer/CLI/loadbal/detail.py

@@ -39,32 +39,44 @@ def lbaas_table(this_lb):
     listener_table, pools = get_listener_table(this_lb)
     table.add_row(['Protocols', listener_table])
 
-    member_table = get_member_table(this_lb, pools)
-    table.add_row(['Members', member_table])
-
-    hp_table = get_hp_table(this_lb)
-    table.add_row(['Health Checks', hp_table])
-
-    l7pool_table = get_l7pool_table(this_lb)
-    table.add_row(['L7 Pools', l7pool_table])
-
-    ssl_table = get_ssl_table(this_lb)
-    table.add_row(['Ciphers', ssl_table])
+    if pools.get('members') is not None:
+        member_table = get_member_table(this_lb, pools)
+        table.add_row(['Members', member_table])
+    else:
+        table.add_row(['Members', "Not Found"])
+
+    if this_lb.get('healthMonitors') != []:
+        hp_table = get_hp_table(this_lb)
+        table.add_row(['Health Checks', hp_table])
+    else:
+        table.add_row(['Health Checks', "Not Found"])
+
+    if this_lb.get('l7Pools') != []:
+        l7pool_table = get_l7pool_table(this_lb)
+        table.add_row(['L7 Pools', l7pool_table])
+    else:
+        table.add_row(['L7 Pools', "Not Found"])
+
+    if this_lb.get('sslCiphers') != []:
+        ssl_table = get_ssl_table(this_lb)
+        table.add_row(['Ciphers', ssl_table])
+    else:
+        table.add_row(['Ciphers', "Not Found"])
 
     return table
 
 
 def get_hp_table(this_lb):
     """Generates a table from a list of LBaaS devices"""
     # https://sldn.softlayer.com/reference/datatypes/SoftLayer_Network_LBaaS_HealthMonitor/
-    hp_table = formatting.Table(['UUID', 'Interval', 'Retries', 'Type', 'Timeout', 'Modify', 'Active'])
+    hp_table = formatting.Table(['UUID', 'Interval', 'Retries', 'Type', 'ServerTimeout ', 'Modify', 'Active'])
     for health in this_lb.get('healthMonitors', []):
         hp_table.add_row([
             health.get('uuid'),
             health.get('interval'),
             health.get('maxRetries'),
             health.get('monitorType'),
-            health.get('timeout'),
+            health.get('serverTimeout'),
             utils.clean_time(health.get('modifyDate')),
             health.get('provisioningStatus')
         ])

SoftLayer/CLI/order/preset_list.py

@@ -16,8 +16,9 @@
 @click.argument('package_keyname')
 @click.option('--keyword',
               help="A word (or string) used to filter preset names.")
+@click.option('--prices', '-p', is_flag=True, help='Use --prices to list the server item prices, e.g. --prices')
 @environment.pass_env
-def cli(env, package_keyname, keyword):
+def cli(env, package_keyname, keyword, prices):
     """List package presets.
 
     .. Note::
@@ -33,6 +34,8 @@ def cli(env, package_keyname, keyword):
         slcli order preset-list BARE_METAL_SERVER --keyword gpu
 
     """
+
+    tables = []
     table = formatting.Table(COLUMNS)
     manager = ordering.OrderingManager(env.client)
 
@@ -41,10 +44,36 @@ def cli(env, package_keyname, keyword):
         _filter = {'activePresets': {'name': {'operation': '*= %s' % keyword}}}
     presets = manager.list_presets(package_keyname, filter=_filter)
 
-    for preset in presets:
-        table.add_row([
-            str(preset['name']).strip(),
-            str(preset['keyName']).strip(),
-            str(preset['description']).strip()
-        ])
-    env.fout(table)
+    if prices:
+        table_prices = formatting.Table(['keyName', 'priceId', 'Hourly', 'Monthly', 'Restriction', 'Location'])
+        for price in presets:
+            locations = []
+            if price['locations'] != []:
+                for location in price['locations']:
+                    locations.append(location['name'])
+            cr_max = get_item_price_data(price['prices'][0], 'capacityRestrictionMaximum')
+            cr_min = get_item_price_data(price['prices'][0], 'capacityRestrictionMinimum')
+            cr_type = get_item_price_data(price['prices'][0], 'capacityRestrictionType')
+            table_prices.add_row([price['keyName'], price['id'],
+                                  get_item_price_data(price['prices'][0], 'hourlyRecurringFee'),
+                                  get_item_price_data(price['prices'][0], 'recurringFee'),
+                                  "%s - %s %s" % (cr_min, cr_max, cr_type), str(locations)])
+        tables.append(table_prices)
+
+    else:
+        for preset in presets:
+            table.add_row([
+                str(preset['name']).strip(),
+                str(preset['keyName']).strip(),
+                str(preset['description']).strip()
+            ])
+        tables.append(table)
+    env.fout(tables)
+
+
+def get_item_price_data(price, item_attribute):
+    """Given an SoftLayer_Product_Item_Price, returns its default price data"""
+    result = '-'
+    if item_attribute in price:
+        result = price[item_attribute]
+    return result

SoftLayer/CLI/report/bandwidth.py

@@ -47,23 +47,25 @@ def _get_pooled_bandwidth(env, start, end):
                            label='Calculating for bandwidth pools',
                            file=sys.stderr) as pools:
         for pool in pools:
-            if not pool.get('metricTrackingObjectId'):
-                continue
-
-            yield {
-                'id': pool['id'],
+            pool_detail = {
+                'id': pool.get('id'),
                 'type': 'pool',
-                'name': pool['name'],
-                'data': env.client.call(
+                'name': pool.get('name'),
+                'data': []
+            }
+            if pool.get('metricTrackingObjectId'):
+                bw_data = env.client.call(
                     'Metric_Tracking_Object',
                     'getSummaryData',
                     start.strftime('%Y-%m-%d %H:%M:%S %Z'),
                     end.strftime('%Y-%m-%d %H:%M:%S %Z'),
                     types,
                     300,
-                    id=pool['metricTrackingObjectId'],
-                ),
-            }
+                    id=pool.get('metricTrackingObjectId'),
+                )
+                pool_detail['data'] = bw_data
+
+            yield pool_detail
 
 
 def _get_hardware_bandwidth(env, start, end):
@@ -172,28 +174,20 @@ def _get_virtual_bandwidth(env, start, end):
 
 
 @click.command(short_help="Bandwidth report for every pool/server")
-@click.option(
-    '--start',
-    callback=_validate_datetime,
-    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',
-    callback=_validate_datetime,
-    default=datetime.datetime.now().strftime('%Y-%m-%d'),
-    help="datetime in the format 'YYYY-MM-DD' or 'YYYY-MM-DD HH:MM:SS'")
-@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)
+@click.option('--start', callback=_validate_datetime,
+              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', callback=_validate_datetime, default=datetime.datetime.now().strftime('%Y-%m-%d'),
+              help="datetime in the format 'YYYY-MM-DD' or 'YYYY-MM-DD HH:MM:SS'")
+@click.option('--sortby', help='Column to sort by', default='hostname', show_default=True)
+@click.option('--virtual', is_flag=True, default=False,
+              help='Show only the bandwidth summary for each virtual server')
+@click.option('--server', is_flag=True, default=False,
+              help='Show only the bandwidth summary for each hardware server')
+@click.option('--pool', is_flag=True, default=False,
+              help='Show only the bandwidth pool summary.')
 @environment.pass_env
-def cli(env, start, end, sortby, virtual, server):
+def cli(env, start, end, sortby, virtual, server, pool):
     """Bandwidth report for every pool/server.
 
     This reports on the total data transfered for each virtual sever, hardware
@@ -243,6 +237,9 @@ def _input_to_table(item):
             for item in itertools.chain(_get_pooled_bandwidth(env, start, end),
                                         _get_hardware_bandwidth(env, start, end)):
                 _input_to_table(item)
+        elif pool:
+            for item in _get_pooled_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),

SoftLayer/CLI/routes.py

@@ -23,6 +23,7 @@
     ('account:item-detail', 'SoftLayer.CLI.account.item_detail:cli'),
     ('account:cancel-item', 'SoftLayer.CLI.account.cancel_item:cli'),
     ('account:orders', 'SoftLayer.CLI.account.orders:cli'),
+    ('account:bandwidth-pools', 'SoftLayer.CLI.account.bandwidth_pools:cli'),
 
     ('virtual', 'SoftLayer.CLI.virt'),
     ('virtual:bandwidth', 'SoftLayer.CLI.virt.bandwidth:cli'),
@@ -355,6 +356,7 @@
 
     ('vlan', 'SoftLayer.CLI.vlan'),
     ('vlan:create', 'SoftLayer.CLI.vlan.create:cli'),
+    ('vlan:create-options', 'SoftLayer.CLI.vlan.create_options:cli'),
     ('vlan:detail', 'SoftLayer.CLI.vlan.detail:cli'),
     ('vlan:edit', 'SoftLayer.CLI.vlan.edit:cli'),
     ('vlan:list', 'SoftLayer.CLI.vlan.list:cli'),

SoftLayer/CLI/vlan/create_options.py

@@ -0,0 +1,33 @@
+"""Vlan order options."""
+# :license: MIT, see LICENSE for more details.
+# pylint: disable=too-many-statements
+import click
+
+import SoftLayer
+from SoftLayer.CLI import environment
+from SoftLayer.CLI import formatting
+
+
+@click.command(short_help="Get options to use for creating Vlan servers.")
+@environment.pass_env
+def cli(env):
+    """List all the options for creating VLAN"""
+
+    mgr = SoftLayer.NetworkManager(env.client)
+    datacenters = mgr.get_list_datacenter()
+
+    table = formatting.Table(['Options', 'Value'], title="Datacenters")
+    router_table = formatting.Table(['Datacenter', 'Router/Pod'])
+    dc_table = formatting.Table(['Datacenters'])
+    table.add_row(['VLAN type', 'Private, Public'])
+
+    for datacenter in datacenters:
+        dc_table.add_row([datacenter['name']])
+        routers = mgr.get_routers(datacenter['id'])
+        for router in routers:
+            router_table.add_row([datacenter['name'], router['hostname']])
+
+    table.add_row(['Datacenters', dc_table])
+    table.add_row(['Routers', router_table])
+
+    env.fout(table)

SoftLayer/consts.py

@@ -5,7 +5,7 @@
 
     :license: MIT, see LICENSE for more details.
 """
-VERSION = 'v5.9.8'
+VERSION = 'v5.9.9'
 API_PUBLIC_ENDPOINT = 'https://api.softlayer.com/xmlrpc/v3.1/'
 API_PRIVATE_ENDPOINT = 'https://api.service.softlayer.com/xmlrpc/v3.1/'
 API_PUBLIC_ENDPOINT_REST = 'https://api.softlayer.com/rest/v3.1/'

SoftLayer/fixtures/SoftLayer_Account.py

@@ -1207,3 +1207,21 @@
         "version": 4
     }
 }]
+
+getBandwidthAllotments = [{
+    'billingCyclePublicBandwidthUsage': {
+        'amountIn': '6.94517',
+        'amountOut': '6.8859'
+    },
+    'id': 309961,
+    'locationGroup': {
+        'description': 'All Datacenters in Mexico',
+        'id': 262,
+        'locationGroupTypeId': 1,
+        'name': 'MEX',
+        'securityLevelId': None
+    },
+    'name': 'MexRegion',
+    'projectedPublicBandwidthUsage': 9.88,
+    'totalBandwidthAllocated': 3361
+}]

SoftLayer/fixtures/SoftLayer_Location_Datacenter.py

@@ -10,3 +10,5 @@
         "name": "dal09"
     }
 ]
+
+getHardwareRouters = []