rename

sfa.plc.aggregate.Aggregate into sfa.plc.plaggregate.PlAggregate
sfa.plc.slices.Slices into sfa.plc.plslices.PlSlices

diff --git a/sfa/managers/aggregate_manager.py b/sfa/managers/aggregate_manager.py
index b9a91e6..91a5c21 100644 (file)
--- a/sfa/managers/aggregate_manager.py
+++ b/sfa/managers/aggregate_manager.py
@@ -19,8 +19,8 @@ from sfa.rspecs.rspec import RSpec
 from sfa.server.sfaapi import SfaApi
 
 import sfa.plc.peers as peers
-from sfa.plc.aggregate import Aggregate
-from sfa.plc.slices import Slices
+from sfa.plc.plaggregate import PlAggregate
+from sfa.plc.plslices import PlSlices
 
 class AggregateManager:
 
@@ -168,8 +168,8 @@ class AggregateManager:
         call_id = options.get('call_id')
         if Callids().already_handled(call_id): return ""
     
-        aggregate = Aggregate(self.driver)
-        slices = Slices(api)
+        aggregate = PlAggregate(self.driver)
+        slices = PlSlices(api)
         (hrn, _) = urn_to_hrn(slice_xrn)
         peer = slices.get_peer(hrn)
         sfa_peer = slices.get_sfa_peer(hrn)
@@ -321,7 +321,7 @@ class AggregateManager:
     
         #panos: passing user-defined options
         #print "manager options = ",options
-        aggregate = Aggregate(self.driver)
+        aggregate = PlAggregate(self.driver)
         rspec =  aggregate.get_rspec(slice_xrn=xrn, version=rspec_version, options=options)
     
         # cache the result
@@ -334,7 +334,7 @@ class AggregateManager:
     def GetTicket(self, api, xrn, creds, rspec, users, options={}):
     
         (slice_hrn, _) = urn_to_hrn(xrn)
-        slices = Slices(api)
+        slices = PlSlices(api)
         peer = slices.get_peer(slice_hrn)
         sfa_peer = slices.get_sfa_peer(slice_hrn)
     

diff --git a/sfa/managers/aggregate_manager_eucalyptus.py b/sfa/managers/aggregate_manager_eucalyptus.py
index 444ceb4..1021392 100644 (file)
--- a/sfa/managers/aggregate_manager_eucalyptus.py
+++ b/sfa/managers/aggregate_manager_eucalyptus.py
@@ -23,8 +23,10 @@ from sfa.util.callids import Callids
 #from sfa.util.sfalogging import logger
 from sfa.util.version import version_core
 from sfa.trust.credential import Credential
-from sfa.plc.aggregate import Aggregate
-from sfa.plc.slices import Slice, Slices
+from sfa.plc.plaggregate import PlAggregate
+# No Slice symbol in there
+#from sfa.plc.plslices import Slice, Slices
+from sfa.plc.plslices import PlSlices
 from sfa.rspecs.version_manager import VersionManager
 from sfa.rspecs.rspec import RSpec
 # not sure what this used to be nor where it is now defined
@@ -549,8 +551,8 @@ class AggregateManagerEucalyptus:
         logger = logging.getLogger('EucaAggregate')
         logger.debug("In CreateSliver")
     
-        aggregate = Aggregate(self.driver)
-        slices = Slices(api)
+        aggregate = PlAggregate(self.driver)
+        slices = PlSlices(api)
         (hrn, type) = urn_to_hrn(slice_xrn)
         peer = slices.get_peer(hrn)
         sfa_peer = slices.get_sfa_peer(hrn)

diff --git a/sfa/managers/aggregate_manager_max.py b/sfa/managers/aggregate_manager_max.py
index 91130bc..e51ec90 100644 (file)
--- a/sfa/managers/aggregate_manager_max.py
+++ b/sfa/managers/aggregate_manager_max.py
@@ -14,7 +14,7 @@ from sfa.util.xrn import urn_to_hrn, hrn_to_urn, Xrn
 
 from sfa.managers.aggregate_manager import AggregateManager
 
-from sfa.plc.slices import Slices
+from sfa.plc.plslices import PlSlices
 
 class AggregateManagerMax (AggregateManager):
 
@@ -85,7 +85,7 @@ class AggregateManagerMax (AggregateManager):
     def prepare_slice(self, api, slice_xrn, creds, users):
         reg_objects = self._get_registry_objects(slice_xrn, creds, users)
         (hrn, type) = urn_to_hrn(slice_xrn)
-        slices = Slices(api)
+        slices = PlSlices(api)
         peer = slices.get_peer(hrn)
         sfa_peer = slices.get_sfa_peer(hrn)
         slice_record=None

diff --git a/sfa/plc/aggregate.py b/sfa/plc/plaggregate.py
similarity index 99%
rename from sfa/plc/aggregate.py
rename to sfa/plc/plaggregate.py
index 15665b5..db79418 100644 (file)
--- a/sfa/plc/aggregate.py
+++ b/sfa/plc/plaggregate.py
@@ -19,7 +19,7 @@ from sfa.plc.vlink import get_tc_rate
 from sfa.plc.topology import Topology
 
 
-class Aggregate:
+class PlAggregate:
 
     api = None
     #panos new user options variable

diff --git a/sfa/plc/slices.py b/sfa/plc/plslices.py
similarity index 99%
rename from sfa/plc/slices.py
rename to sfa/plc/plslices.py
index 938a3e1..7b08c99 100644 (file)
--- a/sfa/plc/slices.py
+++ b/sfa/plc/plslices.py
@@ -10,7 +10,7 @@ from sfa.util.xrn import Xrn
 
 MAXINT =  2L**31-1
 
-class Slices:
+class PlSlices:
 
     rspec_to_slice_tag = {'max_rate':'net_max_rate'}