From: yunlong ying <ying.yunlong@zte.com.cn>
Date: Mon, 22 Apr 2019 11:53:07 +0000 (+0000)
Subject: Merge "move heal test json from code to indepandent file"
X-Git-Tag: 1.3.0~14
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=87b3e72e8d151bdaa9147fd73b919a5b4b06592f;p=vfc%2Fnfvo%2Flcm.git

Merge "move heal test json from code to indepandent file"
---

87b3e72e8d151bdaa9147fd73b919a5b4b06592f
diff --cc lcm/ns/biz/ns_heal.py
index be069cbd,20db7722..096561e0
--- a/lcm/ns/biz/ns_heal.py
+++ b/lcm/ns/biz/ns_heal.py
@@@ -85,27 -83,21 +85,23 @@@ class NSHealService(threading.Thread)
              vnf_heal_params = self.prepare_vnf_heal_params(self.heal_vnf_data)
              status = self.do_vnf_or_ns_heal(vnf_heal_params, 15)
              if status is JOB_MODEL_STATUS.FINISHED:
-                 logger.info('nf[%s] heal handle end' %
-                             vnf_heal_params.get('vnfInstanceId'))
-                 self.update_job(90,
-                                 desc='nf[%s] heal handle end' % vnf_heal_params.get('vnfInstanceId'))
+                 logger.info('nf[%s] heal handle end' % vnf_heal_params.get('vnfInstanceId'))
+                 self.update_job(90, desc='nf[%s] heal handle end' % vnf_heal_params.get('vnfInstanceId'))
              else:
 -                logger.error('nf heal failed')
 -                raise NSLCMException('nf heal failed')
 +                errmsg = 'nf heal failed'
 +                logger.error(errmsg)
 +                raise NSLCMException(errmsg)
          else:
              ns_heal_params = self.prepare_ns_heal_params(self.heal_ns_data)
              for ns_heal_param in ns_heal_params:
                  status = self.do_vnf_or_ns_heal(ns_heal_param, 15)
                  if status is JOB_MODEL_STATUS.FINISHED:
-                     logger.info('nf[%s] heal handle end' %
-                                 ns_heal_param.get('vnfInstanceId'))
-                     self.update_job(90,
-                                     desc='nf[%s] heal handle end' % ns_heal_param.get('vnfInstanceId'))
+                     logger.info('nf[%s] heal handle end' % ns_heal_param.get('vnfInstanceId'))
+                     self.update_job(90, desc='nf[%s] heal handle end' % ns_heal_param.get('vnfInstanceId'))
                  else:
 -                    logger.error('nf heal failed')
 -                    raise NSLCMException('nf heal failed')
 +                    errmsg = 'nf heal failed'
 +                    logger.error(errmsg)
 +                    raise NSLCMException(errmsg)
  
      def do_vnf_or_ns_heal(self, heal_param, progress):
          instance_id = heal_param.get('vnfInstanceId')
@@@ -119,27 -111,21 +115,22 @@@
      def prepare_ns_heal_params(self, ns_data):
          degree_healing = ignore_case_get(ns_data, 'degreeHealing')
          if not degree_healing:
 -            logger.error('degreeHealing does not exist.')
 -            raise NSLCMException('degreeHealing does not exist.')
 +            errmsg = 'degreeHealing does not exist.'
 +            logger.error(errmsg)
 +            raise NSLCMException(errmsg)
          ns_instance_id = self.ns_instance_id
-         cause = ''
-         action = ignore_case_get(ns_data, 'actionsHealing')
+         cause = 'vm is down'
+         # action = ignore_case_get(ns_data, 'actionsHealing')
          if degree_healing == "HEAL_RESTORE":
-             ns_inst_infos = NfInstModel.objects.filter(
-                 ns_inst_id=self.ns_instance_id)
+             ns_inst_infos = NfInstModel.objects.filter(ns_inst_id=self.ns_instance_id)
              if not ns_inst_infos.exists():
-                 raise NSLCMException(
-                     'NSInsts(%s) does not exist' % self.ns_instance_id)
- 
+                 raise NSLCMException('NSInsts(%s) does not exist' % self.ns_instance_id)
              result_arr = []
              for ns_inst_info in ns_inst_infos:
-                 vnfc_insts = VNFCInstModel.objects.filter(
-                     nfinstid=ns_inst_info.nfinstid)
+                 vnfc_insts = VNFCInstModel.objects.filter(nfinstid=ns_inst_info.nfinstid)
                  # If a condition is not met, will it all terminate?
                  if not vnfc_insts.exists():
-                     raise NSLCMException(
-                         'vnfcinsts(%s) does not exist' % ns_inst_info.nfinstid)
+                     raise NSLCMException('vnfcinsts(%s) does not exist' % ns_inst_info.nfinstid)
                  for vnfc_inst in vnfc_insts:
                      vm_id = vnfc_inst.vmid
                      vdu_id = vnfc_inst.vduid