- added 'message' instance variable (high level description of this event)

diff --git a/PLC/Methods/AddNode.py b/PLC/Methods/AddNode.py
index 17f0bff..485667b 100644 (file)
--- a/PLC/Methods/AddNode.py
+++ b/PLC/Methods/AddNode.py
@@ -61,5 +61,6 @@ class AddNode(Method):
         node.sync()
 
        self.object_ids = [site['site_id'], node['node_id']]    
+       self.message = "Node %s created" % node['node_id']
 
         return node['node_id']

diff --git a/PLC/Methods/AddNodeGroup.py b/PLC/Methods/AddNodeGroup.py
index 23462f7..bdde7fe 100644 (file)
--- a/PLC/Methods/AddNodeGroup.py
+++ b/PLC/Methods/AddNodeGroup.py
@@ -32,6 +32,8 @@ class AddNodeGroup(Method):
         nodegroup = NodeGroup(self.api, nodegroup_fields)
         nodegroup.sync()
 
+       # Logging variables
        self.object_ids = [nodegroup['nodegroup_id']]
-
+       self.message = 'Node group %d created' % nodegroup['nodegroup_id']
+ 
         return nodegroup['nodegroup_id']

diff --git a/PLC/Methods/AddNodeNetwork.py b/PLC/Methods/AddNodeNetwork.py
index 2dfe7ab..6e24bce 100644 (file)
--- a/PLC/Methods/AddNodeNetwork.py
+++ b/PLC/Methods/AddNodeNetwork.py
@@ -65,7 +65,9 @@ class AddNodeNetwork(Method):
        if not node['nodenetwork_ids']:
                nodenetwork['is_primary'] = True
         nodenetwork.sync()
-
+       
+       # Logging variables
        self.object_ids = [node['node_id'], nodenetwork['nodenetwork_id']]      
+       self.messgage = "Node network %d added" % nodenetwork['nodenetwork_id']
 
         return nodenetwork['nodenetwork_id']

diff --git a/PLC/Methods/AddNodeToNodeGroup.py b/PLC/Methods/AddNodeToNodeGroup.py
index 336387b..7669698 100644 (file)
--- a/PLC/Methods/AddNodeToNodeGroup.py
+++ b/PLC/Methods/AddNodeToNodeGroup.py
@@ -44,6 +44,9 @@ class AddNodeToNodeGroup(Method):
        # add node to nodegroup
         if node['node_id'] not in nodegroup['node_ids']:
             nodegroup.add_node(node)
+       
+       # Logging variables
        self.object_ids = [nodegroup['nodegroup_id']]
-
+       self.message = 'Node %d added to node group %d' % \
+               (node['node_id'], nodegroup['nodegroup_id'])
         return 1

diff --git a/PLC/Methods/AddNodeToPCU.py b/PLC/Methods/AddNodeToPCU.py
index e57e168..0c63411 100644 (file)
--- a/PLC/Methods/AddNodeToPCU.py
+++ b/PLC/Methods/AddNodeToPCU.py
@@ -65,6 +65,8 @@ class AddNodeToPCU(Method):
 
         pcu.add_node(node, port)
 
+       # Logging variables
        self.object_ids = [node['node_id'], pcu['pcu_id']]
-
+       self.message = 'Node %d added to pcu %d on port %d' % \
+               (node['node_id'], pcu['pcu_id'], port)
         return 1

diff --git a/PLC/Methods/AddPCU.py b/PLC/Methods/AddPCU.py
index cc9113d..2d5b034 100644 (file)
--- a/PLC/Methods/AddPCU.py
+++ b/PLC/Methods/AddPCU.py
@@ -52,6 +52,9 @@ class AddPCU(Method):
         pcu['site_id'] = site['site_id']
         pcu.sync()
 
+       # Logging variables
        self.object_ids = [site['site_id'], pcu['pcu_id']]
+       self.message = 'PCU %d added site %s' % \
+               (pcu['pcu_id'], site['site_id'])
 
         return pcu['pcu_id']

diff --git a/PLC/Methods/AddPerson.py b/PLC/Methods/AddPerson.py
index 6ad6848..ea9e84a 100644 (file)
--- a/PLC/Methods/AddPerson.py
+++ b/PLC/Methods/AddPerson.py
@@ -36,6 +36,8 @@ class AddPerson(Method):
         person = Person(self.api, person_fields)
         person.sync()
 
+       # Logging variables
        self.object_ids = [person['person_id']]
+       self.message = 'Person %d added' % person['person_id']  
 
         return person['person_id']

diff --git a/PLC/Methods/AddPersonKey.py b/PLC/Methods/AddPersonKey.py
index a06ea06..6badf39 100644 (file)
--- a/PLC/Methods/AddPersonKey.py
+++ b/PLC/Methods/AddPersonKey.py
@@ -49,6 +49,9 @@ class AddPersonKey(Method):
         key.sync(commit = False)
         person.add_key(key, commit = True)
 
-        self.object_ids = [person['person_id'], key['key_id']]
+        # Logging variables
+       self.object_ids = [person['person_id'], key['key_id']]
+       self.message = 'Key %d added to person %d' % \
+               (key['key_id'], person['person_id'])
 
         return key['key_id']

diff --git a/PLC/Methods/AddPersonToSite.py b/PLC/Methods/AddPersonToSite.py
index 0753e9a..fb77a31 100644 (file)
--- a/PLC/Methods/AddPersonToSite.py
+++ b/PLC/Methods/AddPersonToSite.py
@@ -45,6 +45,9 @@ class AddPersonToSite(Method):
 
         if site['site_id'] not in person['site_ids']:
             site.add_person(person)
-       self.object_ids = [site['site_id']]
        
+       # Logging variables
+       self.object_ids = [site['site_id']]
+       self.message = 'Person %d added to site %d' % \
+               (person['person_id'], site['site_id'])
         return 1

diff --git a/PLC/Methods/AddRoleToPerson.py b/PLC/Methods/AddRoleToPerson.py
index 100bb66..cae0297 100644 (file)
--- a/PLC/Methods/AddRoleToPerson.py
+++ b/PLC/Methods/AddRoleToPerson.py
@@ -67,5 +67,7 @@ class AddRoleToPerson(Method):
             person.add_role(role_id)
 
        self.object_ids = [person['person_id']]
+       self.message = "Role %d granted to person %d" % \
+               (role['role_id'], person['person_id'])
 
         return 1

diff --git a/PLC/Methods/AddSite.py b/PLC/Methods/AddSite.py
index 9bd1734..5f4c355 100644 (file)
--- a/PLC/Methods/AddSite.py
+++ b/PLC/Methods/AddSite.py
@@ -34,7 +34,9 @@ class AddSite(Method):
         site_fields = dict(filter(can_update, site_fields.items()))
         site = Site(self.api, site_fields)
         site.sync()
-
+       
+       # Logging variables 
        self.object_ids = [site['site_id']]
-        
+        self.message = 'Site %d created' % site['site_id']
+       
        return site['site_id']

diff --git a/PLC/Methods/AddSiteAddress.py b/PLC/Methods/AddSiteAddress.py
index e7984a2..746cb0e 100644 (file)
--- a/PLC/Methods/AddSiteAddress.py
+++ b/PLC/Methods/AddSiteAddress.py
@@ -50,6 +50,9 @@ class AddSiteAddress(Method):
         address.sync(commit = False)
         site.add_address(address, commit = True)
 
+       # Logging variables
        self.object_ids = [site['site_id'], address['address_id']]
+       self.message = 'Address %d assigned to Site %d' % \
+               (address['address_id'], site['site_id'])
 
         return address['address_id']

diff --git a/PLC/Methods/BlacklistKey.py b/PLC/Methods/BlacklistKey.py
index a412865..0e583df 100644 (file)
--- a/PLC/Methods/BlacklistKey.py
+++ b/PLC/Methods/BlacklistKey.py
@@ -37,6 +37,9 @@ class BlacklistKey(Method):
        PLCCheckLocalKey(key,"BlackListKey")
 
         key.blacklist()
+       
+       # Logging variables
        self.object_ids = [key['key_id']]
+       self.message = 'Key %d blacklisted' % key['key_id']
 
         return 1

diff --git a/PLC/Methods/BootGetNodeDetails.py b/PLC/Methods/BootGetNodeDetails.py
index 0e8f710..2f5056d 100644 (file)
--- a/PLC/Methods/BootGetNodeDetails.py
+++ b/PLC/Methods/BootGetNodeDetails.py
@@ -49,5 +49,7 @@ class BootGetNodeDetails(Method):
                         else:
                             network[field] = ""
 
+       self.messge = "Node request boot_state (%s) and networks" % \
+               (details['boot_state'])
         return details
 

diff --git a/PLC/Methods/BootNotifyOwners.py b/PLC/Methods/BootNotifyOwners.py
index c467617..b3a0b99 100644 (file)
--- a/PLC/Methods/BootNotifyOwners.py
+++ b/PLC/Methods/BootNotifyOwners.py
@@ -57,5 +57,6 @@ class BootNotifyOwners(Method):
                     recipients[person['email']] = person['first_name'] + " " + person['last_name']
 
         # XXX Send mail
+       self.message = "Node sent message %s to contacts"
 
         return 1

diff --git a/PLC/Methods/BootUpdateNode.py b/PLC/Methods/BootUpdateNode.py
index 31dbb37..271da9f 100644 (file)
--- a/PLC/Methods/BootUpdateNode.py
+++ b/PLC/Methods/BootUpdateNode.py
@@ -59,5 +59,6 @@ class BootUpdateNode(Method):
             nodenetwork.sync(commit = False)
 
         self.caller.sync(commit = True)
+       self.message = "Node updated: %s" % ", ".join(node_fields.keys())
 
         return 1

diff --git a/PLC/Methods/DeleteAddress.py b/PLC/Methods/DeleteAddress.py
index f50e15b..ece41bf 100644 (file)
--- a/PLC/Methods/DeleteAddress.py
+++ b/PLC/Methods/DeleteAddress.py
@@ -35,6 +35,9 @@ class DeleteAddress(Method):
                 raise PLCPermissionDenied, "Address must be associated with one of your sites"
 
         address.delete()
+
+       # Logging variables
         self.object_ids = [address['address_id']]
+       self.message = 'Address %d deleted' % address['address_id']     
 
         return 1

diff --git a/PLC/Methods/DeleteKey.py b/PLC/Methods/DeleteKey.py
index d3eb68d..3920db3 100644 (file)
--- a/PLC/Methods/DeleteKey.py
+++ b/PLC/Methods/DeleteKey.py
@@ -36,6 +36,9 @@ class DeleteKey(Method):
                 raise PLCPermissionDenied, "Key must be associated with your account"
 
         key.delete()
+       
+       # Logging variables
        self.object_ids = [key['key_id']]
+       self.message = 'Key %d deleted' % key['key_id']
 
         return 1

diff --git a/PLC/Methods/DeleteNode.py b/PLC/Methods/DeleteNode.py
index 0f07230..c998bdc 100644 (file)
--- a/PLC/Methods/DeleteNode.py
+++ b/PLC/Methods/DeleteNode.py
@@ -44,6 +44,9 @@ class DeleteNode(Method):
                 raise PLCPermissionDenied, "Not allowed to delete nodes from specified site"
 
         node.delete()
+
+       # Logging variables
        self.object_ids = [node['node_id']]
+       self.message = "Node %d deleted" % node['node_id']
 
         return 1

diff --git a/PLC/Methods/DeleteNodeFromNodeGroup.py b/PLC/Methods/DeleteNodeFromNodeGroup.py
index 1f5572b..0cd41a5 100644 (file)
--- a/PLC/Methods/DeleteNodeFromNodeGroup.py
+++ b/PLC/Methods/DeleteNodeFromNodeGroup.py
@@ -44,6 +44,9 @@ class DeleteNodeFromNodeGroup(Method):
         if node['node_id'] in nodegroup['node_ids']:
             nodegroup.remove_node(node)
        
+       # Logging variables
        self.object_ids = [nodegroup['nodegroup_id']]
+       self.message = 'node %d deleted from node group %d' % \
+               (node['node_id'], nodegroup['nodegroup_id'])
 
         return 1

diff --git a/PLC/Methods/DeleteNodeFromPCU.py b/PLC/Methods/DeleteNodeFromPCU.py
index b51b3db..0cf0845 100644 (file)
--- a/PLC/Methods/DeleteNodeFromPCU.py
+++ b/PLC/Methods/DeleteNodeFromPCU.py
@@ -52,9 +52,13 @@ class DeleteNodeFromPCU(Method):
                 raise PLCPermissionDenied, "Not allowed to update that PCU"
        
        # Removed node from PCU
+       
         if node['node_id'] in pcu['node_ids']:
             pcu.remove_node(node)
 
+       # Logging variables
        self.object_ids = [pcu['pcu_id']]
-        
+       self.message = 'Node %d removed from PCU %d' % \
+               (node['node_id'], pcu['pcu_id']) 
+       
        return 1

diff --git a/PLC/Methods/DeleteNodeGroup.py b/PLC/Methods/DeleteNodeGroup.py
index bed1dfb..7606607 100644 (file)
--- a/PLC/Methods/DeleteNodeGroup.py
+++ b/PLC/Methods/DeleteNodeGroup.py
@@ -33,6 +33,9 @@ class DeleteNodeGroup(Method):
         nodegroup = nodegroups[0]
 
         nodegroup.delete()
-       self.object_ids = [nodegroup['nodegroup_id']]
 
+       # Logging variables
+       self.object_ids = [nodegroup['nodegroup_id']]
+       self.message  = 'Node group %d deleted' % nodegroup['nodegroup_id']
+ 
         return 1

diff --git a/PLC/Methods/DeleteNodeNetwork.py b/PLC/Methods/DeleteNodeNetwork.py
index 82d8ceb..6cba6a6 100644 (file)
--- a/PLC/Methods/DeleteNodeNetwork.py
+++ b/PLC/Methods/DeleteNodeNetwork.py
@@ -49,6 +49,9 @@ class DeleteNodeNetwork(Method):
                 raise PLCPermissionDenied, "Not allowed to delete this node network"
 
         nodenetwork.delete()
+
+       # Logging variables
        self.object_ids = [nodenetwork['nodenetwork_id']]
+       self.message = "Node network %d deleted" % nodenetwork['nodenetwork_id']
 
         return 1

diff --git a/PLC/Methods/DeletePCU.py b/PLC/Methods/DeletePCU.py
index 6cee18f..0d7a09a 100644 (file)
--- a/PLC/Methods/DeletePCU.py
+++ b/PLC/Methods/DeletePCU.py
@@ -35,6 +35,9 @@ class DeletePCU(Method):
                 raise PLCPermissionDenied, "Not allowed to update that PCU"
 
         pcu.delete()
+       
+       # Logging variables
        self.object_ids = [pcu['pcu_id']]
+       self.message = 'PCU %d deleted' % pcu['pcu_id']
 
         return 1

diff --git a/PLC/Methods/DeletePerson.py b/PLC/Methods/DeletePerson.py
index fd930a1..93ae858 100644 (file)
--- a/PLC/Methods/DeletePerson.py
+++ b/PLC/Methods/DeletePerson.py
@@ -43,6 +43,9 @@ class DeletePerson(Method):
             raise PLCPermissionDenied, "Not allowed to delete specified account"
 
         person.delete()
+       
+       # Logging variables
        self.object_ids = [person['person_id']]
+       self.message = 'Person %d deleted' % person['person_id']
 
         return 1

diff --git a/PLC/Methods/DeletePersonFromSite.py b/PLC/Methods/DeletePersonFromSite.py
index 2c48127..b497463 100644 (file)
--- a/PLC/Methods/DeletePersonFromSite.py
+++ b/PLC/Methods/DeletePersonFromSite.py
@@ -46,6 +46,8 @@ class DeletePersonFromSite(Method):
         if site['site_id'] in person['site_ids']:
             site.remove_person(person)
 
+       # Logging variables
        self.object_ids = [site['site_id']]
-       
+       self.message = 'Person %d deleted from site %d  ' % \
+               (person['person_id'], site['site_id'])
         return 1

diff --git a/PLC/Methods/DeleteRoleFromPerson.py b/PLC/Methods/DeleteRoleFromPerson.py
index f2106a7..acc2f74 100644 (file)
--- a/PLC/Methods/DeleteRoleFromPerson.py
+++ b/PLC/Methods/DeleteRoleFromPerson.py
@@ -66,6 +66,8 @@ class DeleteRoleFromPerson(Method):
         if role_id in person['role_ids']:
             person.remove_role(role_id)
        
+       # Logging variables
        self.object_ids = [person['person_id']]
-
+       self.message = 'Role %d revoked from person %d' \
+               (role['role_id'], person['person_id'])
         return 1

diff --git a/PLC/Methods/DeleteSite.py b/PLC/Methods/DeleteSite.py
index 2f5b54d..4dde7cc 100644 (file)
--- a/PLC/Methods/DeleteSite.py
+++ b/PLC/Methods/DeleteSite.py
@@ -38,6 +38,9 @@ class DeleteSite(Method):
        PLCCheckLocalSite(site,"DeleteSite")
 
         site.delete()
+       
+       # Logging variables
        self.object_ids = [site['site_id']]
+       self.message = 'Site %d deleted' % site['site_id']      
 
         return 1

diff --git a/PLC/Methods/UpdateAddress.py b/PLC/Methods/UpdateAddress.py
index dd467c1..3573573 100644 (file)
--- a/PLC/Methods/UpdateAddress.py
+++ b/PLC/Methods/UpdateAddress.py
@@ -45,6 +45,10 @@ class UpdateAddress(Method):
 
         address.update(address_fields)
         address.sync()
+       
+       # Logging variables
        self.object_ids = [address['address_id']]
-
-        return 1
+       self.message = 'Address %d updated: %s' % \
+               (address['address_id'], ", ".join(address_fields.keys()))
+        
+       return 1

diff --git a/PLC/Methods/UpdateKey.py b/PLC/Methods/UpdateKey.py
index 14e521e..15a01ce 100644 (file)
--- a/PLC/Methods/UpdateKey.py
+++ b/PLC/Methods/UpdateKey.py
@@ -45,6 +45,9 @@ class UpdateKey(Method):
 
         key.update(key_fields)
         key.sync()
+       
+       # Logging variables
        self.object_ids = [key['key_id']]
-
+       self.message = 'key %d updated: %s' % \
+               (key['key_id'], ", ".join(key_fields.keys()))
         return 1

diff --git a/PLC/Methods/UpdateNode.py b/PLC/Methods/UpdateNode.py
index 5530874..9fa5259 100644 (file)
--- a/PLC/Methods/UpdateNode.py
+++ b/PLC/Methods/UpdateNode.py
@@ -59,6 +59,12 @@ class UpdateNode(Method):
 
         node.update(node_fields)
         node.sync()
+       
+       # Logging variables
        self.object_ids = [node['node_id']]
+       self.message = 'Node %d updated: %s.' % \
+               (node['node_id'], ", ".join(node_fields.keys()))
+       if 'boot_state' in node_fields.keys():
+               self.message += ' boot_state updated to %s' %  node_fields['boot_state']
 
         return 1

diff --git a/PLC/Methods/UpdateNodeGroup.py b/PLC/Methods/UpdateNodeGroup.py
index 9d7798c..5d31026 100644 (file)
--- a/PLC/Methods/UpdateNodeGroup.py
+++ b/PLC/Methods/UpdateNodeGroup.py
@@ -38,6 +38,9 @@ class UpdateNodeGroup(Method):
        
        nodegroup.update(nodegroup_fields)
         nodegroup.sync()
+       
+       # Logging variables
        self.object_ids = [nodegroup['nodegroup_id']]
-
+       self.message = 'Node group %d updated: %s' % \
+               (nodegroup['nodegroup_id'], ", ".join(nodegroup_fields.keys()))  
         return 1

diff --git a/PLC/Methods/UpdateNodeNetwork.py b/PLC/Methods/UpdateNodeNetwork.py
index a5b6ac5..244647c 100644 (file)
--- a/PLC/Methods/UpdateNodeNetwork.py
+++ b/PLC/Methods/UpdateNodeNetwork.py
@@ -61,6 +61,9 @@ class UpdateNodeNetwork(Method):
        # Update node network
        nodenetwork.update(nodenetwork_fields)
         nodenetwork.sync()
+       
        self.object_ids = [nodenetwork['nodenetwork_id']]
+       self.message = "Node network %d updated: %s " % \
+           (nodenetwork['nodenetwork_id'], ", ".join(nodenetwork_fields.keys()))
 
         return 1

diff --git a/PLC/Methods/UpdatePCU.py b/PLC/Methods/UpdatePCU.py
index 99415f2..1c915ac 100644 (file)
--- a/PLC/Methods/UpdatePCU.py
+++ b/PLC/Methods/UpdatePCU.py
@@ -44,6 +44,9 @@ class UpdatePCU(Method):
 
         pcu.update(pcu_fields)
         pcu.sync()
+       
+       # Logging variables
        self.object_ids = [pcu['pcu_id']]
-
+       self.message = 'PCU %d updated: %s' % \
+               (pcu['pcu_id'], ", ".join(pcu_fields.keys()))
         return 1

diff --git a/PLC/Methods/UpdatePerson.py b/PLC/Methods/UpdatePerson.py
index 65a490f..bdca220 100644 (file)
--- a/PLC/Methods/UpdatePerson.py
+++ b/PLC/Methods/UpdatePerson.py
@@ -53,6 +53,12 @@ class UpdatePerson(Method):
 
         person.update(person_fields)
         person.sync()
+       
+       # Logging variables
        self.object_ids = [person['person_id']]
+       self.message = 'Person %d updated: %s.' % \
+               (person['person_id'], person_fields.keys())
+       if 'enabled' in person_fields:
+               self.message += ' Person enabled'       
 
         return 1

diff --git a/PLC/Methods/UpdateSite.py b/PLC/Methods/UpdateSite.py
index d09a21b..cbd359e 100644 (file)
--- a/PLC/Methods/UpdateSite.py
+++ b/PLC/Methods/UpdateSite.py
@@ -59,6 +59,10 @@ class UpdateSite(Method):
 
         site.update(site_fields)
        site.sync()
+       
+       # Logging variables
        self.object_ids = [site['site_id']]
+       self.message = 'Site %d updated: %s' % \
+               (site['site_id'], ", ".join(site_fields.keys()))        
        
        return 1