From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Wed, 21 Dec 2011 20:31:07 +0000 (-0500)
Subject: -s --sliceapi option no longer requires users to prefix url with 'http://'
X-Git-Tag: sfa-2.0-7~13^2~20
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=eca22f46216e1c56afbf3b43a163cd856673417f;p=sfa.git

-s --sliceapi option no longer requires users to prefix url with ''
---

diff --git a/sfa/client/sfi.py b/sfa/client/sfi.py
index 83cd9bf8..d91e7e25 100644
--- a/sfa/client/sfi.py
+++ b/sfa/client/sfi.py
@@ -554,6 +554,8 @@ class Sfi:
                 self.sliceapi_proxy=SfaServerProxy(cm_url, self.private_key, self.my_gid)
             else:
                 # otherwise use what was provided as --sliceapi, or SFI_SM in the config
+                if not self.sm_url.startswith('http://') or self.sm_url.startswith('https://'):
+                    self.sm_url = 'http://' + self.sm_url
                 self.logger.info("Contacting Slice Manager at: %s"%self.sm_url)
                 self.sliceapi_proxy = SfaServerProxy(self.sm_url, self.private_key, self.my_gid, 
                                                      timeout=self.options.timeout, verbose=self.options.debug)