X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmanagers%2Fslice_manager.py;h=b84ef716c858c5bb5aaf2848ea93aaffa5a95210;hb=a0f0c89522484f1c984a04a4824d69a856be8095;hp=31753106da4ada922a553599c54ddb1d7c8c4650;hpb=9277a03fd5b813e866746eae78b633d5f614a375;p=sfa.git

diff --git a/sfa/managers/slice_manager.py b/sfa/managers/slice_manager.py
index 31753106..b84ef716 100644
--- a/sfa/managers/slice_manager.py
+++ b/sfa/managers/slice_manager.py
@@ -1,33 +1,23 @@
-#
 import sys
-import time,datetime
+import time
 from StringIO import StringIO
-from types import StringTypes
-from copy import deepcopy
 from copy import copy
 from lxml import etree
 
+from sfa.trust.sfaticket import SfaTicket
+from sfa.trust.credential import Credential
+
 from sfa.util.sfalogging import logger
 from sfa.util.rspecHelper import merge_rspecs
-from sfa.util.xrn import Xrn, urn_to_hrn, hrn_to_urn
-from sfa.util.plxrn import hrn_to_pl_slicename
-from sfa.util.specdict import *
-from sfa.util.faults import *
-from sfa.util.record import SfaRecord
-from sfa.rspecs.rspec_converter import RSpecConverter
-from sfa.client.client_helper import sfa_to_pg_users_arg
-from sfa.rspecs.version_manager import VersionManager
-from sfa.rspecs.rspec import RSpec 
-from sfa.util.policy import Policy
-from sfa.util.prefixTree import prefixTree
-from sfa.util.sfaticket import *
-from sfa.trust.credential import Credential
+from sfa.util.xrn import Xrn, urn_to_hrn
 from sfa.util.threadmanager import ThreadManager
-import sfa.util.xmlrpcprotocol as xmlrpcprotocol     
-import sfa.plc.peers as peers
 from sfa.util.version import version_core
 from sfa.util.callids import Callids
 
+from sfa.rspecs.rspec_converter import RSpecConverter
+from sfa.rspecs.version_manager import VersionManager
+from sfa.rspecs.rspec import RSpec 
+from sfa.client.client_helper import sfa_to_pg_users_arg
 
 def _call_id_supported(api, server):
     """
@@ -91,7 +81,7 @@ def drop_slicemgr_stats(rspec):
         for node in stats_elements:
             node.getparent().remove(node)
     except Exception, e:
-        api.logger.warn("drop_slicemgr_stats failed: %s " % (str(e)))
+        logger.warn("drop_slicemgr_stats failed: %s " % (str(e)))
 
 def add_slicemgr_stat(rspec, callname, aggname, elapsed, status):
     try:
@@ -103,7 +93,7 @@ def add_slicemgr_stat(rspec, callname, aggname, elapsed, status):
 
         etree.SubElement(stats_tag, "aggregate", name=str(aggname), elapsed=str(elapsed), status=str(status))
     except Exception, e:
-        api.logger.warn("add_slicemgr_stat failed on  %s: %s" %(aggname, str(e)))
+        logger.warn("add_slicemgr_stat failed on  %s: %s" %(aggname, str(e)))
 
 def ListResources(api, creds, options, call_id):
     version_manager = VersionManager()
@@ -218,9 +208,9 @@ def CreateSliver(api, xrn, creds, rspec_str, users, call_id):
     # The schema used here needs to aggregate the PL and VINI schemas
     # schema = "/var/www/html/schemas/pl.rng"
     rspec = RSpec(rspec_str)
-    schema = None
-    if schema:
-        rspec.validate(schema)
+#    schema = None
+#    if schema:
+#        rspec.validate(schema)
 
     # if there is a <statistics> section, the aggregates don't care about it,
     # so delete it.
@@ -539,11 +529,12 @@ def status(api, xrn, creds):
     """
     return 1
 
-def main():
-    r = RSpec()
-    r.parseFile(sys.argv[1])
-    rspec = r.toDict()
-    CreateSliver(None,'plc.princeton.tmacktestslice',rspec,'create-slice-tmacktestslice')
+# this is plain broken
+#def main():
+#    r = RSpec()
+#    r.parseFile(sys.argv[1])
+#    rspec = r.toDict()
+#    CreateSliver(None,'plc.princeton.tmacktestslice',rspec,'create-slice-tmacktestslice')
 
 if __name__ == "__main__":
     main()