Merge pull request #89 from davehouse/bug1505892_power-cycle-macs-wit…

…h-downtime

Bug1505892 power cycle macs with downtime

relops_hardware_controller/api/management/commands/reboot.py

@@ -117,9 +117,19 @@ def handle(self, hostname, job_data, *args, **options):
                     reboot_args = [ reboot_method ]
                     reboot_method = 'ipmi'
                 elif reboot_method == 'snmp_reboot':
-                    if not hasattr(server, 'pdu'):
+                    try:
+                        reboot_args = server['pdu'].rsplit(':', 1)
+                    except KeyError:
+                        # no pdu information
+                        continue
+                elif reboot_method == 'snmp_rebootdelay':
+                    try:
+                        reboot_args = server['pdu'].rsplit(':', 1)
+                    except KeyError:
+                        # no pdu information
                         continue
-                    reboot_args = server['pdu'].rsplit(':', 1)
+                    reboot_args.extend(['--delay', 60])
+                    reboot_method = 'snmp_reboot'
                 elif reboot_method == 'xenapi_reboot':
                     reboot_args = server['xen']['reboot']
                 elif reboot_method == 'ilo_reboot':
@@ -165,5 +175,5 @@ def check(hostname):
         elapsed = time.time() - start
         return result_template.format(
             command=reboot_command,
-            stdout=stdout.getvalue().rstrip('\n'),
+            stdout=stdout.getvalue().replace('\n', '\r'),
             time=elapsed)

relops_hardware_controller/api/management/commands/snmp_reboot.py

@@ -1,4 +1,3 @@
-
 import logging
 import subprocess
 import time
@@ -55,15 +54,13 @@ def add_arguments(self, parser):
             help='Wait N seconds before turning the power back on.',
         )
 
-        # Named (required) arguments
-
         # Named (optional) arguments
 
         # Not an snmp option
         parser.add_argument(
             '--delay',
             dest='delay',
-            default=5,
+            default=0,
             type=int,
             help='Wait N seconds before turning the power back on.',
         )
@@ -117,4 +114,19 @@ def handle(self, fqdn, pdu, port, *args, **options):
         self.tower, self.infeed, self.outlet = self._parse_port(port)
 
         logger.info("Powercycling {} via {}.".format(fqdn, pdu))
-        return self.run_cmd(pdu, self.cmds['reboot'], **options)
+
+        if options['delay'] > 0:
+            logger.info('Powering down {} ...'.format(fqdn))
+            output = self.run_cmd(pdu, self.cmds['off'], **options)
+
+            delay_note = ' wait {}s ... '.format(options['delay'])
+            logger.info(delay_note)
+            time.sleep(options['delay'])
+            output += delay_note
+
+            logger.info('Powering up {} ...'.format(fqdn))
+            output += self.run_cmd(pdu, self.cmds['on'], **options)
+        else:
+            output = self.run_cmd(pdu, self.cmds['reboot'], **options)
+
+        return output