fix Sites bugs

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

diff --git a/PLC/Methods/AddSite.py b/PLC/Methods/AddSite.py
index 320121a..2b13991 100644 (file)
--- a/PLC/Methods/AddSite.py
+++ b/PLC/Methods/AddSite.py
@@ -2,10 +2,10 @@ 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
 
 can_update = lambda (field, value): field in \
-             ['is_public', 'latitude', 'longitude', 'url']
+             ['login_base', 'enabled', 'tenant_name', 'description', 'name', 'abbreviated_name' ]
 
 class AddSite(Method):
     """
@@ -18,24 +18,17 @@ class AddSite(Method):
 
     roles = ['admin']
 
-    update_fields = dict(filter(can_update, Site.fields.items()))
+    site_fields = dict(filter(can_update, Site.fields.items()))
 
     accepts = [
-        PasswordAuth(),
-        Site.fields['name'],
-        Site.fields['abbreviated_name'],
-        Site.fields['login_base'],
-        update_fields
+        Auth(),
+        site_fields
         ]
 
-    returns = Parameter(int, 'New site_id (> 0) if successful')
+    returns = Parameter(str, 'New site_id if successful')
 
-    def call(self, auth, name, abbreviated_name, login_base, site_fields = {}):
+    def call(self, auth, site_fields):
         site_fields = dict(filter(can_update, site_fields.items()))
         site = Site(self.api, site_fields)
-        site['name'] = name
-        site['abbreviated_name'] = abbreviated_name
-        site['login_base'] = login_base
-        site.sync()
-
-        return site['site_id']
+        site.sync() 
+        return site['id']