projects
/
osm
/
osmclient.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improved help messages, increased width
[osm/osmclient.git]
/
osmclient
/
sol005
/
client.py
diff --git
a/osmclient/sol005/client.py
b/osmclient/sol005/client.py
index
cec7436
..
513e947
100644
(file)
--- a/
osmclient/sol005/client.py
+++ b/
osmclient/sol005/client.py
@@
-21,30
+21,37
@@
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 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__(
self,
host=None,
so_port=9999,
class Client(object):
def __init__(
self,
host=None,
so_port=9999,
-
so_project
='admin',
-
ro_host=None
,
-
ro_port=9090
,
+
user
='admin',
+
password='admin'
,
+
project='admin'
,
**kwargs):
**kwargs):
- self._user = 'admin'
- self._password = 'admin'
- #self._project = so_project
- self._project = 'admin'
+ self._user = user
+ self._password = password
+ self._project = project
self._auth_endpoint = '/admin/v1/tokens'
self._headers = {}
self._auth_endpoint = '/admin/v1/tokens'
self._headers = {}
@@
-56,19
+63,12
@@
class Client(object):
self._host = host
self._so_port = so_port
self._host = host
self._so_port = so_port
- if ro_host is None:
- ro_host = host
- ro_http_client = http.Http('http://{}:{}/openmano'.format(ro_host, ro_port))
- ro_http_client.set_http_header(
- ['Accept: application/json',
- 'Content-Type: application/json'])
-
self._http_client = http.Http(
'https://{}:{}/osm'.format(self._host,self._so_port))
self._headers['Accept'] = 'application/json'
self._headers['Content-Type'] = 'application/yaml'
self._http_client = http.Http(
'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 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()
@@
-81,11
+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.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)
@@
-94,9
+101,9
@@
class Client(object):
def get_token(self):
postfields_dict = {'username': self._user,
'password': self._password,
def get_token(self):
postfields_dict = {'username': self._user,
'password': self._password,
- 'project
-
id': self._project}
+ 'project
_
id': self._project}
http_code, resp = self._http_client.post_cmd(endpoint=self._auth_endpoint,
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