Merge lp:~nuclearbob/utah/cobbler-power-workaround into lp:utah

[Max Brustkern]

This branch modifies the CobblerMachine to use non-cobbler power management scripts if the cobbler ones fail.

[Joe Talbott (joetalbott)]

Looks okay to me.

review: Approve

=== modified file 'utah/provisioning/baremetal/cobbler.py'
--- utah/provisioning/baremetal/cobbler.py	2012-11-07 19:49:03 +0000
+++ utah/provisioning/baremetal/cobbler.py	2012-11-15 20:05:31 +0000
@@ -16,10 +16,11 @@
         SSHMixin,
         )
 from utah.provisioning.baremetal.exceptions import UTAHBMProvisioningException
+from utah.provisioning.baremetal.power import PowerMixin
 from utah.retry import retry
 
 
-class CobblerMachine(CustomInstallMixin, SSHMixin, Machine):
+class CobblerMachine(CustomInstallMixin, SSHMixin, PowerMixin, Machine):
     """
     Provide a class to provision a machine via cobbler.
     """
@@ -34,6 +35,10 @@
                     'No cobbler arguments given for machine creation')
         else:
             self.cargs = cargs
+        self.power = {}
+        for item in cargs:
+            if 'power' in item:
+                self.power[item] = cargs[item]
         self.inventory = inventory
         if preseed is None:
             preseed = '/etc/utah/default-preseed.cfg'
@@ -228,29 +233,27 @@
     def _start(self):
         """
         Use cobbler to start the machine.
+        If that fails, use the powercommand generated by PowerMachine.
         """
         self.logger.debug('Starting system')
-        self._cobble(['system', 'poweron', '--name=' + self.name])
+        try:
+            self._cobble(['system', 'poweron', '--name=' + self.name])
+        except UTAHBMProvisioningException:
+            self._runargs(self.powercommand() + ['on'])
         self.active = True
 
     def stop(self):
         """
         Use cobbler to stop the machine.
+        If that fails, use the powercommand generated by PowerMachine.
         """
         self.logger.debug('Stopping system')
-        self._cobble(['system', 'poweroff', '--name=' + self.name])
+        try:
+            self._cobble(['system', 'poweroff', '--name=' + self.name])
+        except UTAHBMProvisioningException:
+            self._runargs(self.powercommand() + ['off'])
         self.active = False
-
-    def restart(self):
-        """
-        Stop the machine, wait powertimeout, then start it/
-        """
-        self.logger.info('Restarting system')
-        self.stop()
-        self.logger.debug('Waiting ' + str(config.powertimeout) + ' seconds')
-        time.sleep(config.powertimeout)
-        self._start()
-
+        
     def __del__(self):
         """
         If the machine has an inventory, tell the inventory to release the