projects
/
osm
/
osmclient.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix bug in vim-create with config
[osm/osmclient.git]
/
osmclient
/
sol005
/
vim.py
diff --git
a/osmclient/sol005/vim.py
b/osmclient/sol005/vim.py
index
9d10302
..
dc107ef
100644
(file)
--- a/
osmclient/sol005/vim.py
+++ b/
osmclient/sol005/vim.py
@@
-31,10
+31,10
@@
class Vim(object):
self._client = client
self._apiName = '/admin'
self._apiVersion = '/v1'
self._client = client
self._apiName = '/admin'
self._apiVersion = '/v1'
- self._apiResource = '/vims'
+ self._apiResource = '/vim
_account
s'
self._apiBase = '{}{}{}'.format(self._apiName,
self._apiVersion, self._apiResource)
self._apiBase = '{}{}{}'.format(self._apiName,
self._apiVersion, self._apiResource)
- def create(self, name, vim_access, sdn_controller
, sdn_port_mapping
):
+ def create(self, name, vim_access, sdn_controller
=None, sdn_port_mapping=None
):
if 'vim-type' not in vim_access:
#'openstack' not in vim_access['vim-type']):
raise Exception("vim type not provided")
if 'vim-type' not in vim_access:
#'openstack' not in vim_access['vim-type']):
raise Exception("vim type not provided")
@@
-43,9
+43,9
@@
class Vim(object):
vim_account['name'] = name
vim_account = self.update_vim_account_dict(vim_account, vim_access)
vim_account['name'] = name
vim_account = self.update_vim_account_dict(vim_account, vim_access)
- vim_config = {}
+ vim_config = {
'hello': 'hello'
}
if 'config' in vim_access and vim_access['config'] is not None:
if 'config' in vim_access and vim_access['config'] is not None:
- vim_config =
json.loads
(vim_access['config'])
+ vim_config =
yaml.safe_load
(vim_access['config'])
if sdn_controller:
sdnc = self._client.sdnc.get(sdn_controller)
vim_config['sdn-controller'] = sdnc['_id']
if sdn_controller:
sdnc = self._client.sdnc.get(sdn_controller)
vim_config['sdn-controller'] = sdnc['_id']
@@
-78,7
+78,7
@@
class Vim(object):
if config=="":
vim_config = None
else:
if config=="":
vim_config = None
else:
- vim_config =
json.loads
(vim_account['config'])
+ vim_config =
yaml.safe_load
(vim_account['config'])
if sdn_controller:
sdnc = self._client.sdnc.get(sdn_controller)
vim_config['sdn-controller'] = sdnc['_id']
if sdn_controller:
sdnc = self._client.sdnc.get(sdn_controller)
vim_config['sdn-controller'] = sdnc['_id']