fixed up the names of new site names/slices to be more PLC compatible

[sfa.git] / sfa / methods / remove.py

diff --git a/sfa/methods/remove.py b/sfa/methods/remove.py
index b56cc50..3419603 100644 (file)
--- a/sfa/methods/remove.py
+++ b/sfa/methods/remove.py
@@ -2,23 +2,21 @@
 ### $URL$
 
 from sfa.util.faults import *
+from sfa.util.namespace import *
 from sfa.util.method import Method
 from sfa.util.parameter import Parameter, Mixed
-from sfa.trust.auth import Auth
-from sfa.util.record import GeniRecord
-from sfa.util.genitable import GeniTable
-from sfa.util.debug import log
-from sfa.trust.credential import Credential
-from sfa.server.registry import Registries
+from sfa.methods.Remove import Remove
 
-class remove(Method):
+class remove(Remove):
     """
+    Deprecated. Use Remove instead.
+
     Remove an object from the registry. If the object represents a PLC object,
     then the PLC records will also be removed.
     
     @param cred credential string
     @param type record type
-    @param hrn human readable name of record to remove
+    @param xrn human readable name of record to remove (hrn or urn)
 
     @return 1 if successful, faults otherwise 
     """
@@ -28,57 +26,13 @@ class remove(Method):
     accepts = [
         Parameter(str, "Credential string"),
         Parameter(str, "Record type"),
-        Parameter(str, "Human readable name (hrn) of record to be removed")
+        Parameter(str, "Human readable name of slice to instantiate (hrn or urn)"),
+        Mixed(Parameter(str, "Human readable name of the original caller"),
+              Parameter(None, "Origin hrn not specified"))
         ]
 
     returns = Parameter(int, "1 if successful")
     
-    def call(self, cred, type, hrn, caller_cred=None):
-        self.api.auth.check(cred, "remove")
-       if caller_cred==None:
-          caller_cred=cred
-       
-       #log the call
-       self.api.logger.info("interface: %s\tcaller-hrn: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, Credential(string=caller_cred).get_gid_caller().get_hrn(), hrn, self.name))
-        self.api.auth.verify_object_permission(hrn)
-        table = GeniTable()
-        filter = {'hrn': hrn}
-        if type not in ['all', '*']:
-            filter['type'] = type
-        records = table.find(filter)
-        if not records:
-            raise RecordNotFound(hrn)
-        record = records[0]
-        type = record['type']
-
-       credential = self.api.getCredential()
-               registries = Registries(self.api) 
-       # Try to remove the object from the PLCDB of federated agg.
-       # This is attempted before removing the object from the local agg's PLCDB and sfa table
-       if hrn.startswith(self.api.hrn) and type in ['user', 'slice', 'authority']:
-          for registry in registries:
-            if registry not in [self.api.hrn]:
-               result=registries[registry].remove_remote_object(credential, hrn, record)
-        if type == "user":
-            persons = self.api.plshell.GetPersons(self.api.plauth, record['pointer'])
-            # only delete this person if he has site ids. if he doesnt, it probably means 
-            # he was just removed from a site, not actually deleted
-            if persons and persons[0]['site_ids']:
-                self.api.plshell.DeletePerson(self.api.plauth, record['pointer'])
-        elif type == "slice":
-            if self.api.plshell.GetSlices(self.api.plauth, record['pointer']):
-                self.api.plshell.DeleteSlice(self.api.plauth, record['pointer'])
-        elif type == "node":
-            if self.api.plshell.GetNodes(self.api.plauth, record['pointer']):
-                self.api.plshell.DeleteNode(self.api.plauth, record['pointer'])
-        elif type == "authority":
-            if self.api.plshell.GetSites(self.api.plauth, record['pointer']):
-                self.api.plshell.DeleteSite(self.api.plauth, record['pointer'])
-        else:
-            raise UnknownGeniType(type)
-
-        table.remove(record)
-           
-       # forward the call after replacing the root hrn
-
-        return 1
+    def call(self, cred, type, xrn, origin_hrn=None):
+        
+        return Remove.call(self, xrn, cred, type)