renamed sfa/plc into sfa/planetlab
Thierry Parmentelat [Sat, 12 May 2012 16:50:02 +0000 (18:50 +0200)]
20 files changed:
setup.py
sfa/federica/fddriver.py
sfa/generic/pl.py
sfa/importer/plimporter.py
sfa/managers/aggregate_manager_eucalyptus.py
sfa/managers/aggregate_manager_max.py
sfa/openstack/nova_driver.py
sfa/planetlab/__init__.py [moved from sfa/plc/__init__.py with 100% similarity]
sfa/planetlab/nodemanager.py [moved from sfa/plc/nodemanager.py with 100% similarity]
sfa/planetlab/peers.py [moved from sfa/plc/peers.py with 100% similarity]
sfa/planetlab/plaggregate.py [moved from sfa/plc/plaggregate.py with 99% similarity]
sfa/planetlab/plcomponentdriver.py [moved from sfa/plc/plcomponentdriver.py with 98% similarity]
sfa/planetlab/pldriver.py [moved from sfa/plc/pldriver.py with 99% similarity]
sfa/planetlab/plshell.py [moved from sfa/plc/plshell.py with 100% similarity]
sfa/planetlab/plslices.py [moved from sfa/plc/plslices.py with 99% similarity]
sfa/planetlab/topology.py [moved from sfa/plc/topology.py with 100% similarity]
sfa/planetlab/vlink.py [moved from sfa/plc/vlink.py with 100% similarity]
sfa/server/modpython/SfaAggregateModPython.py
sfa/server/modpython/SfaRegistryModPython.py
sfa/server/modpython/SfaSliceMgrModPython.py

index 5512d99..858802b 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -32,7 +32,7 @@ packages = [
     'sfa/generic',
     'sfa/managers',
     'sfa/importer',
-    'sfa/plc',
+    'sfa/planetlab',
     'sfa/rspecs',
     'sfa/rspecs/elements',
     'sfa/rspecs/elements/versions',
index 1e16d7f..3b94756 100644 (file)
@@ -2,7 +2,7 @@ from sfa.util.sfalogging import logger
 from sfa.util.faults import SfaFault
 
 # this is probably too big to swallow but for a starting point..
-from sfa.plc.pldriver import PlDriver
+from sfa.planetlab.pldriver import PlDriver
 
 from sfa.federica.fdshell import FdShell
 
index c8b1bc6..457a09b 100644 (file)
@@ -25,8 +25,8 @@ class pl (Generic):
 
     # driver class for server-side services, talk to the whole testbed
     def driver_class (self):
-        import sfa.plc.pldriver
-        return sfa.plc.pldriver.PlDriver
+        import sfa.planetlab.pldriver
+        return sfa.planetlab.pldriver.PlDriver
 
     # for the component mode, to be run on board planetlab nodes
     # manager class
@@ -35,6 +35,6 @@ class pl (Generic):
         return sfa.managers.component_manager_pl
     # driver_class
     def component_driver_class (self):
-        import sfa.plc.plcomponentdriver
-        return sfa.plc.plcomponentdriver.PlComponentDriver
+        import sfa.planetlab.plcomponentdriver
+        return sfa.planetlab.plcomponentdriver.PlComponentDriver
 
index a292c92..d205a87 100644 (file)
@@ -28,7 +28,7 @@ from sfa.trust.certificate import convert_public_key, Keypair
 from sfa.storage.alchemy import dbsession
 from sfa.storage.model import RegRecord, RegAuthority, RegSlice, RegNode, RegUser, RegKey
 
-from sfa.plc.plshell import PlShell    
+from sfa.planetlab.plshell import PlShell    
 
 def _get_site_hrn(interface_hrn, site):
     # Hardcode 'internet2' into the hrn for sites hosting
index b83afe4..950d2f2 100644 (file)
@@ -22,17 +22,12 @@ from sfa.util.callids import Callids
 #comes with its own logging
 #from sfa.util.sfalogging import logger
 from sfa.util.version import version_core
+
 from sfa.trust.credential import Credential
-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.planetlab.plaggregate import PlAggregate
+from sfa.planetlab.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
-#from sfa.rspecs.sfa_rspec import sfa_rspec_version
-# most likely this should now be
-#from sfa.rspecs.version_manager import VersionManager
 
 ##
 # Meta data of an instance.
index 0300522..64fd0ec 100644 (file)
@@ -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.plslices import PlSlices
+from sfa.planetlab.plslices import PlSlices
 
 class AggregateManagerMax (AggregateManager):
 
index 7dee979..e4b95b0 100644 (file)
@@ -22,7 +22,7 @@ from sfa.managers.driver import Driver
 from sfa.openstack.nova_shell import NovaShell
 from sfa.openstack.euca_shell import EucaShell
 from sfa.openstack.osaggregate import OSAggregate
-from sfa.plc.plslices import PlSlices
+from sfa.planetlab.plslices import PlSlices
 from sfa.util.osxrn import OSXrn
 
 
similarity index 100%
rename from sfa/plc/peers.py
rename to sfa/planetlab/peers.py
similarity index 99%
rename from sfa/plc/plaggregate.py
rename to sfa/planetlab/plaggregate.py
index 04fdca4..dcb81d4 100644 (file)
@@ -16,8 +16,8 @@ from sfa.rspecs.elements.pltag import PLTag
 from sfa.rspecs.version_manager import VersionManager
 
 from sfa.util.plxrn import PlXrn, hostname_to_urn, hrn_to_pl_slicename
-from sfa.plc.vlink import get_tc_rate
-from sfa.plc.topology import Topology
+from sfa.planetlab.vlink import get_tc_rate
+from sfa.planetlab.topology import Topology
 
 
 class PlAggregate:
similarity index 98%
rename from sfa/plc/plcomponentdriver.py
rename to sfa/planetlab/plcomponentdriver.py
index 991cdde..25f9b7a 100644 (file)
@@ -2,7 +2,7 @@ import os
 import tempfile
 
 from sfa.client.sfaserverproxy import SfaServerProxy
-from sfa.plc.nodemanager import NodeManager
+from sfa.planetlab.nodemanager import NodeManager
 
 from sfa.trust.credential import Credential
 from sfa.trust.certificate import Certificate, Keypair
similarity index 99%
rename from sfa/plc/pldriver.py
rename to sfa/planetlab/pldriver.py
index 49908ba..b73fcf7 100644 (file)
@@ -23,10 +23,10 @@ from sfa.rspecs.rspec import RSpec
 # the driver interface, mostly provides default behaviours
 from sfa.managers.driver import Driver
 
-from sfa.plc.plshell import PlShell
-import sfa.plc.peers as peers
-from sfa.plc.plaggregate import PlAggregate
-from sfa.plc.plslices import PlSlices
+from sfa.planetlab.plshell import PlShell
+import sfa.planetlab.peers as peers
+from sfa.planetlab.plaggregate import PlAggregate
+from sfa.planetlab.plslices import PlSlices
 from sfa.util.plxrn import PlXrn, slicename_to_hrn, hostname_to_hrn, hrn_to_pl_slicename
 
 
similarity index 100%
rename from sfa/plc/plshell.py
rename to sfa/planetlab/plshell.py
similarity index 99%
rename from sfa/plc/plslices.py
rename to sfa/planetlab/plslices.py
index 9413e81..ef04997 100644 (file)
@@ -7,7 +7,7 @@ from sfa.util.xrn import Xrn, get_leaf, get_authority, urn_to_hrn
 #from sfa.util.policy import Policy
 from sfa.util.plxrn import PlXrn
 from sfa.rspecs.rspec import RSpec
-from sfa.plc.vlink import VLink
+from sfa.planetlab.vlink import VLink
 from sfa.util.plxrn import hrn_to_pl_slicename
 
 MAXINT =  2L**31-1
similarity index 100%
rename from sfa/plc/vlink.py
rename to sfa/planetlab/vlink.py
index 8c97d19..50f9f5f 100755 (executable)
@@ -12,7 +12,7 @@ import traceback
 from mod_python import apache
 
 from sfa.util.sfalogging import logger
-from sfa.plc.server import SfaApi
+from sfa.planetlab.server import SfaApi
 
 api = SfaApi(interface='aggregate')
 
index 6ea2710..31d0812 100755 (executable)
@@ -12,7 +12,7 @@ import traceback
 from mod_python import apache
 
 from sfa.util.sfalogging import logger
-from sfa.plc.server import SfaApi
+from sfa.planetlab.server import SfaApi
 
 api = SfaApi(interface='registry')
 
index 7d0e5f2..61cb161 100755 (executable)
@@ -12,7 +12,7 @@ import traceback
 from mod_python import apache
 
 from sfa.util.sfalogging import logger
-from sfa.plc.server import SfaApi
+from sfa.planetlab.server import SfaApi
 
 api = SfaApi(interface='slicemgr')