X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osmclient%2Fv1%2Fvca.py;h=d2f17c611eacc401d8875ccc9f190a6b437b43a9;hb=29c6d8d0418e15012524b57a99adfbaeba59a712;hp=b6b47716bf759635a031f5f25b88295c8c04cc57;hpb=4c7e237e45bc6fe209006b4837a8e6b031e78e1c;p=osm%2Fosmclient.git

diff --git a/osmclient/v1/vca.py b/osmclient/v1/vca.py
index b6b4771..d2f17c6 100644
--- a/osmclient/v1/vca.py
+++ b/osmclient/v1/vca.py
@@ -22,37 +22,41 @@ from osmclient.common.exceptions import ClientException
 
 
 class Vca(object):
-
-    def __init__(self, http=None):
+    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))):
-            raise ClientException("failed to delete config agent {}"
-                                  .format(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()
+        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):
-            raise ClientException("failed to create config agent {}"
-                                  .format(name))
+        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))