diff options
| author |   maopeng zhang <zhang.maopeng1@zte.com.cn> | 2017-11-01 06:35:45 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-11-01 06:35:45 +0000 |
| commit | 577d3031df469722d2eec03e87842bc19dd082cc (patch) | |
| tree | d1f041415fe71e16f2c7515afb1ea6a0e0ef12c0 | |
| parent | ae66504e56e6fab3f689bc48a9c1f626769a99f1 (diff) | |
| parent | 30f7552182e54060eed1f7807e0702d7e21dc14a (diff) | |
Merge "modify VIM INFO"
| -rw-r--r-- | lcm/pub/msapi/extsys.py | 5 | ||||
| -rw-r--r-- | lcm/swagger/vfc.vnfdriver.swagger.json | 28 |
2 files changed, 24 insertions, 9 deletions
diff --git a/lcm/pub/msapi/extsys.py b/lcm/pub/msapi/extsys.py index 1baed838..51673d31 100644 --- a/lcm/pub/msapi/extsys.py +++ b/lcm/pub/msapi/extsys.py @@ -74,7 +74,10 @@ def convert_vim_info(vim_info_aai): "description": "vim", "domain": "", "type": ignore_case_get(esr_system_info[0], "type"), - "createTime": "2016-07-18 12:22:53" + "createTime": "2016-07-18 12:22:53", + "sslCacert": ignore_case_get(esr_system_info[0], "ssl-cacert"), + "sslInsecure": ignore_case_get(esr_system_info[0], "ssl-insecure"), + "status": ignore_case_get(esr_system_info[0], "system-status") } return vim_info diff --git a/lcm/swagger/vfc.vnfdriver.swagger.json b/lcm/swagger/vfc.vnfdriver.swagger.json index bf529995..068ecc90 100644 --- a/lcm/swagger/vfc.vnfdriver.swagger.json +++ b/lcm/swagger/vfc.vnfdriver.swagger.json @@ -1283,23 +1283,23 @@ }, "name": { "type": "string", - "description": "vnfm name" + "description": "vim name" }, "type": { "type": "string", - "description": "vnfm type" + "description": "vim type" }, "url": { "type": "string", - "description": "vnfm url" + "description": "vim url" }, "userName": { "type": "string", - "description": "vnfm login username" + "description": "vim login username" }, "password": { "type": "string", - "description": "vnfm login password" + "description": "vim login password" }, "vendor": { "type": "string", @@ -1307,15 +1307,27 @@ }, "version": { "type": "string", - "description": "vnfm version" + "description": "vim version" }, "description": { "type": "string", - "description": "vnfm description" + "description": "vim description" }, "createTime": { "type": "string", - "description": "vnfm info createTime" + "description": "vim info createTime" + }, + "sslCacert": { + "type": "string", + "description": "CA file content if enabled ssl on auth-url" + }, + "sslInsecure": { + "type": "string", + "description": "Whether to verify VIM's certificate" + }, + "status": { + "type": "string", + "description": "The status of external system" } } } |