From 7e37315fd8f26d2e9376c26e83d9c2aff0482541 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Fri, 28 Oct 2011 00:13:36 +0200 Subject: [PATCH] need to rename sfa.plc.api into sfa.plc.plcsfaapi --- sfa/managers/aggregate_manager_eucalyptus.py | 2 +- sfa/server/modpython/SfaAggregateModPython.py | 2 +- sfa/server/modpython/SfaRegistryModPython.py | 2 +- sfa/server/modpython/SfaSliceMgrModPython.py | 2 +- sfa/server/sfa-clean-peer-records.py | 2 +- sfa/server/sfa-start.py | 2 +- sfa/server/sfa_component_setup.py | 3 ++- 7 files changed, 8 insertions(+), 7 deletions(-) diff --git a/sfa/managers/aggregate_manager_eucalyptus.py b/sfa/managers/aggregate_manager_eucalyptus.py index 24cc0db3..6c681183 100644 --- a/sfa/managers/aggregate_manager_eucalyptus.py +++ b/sfa/managers/aggregate_manager_eucalyptus.py @@ -17,7 +17,7 @@ from sfa.util.faults import * from sfa.util.xrn import urn_to_hrn, Xrn from sfa.server.registry import Registries from sfa.trust.credential import Credential -from sfa.plc.api import PlcSfaApi +from sfa.plc.plcsfaapi import PlcSfaApi from sfa.plc.aggregate import Aggregate from sfa.plc.slices import * from sfa.util.plxrn import hrn_to_pl_slicename, slicename_to_hrn diff --git a/sfa/server/modpython/SfaAggregateModPython.py b/sfa/server/modpython/SfaAggregateModPython.py index ee4dc1f9..8638ce9c 100755 --- a/sfa/server/modpython/SfaAggregateModPython.py +++ b/sfa/server/modpython/SfaAggregateModPython.py @@ -12,7 +12,7 @@ import traceback import xmlrpclib from mod_python import apache -from sfa.plc.api import PlcSfaApi +from sfa.plc.plcsfaapi import PlcSfaApi from sfa.util.sfalogging import logger api = PlcSfaApi(interface='aggregate') diff --git a/sfa/server/modpython/SfaRegistryModPython.py b/sfa/server/modpython/SfaRegistryModPython.py index 5fb7c379..115fcbaf 100755 --- a/sfa/server/modpython/SfaRegistryModPython.py +++ b/sfa/server/modpython/SfaRegistryModPython.py @@ -12,7 +12,7 @@ import traceback import xmlrpclib from mod_python import apache -from sfa.plc.api import PlcSfaApi +from sfa.plc.plcsfaapi import PlcSfaApi from sfa.util.sfalogging import logger api = PlcSfaApi(interface='registry') diff --git a/sfa/server/modpython/SfaSliceMgrModPython.py b/sfa/server/modpython/SfaSliceMgrModPython.py index 93f5ecf9..3de4519d 100755 --- a/sfa/server/modpython/SfaSliceMgrModPython.py +++ b/sfa/server/modpython/SfaSliceMgrModPython.py @@ -12,7 +12,7 @@ import traceback import xmlrpclib from mod_python import apache -from sfa.plc.api import PlcSfaApi +from sfa.plc.plcsfaapi import PlcSfaApi from sfa.util.sfalogging import logger api = PlcSfaApi(interface='slicemgr') diff --git a/sfa/server/sfa-clean-peer-records.py b/sfa/server/sfa-clean-peer-records.py index c7aea3c1..93fef143 100644 --- a/sfa/server/sfa-clean-peer-records.py +++ b/sfa/server/sfa-clean-peer-records.py @@ -5,7 +5,7 @@ import os import traceback from sfa.util.table import SfaTable from sfa.util.prefixTree import prefixTree -from sfa.plc.api import PlcSfaApi +from sfa.plc.plcsfaapi import PlcSfaApi from sfa.util.config import Config from sfa.trust.certificate import Keypair from sfa.trust.hierarchy import Hierarchy diff --git a/sfa/server/sfa-start.py b/sfa/server/sfa-start.py index ed77c78a..a39d9b71 100755 --- a/sfa/server/sfa-start.py +++ b/sfa/server/sfa-start.py @@ -42,7 +42,7 @@ from sfa.trust.certificate import Keypair, Certificate from sfa.trust.hierarchy import Hierarchy from sfa.trust.gid import GID from sfa.util.config import Config -from sfa.plc.api import PlcSfaApi +from sfa.plc.plcsfaapi import PlcSfaApi from sfa.server.registry import Registries from sfa.server.aggregate import Aggregates from sfa.util.xrn import get_authority, hrn_to_urn diff --git a/sfa/server/sfa_component_setup.py b/sfa/server/sfa_component_setup.py index e1e02811..954ff6d0 100755 --- a/sfa/server/sfa_component_setup.py +++ b/sfa/server/sfa_component_setup.py @@ -8,6 +8,7 @@ from sfa.util.faults import ConnectionKeyGIDMismatch from sfa.util.config import Config import sfa.util.xmlrpcprotocol as xmlrpcprotocol from sfa.util.plxrn import hrn_to_pl_slicename, slicename_to_hrn + from sfa.trust.certificate import Keypair, Certificate from sfa.trust.credential import Credential from sfa.trust.gid import GID @@ -221,7 +222,7 @@ def get_gids(registry=None, verbose=False): if verbose: print "Getting current slices on this node" # get a list of slices on this node - from sfa.plc.api import PlcComponentApi + from sfa.plc.plcsfaapi import PlcComponentApi api = PlcComponentApi() xids_tuple = api.nodemanager.GetXIDs() slices = eval(xids_tuple[1]) -- 2.45.2