cleanup

diff --git a/sfa/managers/aggregate_manager.py b/sfa/managers/aggregate_manager.py
index df97dfc..fffcd72 100644 (file)
--- a/sfa/managers/aggregate_manager.py
+++ b/sfa/managers/aggregate_manager.py
@@ -41,7 +41,7 @@ def GetVersion(api):
                     }
     return version_core(version_more)
 
-def __get_registry_objects(slice_xrn, creds, users):
+def _get_registry_objects(slice_xrn, creds, users):
     """
 
     """
@@ -100,12 +100,6 @@ def __get_registry_objects(slice_xrn, creds, users):
 
         return reg_objects
 
-def __get_hostnames(nodes):
-    hostnames = []
-    for node in nodes:
-        hostnames.append(node.hostname)
-    return hostnames
-
 def SliverStatus(api, slice_xrn, creds, call_id):
     if Callids().already_handled(call_id): return {}
 
@@ -391,23 +385,3 @@ def get_ticket(api, xrn, creds, rspec, users):
     new_ticket.sign()
 
     return new_ticket.save_to_string(save_parents=True)
-
-
-
-#def main():
-#    """
-#    rspec = ListResources(api, "plc.princeton.sapan", None, 'pl_test_sapan')
-#    #rspec = ListResources(api, "plc.princeton.coblitz", None, 'pl_test_coblitz')
-#    #rspec = ListResources(api, "plc.pl.sirius", None, 'pl_test_sirius')
-#    print rspec
-#    """
-#    api = PlcSfaApi()
-#    f = open(sys.argv[1])
-#    xml = f.read()
-#    f.close()
-##Error (E1120, main): No value passed for parameter 'users' in function call
-##Error (E1120, main): No value passed for parameter 'call_id' in function call
-#    CreateSliver(api, "plc.princeton.sapan", xml, 'CreateSliver_sapan')
-#
-#if __name__ == "__main__":
-#    main()

diff --git a/sfa/managers/aggregate_manager_max.py b/sfa/managers/aggregate_manager_max.py
index 315f543..efdb06d 100644 (file)
--- a/sfa/managers/aggregate_manager_max.py
+++ b/sfa/managers/aggregate_manager_max.py
@@ -17,7 +17,7 @@ from sfa.rspecs.rspec_version import RSpecVersion
 from sfa.rspecs.sfa_rspec import sfa_rspec_version\r
 from sfa.rspecs.rspec_parser import parse_rspec\r
 \r
-from sfa.managers.aggregate_manager import __get_registry_objects, ListSlices\r
+from sfa.managers.aggregate_manager import _get_registry_objects, ListSlices\r
 \r
 from sfa.plc.slices import Slices\r
 \r
@@ -86,7 +86,7 @@ def get_xml_by_tag(text, tag):
     return xml\r
 \r
 def prepare_slice(api, slice_xrn, creds, users):\r
-    reg_objects = __get_registry_objects(slice_xrn, creds, users)\r
+    reg_objects = _get_registry_objects(slice_xrn, creds, users)\r
     (hrn, type) = urn_to_hrn(slice_xrn)\r
     slices = Slices(api)\r
     peer = slices.get_peer(hrn)\r