X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osmclient%2Fv1%2Fvca.py;h=d2f17c611eacc401d8875ccc9f190a6b437b43a9;hb=refs%2Fchanges%2F33%2F11033%2F6;hp=37f37aa645ac61ea1aba77b2a3294dfa140f1214;hpb=e84eb31aded0cb62a5523422ddc4524f6e615209;p=osm%2Fosmclient.git

diff --git a/osmclient/v1/vca.py b/osmclient/v1/vca.py
index 37f37aa..d2f17c6 100644
--- a/osmclient/v1/vca.py
+++ b/osmclient/v1/vca.py
@@ -20,33 +20,43 @@ OSM VCA API handling
 
 from osmclient.common.exceptions import ClientException
 
-class Vca(object):
 
-    def __init__(self,http=None):
-        self._http=http
+class Vca(object):
+    def __init__(self, http=None, client=None):
+        self._http = http
+        self._client = client
 
     def list(self):
-        resp = self._http.get_cmd('api/config/config-agent')
-        if resp and 'rw-config-agent:config-agent' in resp:
-            return resp['rw-config-agent:config-agent']['account']
+        resp = self._http.get_cmd(
+            "api/config/{}config-agent".format(self._client.so_rbac_project_path)
+        )
+        if resp and "rw-config-agent:config-agent" in resp:
+            return resp["rw-config-agent:config-agent"]["account"]
         return list()
 
-    def delete(self,name):
-        if 'success' not in self._http.delete_cmd('api/config/config-agent/account/{}'.format(name)):
+    def delete(self, name):
+        if "success" not in self._http.delete_cmd(
+            "api/config/{}config-agent/account/{}".format(
+                self._client.so_rbac_project_path, name
+            )
+        ):
             raise ClientException("failed to delete config agent {}".format(name))
 
-    def create(self,name,account_type,server,user,secret):
-        postdata={}
-        postdata['account'] = list()
-
-        account={}
-        account['name'] = name
-        account['account-type'] = account_type
-        account['juju'] = {}
-        account['juju']['user'] = user 
-        account['juju']['secret'] = secret
-        account['juju']['ip-address'] = server
-        postdata['account'].append(account)
-
-        if 'success' not in self._http.post_cmd('api/config/config-agent',postdata):
+    def create(self, name, account_type, server, user, secret):
+        postdata = {}
+        postdata["account"] = list()
+
+        account = {}
+        account["name"] = name
+        account["account-type"] = account_type
+        account["juju"] = {}
+        account["juju"]["user"] = user
+        account["juju"]["secret"] = secret
+        account["juju"]["ip-address"] = server
+        postdata["account"].append(account)
+
+        if "success" not in self._http.post_cmd(
+            "api/config/{}config-agent".format(self._client.so_rbac_project_path),
+            postdata,
+        ):
             raise ClientException("failed to create config agent {}".format(name))