projects
/
osm
/
osmclient.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/master' into paas
[osm/osmclient.git]
/
osmclient
/
sol005
/
vim.py
diff --git
a/osmclient/sol005/vim.py
b/osmclient/sol005/vim.py
index
89c2db4
..
4962a91
100644
(file)
--- a/
osmclient/sol005/vim.py
+++ b/
osmclient/sol005/vim.py
@@
-70,7
+70,13
@@
class Vim(object):
return ""
def create(
return ""
def create(
- self, name, vim_access, config={}, sdn_controller=None, sdn_port_mapping=None, wait=False
+ self,
+ name,
+ vim_access,
+ config={},
+ sdn_controller=None,
+ sdn_port_mapping=None,
+ wait=False,
):
vca_id = None
):
vca_id = None
@@
-127,7
+133,13
@@
class Vim(object):
# raise ClientException("failed to create vim {} - {}".format(name, msg))
def update(
# raise ClientException("failed to create vim {} - {}".format(name, msg))
def update(
- self, vim_name, vim_account, config, sdn_controller, sdn_port_mapping, wait=False
+ self,
+ vim_name,
+ vim_account,
+ config,
+ sdn_controller,
+ sdn_port_mapping,
+ wait=False,
):
self._logger.debug("")
self._client.get_token()
):
self._logger.debug("")
self._client.get_token()
@@
-185,6
+197,8
@@
class Vim(object):
vim_account["vim_user"] = vim_access["vim-username"] or "null"
vim_account["vim_password"] = vim_access["vim-password"] or "null"
vim_account["vim_tenant_name"] = vim_access["vim-tenant-name"] or "null"
vim_account["vim_user"] = vim_access["vim-username"] or "null"
vim_account["vim_password"] = vim_access["vim-password"] or "null"
vim_account["vim_tenant_name"] = vim_access["vim-tenant-name"] or "null"
+ if "prometheus-config" in vim_access:
+ vim_account["prometheus-config"] = vim_access["prometheus-config"]
return vim_account
def get_id(self, name):
return vim_account
def get_id(self, name):