From 89c4ee7105d4da9cad97f9d91221cb6ab5fc7698 Mon Sep 17 00:00:00 2001 From: Mark Huang Date: Mon, 25 Sep 2006 15:20:19 +0000 Subject: [PATCH] - no need to specify extra_fields anymore when instantiating Sites lists - removed concept of site node groups --- PLC/Methods/AdmAddNode.py | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/PLC/Methods/AdmAddNode.py b/PLC/Methods/AdmAddNode.py index d8cb3165..2f9afb7b 100644 --- a/PLC/Methods/AdmAddNode.py +++ b/PLC/Methods/AdmAddNode.py @@ -39,19 +39,12 @@ class AdmAddNode(Method): raise PLCInvalidArgument, "Invalid fields specified" # Get site information - sites = Sites(self.api, [site_id_or_login_base], ['person_ids']) + sites = Sites(self.api, [site_id_or_login_base]) if not sites: raise PLCInvalidArgument, "No such site" site = sites.values()[0] - # Get site node group information - nodegroups = NodeGroups(self.api, [site['nodegroup_id']]) - if not nodegroups: - raise PLCAPIError, "Site %d does not have a nodegroup" % site['site_id'] - - nodegroup = nodegroups.values()[0] - # Authenticated function assert self.caller is not None @@ -67,9 +60,7 @@ class AdmAddNode(Method): node = Node(self.api, optional_vals) node['hostname'] = hostname node['boot_state'] = boot_state - node.flush(commit = False) - - # Now associate the node with the site - nodegroup.add_node(node, commit = True) + node['site_id'] = site['site_id'] + node.sync(commit = False) return node['node_id'] -- 2.47.0