Merge pull request #2006 from ramkishor-ch/issue_2002

Added blank value if it is empty when "Deletion Scheduled" to bandwidth pools and pool-details

Author: allmightyspiff

SoftLayer/CLI/bandwidth/pools.py

@@ -31,7 +31,8 @@ def cli(env):
         "Allocation",
         "Current Usage",
         "Projected Usage",
-        "Cost"
+        "Cost",
+        "Deletion"
     ], title="Bandwidth Pools")
     table.align = 'l'
     for item in items:
@@ -55,5 +56,10 @@ def cli(env):
         else:
             cost = "$0.0"
 
-        table.add_row([id_bandwidth, name, region, servers, allocation, current, projected, cost])
+        deletion = utils.clean_time(item.get('endDate'))
+
+        if deletion == '':
+            deletion = formatting.blank()
+
+        table.add_row([id_bandwidth, name, region, servers, allocation, current, projected, cost, deletion])
     env.fout(table)

SoftLayer/CLI/bandwidth/pools_detail.py

@@ -24,6 +24,12 @@ def cli(env, identifier):
     table.add_row(['Id', bandwidths['id']])
     table.add_row(['Name', bandwidths['name']])
     table.add_row(['Create Date', utils.clean_time(bandwidths.get('createDate'), '%Y-%m-%d')])
+    end_date = utils.clean_time(bandwidths.get('endDate'))
+    if end_date == '':
+        end_date = formatting.blank()
+        table.add_row(['End Date', end_date])
+    else:
+        table.add_row(['End Date', utils.clean_time(bandwidths.get('endDate'))])
     current = f"{utils.lookup(bandwidths, 'billingCyclePublicBandwidthUsage', 'amountOut')} GB"
     if current is None:
         current = '-'

SoftLayer/fixtures/SoftLayer_Account.py

@@ -1420,6 +1420,7 @@
         'amountIn': '6.94517',
         'amountOut': '6.8859'
     },
+    "endDate": "2023-07-03T22:59:59-06:00",
     'id': 309961,
     'locationGroup': {
         'description': 'All Datacenters in Mexico',

SoftLayer/managers/account.py

@@ -374,7 +374,7 @@ def get_bandwidth_pools(self, mask=None):
         if mask is None:
             mask = """mask[totalBandwidthAllocated,locationGroup, id, name, projectedPublicBandwidthUsage,
                       billingCyclePublicBandwidthUsage[amountOut,amountIn],
-                      billingItem[id,nextInvoiceTotalRecurringAmount],outboundPublicBandwidthUsage,serviceProviderId,bandwidthAllotmentTypeId,activeDetailCount]
+                      billingItem[id,nextInvoiceTotalRecurringAmount],outboundPublicBandwidthUsage,serviceProviderId,bandwidthAllotmentTypeId,activeDetailCount,endDate]
                    """
 
         return self.client.call('SoftLayer_Account', 'getBandwidthAllotments', mask=mask, iter=True)