'sfa/generic',
'sfa/managers',
'sfa/importer',
- 'sfa/plc',
+ 'sfa/planetlab',
'sfa/rspecs',
'sfa/rspecs/elements',
'sfa/rspecs/elements/versions',
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
# 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
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
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
#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.
from sfa.managers.aggregate_manager import AggregateManager
-from sfa.plc.plslices import PlSlices
+from sfa.planetlab.plslices import PlSlices
class AggregateManagerMax (AggregateManager):
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
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:
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
# 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
#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
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')
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')
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')