From 9277a03fd5b813e866746eae78b633d5f614a375 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Fri, 21 Oct 2011 09:24:00 +0200 Subject: [PATCH] removed imports on sfa.util.rspec that is gone --- sfa/client/getNodes.py | 2 -- sfa/client/getRecord.py | 3 --- sfa/client/setRecord.py | 3 --- sfa/client/sfadump.py | 1 - sfa/managers/aggregate_manager.py | 1 - sfa/managers/aggregate_manager_eucalyptus.py | 1 - sfa/managers/aggregate_manager_max.py | 1 - sfa/managers/aggregate_manager_openflow.py | 1 - sfa/managers/aggregate_manager_vini.py | 1 - sfa/managers/slice_manager.py | 1 - sfa/plc/slices.py | 1 - sfa/util/record.py | 1 - sfa/util/storage.py | 2 -- tests/testInterfaces.py | 1 - 14 files changed, 20 deletions(-) diff --git a/sfa/client/getNodes.py b/sfa/client/getNodes.py index 67f9a28d..71d17f02 100644 --- a/sfa/client/getNodes.py +++ b/sfa/client/getNodes.py @@ -6,8 +6,6 @@ from optparse import OptionParser from pprint import pprint from types import StringTypes -from sfa.util.rspec import RSpec - def create_parser(): command = sys.argv[0] argv = sys.argv[1:] diff --git a/sfa/client/getRecord.py b/sfa/client/getRecord.py index cb765e03..92937806 100755 --- a/sfa/client/getRecord.py +++ b/sfa/client/getRecord.py @@ -15,9 +15,6 @@ from optparse import OptionParser from pprint import pprint from xml.parsers.expat import ExpatError -from sfa.util.rspec import RecordSpec - - def create_parser(): command = sys.argv[0] argv = sys.argv[1:] diff --git a/sfa/client/setRecord.py b/sfa/client/setRecord.py index 5f48e68a..4cd22a4e 100755 --- a/sfa/client/setRecord.py +++ b/sfa/client/setRecord.py @@ -15,9 +15,6 @@ import os from optparse import OptionParser from pprint import pprint -from sfa.util.rspec import RecordSpec - - def create_parser(): command = sys.argv[0] argv = sys.argv[1:] diff --git a/sfa/client/sfadump.py b/sfa/client/sfadump.py index 54654f84..52a91055 100755 --- a/sfa/client/sfadump.py +++ b/sfa/client/sfadump.py @@ -12,7 +12,6 @@ from sfa.trust.certificate import Certificate from sfa.trust.credential import Credential from sfa.trust.gid import GID from sfa.util.record import SfaRecord -from sfa.util.rspec import RSpec from sfa.util.sfalogging import logger def determine_sfa_filekind(fn): diff --git a/sfa/managers/aggregate_manager.py b/sfa/managers/aggregate_manager.py index e61efc7c..77af0723 100644 --- a/sfa/managers/aggregate_manager.py +++ b/sfa/managers/aggregate_manager.py @@ -8,7 +8,6 @@ from types import StringTypes from sfa.util.faults import * from sfa.util.xrn import get_authority, hrn_to_urn, urn_to_hrn, Xrn, urn_to_sliver_id from sfa.util.plxrn import slicename_to_hrn, hrn_to_pl_slicename, hostname_to_urn -from sfa.util.rspec import * from sfa.util.specdict import * from sfa.util.record import SfaRecord from sfa.util.policy import Policy diff --git a/sfa/managers/aggregate_manager_eucalyptus.py b/sfa/managers/aggregate_manager_eucalyptus.py index ea8f2afc..6c7c1f4c 100644 --- a/sfa/managers/aggregate_manager_eucalyptus.py +++ b/sfa/managers/aggregate_manager_eucalyptus.py @@ -15,7 +15,6 @@ from sqlobject import * from sfa.util.faults import * from sfa.util.xrn import urn_to_hrn, Xrn -from sfa.util.rspec import RSpec from sfa.server.registry import Registries from sfa.trust.credential import Credential from sfa.plc.api import SfaAPI diff --git a/sfa/managers/aggregate_manager_max.py b/sfa/managers/aggregate_manager_max.py index fd0e1277..d7d37761 100644 --- a/sfa/managers/aggregate_manager_max.py +++ b/sfa/managers/aggregate_manager_max.py @@ -2,7 +2,6 @@ from sfa.plc.slices import Slices from sfa.server.registry import Registries from sfa.util.xrn import urn_to_hrn, hrn_to_urn, get_authority, Xrn from sfa.util.plxrn import hrn_to_pl_slicename -from sfa.util.rspec import RSpec from sfa.util.sfalogging import logger from sfa.util.faults import * from sfa.util.config import Config diff --git a/sfa/managers/aggregate_manager_openflow.py b/sfa/managers/aggregate_manager_openflow.py index 1edc90b3..a804a651 100755 --- a/sfa/managers/aggregate_manager_openflow.py +++ b/sfa/managers/aggregate_manager_openflow.py @@ -10,7 +10,6 @@ import struct from sfa.util.faults import * from sfa.util.xrn import urn_to_hrn -from sfa.util.rspec import RSpec from sfa.server.registry import Registries from sfa.util.config import Config from sfa.plc.nodes import * diff --git a/sfa/managers/aggregate_manager_vini.py b/sfa/managers/aggregate_manager_vini.py index 7f36419d..eadcbfd0 100644 --- a/sfa/managers/aggregate_manager_vini.py +++ b/sfa/managers/aggregate_manager_vini.py @@ -6,7 +6,6 @@ import sys from types import StringTypes from sfa.util.xrn import urn_to_hrn, Xrn from sfa.util.plxrn import hrn_to_pl_slicename -from sfa.util.rspec import * from sfa.util.specdict import * from sfa.util.faults import * from sfa.util.record import SfaRecord diff --git a/sfa/managers/slice_manager.py b/sfa/managers/slice_manager.py index 8d5a6955..31753106 100644 --- a/sfa/managers/slice_manager.py +++ b/sfa/managers/slice_manager.py @@ -11,7 +11,6 @@ from sfa.util.sfalogging import logger from sfa.util.rspecHelper import merge_rspecs from sfa.util.xrn import Xrn, urn_to_hrn, hrn_to_urn from sfa.util.plxrn import hrn_to_pl_slicename -from sfa.util.rspec import * from sfa.util.specdict import * from sfa.util.faults import * from sfa.util.record import SfaRecord diff --git a/sfa/plc/slices.py b/sfa/plc/slices.py index 78ba4b9e..82ac9c9d 100644 --- a/sfa/plc/slices.py +++ b/sfa/plc/slices.py @@ -6,7 +6,6 @@ import sys from types import StringTypes from sfa.util.xrn import Xrn, get_leaf, get_authority, hrn_to_urn, urn_to_hrn from sfa.util.plxrn import hrn_to_pl_slicename, hrn_to_pl_login_base -from sfa.util.rspec import * from sfa.util.specdict import * from sfa.util.faults import * from sfa.util.record import SfaRecord diff --git a/sfa/util/record.py b/sfa/util/record.py index 8a50a65e..11f46952 100644 --- a/sfa/util/record.py +++ b/sfa/util/record.py @@ -11,7 +11,6 @@ from types import StringTypes from sfa.trust.gid import * -from sfa.util.rspec import * from sfa.util.parameter import * from sfa.util.xrn import get_authority from sfa.util.row import Row diff --git a/sfa/util/storage.py b/sfa/util/storage.py index 5d915398..f80e2ff8 100644 --- a/sfa/util/storage.py +++ b/sfa/util/storage.py @@ -1,7 +1,5 @@ import os -from sfa.util.rspec import RecordSpec - class SimpleStorage(dict): """ Handles storing and loading python dictionaries. The storage file created diff --git a/tests/testInterfaces.py b/tests/testInterfaces.py index 4d49d089..d25484cf 100755 --- a/tests/testInterfaces.py +++ b/tests/testInterfaces.py @@ -13,7 +13,6 @@ from sfa.util.config import * from sfa.trust.certificate import * from sfa.trust.credential import * from sfa.util.sfaticket import * -from sfa.util.rspec import * from sfa.client import sfi def random_string(size): -- 2.43.0