summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFu Jinhua <fu.jinhua@zte.com.cn>2017-12-15 04:06:01 +0000
committerGerrit Code Review <gerrit@onap.org>2017-12-15 04:06:01 +0000
commit0aa2fb9fb5053485b1a49f2e25de00740b0bd12c (patch)
tree3f769c4f21a5437c44b797ac75dcb20e88c95e06
parentca765f92fea3d438ca39f33756551ea3a478bbcd (diff)
parent69b84016dac990332112996b3bb5b8ec2879685e (diff)
Merge "Fix vfc-ztevnfmdirver affectedvl data"
-rw-r--r--zte/vmanager/driver/interfaces/views.py16
1 files changed, 10 insertions, 6 deletions
diff --git a/zte/vmanager/driver/interfaces/views.py b/zte/vmanager/driver/interfaces/views.py
index 27983334..27b57c7a 100644
--- a/zte/vmanager/driver/interfaces/views.py
+++ b/zte/vmanager/driver/interfaces/views.py
@@ -353,18 +353,22 @@ def notify(request, *args, **kwargs):
"vnfcInstanceId": ignorcase_get(affectedvnfc, "vnfcInstanceId"),
"vduId": ignorcase_get(affectedvnfc, "vduId"),
"changeType": ignorcase_get(affectedvnfc, "changeType"),
- "vimid": ignorcase_get(ignorcase_get(affectedvnfc, "computeResource"), "vimId"),
+ "vimId": ignorcase_get(ignorcase_get(affectedvnfc, "computeResource"), "vimId"),
"vmId": ignorcase_get(ignorcase_get(affectedvnfc, "computeResource"), "resourceId"),
"vmName": ignorcase_get(ignorcase_get(affectedvnfc, "computeResource"), "resourceName")
})
for affectedvl in affectedvls:
data["affectedVl"].append({
- "vlInstanceId": ignorcase_get(affectedvl, "virtuallinkinstanceid"),
- "vimid": ignorcase_get(ignorcase_get(affectedvl, "networkresource"), "vimid"),
- "vldid": ignorcase_get(affectedvl, "virtuallinkdescid"),
- "vllid": ignorcase_get(ignorcase_get(affectedvl, "networkresource"), "resourceid"),
- "vlName": ignorcase_get(ignorcase_get(affectedvl, "networkresource"), "resourcename")
+ "vlInstanceId": ignorcase_get(affectedvl, "virtualLinkInstanceId"),
+ "changeType": ignorcase_get(affectedvl, "changeType"),
+ "vimId": ignorcase_get(ignorcase_get(affectedvl, "networkResource"), "vimId"),
+ "vldId": ignorcase_get(affectedvl, "virtuallinkdescid"),
+ "networkResource": {
+ "resourceType": "network",
+ "resourceId": ignorcase_get(ignorcase_get(affectedvl, "networkresource"), "resourceid"),
+ "resourceName": ignorcase_get(ignorcase_get(affectedvl, "networkresource"), "resourcename")
+ }
})
for affectedcp in affectedcps: