accepts = [
Auth(),
+ Mixed(Node.fields['node_id'],
+ Node.fields['hostname']),
Mixed(NodeGroup.fields['nodegroup_id'],
NodeGroup.fields['name']),
- Mixed(Node.fields['node_id'],
- Node.fields['hostname'])
]
returns = Parameter(int, '1 if successful')
object_type = 'NodeGroup'
object_ids = []
- def call(self, auth, nodegroup_id_or_name, node_id_or_hostname):
+ def call(self, auth, node_id_or_hostname, nodegroup_id_or_name):
# Get node info
nodes = Nodes(self.api, [node_id_or_hostname])
if not nodes:
accepts = [
Auth(),
+ Mixed(Node.fields['node_id'],
+ Node.fields['hostname']),
Mixed(NodeGroup.fields['nodegroup_id'],
NodeGroup.fields['name']),
- Mixed(Node.fields['node_id'],
- Node.fields['hostname'])
]
returns = Parameter(int, '1 if successful')
- def call(self, auth, nodegroup_id_or_name, node_id_or_hostname):
+ def call(self, auth, node_id_or_hostname, nodegroup_id_or_name):
# Get node info
nodes = Nodes(self.api, [node_id_or_hostname])
if not nodes:
# Mark Huang <mlhuang@cs.princeton.edu>
# Copyright (C) 2006 The Trustees of Princeton University
#
-# $Id: Test.py,v 1.12 2006/10/25 14:32:31 mlhuang Exp $
+# $Id$
#
from pprint import pprint
# Add to node groups
for nodegroup_id in nodegroup_ids:
- print "AddNodeToNodeGroup(%d, %d)" % (nodegroup_id, node_id),
- AddNodeToNodeGroup(admin, nodegroup_id, node_id)
+ print "AddNodeToNodeGroup(%d, %d)" % (node_id, nodegroup_id),
+ AddNodeToNodeGroup(admin, node_id, nodegroup_id)
print "=> OK"
print "GetNodes",
for node_id in node_ids:
# Remove from node groups
for nodegroup_id in nodegroup_ids:
- print "DeleteNodeFromNodeGroup(%d, %d)" % (nodegroup_id, node_id),
- DeleteNodeFromNodeGroup(admin, nodegroup_id, node_id)
+ print "DeleteNodeFromNodeGroup(%d, %d)" % (node_id, nodegroup_id),
+ DeleteNodeFromNodeGroup(admin, node_id, nodegroup_id)
print "=> OK"
node = GetNodes(admin, [node_id])[0]
assert not node['nodegroup_ids']