trailing spaces in sql schema

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

diff --git a/PLC/Methods/AddSite.py b/PLC/Methods/AddSite.py
index 9bd1734..5f1a957 100644 (file)
--- a/PLC/Methods/AddSite.py
+++ b/PLC/Methods/AddSite.py
@@ -4,10 +4,12 @@ from PLC.Parameter import Parameter, Mixed
 from PLC.Sites import Site, Sites
 from PLC.Auth import Auth
 
-can_update = lambda (field, value): field in \
+from PLC.Methods.AddSiteTag import AddSiteTag
+
+can_update = lambda field_value: field_value[0] in \
              ['name', 'abbreviated_name', 'login_base',
               'is_public', 'latitude', 'longitude', 'url',
-              'max_slices', 'max_slivers']
+              'max_slices', 'max_slivers', 'enabled', 'ext_consortium_id']
 
 class AddSite(Method):
     """
@@ -20,7 +22,7 @@ class AddSite(Method):
 
     roles = ['admin']
 
-    site_fields = dict(filter(can_update, Site.fields.items()))
+    site_fields = dict(list(filter(can_update, list(Site.fields.items()))))
 
     accepts = [
         Auth(),
@@ -29,12 +31,20 @@ class AddSite(Method):
 
     returns = Parameter(int, 'New site_id (> 0) if successful')
 
-
     def call(self, auth, site_fields):
-        site_fields = dict(filter(can_update, site_fields.items()))
+        site_fields = dict(list(filter(can_update, list(site_fields.items()))))
         site = Site(self.api, site_fields)
         site.sync()
 
-       self.object_ids = [site['site_id']]
-        
-       return site['site_id']
+        # Logging variables
+        self.event_objects = {'Site': [site['site_id']]}
+        self.message = 'Site %d created' % site['site_id']
+
+        # Set Site HRN
+        root_auth = self.api.config.PLC_HRN_ROOT
+        tagname = 'hrn'
+        tagvalue = '.'.join([root_auth, site['login_base']])
+        AddSiteTag(self.api).__call__(auth,site['site_id'],tagname,tagvalue)
+
+
+        return site['site_id']