double underscore identifiers (__foo) are troublesome

diff --git a/sfa/managers/slice_manager_pl.py b/sfa/managers/slice_manager_pl.py
index 23f659a..1b98e6a 100644 (file)
--- a/sfa/managers/slice_manager_pl.py
+++ b/sfa/managers/slice_manager_pl.py
@@ -390,7 +390,6 @@ def ListResources(api, creds, options, call_id):
         threads.run(server.ListResources, credential, my_opts, call_id)
                     
     results = threads.get_results()
-    #results.append(open('/root/protogeni.rspec', 'r').read())
     rspec_version = RSpecVersion(my_opts.get('rspec_version'))
     if rspec_version['type'] == pg_rspec_ad_version['type']:
         rspec = PGRSpec()

diff --git a/sfa/rspecs/pg_rspec.py b/sfa/rspecs/pg_rspec.py
index 0feeb67..3d2ae4f 100755 (executable)
--- a/sfa/rspecs/pg_rspec.py
+++ b/sfa/rspecs/pg_rspec.py
@@ -122,7 +122,7 @@ class PGRSpec(RSpec):
             
 
     def add_slivers(self, slivers, sliver_urn=None, no_dupes=False): 
-        slivers = self.__process_slivers(slivers)
+        slivers = self._process_slivers(slivers)
         nodes_with_slivers = self.get_nodes_with_slivers()
         for sliver in slivers:
             hostname = sliver['hostname']

diff --git a/sfa/rspecs/rspec.py b/sfa/rspecs/rspec.py
index fd7453b..c127ae1 100755 (executable)
--- a/sfa/rspecs/rspec.py
+++ b/sfa/rspecs/rspec.py
@@ -129,7 +129,7 @@ class RSpec:
         """
         pass 
 
-    def __process_slivers(self, slivers):
+    def _process_slivers(self, slivers):
         """
         Creates a dict of sliver details for each sliver host
         

diff --git a/sfa/rspecs/sfa_rspec.py b/sfa/rspecs/sfa_rspec.py
index 16d81c1..85d5fcc 100755 (executable)
--- a/sfa/rspecs/sfa_rspec.py
+++ b/sfa/rspecs/sfa_rspec.py
@@ -223,7 +223,7 @@ class SfaRSpec(RSpec):
         pass
     
     def add_slivers(self, slivers, network=None, sliver_urn=None, no_dupes=False):
-        slivers = self.__process_slivers(slivers)
+        slivers = self._process_slivers(slivers)
         nodes_with_slivers = self.get_nodes_with_slivers(network)
         for sliver in slivers:
             if sliver['hostname'] in nodes_with_slivers: