Modify the code of scaling

[vfc/nfvo/lcm.git] / lcm / ns / vnfs / notify_lcm.py

diff --git a/lcm/ns/vnfs/notify_lcm.py b/lcm/ns/vnfs/notify_lcm.py
index 9ebd89e..362e347 100644 (file)
--- a/lcm/ns/vnfs/notify_lcm.py
+++ b/lcm/ns/vnfs/notify_lcm.py
@@ -62,11 +62,12 @@ class NotifyLcm(object):
             self.exception('unexpected exception')
 
     def get_vnfinstid(self, mnfinstid, vnfm_inst_id):
+        logger.debug("vnfinstid in vnfm is:%s,vnfmid is:%s", mnfinstid, vnfm_inst_id)
+        logger.debug("mnfinstid=%s, vnfm_inst_id=%s", mnfinstid, vnfm_inst_id)
         nfinst = NfInstModel.objects.filter(mnfinstid=mnfinstid, vnfm_inst_id=vnfm_inst_id).first()
         if nfinst:
             return nfinst.nfinstid
-        else:
-            self.exception('vnfinstid not exist')
+        raise NSLCMException("vnfinstid not exist")
 
     def exception(self, error_msg):
         logger.error('Notify Lcm failed, detail message: %s' % error_msg)
@@ -106,6 +107,7 @@ class NotifyLcm(object):
             networkResource = ignore_case_get(vl, 'networkResource')
             resourceType = ignore_case_get(networkResource, 'resourceType')
             resourceId = ignore_case_get(networkResource, 'resourceId')
+            resourceName = ignore_case_get(networkResource, 'resourceName')
 
             if resourceType != 'network':
                 self.exception('affectedVl struct error: resourceType not euqal network')
@@ -113,13 +115,14 @@ class NotifyLcm(object):
             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, vlinstancename=resourceName, ownertype=0,
+                            ownerid=ownerId, relatednetworkid=resourceId, vltype=0).save()
             elif changeType == 'removed':
                 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)
+                    .update(vldid=vldid, vlinstancename=resourceName, ownertype=0, ownerid=ownerId,
+                            relatednetworkid=resourceId, vltype=0)
             else:
                 self.exception('affectedVl struct error: changeType not in {added,removed,modified}')