From: Denes Nemeth <denes.nemeth@nokia.com>
Date: Mon, 4 Dec 2017 12:29:39 +0000 (+0100)
Subject: Fix affected virtual link in LCNs
X-Git-Tag: v1.1.0~259
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=d2262c1bc884321e38427d9c415f90760bed42d9;p=vfc%2Fnfvo%2Flcm.git

Fix affected virtual link in LCNs

Change-Id: I185c8ab923ed2c1e0c5729a9edb16fa5ed36064c
Issue-ID: VFC-612
Signed-off-by: Denes Nemeth <denes.nemeth@nokia.com>
---

diff --git a/lcm/ns/vnfs/notify_lcm.py b/lcm/ns/vnfs/notify_lcm.py
index ee4c5ee2..49a4e72b 100644
--- a/lcm/ns/vnfs/notify_lcm.py
+++ b/lcm/ns/vnfs/notify_lcm.py
@@ -110,17 +110,16 @@ class NotifyLcm(object):
             if resourceType != 'network':
                 self.exception('affectedVl struct error: resourceType not euqal network')
 
-            ownerId = self.vnf_instid
-            ownerId = self.get_vnfinstid(self.vnf_instid, self.vnfmid)
+            ownerId = self.get_vnfinstid(self.m_vnfInstanceId, self.vnfmid)
 
             if changeType == 'added':
-                VLInstModel(vlInstanceId=vlInstanceId, vldId=vldid, ownerType=0, ownerId=ownerId,
-                            relatedNetworkId=resourceId, vlType=0).save()
+                VLInstModel(vlinstanceid=vlInstanceId, vldid=vldid, ownertype=0, ownerid=ownerId,
+                            relatednetworkid=resourceId, vltype=0).save()
             elif changeType == 'removed':
-                VLInstModel.objects.filter(vlInstanceId=vlInstanceId).delete()
+                VLInstModel.objects.filter(vlinstanceid=vlInstanceId).delete()
             elif changeType == 'modified':
-                VLInstModel.objects.filter(vlInstanceId=vlInstanceId)\
-                    .update(vldId=vldid, ownerType=0, ownerId=ownerId, relatedNetworkId=resourceId, vlType=0)
+                VLInstModel.objects.filter(vlinstanceid=vlInstanceId)\
+                    .update(vldid=vldid, ownertype=0, ownerid=ownerId, relatednetworkid=resourceId, vltype=0)
             else:
                 self.exception('affectedVl struct error: changeType not in {added,removed,modified}')
 
@@ -186,8 +185,7 @@ class NotifyLcm(object):
                     logger.error('affectedVl struct error: resourceType not euqal network')
                     raise NSLCMException("affectedVl struct error: resourceType not euqal network")
 
-                # ownerId = self.vnf_instid
-                ownerId = self.get_vnfinstid(self.vnf_instid, self.vnfmid)
+                ownerId = self.get_vnfinstid(self.m_vnfInstanceId, self.vnfmid)
 
                 if changeType in ['added', 'modified']:
                     self.create_network_and_subnet_in_aai(vlInstanceId, ownerId)