From 343600c2aa766a964f98b18fecebcff5345bbaf0 Mon Sep 17 00:00:00 2001
From: Jarrod Johnson <jbjohnso@us.ibm.com>
Date: Fri, 22 Nov 2013 18:27:15 -0500
Subject: [PATCH] Rework the 'update' button for clearer use alongside other
 buttons

---
 confluent/httpapi.py               | 5 +++--
 confluent/messages.py              | 3 ++-
 plugins/hardwaremanagement/ipmi.py | 8 +++++++-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/confluent/httpapi.py b/confluent/httpapi.py
index 07614966..aec32850 100644
--- a/confluent/httpapi.py
+++ b/confluent/httpapi.py
@@ -257,7 +257,6 @@ def _assemble_html(responses, resource, querydict, url):
         yield '<hr>'
     yield 'Only fields that have their boxes checked will have their '
     yield 'respective values honored by the confluent server.<hr>'
-    yield '<input type="hidden" name="restexplorerop" value="update">'
     yield '<input type="hidden" name="restexplorerhonorkey" value="">'
     yield '<a rel="self" href="%s">%s</a><br>' % (resource, resource)
     if url == '/':
@@ -279,7 +278,9 @@ def _assemble_html(responses, resource, querydict, url):
         yield rsp.html()
         yield "<br>"
     if not iscollection:
-        yield '<input value="PUT" type="submit"></form></body></html>'
+        yield '<input value="update" name="restexplorerop" type="submit"></form></body></html>'
+    else:
+        yield '<input type="hidden" name="restexplorerop" value="update">'
 
 
 def _assemble_json(responses, resource, url):
diff --git a/confluent/messages.py b/confluent/messages.py
index 4544f3a8..c8f3ff05 100644
--- a/confluent/messages.py
+++ b/confluent/messages.py
@@ -98,6 +98,7 @@ class LinkRelation(ConfluentMessage):
 
         This is used by the API explorer aspect of httpapi"""
         return '<a href="%s" rel="%s">%s</a>' % (self.href, self.rel, self.href)
+        #return '<a href="%s" rel="%s">%s</a><input type="submit" name="restexprerorop" value="delete:%s"' % (self.href, self.rel, self.href, self.href)
 
 
 
@@ -187,7 +188,7 @@ class BootDevice(ConfluentChoiceMessage):
 
     def __init__(self, node, device):
         if device not in self.valid_values:
-            raise Exception("Invalid boot device argument passed in")
+            raise Exception("Invalid boot device argument passed in: %s" % device)
         self.kvpairs = {
             node: {
                 'bootdevice': { 'value': device },
diff --git a/plugins/hardwaremanagement/ipmi.py b/plugins/hardwaremanagement/ipmi.py
index 522e0a5b..9b75268b 100644
--- a/plugins/hardwaremanagement/ipmi.py
+++ b/plugins/hardwaremanagement/ipmi.py
@@ -251,6 +251,9 @@ class IpmiHandler(object):
     def handle_request(self):
         while not self.loggedin:
             wait_on_ipmi()
+        bootdevices = {
+            'optical': 'cd'
+        }
         if self.element == [ 'power', 'state' ]:
             if 'read' == self.op:
                 power = self.call_ipmicmd(self.ipmicmd.get_power)
@@ -266,12 +269,15 @@ class IpmiHandler(object):
         elif self.element == [ 'boot', 'device' ]:
             if 'read' == self.op:
                 bootdev = self.call_ipmicmd(self.ipmicmd.get_bootdev)
-                print repr(bootdev)
+                if bootdev['bootdev'] in bootdevices:
+                    bootdev['bootdev'] = bootdevices[bootdev['bootdev']]
                 return msg.BootDevice(node=self.node,
                         device=bootdev['bootdev'])
             elif 'update' == self.op:
                 bootdev = self.inputdata.bootdevice(self.node)
                 bootdev = self.call_ipmicmd(self.ipmicmd.set_bootdev, bootdev)
+                if bootdev['bootdev'] in bootdevices:
+                    bootdev['bootdev'] = bootdevices[bootdev['bootdev']]
                 return msg.BootDevice(node=self.node,
                         device=bootdev['bootdev'])