From: Lucia Guevgeozian Odizzio <lucia.guevgeozian_odizzio@inria.fr>
Date: Wed, 23 Oct 2013 15:49:16 +0000 (+0200)
Subject: PLCAPIFactory parameters modification, using pl_user instead of slicename
X-Git-Tag: nepi-3.0.0~32
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=c5a7f3f327d5068ae54404aa27c63c00bfcfe096;p=nepi.git

PLCAPIFactory parameters modification, using pl_user instead of slicename
---

diff --git a/src/nepi/resources/planetlab/plcapi.py b/src/nepi/resources/planetlab/plcapi.py
index 6d6555c6..fed1a021 100644
--- a/src/nepi/resources/planetlab/plcapi.py
+++ b/src/nepi/resources/planetlab/plcapi.py
@@ -485,13 +485,13 @@ class PLCAPIFactory(object):
     _apis = dict()
 
     @classmethod 
-    def get_api(cls, slicename, pl_pass, pl_host,
+    def get_api(cls, pl_user, pl_pass, pl_host,
             pl_ptn = "https://%(hostname)s:443/PLCAPI/",
             proxy = None):
         """ Get existing PLCAPI instance
 
-        :param slicename: Planelab slice name
-        :type slicename: str
+        :param pl_user: Planelab user name (used for web login)
+        :type pl_user: str
         :param pl_pass: Planetlab password (used for web login)
         :type pl_pass: str
         :param pl_host: Planetlab registry host (e.g. "www.planet-lab.eu")
@@ -501,23 +501,23 @@ class PLCAPIFactory(object):
         :param proxy: Proxy service url
         :type pl_ptn: str
         """
-        if slice and pl_pass and pl_host:
-            key = cls._make_key(slicename, pl_host)
+        if pl_user and pl_pass and pl_host:
+            key = cls._make_key(pl_user, pl_host)
             with cls._lock:
                 api = cls._apis.get(key)
                 if not api:
-                    api = cls.create_api(slicename, pl_pass, pl_host, pl_ptn, proxy)
+                    api = cls.create_api(pl_user, pl_pass, pl_host, pl_ptn, proxy)
                 return api
         return None
 
     @classmethod 
-    def create_api(cls, slicename, pl_pass, pl_host,
+    def create_api(cls, pl_user, pl_pass, pl_host,
             pl_ptn = "https://%(hostname)s:443/PLCAPI/",
             proxy = None):
         """ Create an PLCAPI instance
 
-        :param slicename: Planelab slice name
-        :type slicename: str
+        :param pl_user: Planelab user name (used for web login)
+        :type pl_user: str
         :param pl_pass: Planetlab password (used for web login)
         :type pl_pass: str
         :param pl_host: Planetlab registry host (e.g. "www.planet-lab.eu")
@@ -528,13 +528,13 @@ class PLCAPIFactory(object):
         :type pl_ptn: str
         """
         api = PLCAPI(
-            username = slicename,
+            username = pl_user,
             password = pl_pass,
             hostname = pl_host,
             urlpattern = pl_ptn,
             proxy = proxy
         )
-        key = cls._make_key(slicename, pl_host)
+        key = cls._make_key(pl_user, pl_host)
         cls._apis[key] = api
         return api