diff --git a/confluent/config/attributes.py b/confluent/config/attributes.py
index f7a9c1e3..72abc999 100644
--- a/confluent/config/attributes.py
+++ b/confluent/config/attributes.py
@@ -57,12 +57,12 @@ node = {
'description': ('List of static groups for which this node is'
'considered a member'),
},
- 'type': {
- 'description': ('Classification of node as system, vm, etc')
- },
- 'id': {
- 'description': ('Numeric identifier for node')
- },
+ #'type': {
+ # 'description': ('Classification of node as system, vm, etc')
+ #},
+ #'id': {
+ # 'description': ('Numeric identifier for node')
+ #},
# 'location.timezone': {
# 'description': 'POSIX timezone to apply to this node',
# },
diff --git a/confluent/httpapi.py b/confluent/httpapi.py
index dece786a..357fe81e 100644
--- a/confluent/httpapi.py
+++ b/confluent/httpapi.py
@@ -6,6 +6,7 @@
import base64
import Cookie
import confluent.auth as auth
+import confluent.config.attributes as attribs
import confluent.consoleserver as consoleserver
import confluent.exceptions as exc
import confluent.messages
@@ -31,6 +32,22 @@ opmap = {
'DELETE': 'delete',
}
+def node_creation_resources():
+ yield confluent.messages.Attributes(
+ kv={ 'name': None}, desc="Name of the node").html() + '
'
+ for attr in sorted(attribs.node.iterkeys()):
+ if attr.startswith("secret."):
+ yield confluent.messages.CryptedAttributes(
+ kv={ attr: None }, desc=attribs.node[attr]['description']).html() + \
+ '
'
+ else:
+ yield confluent.messages.Attributes(
+ kv={ attr: None }, desc=attribs.node[attr]['description']).html() + \
+ '
'
+
+create_resource_functions = {
+ '/node/': node_creation_resources,
+}
def _sessioncleaner():
while (1):
@@ -248,7 +265,7 @@ def resourcehandler(env, start_response):
def _assemble_html(responses, resource, querydict, url):
yield '