From 4ba42558b108748d395f27b34258fb537f15d7cb Mon Sep 17 00:00:00 2001
From: Jarrod Johnson <jbjohnso@us.ibm.com>
Date: Sun, 3 Nov 2013 10:12:50 -0500
Subject: [PATCH] Add the attributes interface to messages for input checking

---
 confluent/httpapi.py  |  2 ++
 confluent/messages.py | 42 +++++++++++++++++++++++++++++++++---------
 2 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/confluent/httpapi.py b/confluent/httpapi.py
index 2fa3d72d..f6041e60 100644
--- a/confluent/httpapi.py
+++ b/confluent/httpapi.py
@@ -14,6 +14,7 @@ import eventlet
 import json
 import os
 import string
+import traceback
 import time
 import urlparse
 import eventlet.wsgi
@@ -228,6 +229,7 @@ def resourcehandler(env, start_response):
             yield "404 - Request path not recognized"
             return
         except exc.InvalidArgumentException:
+            traceback.print_exc()
             start_response('400 Bad Request', headers)
             yield '400 - Bad Request'
             return
diff --git a/confluent/messages.py b/confluent/messages.py
index 0611502d..ea9e2aac 100644
--- a/confluent/messages.py
+++ b/confluent/messages.py
@@ -36,39 +36,63 @@ class ConfluentMessage(object):
             snippet += '<input type="checkbox" name="restexplorerhonorkey" '
             snippet += 'value="%s">' % (key)
         return snippet
+
+
 def get_input_message(path, operation, inputdata, nodes=None):
     if 'power/state' in path and operation != 'retrieve':
         return InputPowerMessage(path, nodes, inputdata)
+    elif path.startswith('attributes/') and operation != 'retrieve':
+        return InputAttributes(path, nodes, inputdata)
+    elif inputdata:
+        raise exc.InvalidArgumentException()
 
 
-valid_powerstates = set([
-    'on',
-    'off',
-    'reset',
-    'boot',
-    ])
+class InputAttributes(ConfluentMessage):
+
+    def __init__(self, path, nodes, inputdata):
+        self.nodeattribs = {}
+        nestedmode = False
+        if not inputdata:
+            raise exc.InvalidArgumentException
+        for node in nodes:
+            if node in inputdata:
+                nestedmode = True
+                self.nodeattribs[node] = inputdata[node]
+        if nestedmode:
+            for key in inputdata:
+                if key not in nodes:
+                    raise exc.InvalidArgumentException
+        else:
+            for node in nodes:
+                self.nodeattribs[node] = inputdata
 
 
 class InputPowerMessage(ConfluentMessage):
+    valid_powerstates = set([
+        'on',
+        'off',
+        'reset',
+        'boot',
+        ])
 
     def __init__(self, path, nodes, inputdata):
         self.powerbynode = {}
         if not inputdata:
             raise exc.InvalidArgumentException()
-        if ('powerstate' not in inputdata):
+        if 'powerstate' not in inputdata:
             #assume we have nested information
             for key in nodes:
                 if key not in inputdata:
                     raise exc.InvalidArgumentException()
                 datum = inputdata[key]
                 if ('powerstate' not in datum or
-                        datum['powerstate'] not in valid_powerstates):
+                        datum['powerstate'] not in self.valid_powerstates):
                     raise exc.InvalidArgumentException()
                 self.powerbynode[key] = datum['powerstate']
         else: # we have a powerstate argument not by node
             datum = inputdata
             if ('powerstate' not in datum or
-                    datum['powerstate'] not in valid_powerstates):
+                    datum['powerstate'] not in self.valid_powerstates):
                 raise exc.InvalidArgumentException()
             for node in nodes:
                 self.powerbynode[node] = datum['powerstate']