Merge remote-tracking branch 'origin/pycurl' into planetlab-4_0-branch

[plcapi.git] / PLC / Methods / AdmAddSite.py

diff --git a/PLC/Methods/AdmAddSite.py b/PLC/Methods/AdmAddSite.py
index e8c7dbc..929c0a7 100644 (file)
--- a/PLC/Methods/AdmAddSite.py
+++ b/PLC/Methods/AdmAddSite.py
@@ -2,42 +2,31 @@ from PLC.Faults import *
 from PLC.Method import Method
 from PLC.Parameter import Parameter, Mixed
 from PLC.Sites import Site, Sites
-from PLC.Auth import PasswordAuth
+from PLC.Auth import Auth
+from PLC.Methods.AddSite import AddSite
 
-class AdmAddSite(Method):
-    """
-    Adds a new site, and creates a node group for that site. Any
-    fields specified in optional_vals are used, otherwise defaults are
-    used.
+can_update = lambda (field, value): field in \
+             ['is_public', 'latitude', 'longitude', 'url']
 
-    Returns the new site_id (> 0) if successful, faults otherwise.
+class AdmAddSite(AddSite):
+    """
+    Deprecated. See AddSite.
     """
 
-    roles = ['admin']
+    status = "deprecated"
 
-    can_update = lambda (field, value): field in \
-                 ['is_public', 'latitude', 'longitude', 'url',
-                  'organization_id', 'ext_consortium_id']
-    update_fields = dict(filter(can_update, Site.fields.items()))
+    site_fields = dict(filter(can_update, Site.fields.items()))
 
     accepts = [
-        PasswordAuth(),
+        Auth(),
         Site.fields['name'],
         Site.fields['abbreviated_name'],
         Site.fields['login_base'],
-        update_fields
+        site_fields
         ]
 
-    returns = Parameter(int, 'New site_id (> 0) if successful')
-
-    def call(self, auth, name, abbreviated_name, login_base, optional_vals = {}):
-        if filter(lambda field: field not in self.update_fields, optional_vals):
-            raise PLCInvalidArgument, "Invalid field specified"
-
-        site = Site(self.api, optional_vals)
-        site['name'] = name
-        site['abbreviated_name'] = abbreviated_name
-        site['login_base'] = login_base
-        site.sync()
-
-        return site['site_id']
+    def call(self, auth, name, abbreviated_name, login_base, site_fields = {}):
+        site_fields['name'] = name
+        site_fields['abbreviated_name'] = abbreviated_name
+        site_fields['login_base'] = login_base
+        return AddSite.call(self, auth, site_fields)