fix the merge conflicts

Author: caberos

CHANGELOG.md

@@ -1,6 +1,15 @@
 # Change Log
 
 
+## [6.0.2] - 2022-03-30
+
+## What's Changed
+* New Command slcli hardware|virtual monitoring by @caberos in https://github.com/softlayer/softlayer-python/pull/1593
+* When listing datacenters/pods, mark those that are closing soon. by @caberos in https://github.com/softlayer/softlayer-python/pull/1597
+
+
+**Full Changelog**: https://github.com/softlayer/softlayer-python/compare/v6.0.1...v6.0.2
+
 ## [6.0.1] - 2022-03-11
 
 

SoftLayer/CLI/account/cancel_item.py

@@ -15,4 +15,5 @@ def cli(env, identifier):
     manager = AccountManager(env.client)
     item = manager.cancel_item(identifier)
 
-    env.fout(item)
+    if item:
+        env.fout("Item: {} was cancelled.".format(identifier))

SoftLayer/CLI/account/event_detail.py

@@ -65,9 +65,9 @@ def update_table(event):
     """Formats a basic event update table"""
     update_number = 0
     for update in event.get('updates', []):
+        update_number = update_number + 1
         header = "======= Update #%s on %s =======" % (update_number, utils.clean_time(update.get('startDate')))
         click.secho(header, fg='green')
-        update_number = update_number + 1
         text = update.get('contents')
         # deals with all the \r\n from the API
         click.secho(utils.clean_splitlines(text))

SoftLayer/CLI/account/events.py

@@ -11,8 +11,14 @@
 @click.command()
 @click.option('--ack-all', is_flag=True, default=False,
               help="Acknowledge every upcoming event. Doing so will turn off the popup in the control portal")
+@click.option('--planned', is_flag=True, default=False,
+              help="Show only planned events")
+@click.option('--unplanned', is_flag=True, default=False,
+              help="Show only unplanned events")
+@click.option('--announcement', is_flag=True, default=False,
+              help="Show only announcement events")
 @environment.pass_env
-def cli(env, ack_all):
+def cli(env, ack_all, planned, unplanned, announcement):
     """Summary and acknowledgement of upcoming and ongoing maintenance events"""
 
     manager = AccountManager(env.client)
@@ -21,13 +27,22 @@ def cli(env, ack_all):
     announcement_events = manager.get_upcoming_events("ANNOUNCEMENT")
 
     add_ack_flag(planned_events, manager, ack_all)
-    env.fout(planned_event_table(planned_events))
-
     add_ack_flag(unplanned_events, manager, ack_all)
-    env.fout(unplanned_event_table(unplanned_events))
-
     add_ack_flag(announcement_events, manager, ack_all)
-    env.fout(announcement_event_table(announcement_events))
+
+    if planned:
+        env.fout(planned_event_table(planned_events))
+
+    if unplanned:
+        env.fout(unplanned_event_table(unplanned_events))
+
+    if announcement:
+        env.fout(announcement_event_table(announcement_events))
+
+    if not planned and not unplanned and not announcement:
+        env.fout(planned_event_table(planned_events))
+        env.fout(unplanned_event_table(unplanned_events))
+        env.fout(announcement_event_table(announcement_events))
 
 
 def add_ack_flag(events, manager, ack_all):

SoftLayer/CLI/account/item_detail.py

@@ -28,7 +28,7 @@ def item_table(item):
     table.add_row(['cancellationDate', utils.clean_time(item.get('cancellationDate'), date_format, date_format)])
     table.add_row(['description', item.get('description')])
     table.align = 'l'
-    fqdn = "{}.{}".format(item.get('hostName'), item.get('domain'))
+    fqdn = "{}.{}".format(item.get('hostName', ''), item.get('domainName', ''))
     if fqdn != ".":
         table.add_row(['FQDN', fqdn])
 

SoftLayer/CLI/globalip/assign.py

@@ -5,17 +5,22 @@
 
 import SoftLayer
 from SoftLayer.CLI import environment
-from SoftLayer.CLI import helpers
 
+target_types = {'vlan': 'SoftLayer_Network_Vlan',
+                'ip': 'SoftLayer_Network_Subnet_IpAddress',
+                'hardware': 'SoftLayer_Hardware_Server',
+                'vsi': 'SoftLayer_Virtual_Guest'}
 
-@click.command()
+
+@click.command(epilog="More information about types and identifiers "
+                      "on https://sldn.softlayer.com/reference/services/SoftLayer_Network_Subnet/route/")
 @click.argument('identifier')
-@click.argument('target')
+@click.option('--target', type=click.Choice(['vlan', 'ip', 'hardware', 'vsi']),
+              help='choose the type. vlan, ip, hardware, vsi')
+@click.option('--target-id', help='The identifier for the destination resource to route this subnet to. ')
 @environment.pass_env
-def cli(env, identifier, target):
-    """Assigns the global IP to a target."""
+def cli(env, identifier, target, target_id):
+    """Assigns the subnet to a target."""
 
     mgr = SoftLayer.NetworkManager(env.client)
-    global_ip_id = helpers.resolve_id(mgr.resolve_global_ip_ids, identifier,
-                                      name='global ip')
-    mgr.assign_global_ip(global_ip_id, target)
+    mgr.route(identifier, target_types.get(target), target_id)

SoftLayer/CLI/hardware/create.py

@@ -41,6 +41,10 @@
 def cli(env, **args):
     """Order/create a dedicated server."""
     mgr = SoftLayer.HardwareManager(env.client)
+    network = SoftLayer.NetworkManager(env.client)
+
+    pods = network.get_closed_pods()
+    closure = []
 
     # Get the SSH keys
     ssh_keys = []
@@ -99,6 +103,10 @@ def cli(env, **args):
         return
 
     if do_create:
+        for pod in pods:
+            if args.get('datacenter') in str(pod['name']):
+                closure.append(pod['name'])
+        click.secho(click.style('Warning: Closed soon: %s' % (', '.join(closure)), fg='yellow'))
         if not (env.skip_confirmations or formatting.confirm(
                 "This action will incur charges on your account. Continue?")):
             raise exceptions.CLIAbort('Aborting dedicated server order.')

SoftLayer/CLI/licenses/__init__.py

@@ -0,0 +1,2 @@
+"""VMware licenses."""
+# :license: MIT, see LICENSE for more details.

SoftLayer/CLI/order/place.py

@@ -8,6 +8,7 @@
 from SoftLayer.CLI import environment
 from SoftLayer.CLI import exceptions
 from SoftLayer.CLI import formatting
+from SoftLayer.managers import NetworkManager
 from SoftLayer.managers import ordering
 
 COLUMNS = ['keyName',
@@ -64,6 +65,10 @@ def cli(env, package_keyname, location, preset, verify, billing, complex_type,
 
     """
     manager = ordering.OrderingManager(env.client)
+    network = NetworkManager(env.client)
+
+    pods = network.get_closed_pods()
+    closure = []
 
     if extras:
         try:
@@ -90,6 +95,9 @@ def cli(env, package_keyname, location, preset, verify, billing, complex_type,
             ])
 
     else:
+        for pod in pods:
+            closure.append(pod['name'])
+        click.secho(click.style('Warning: Closed soon: %s' % (', '.join(closure)), fg='yellow'))
         if not (env.skip_confirmations or formatting.confirm(
                 "This action will incur charges on your account. Continue?")):
             raise exceptions.CLIAbort("Aborting order.")

SoftLayer/CLI/routes.py

@@ -323,6 +323,7 @@
     ('subnet:list', 'SoftLayer.CLI.subnet.list:cli'),
     ('subnet:lookup', 'SoftLayer.CLI.subnet.lookup:cli'),
     ('subnet:edit-ip', 'SoftLayer.CLI.subnet.edit_ip:cli'),
+    ('subnet:route', 'SoftLayer.CLI.subnet.route:cli'),
 
     ('tags', 'SoftLayer.CLI.tags'),
     ('tags:cleanup', 'SoftLayer.CLI.tags.cleanup:cli'),