remove sfa upcalls

diff --git a/PLC/Methods/AddNode.py b/PLC/Methods/AddNode.py
index f9da543..8403162 100644 (file)
--- a/PLC/Methods/AddNode.py
+++ b/PLC/Methods/AddNode.py
@@ -12,7 +12,6 @@ from PLC.TagTypes import TagTypes
 from PLC.NodeTags import NodeTags
 from PLC.Methods.AddNodeTag import AddNodeTag
 from PLC.Methods.UpdateNodeTag import UpdateNodeTag
-from PLC.SFA import SFA
 
 can_update = ['hostname', 'node_type', 'boot_state', 'model', 'version']
 
@@ -87,8 +86,4 @@ class AddNode(Method):
                             'Node': [node['node_id']]} 
         self.message = "Node %s created" % node['node_id']
         
-        # sync with geni db
-        sfa = SFA(self.api)
-        sfa.update_record(node, 'node', site['login_base']) 
-        
         return node['node_id']

diff --git a/PLC/Methods/AddPersonKey.py b/PLC/Methods/AddPersonKey.py
index c7a8d24..5212b44 100644 (file)
--- a/PLC/Methods/AddPersonKey.py
+++ b/PLC/Methods/AddPersonKey.py
@@ -6,7 +6,6 @@ from PLC.Parameter import Parameter, Mixed
 from PLC.Keys import Key, Keys
 from PLC.Persons import Person, Persons
 from PLC.Auth import Auth
-from PLC.SFA import SFA
 
 can_update = lambda (field, value): field in ['key_type','key']
 
@@ -59,9 +58,4 @@ class AddPersonKey(Method):
         self.message = 'Key %d added to person %d' % \
                         (key['key_id'], person['person_id'])
 
-        # sync with the geni db
-        person['key'] = key_fields['key']
-        sfa = SFA(self.api)
-        sfa.update_record(person, 'user') 
-        
         return key['key_id']

diff --git a/PLC/Methods/AddPersonToSite.py b/PLC/Methods/AddPersonToSite.py
index fce91f1..595399f 100644 (file)
--- a/PLC/Methods/AddPersonToSite.py
+++ b/PLC/Methods/AddPersonToSite.py
@@ -6,7 +6,6 @@ from PLC.Parameter import Parameter, Mixed
 from PLC.Persons import Person, Persons
 from PLC.Sites import Site, Sites
 from PLC.Auth import Auth
-from PLC.SFA import SFA
 
 class AddPersonToSite(Method):
     """
@@ -57,9 +56,4 @@ class AddPersonToSite(Method):
         self.message = 'Person %d added to site %d' % \
                        (person['person_id'], site['site_id'])
 
-        
-        sfa = SFA(self.api)
-        person['site_ids'] = [site['site_id']]
-        sfa.update_record(person, 'user')
-
         return 1

diff --git a/PLC/Methods/AddSite.py b/PLC/Methods/AddSite.py
index 6b49001..219f647 100644 (file)
--- a/PLC/Methods/AddSite.py
+++ b/PLC/Methods/AddSite.py
@@ -5,7 +5,6 @@ from PLC.Method import Method
 from PLC.Parameter import Parameter, Mixed
 from PLC.Sites import Site, Sites
 from PLC.Auth import Auth
-from PLC.SFA import SFA
 
 can_update = lambda (field, value): field in \
              ['name', 'abbreviated_name', 'login_base',
@@ -41,7 +40,4 @@ class AddSite(Method):
         self.event_objects = {'Site': [site['site_id']]}
         self.message = 'Site %d created' % site['site_id']
        
-        sfa = SFA(self.api)
-        sfa.update_record(site, 'site', site['login_base'])
-
         return site['site_id']

diff --git a/PLC/Methods/AddSlice.py b/PLC/Methods/AddSlice.py
index 9644e6d..937c551 100644 (file)
--- a/PLC/Methods/AddSlice.py
+++ b/PLC/Methods/AddSlice.py
@@ -14,7 +14,6 @@ from PLC.TagTypes import TagTypes
 from PLC.SliceTags import SliceTags
 from PLC.Methods.AddSliceTag import AddSliceTag
 from PLC.Methods.UpdateSliceTag import UpdateSliceTag
-from PLC.SFA import SFA
 
 can_update = ['name', 'instantiation', 'url', 'description', 'max_nodes']
 
@@ -106,6 +105,4 @@ class AddSlice(Method):
         self.event_objects = {'Slice': [slice['slice_id']]}
         self.message = "Slice %d created" % slice['slice_id']
     
-        sfa = SFA(self.api)
-        sfa.update_record(slice, 'slice', site['login_base']) 
         return slice['slice_id']

diff --git a/PLC/Methods/DeleteNode.py b/PLC/Methods/DeleteNode.py
index e62f23c..01e382a 100644 (file)
--- a/PLC/Methods/DeleteNode.py
+++ b/PLC/Methods/DeleteNode.py
@@ -5,7 +5,6 @@ from PLC.Method import Method
 from PLC.Parameter import Parameter, Mixed
 from PLC.Auth import Auth
 from PLC.Nodes import Node, Nodes
-from PLC.SFA import SFA
 
 class DeleteNode(Method):
     """
@@ -55,7 +54,4 @@ class DeleteNode(Method):
         self.event_objects = {'Node': [node_id], 'Site': [site_id] }
         self.message = "Node %d deleted" % node['node_id']
 
-        sfa = SFA(self.api)
-        sfa.delete_record(node, 'node')       
-
         return 1

diff --git a/PLC/Methods/DeletePerson.py b/PLC/Methods/DeletePerson.py
index d890115..a199aec 100644 (file)
--- a/PLC/Methods/DeletePerson.py
+++ b/PLC/Methods/DeletePerson.py
@@ -5,7 +5,6 @@ from PLC.Method import Method
 from PLC.Parameter import Parameter, Mixed
 from PLC.Persons import Person, Persons
 from PLC.Auth import Auth
-from PLC.SFA import SFA
 
 class DeletePerson(Method):
     """
@@ -51,7 +50,4 @@ class DeletePerson(Method):
         self.event_objects = {'Person': [person['person_id']]}
         self.message = 'Person %d deleted' % person['person_id']
 
-        sfa = SFA(self.api)
-        sfa.delete_record(person, 'user')
-
         return 1

diff --git a/PLC/Methods/DeletePersonFromSite.py b/PLC/Methods/DeletePersonFromSite.py
index 7400dc3..0345100 100644 (file)
--- a/PLC/Methods/DeletePersonFromSite.py
+++ b/PLC/Methods/DeletePersonFromSite.py
@@ -6,7 +6,6 @@ from PLC.Parameter import Parameter, Mixed
 from PLC.Persons import Person, Persons
 from PLC.Sites import Site, Sites
 from PLC.Auth import Auth
-from PLC.SFA import SFA
 
 class DeletePersonFromSite(Method):
     """
@@ -57,7 +56,4 @@ class DeletePersonFromSite(Method):
         self.message = 'Person %d deleted from site %d ' % \
                         (person['person_id'], site['site_id'])
 
-        sfa = SFA(self.api)
-        sfa.delete_record(person, 'user')
-
         return 1

diff --git a/PLC/Methods/DeleteSite.py b/PLC/Methods/DeleteSite.py
index b2adfdb..8c7feb3 100644 (file)
--- a/PLC/Methods/DeleteSite.py
+++ b/PLC/Methods/DeleteSite.py
@@ -8,7 +8,6 @@ from PLC.Persons import Person, Persons
 from PLC.Nodes import Node, Nodes
 from PLC.PCUs import PCU, PCUs
 from PLC.Auth import Auth
-from PLC.SFA import SFA
 
 class DeleteSite(Method):
     """
@@ -40,10 +39,6 @@ class DeleteSite(Method):
         if site['peer_id'] is not None:
             raise PLCInvalidArgument, "Not a local site"
 
-        # sync with sfa db
-        sfa = SFA(self.api)
-        sfa.delete_record(site, 'site')
-        
         site.delete()
        
         # Logging variables

diff --git a/PLC/Methods/DeleteSlice.py b/PLC/Methods/DeleteSlice.py
index d2d4be8..d3bc8f4 100644 (file)
--- a/PLC/Methods/DeleteSlice.py
+++ b/PLC/Methods/DeleteSlice.py
@@ -5,7 +5,6 @@ from PLC.Method import Method
 from PLC.Parameter import Parameter, Mixed
 from PLC.Slices import Slice, Slices
 from PLC.Auth import Auth
-from PLC.SFA import SFA
 
 class DeleteSlice(Method):
     """
@@ -48,7 +47,4 @@ class DeleteSlice(Method):
         slice.delete()
         self.event_objects = {'Slice': [slice['slice_id']]}
 
-        sfa = SFA(self.api)
-        sfa.delete_record(slice, 'slice')
-
         return 1