summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lcm/pub/msapi/extsys.py5
-rw-r--r--lcm/swagger/vfc.vnfdriver.swagger.json28
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"
}
}
}