From 69cefdf49675d55fd33ff34c240972a5a6ad350a Mon Sep 17 00:00:00 2001 From: Josh Karlin Date: Wed, 21 Apr 2010 18:22:08 +0000 Subject: [PATCH] Makefile updated to call environment python instead of #!/usr/bin/python for os x support --- sfa/methods/CreateSliver.py | 2 +- sfa/util/api.py | 1 - wsdl/Makefile | 8 ++++---- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/sfa/methods/CreateSliver.py b/sfa/methods/CreateSliver.py index 5961eb33..7415a736 100644 --- a/sfa/methods/CreateSliver.py +++ b/sfa/methods/CreateSliver.py @@ -56,7 +56,7 @@ class CreateSliver(Method): manager = __import__(manager_module, fromlist=[manager_base]) rspec = self.__run_sfatables(manager, SFATablesRules('INCOMING'), hrn, origin_hrn, rspec) - logger.info("Calling with rspec = %s"% rspec) + return manager.CreateSliver(self.api, slice_xrn, ValidCreds, rspec) return '' diff --git a/sfa/util/api.py b/sfa/util/api.py index 41b4b3e5..037ff0d5 100644 --- a/sfa/util/api.py +++ b/sfa/util/api.py @@ -125,7 +125,6 @@ class BaseAPI: self.source = None self.time_format = "%Y-%m-%d %H:%M:%S" self.logger=get_sfa_logger() - self.method_map = {} # load registries from sfa.server.registry import Registries diff --git a/wsdl/Makefile b/wsdl/Makefile index 1abba026..acbaf74e 100644 --- a/wsdl/Makefile +++ b/wsdl/Makefile @@ -12,16 +12,16 @@ registry.wsdl slice-manager.wsdl aggregate.wsdl sfa.wsdl: touch $@ else registry.wsdl: - PYTHONPATH=../ ./sfa2wsdl.py --registry > $@ + PYTHONPATH=../ python sfa2wsdl.py --registry > $@ slice-manager.wsdl: - PYTHONPATH=../ ./sfa2wsdl.py --slice-manager > $@ + PYTHONPATH=../ python sfa2wsdl.py --slice-manager > $@ aggregate.wsdl: - PYTHONPATH=../ ./sfa2wsdl.py --aggregate > $@ + PYTHONPATH=../ python sfa2wsdl.py --aggregate > $@ sfa.wsdl: - PYTHONPATH=../ ./sfa2wsdl.py --registry --slice-manager --aggregate > $@ + PYTHONPATH=../ python sfa2wsdl.py --registry --slice-manager --aggregate > $@ endif #################### install -- 2.47.0