From 0f90da7f05fbe3d07e56790c10f6ecc877b33754 Mon Sep 17 00:00:00 2001
From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Sat, 12 May 2012 18:50:02 +0200
Subject: [PATCH] renamed sfa/plc into sfa/planetlab
---
setup.py | 2 +-
sfa/federica/fddriver.py | 2 +-
sfa/generic/pl.py | 8 ++++----
sfa/importer/plimporter.py | 2 +-
sfa/managers/aggregate_manager_eucalyptus.py | 11 +++--------
sfa/managers/aggregate_manager_max.py | 2 +-
sfa/openstack/nova_driver.py | 2 +-
sfa/{plc => planetlab}/__init__.py | 0
sfa/{plc => planetlab}/nodemanager.py | 0
sfa/{plc => planetlab}/peers.py | 0
sfa/{plc => planetlab}/plaggregate.py | 4 ++--
sfa/{plc => planetlab}/plcomponentdriver.py | 2 +-
sfa/{plc => planetlab}/pldriver.py | 8 ++++----
sfa/{plc => planetlab}/plshell.py | 0
sfa/{plc => planetlab}/plslices.py | 2 +-
sfa/{plc => planetlab}/topology.py | 0
sfa/{plc => planetlab}/vlink.py | 0
sfa/server/modpython/SfaAggregateModPython.py | 2 +-
sfa/server/modpython/SfaRegistryModPython.py | 2 +-
sfa/server/modpython/SfaSliceMgrModPython.py | 2 +-
20 files changed, 23 insertions(+), 28 deletions(-)
rename sfa/{plc => planetlab}/__init__.py (100%)
rename sfa/{plc => planetlab}/nodemanager.py (100%)
rename sfa/{plc => planetlab}/peers.py (100%)
rename sfa/{plc => planetlab}/plaggregate.py (99%)
rename sfa/{plc => planetlab}/plcomponentdriver.py (98%)
rename sfa/{plc => planetlab}/pldriver.py (99%)
rename sfa/{plc => planetlab}/plshell.py (100%)
rename sfa/{plc => planetlab}/plslices.py (99%)
rename sfa/{plc => planetlab}/topology.py (100%)
rename sfa/{plc => planetlab}/vlink.py (100%)
diff --git a/setup.py b/setup.py
index 5512d998..858802b9 100755
--- 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',
diff --git a/sfa/federica/fddriver.py b/sfa/federica/fddriver.py
index 1e16d7fa..3b947566 100644
--- a/sfa/federica/fddriver.py
+++ b/sfa/federica/fddriver.py
@@ -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
diff --git a/sfa/generic/pl.py b/sfa/generic/pl.py
index c8b1bc68..457a09b4 100644
--- a/sfa/generic/pl.py
+++ b/sfa/generic/pl.py
@@ -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
diff --git a/sfa/importer/plimporter.py b/sfa/importer/plimporter.py
index a292c928..d205a87b 100644
--- a/sfa/importer/plimporter.py
+++ b/sfa/importer/plimporter.py
@@ -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
diff --git a/sfa/managers/aggregate_manager_eucalyptus.py b/sfa/managers/aggregate_manager_eucalyptus.py
index b83afe41..950d2f2f 100644
--- a/sfa/managers/aggregate_manager_eucalyptus.py
+++ b/sfa/managers/aggregate_manager_eucalyptus.py
@@ -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.
diff --git a/sfa/managers/aggregate_manager_max.py b/sfa/managers/aggregate_manager_max.py
index 03005228..64fd0ecf 100644
--- 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.plslices import PlSlices
+from sfa.planetlab.plslices import PlSlices
class AggregateManagerMax (AggregateManager):
diff --git a/sfa/openstack/nova_driver.py b/sfa/openstack/nova_driver.py
index 7dee9797..e4b95b07 100644
--- a/sfa/openstack/nova_driver.py
+++ b/sfa/openstack/nova_driver.py
@@ -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
diff --git a/sfa/plc/__init__.py b/sfa/planetlab/__init__.py
similarity index 100%
rename from sfa/plc/__init__.py
rename to sfa/planetlab/__init__.py
diff --git a/sfa/plc/nodemanager.py b/sfa/planetlab/nodemanager.py
similarity index 100%
rename from sfa/plc/nodemanager.py
rename to sfa/planetlab/nodemanager.py
diff --git a/sfa/plc/peers.py b/sfa/planetlab/peers.py
similarity index 100%
rename from sfa/plc/peers.py
rename to sfa/planetlab/peers.py
diff --git a/sfa/plc/plaggregate.py b/sfa/planetlab/plaggregate.py
similarity index 99%
rename from sfa/plc/plaggregate.py
rename to sfa/planetlab/plaggregate.py
index 04fdca4a..dcb81d42 100644
--- a/sfa/plc/plaggregate.py
+++ b/sfa/planetlab/plaggregate.py
@@ -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:
diff --git a/sfa/plc/plcomponentdriver.py b/sfa/planetlab/plcomponentdriver.py
similarity index 98%
rename from sfa/plc/plcomponentdriver.py
rename to sfa/planetlab/plcomponentdriver.py
index 991cdde2..25f9b7af 100644
--- a/sfa/plc/plcomponentdriver.py
+++ b/sfa/planetlab/plcomponentdriver.py
@@ -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
diff --git a/sfa/plc/pldriver.py b/sfa/planetlab/pldriver.py
similarity index 99%
rename from sfa/plc/pldriver.py
rename to sfa/planetlab/pldriver.py
index 49908ba8..b73fcf7d 100644
--- a/sfa/plc/pldriver.py
+++ b/sfa/planetlab/pldriver.py
@@ -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
diff --git a/sfa/plc/plshell.py b/sfa/planetlab/plshell.py
similarity index 100%
rename from sfa/plc/plshell.py
rename to sfa/planetlab/plshell.py
diff --git a/sfa/plc/plslices.py b/sfa/planetlab/plslices.py
similarity index 99%
rename from sfa/plc/plslices.py
rename to sfa/planetlab/plslices.py
index 9413e814..ef049972 100644
--- a/sfa/plc/plslices.py
+++ b/sfa/planetlab/plslices.py
@@ -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
diff --git a/sfa/plc/topology.py b/sfa/planetlab/topology.py
similarity index 100%
rename from sfa/plc/topology.py
rename to sfa/planetlab/topology.py
diff --git a/sfa/plc/vlink.py b/sfa/planetlab/vlink.py
similarity index 100%
rename from sfa/plc/vlink.py
rename to sfa/planetlab/vlink.py
diff --git a/sfa/server/modpython/SfaAggregateModPython.py b/sfa/server/modpython/SfaAggregateModPython.py
index 8c97d194..50f9f5f3 100755
--- a/sfa/server/modpython/SfaAggregateModPython.py
+++ b/sfa/server/modpython/SfaAggregateModPython.py
@@ -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')
diff --git a/sfa/server/modpython/SfaRegistryModPython.py b/sfa/server/modpython/SfaRegistryModPython.py
index 6ea2710b..31d0812d 100755
--- a/sfa/server/modpython/SfaRegistryModPython.py
+++ b/sfa/server/modpython/SfaRegistryModPython.py
@@ -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')
diff --git a/sfa/server/modpython/SfaSliceMgrModPython.py b/sfa/server/modpython/SfaSliceMgrModPython.py
index 7d0e5f2c..61cb1614 100755
--- a/sfa/server/modpython/SfaSliceMgrModPython.py
+++ b/sfa/server/modpython/SfaSliceMgrModPython.py
@@ -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')
--
2.47.0