update

Author: caberos

SoftLayer/CLI/account/bandwidth_pools_detail.py

@@ -37,17 +37,17 @@ def cli(env, identifier):
         inbound = '-'
     table.add_row(['Inbound   Usage', inbound])
     if bandwidths['hardware'] != []:
-        table.add_row(['hardware', _bw_table(bandwidths['hardware'])])
+        table.add_row(['hardware', *(_bw_table(bandwidths['hardware']))])
     else:
         table.add_row(['hardware', 'Not Found'])
 
     if bandwidths['virtualGuests'] != []:
-        table.add_row(['virtualGuests', _virtual_table(bandwidths['virtualGuests'])])
+        table.add_row(['virtualGuests', *(_virtual_table(bandwidths['virtualGuests']))])
     else:
         table.add_row(['virtualGuests', 'Not Found'])
 
     if bandwidths['bareMetalInstances'] != []:
-        table.add_row(['Netscaler', _bw_table(bandwidths['bareMetalInstances'])])
+        table.add_row(['Netscaler', *(_bw_table(bandwidths['bareMetalInstances']))])
     else:
         table.add_row(['Netscaler', 'Not Found'])
 

SoftLayer/CLI/block/object_storage_detail.py

@@ -0,0 +1,34 @@
+"""Display details for a specified cloud object storage."""
+# :license: MIT, see LICENSE for more details.
+
+import click
+import SoftLayer
+from SoftLayer.CLI import environment
+from SoftLayer.CLI import formatting
+
+
+@click.command(cls=SoftLayer.CLI.command.SLCommand, )
+@click.argument('object_id')
+@environment.pass_env
+def cli(env, object_id):
+    """Display details for a cloud object storage."""
+
+    block_manager = SoftLayer.BlockStorageManager(env.client)
+
+    cloud = block_manager.get_volume_details(object_id)
+    bucket = block_manager.get_buckets(object_id)
+
+    table = formatting.KeyValueTable(['Name', 'Value'])
+    table.align['Name'] = 'r'
+    table.align['Value'] = 'l'
+
+    table.add_row(['Id', cloud.get('id')])
+    table.add_row(['Username', cloud.get('username')])
+    table.add_row(['Name Service Resource', cloud['serviceResource']['name']])
+    table.add_row(['Type Service Resource', cloud['serviceResource']['type']['type']])
+    table.add_row(['Datacenter', cloud['serviceResource']['datacenter']['name']])
+    table.add_row(['Storage type', cloud['storageType']['keyName']])
+    table.add_row(['Bytes Used', formatting.b_to_gb(bucket[0]['bytesUsed'])])
+    table.add_row(['Bucket name', bucket[0]['name']])
+
+    env.fout(table)

SoftLayer/CLI/firewall/monitoring.py

@@ -0,0 +1,51 @@
+"""Get monitoring for a firewall device."""
+# :license: MIT, see LICENSE for more details.
+import datetime
+
+import click
+
+import SoftLayer
+from SoftLayer.CLI import environment
+from SoftLayer.CLI import formatting
+
+
+@click.command(cls=SoftLayer.CLI.command.SLCommand, )
+@click.argument('identifier')
+@environment.pass_env
+def cli(env, identifier):
+    """Gets bandwidth details for a firewall from the past 30 days."""
+
+    mgr = SoftLayer.FirewallManager(env.client)
+
+    _firewall = mgr.get_instance(identifier)
+
+    table = formatting.KeyValueTable(['name', 'value'])
+    table.align['name'] = 'r'
+    table.align['value'] = 'l'
+
+    end = datetime.date.today()
+    start = end.replace(day=1)
+    last_month = start - datetime.timedelta(days=30)
+
+    monitoring = mgr.get_summary(_firewall['metricTrackingObject']['id'],
+                                 last_month.strftime('%Y-%m-%d'), end.strftime('%Y-%m-%d'))
+    public_out = 0
+    public_in = 0
+    for monitor in monitoring:
+
+        if monitor['type'] == 'publicOut_net_octet':
+            public_out += monitor['counter']
+
+        if monitor['type'] == 'publicIn_net_octet':
+            public_in += monitor['counter']
+
+    table.add_row(['Id', _firewall.get('id')])
+    table.add_row(['Name', _firewall['networkGateway']['name']])
+    table.add_row(['Stard Date', last_month.strftime('%Y-%m-%d')])
+    table.add_row(['End Date', end.strftime('%Y-%m-%d')])
+    table.add_row(['Out', formatting.b_to_gb(public_out)])
+    table.add_row(['In', formatting.b_to_gb(public_in)])
+    table.add_row(['Total', formatting.b_to_gb(public_out + public_in)])
+    table.add_row(['Status', _firewall['networkGateway']['status']['name']])
+
+    env.fout(table)

SoftLayer/CLI/routes.py

@@ -127,6 +127,7 @@
     ('block:volume-convert', 'SoftLayer.CLI.block.convert:cli'),
     ('block:volume-set-note', 'SoftLayer.CLI.block.set_note:cli'),
     ('block:object-list', 'SoftLayer.CLI.block.object_list:cli'),
+    ('block:object-storage-detail', 'SoftLayer.CLI.block.object_storage_detail:cli'),
 
     ('email', 'SoftLayer.CLI.email'),
     ('email:list', 'SoftLayer.CLI.email.list:cli'),
@@ -180,6 +181,7 @@
     ('firewall:detail', 'SoftLayer.CLI.firewall.detail:cli'),
     ('firewall:edit', 'SoftLayer.CLI.firewall.edit:cli'),
     ('firewall:list', 'SoftLayer.CLI.firewall.list:cli'),
+    ('firewall:monitoring', 'SoftLayer.CLI.firewall.monitoring:cli'),
 
     ('globalip', 'SoftLayer.CLI.globalip'),
     ('globalip:assign', 'SoftLayer.CLI.globalip.assign:cli'),

SoftLayer/fixtures/SoftLayer_Network_Storage.py

@@ -149,7 +149,11 @@
         }
     ],
     'serviceProviderId': 1,
-    'serviceResource': {'datacenter': {'id': 449500, 'name': 'dal05'}},
+    'serviceResource': {'datacenter': {'id': 449500, 'name': 'dal05'},
+                        'name': 'Cleversafe - US Region',
+                        'type': {
+                            'type': 'CLEVERSAFE_SVC_API'
+                        }},
     'serviceResourceBackendIpAddress': '10.1.2.3',
     'serviceResourceName': 'Storage Type 01 Aggregate staaspar0101_pc01',
     'snapshotCapacityGb': '10',

SoftLayer/fixtures/SoftLayer_Network_Vlan_Firewall.py

@@ -174,6 +174,12 @@
             "modifyDate": "2022-05-17T14:00:42-06:00",
             "primarySubnetId": 2623338,
             "vlanNumber": 1255
+        },
+        "status": {
+            "description": "Gateway is ready to accept commands and actions",
+            "id": 1,
+            "keyName": "ACTIVE",
+            "name": "Active"
         }
     },
     "rules": [
@@ -212,7 +218,16 @@
             'action': 'permit',
             'sourceIpAddress': '0.0.0.0'
         }
-    ]
+    ],
+    "metricTrackingObject": {
+        "id": 147258369,
+        "resourceTableId": 17438,
+        "startDate": "2022-05-17T14:01:48-06:00",
+        "type": {
+            "keyname": "FIREWALL_CONTEXT",
+            "name": "Firewall Module Context"
+        }
+    }
 
 }
 

SoftLayer/managers/block.py

@@ -207,3 +207,13 @@ def get_cloud_list(self):
         mask = 'mask[id,username,billingItem,storageType, notes]'
 
         return self.client.call('Account', 'getHubNetworkStorage', mask=mask)
+
+    def get_buckets(self, object_id):
+        """Return  buckets data of the cloud storage.
+
+        :param object_id cloud object storage identifier
+
+        Returns: Get buckets
+
+        """
+        return self.client.call('SoftLayer_Network_Storage_Hub_Cleversafe_Account', 'getBuckets', id=object_id)

SoftLayer/managers/firewall.py

@@ -297,8 +297,9 @@ def get_instance(self, firewall_id, mask=None):
         :param integer firewall_id: the instance ID of the standard firewall
         """
         if not mask:
-            mask = 'mask[firewallType,networkGateway[insideVlans,members,privateIpAddress,publicIpAddress,' \
-                   'publicIpv6Address,privateVlan,publicVlan],datacenter,managementCredentials,networkVlan]'
+            mask = 'mask[firewallType,datacenter,managementCredentials,networkVlan,' \
+                   'metricTrackingObject[data,type],networkGateway[insideVlans,members,privateIpAddress,' \
+                   'publicIpAddress,publicIpv6Address,privateVlan,publicVlan,status]]'
 
         svc = self.client['Network_Vlan_Firewall']
 
@@ -319,3 +320,20 @@ def get_firewalls_gatewalls(self):
         _filter = {"networkGateways": {"networkFirewall": {"operation": "not null"}}}
 
         return self.account.getNetworkGateways(mask=mask, filter=_filter)
+
+    def get_summary(self, identifier, start_date, end_date):
+        """Returns the metric data for the date range provided
+
+        :param integer metric_tracking_id
+        """
+        body = [{
+            "keyName": "PUBLICIN",
+            "summaryType": "sum"
+
+        }, {
+            "keyName": "PUBLICOUT",
+            "summaryType": "sum"
+        }]
+
+        return self.client['Metric_Tracking_Object'].getSummaryData(start_date,
+                                                                    end_date, body, 86400, id=identifier)

docs/cli/block.rst

@@ -160,6 +160,10 @@ Block Commands
     :prog: block object-list
     :show-nested:
 
+.. click:: SoftLayer.CLI.block.object_storage_detail:cli
+    :prog: block object-storage-detail
+    :show-nested:
+
 .. click:: SoftLayer.CLI.block.duplicate_convert_status:cli
     :prog: block duplicate-convert-status
     :show-nested:

docs/cli/firewall.rst

@@ -22,3 +22,7 @@ Firewall Management
 .. click:: SoftLayer.CLI.firewall.list:cli
     :prog: firewall list
     :show-nested:
+
+.. click:: SoftLayer.CLI.firewall.monitoring:cli
+    :prog: firewall monitoring
+    :show-nested:

tests/CLI/modules/block_tests.py

@@ -444,7 +444,7 @@ def test_snapshot_restore(self):
 
         self.assert_no_fail(result)
         self.assertEqual(result.output, 'Block volume 12345678 is being'
-                         ' restored using snapshot 87654321\n')
+                                        ' restored using snapshot 87654321\n')
 
     @mock.patch('SoftLayer.BlockStorageManager.order_snapshot_space')
     def test_snapshot_order_order_not_placed(self, order_mock):
@@ -825,3 +825,9 @@ def test_object_list(self):
 
         self.assert_no_fail(result)
         self.assert_called_with('SoftLayer_Account', 'getHubNetworkStorage')
+
+    def test_object_details(self):
+        result = self.run_command(['block', 'object-storage-detail', '1234'])
+
+        self.assert_no_fail(result)
+        self.assert_called_with('SoftLayer_Network_Storage_Hub_Cleversafe_Account', 'getBuckets')

tests/CLI/modules/firewall_tests.py

@@ -154,3 +154,7 @@ def test_edit(self, confirm_mock):
         confirm_mock.return_value = True
         result = self.run_command(['firewall', 'edit', 'vlan:1234'])
         print(result.output)
+
+    def test_monitoring(self):
+        result = self.run_command(['firewall', 'monitoring', '123456'])
+        print(result.output)

tests/managers/block_tests.py

@@ -1119,3 +1119,7 @@ def test_convert_block_depdupe(self):
     def test_get_cloud_list(self):
         self.block.get_cloud_list()
         self.assert_called_with('SoftLayer_Account', 'getHubNetworkStorage')
+
+    def test_get_bucket(self):
+        self.block.get_buckets(1234)
+        self.assert_called_with('SoftLayer_Network_Storage_Hub_Cleversafe_Account', 'getBuckets')

tests/managers/firewall_tests.py

@@ -46,7 +46,6 @@ def test_get_standard_fwl_rules(self):
                                 identifier=1234)
 
     def test_get_dedicated_fwl_rules(self):
-
         rules = self.firewall.get_dedicated_fwl_rules(1234)
 
         self.assertEqual(rules,