New Command slcli hardware|virtual monitoring

SoftLayer/CLI/hardware/monitoring.py

@@ -0,0 +1,37 @@
+"""Get monitoring for a hardware device."""
+# :license: MIT, see LICENSE for more details.
+
+import click
+
+import SoftLayer
+from SoftLayer.CLI import environment
+from SoftLayer.CLI import formatting
+
+
+@click.command()
+@click.argument('identifier')
+@environment.pass_env
+def cli(env, identifier):
+    """Get details for a hardware monitors device."""
+
+    hardware = SoftLayer.HardwareManager(env.client)
+
+    table = formatting.KeyValueTable(['name', 'value'])
+    table.align['name'] = 'r'
+    table.align['value'] = 'l'
+
+    monitoring = hardware.get_hardware(identifier)
+
+    table.add_row(['domain', monitoring.get('fullyQualifiedDomainName')])
+    table.add_row(['public Ip', monitoring.get('primaryIpAddress')])
+    table.add_row(['private Ip', monitoring.get('primaryBackendIpAddress')])
+    table.add_row(['location', monitoring['datacenter']['longName']])
+
+    monitoring_table = formatting.Table(['Id', 'ipAddress', 'status', 'type', 'notify'])
+    for monitor in monitoring['networkMonitors']:
+        monitoring_table.add_row([monitor.get('id'), monitor.get('ipAddress'), monitor.get('status'),
+                                  monitor['queryType']['name'], monitor['responseAction']['actionDescription']])
+
+    table.add_row(['Devices monitors', monitoring_table])
+
+    env.fout(table)

SoftLayer/CLI/routes.py

@@ -52,6 +52,7 @@
     ('virtual:capacity', 'SoftLayer.CLI.virt.capacity:cli'),
     ('virtual:placementgroup', 'SoftLayer.CLI.virt.placementgroup:cli'),
     ('virtual:migrate', 'SoftLayer.CLI.virt.migrate:cli'),
+    ('virtual:monitoring', 'SoftLayer.CLI.virt.monitoring:cli'),
 
     ('dedicatedhost', 'SoftLayer.CLI.dedicatedhost'),
     ('dedicatedhost:list', 'SoftLayer.CLI.dedicatedhost.list:cli'),
@@ -280,6 +281,7 @@
     ('hardware:storage', 'SoftLayer.CLI.hardware.storage:cli'),
     ('hardware:upgrade', 'SoftLayer.CLI.hardware.upgrade:cli'),
     ('hardware:sensor', 'SoftLayer.CLI.hardware.sensor:cli'),
+    ('hardware:monitoring', 'SoftLayer.CLI.hardware.monitoring:cli'),
 
     ('securitygroup', 'SoftLayer.CLI.securitygroup'),
     ('securitygroup:list', 'SoftLayer.CLI.securitygroup.list:cli'),

SoftLayer/CLI/virt/monitoring.py

@@ -0,0 +1,37 @@
+"""Get monitoring for a vSI device."""
+# :license: MIT, see LICENSE for more details.
+
+import click
+
+import SoftLayer
+from SoftLayer.CLI import environment
+from SoftLayer.CLI import formatting
+
+
+@click.command()
+@click.argument('identifier')
+@environment.pass_env
+def cli(env, identifier):
+    """Get details for a vsi monitors device."""
+
+    vsi = SoftLayer.VSManager(env.client)
+
+    table = formatting.KeyValueTable(['name', 'value'])
+    table.align['name'] = 'r'
+    table.align['value'] = 'l'
+
+    monitoring = vsi.get_instance(identifier)
+
+    table.add_row(['domain', monitoring.get('fullyQualifiedDomainName')])
+    table.add_row(['public Ip', monitoring.get('primaryIpAddress')])
+    table.add_row(['private Ip', monitoring.get('primaryBackendIpAddress')])
+    table.add_row(['location', monitoring['datacenter']['longName']])
+
+    monitoring_table = formatting.Table(['Id', 'ipAddress', 'status', 'type', 'notify'])
+    for monitor in monitoring['networkMonitors']:
+        monitoring_table.add_row([monitor.get('id'), monitor.get('ipAddress'), monitor.get('status'),
+                                  monitor['queryType']['name'], monitor['responseAction']['actionDescription']])
+
+    table.add_row(['Devices monitors', monitoring_table])
+
+    env.fout(table)

SoftLayer/fixtures/SoftLayer_Hardware_Server.py

@@ -1,7 +1,7 @@
 getObject = {
     'id': 1000,
     'globalIdentifier': '1a2b3c-1701',
-    'datacenter': {'id': 50, 'name': 'TEST00',
+    'datacenter': {'id': 50, 'name': 'TEST00', 'longName': 'test 00',
                    'description': 'Test Data Center'},
     'billingItem': {
         'id': 6327,
@@ -74,7 +74,35 @@
             'friendlyName': 'Friendly Transaction Name',
             'id': 6660
         }
-    }
+    },
+    'networkMonitors': [
+        {
+            'hardwareId': 3123796,
+            'hostId': 3123796,
+            'id': 19016454,
+            'ipAddress': '169.53.167.199',
+            'queryTypeId': 1,
+            'responseActionId': 2,
+            'status': 'ON',
+            'waitCycles': 0,
+            'lastResult': {
+                'finishTime': '2022-03-10T08:31:40-06:00',
+                'responseStatus': 2,
+                'responseTime': 159.15,
+            },
+            'queryType': {
+                'description': 'Test ping to address',
+                'id': 1,
+                'monitorLevel': 0,
+                'name': 'SERVICE PING'
+            },
+            'responseAction': {
+                'actionDescription': 'Notify Users',
+                'id': 2,
+                'level': 0
+            }
+        }
+    ]
 }
 editObject = True
 setTags = True

SoftLayer/fixtures/SoftLayer_Virtual_Guest.py

@@ -47,7 +47,7 @@
             'preset': {'keyName': 'B1_8X16X100'}
         }
     },
-    'datacenter': {'id': 50, 'name': 'TEST00',
+    'datacenter': {'id': 50, 'name': 'TEST00', 'longName': 'test 00',
                    'description': 'Test Data Center'},
     'powerState': {'keyName': 'RUNNING', 'name': 'Running'},
     'maxCpu': 2,
@@ -83,6 +83,29 @@
             'softwareDescription': {'name': 'Ubuntu'}}
     }],
     'tagReferences': [{'tag': {'name': 'production'}}],
+    'networkMonitors': [
+        {
+            'guestId': 116114480,
+            'hostId': 116114480,
+            'id': 17653845,
+            'ipAddress': '52.116.23.73',
+            'queryTypeId': 1,
+            'responseActionId': 1,
+            'status': 'ON',
+            'waitCycles': 0,
+            'queryType': {
+                'description': 'Test ping to address',
+                'id': 1,
+                'monitorLevel': 0,
+                'name': 'SERVICE PING'
+            },
+            'responseAction': {
+                'actionDescription': 'Do Nothing',
+                'id': 1,
+                'level': 0
+            }
+        }
+    ]
 }
 getCreateObjectOptions = {
     'flavors': [
@@ -894,6 +917,6 @@
 allowAccessToNetworkStorageList = True
 
 attachDiskImage = {
-            "createDate": "2021-03-22T13:15:31-06:00",
-            "id": 1234567
-        }
+    "createDate": "2021-03-22T13:15:31-06:00",
+    "id": 1234567
+}

SoftLayer/managers/hardware.py

@@ -231,6 +231,7 @@ def get_hardware(self, hardware_id, **kwargs):
                 'domain,'
                 'provisionDate,'
                 'hardwareStatus,'
+                'bareMetalInstanceFlag,'
                 'processorPhysicalCoreAmount,'
                 'memoryCapacity,'
                 'notes,'
@@ -269,6 +270,7 @@ def get_hardware(self, hardware_id, **kwargs):
                 'hourlyBillingFlag,'
                 'tagReferences[id,tag[name,id]],'
                 'networkVlans[id,vlanNumber,networkSpace],'
+                'monitoringServiceComponent,networkMonitors[queryType,lastResult,responseAction],'
                 'remoteManagementAccounts[username,password]'
             )
 

SoftLayer/managers/vs.py

@@ -252,6 +252,7 @@ def get_instance(self, instance_id, **kwargs):
                 'tagReferences[id,tag[name,id]],'
                 'networkVlans[id,vlanNumber,networkSpace],'
                 'dedicatedHost.id,'
+                'monitoringServiceComponent,networkMonitors[queryType,lastResult,responseAction],'
                 'placementGroupId'
             )
 

docs/cli/hardware.rst

@@ -24,6 +24,10 @@ Interacting with Hardware
    :prog: hardware create
    :show-nested:
 
+.. click:: SoftLayer.CLI.hardware.monitoring:cli
+   :prog: hardware monitoring
+   :show-nested:
+
 
 Provides some basic functionality to order a server. `slcli order` has a more full featured method of ordering servers. This command only supports the FAST_PROVISION type.
 

docs/cli/vs.rst

@@ -271,6 +271,10 @@ If no timezone is specified, IMS local time (CST) will be assumed, which might n
    :prog: virtual authorize-storage
    :show-nested:
 
+.. click:: SoftLayer.CLI.virt.monitoring:cli
+   :prog: virtual monitoring
+   :show-nested:
+
 Manages the migration of virutal guests. Supports migrating virtual guests on Dedicated Hosts as well.
 
 Reserved Capacity

tests/CLI/modules/server_tests.py

@@ -1010,3 +1010,7 @@ def test_sensor(self):
     def test_sensor_discrete(self):
         result = self.run_command(['hardware', 'sensor', '100', '--discrete'])
         self.assert_no_fail(result)
+
+    def test_monitoring(self):
+        result = self.run_command(['hardware', 'monitoring', '100'])
+        self.assert_no_fail(result)

tests/CLI/modules/vs/vs_tests.py

@@ -937,3 +937,7 @@ def test_authorize_volume_and_portable_storage_vs(self):
         result = self.run_command(['vs', 'authorize-storage', '--username-storage=SL01SEL301234-11',
                                    '--portable-id=12345', '1234'])
         self.assert_no_fail(result)
+
+    def test_monitoring_vs(self):
+        result = self.run_command(['vs', 'monitoring', '1234'])
+        self.assert_no_fail(result)