From: ying.yunlong <ying.yunlong@zte.com.cn>
Date: Fri, 15 Dec 2017 01:53:33 +0000 (+0800)
Subject: Fix vfc-ztevnfmdirver affectedvl data
X-Git-Tag: v1.1.0~163^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F45%2F26345%2F2;p=vfc%2Fnfvo%2Fdriver%2Fvnfm%2Fsvnfm.git

Fix vfc-ztevnfmdirver affectedvl data

Change-Id: I3a9bdf9b3e1110f2228df6d05895364841c3a90b
Issue-ID: VFC-620
Signed-off-by: ying.yunlong <ying.yunlong@zte.com.cn>
---

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: