fix bugs 747 757: fix user-update interface

[osm/osmclient.git] / osmclient / sol005 / client.py

diff --git a/osmclient/sol005/client.py b/osmclient/sol005/client.py
index 5de4ff0..513e947 100644 (file)
--- a/osmclient/sol005/client.py
+++ b/osmclient/sol005/client.py
@@ -21,17 +21,23 @@ OSM SOL005 client API
 #from osmclient.v1 import vca
 from osmclient.sol005 import vnfd
 from osmclient.sol005 import nsd
 #from osmclient.v1 import vca
 from osmclient.sol005 import vnfd
 from osmclient.sol005 import nsd

+from osmclient.sol005 import nst
+from osmclient.sol005 import nsi

 from osmclient.sol005 import ns
 from osmclient.sol005 import vnf
 from osmclient.sol005 import vim
 from osmclient.sol005 import ns
 from osmclient.sol005 import vnf
 from osmclient.sol005 import vim

+from osmclient.sol005 import wim

 from osmclient.sol005 import package
 from osmclient.sol005 import http
 from osmclient.sol005 import sdncontroller
 from osmclient.sol005 import project as projectmodule
 from osmclient.sol005 import user as usermodule
 from osmclient.sol005 import package
 from osmclient.sol005 import http
 from osmclient.sol005 import sdncontroller
 from osmclient.sol005 import project as projectmodule
 from osmclient.sol005 import user as usermodule

+from osmclient.sol005 import role
+from osmclient.sol005 import pdud

 from osmclient.common.exceptions import ClientException
 import json
 
 from osmclient.common.exceptions import ClientException
 import json
 

+

 class Client(object):
 
     def __init__(
 class Client(object):
 
     def __init__(


@@ -61,8 +67,8 @@ class Client(object):
             'https://{}:{}/osm'.format(self._host,self._so_port))
         self._headers['Accept'] = 'application/json'
         self._headers['Content-Type'] = 'application/yaml'
             'https://{}:{}/osm'.format(self._host,self._so_port))
         self._headers['Accept'] = 'application/json'
         self._headers['Content-Type'] = 'application/yaml'

-        http_header = ['{}: {}'.format(key,val)
-                      for (key,val) in list(self._headers.items())]
+        http_header = ['{}: {}'.format(key, val)
+                       for (key, val) in list(self._headers.items())]

         self._http_client.set_http_header(http_header)
 
         token = self.get_token()
         self._http_client.set_http_header(http_header)
 
         token = self.get_token()


@@ -75,13 +81,18 @@ class Client(object):
 
         self.vnfd = vnfd.Vnfd(self._http_client, client=self)
         self.nsd = nsd.Nsd(self._http_client, client=self)
 
         self.vnfd = vnfd.Vnfd(self._http_client, client=self)
         self.nsd = nsd.Nsd(self._http_client, client=self)

+        self.nst = nst.Nst(self._http_client, client=self)

         self.package = package.Package(self._http_client, client=self)
         self.ns = ns.Ns(self._http_client, client=self)
         self.package = package.Package(self._http_client, client=self)
         self.ns = ns.Ns(self._http_client, client=self)

+        self.nsi = nsi.Nsi(self._http_client, client=self)

         self.vim = vim.Vim(self._http_client, client=self)
         self.vim = vim.Vim(self._http_client, client=self)

+        self.wim = wim.Wim(self._http_client, client=self)

         self.sdnc = sdncontroller.SdnController(self._http_client, client=self)
         self.vnf = vnf.Vnf(self._http_client, client=self)
         self.project = projectmodule.Project(self._http_client, client=self)
         self.user = usermodule.User(self._http_client, client=self)
         self.sdnc = sdncontroller.SdnController(self._http_client, client=self)
         self.vnf = vnf.Vnf(self._http_client, client=self)
         self.project = projectmodule.Project(self._http_client, client=self)
         self.user = usermodule.User(self._http_client, client=self)

+        self.role = role.Role(self._http_client, client=self)
+        self.pdu = pdud.Pdu(self._http_client, client=self)

         '''
         self.vca = vca.Vca(http_client, client=self, **kwargs)
         self.utils = utils.Utils(http_client, **kwargs)
         '''
         self.vca = vca.Vca(http_client, client=self, **kwargs)
         self.utils = utils.Utils(http_client, **kwargs)


@@ -92,7 +103,7 @@ class Client(object):
                            'password': self._password,
                            'project_id': self._project}
         http_code, resp = self._http_client.post_cmd(endpoint=self._auth_endpoint,
                            'password': self._password,
                            'project_id': self._project}
         http_code, resp = self._http_client.post_cmd(endpoint=self._auth_endpoint,

-                              postfields_dict=postfields_dict)
+                                                     postfields_dict=postfields_dict)

         if http_code not in (200, 201, 202, 204):
             raise ClientException(resp)
         token = json.loads(resp) if resp else None
         if http_code not in (200, 201, 202, 204):
             raise ClientException(resp)
         token = json.loads(resp) if resp else None