from lcm.pub.utils.values import ignore_case_get
from lcm.pub.utils import restcall
from lcm.pub.exceptions import NSLCMException
+from lcm.ns.biz.ns_lcm_op_occ import NsLcmOpOcc
logger = logging.getLogger(__name__)
"""
format of input_data
{
- "jobId": uuid of job,
+ "jobId": uuid of job,
"nsInstanceId": id of ns instance,
"object_context": json format of nsd,
"object_additionalParamForNs": json format of additional parameters for ns,
"object_additionalParamForVnf": json format of additional parameters for vnf,
"vlCount": int type of VL count,
"vnfCount: int type of VNF count,
- "sfcCount": int type of SFC count,
+ "sfcCount": int type of SFC count,
"sdnControllerId": uuid of SDN controller
}
"""
-def run_ns_instantiate(input_data):
+def run_ns_instantiate(input_data, occ_id):
logger.debug("Enter %s, input_data is %s", fun_name(), input_data)
ns_instantiate_ok = False
job_id = ignore_case_get(input_data, "jobId")
nsd_json = ignore_case_get(input_data, "object_context")
ns_param_json = ignore_case_get(input_data, "object_additionalParamForNs")
vnf_param_json = ignore_case_get(input_data, "object_additionalParamForVnf")
- vl_count = ignore_case_get(input_data, "vlCount")
- vnf_count = ignore_case_get(input_data, "vnfCount")
- sfc_count = ignore_case_get(input_data, "sfcCount")
+ pnf_param_json = ignore_case_get(input_data, "object_additionalParamForPnf")
+ vl_count = int(ignore_case_get(input_data, "vlCount", 0))
+ vnf_count = int(ignore_case_get(input_data, "vnfCount", 0))
+ sfc_count = int(ignore_case_get(input_data, "sfcCount", 0))
sdnc_id = ignore_case_get(input_data, "sdnControllerId")
g_jobs_status[job_id] = [1 for i in range(vnf_count)]
try:
- update_job(job_id, 10, "0", "Start to create VL")
+ update_job(job_id, 10, "true", "Start to create VL")
for i in range(vl_count):
create_vl(ns_inst_id, i + 1, nsd_json, ns_param_json)
- update_job(job_id, 30, "0", "Start to create VNF")
- jobs = [create_vnf(ns_inst_id, i + 1, vnf_param_json) for i in range(vnf_count)]
+ update_job(job_id, 30, "true", "Start to create VNF")
+ jobs = [create_vnf(ns_inst_id, i + 1, vnf_param_json) for i in range(vnf_count)]
wait_until_jobs_done(job_id, jobs)
[confirm_vnf_status(inst_id) for inst_id, _, _ in jobs]
- update_job(job_id, 70, "0", "Start to create SFC")
+ update_job(job_id, 50, "true", "Start to create PNF")
+ create_pnf(pnf_param_json)
+
+ update_job(job_id, 70, "true", "Start to create SFC")
g_jobs_status[job_id] = [1 for i in range(sfc_count)]
- jobs = [create_sfc(ns_inst_id, i + 1, nsd_json, sdnc_id) for i in range(sfc_count)]
+ jobs = [create_sfc(ns_inst_id, i + 1, nsd_json, sdnc_id) for i in range(sfc_count)]
wait_until_jobs_done(job_id, jobs)
[confirm_sfc_status(inst_id) for inst_id, _, _ in jobs]
- update_job(job_id, 90, "0", "Start to post deal")
+ update_job(job_id, 90, "true", "Start to post deal")
post_deal(ns_inst_id, "true")
- update_job(job_id, 100, "0", "Create NS successfully.")
+ update_job(job_id, 100, "true", "Create NS successfully.")
+ NsLcmOpOcc.update(occ_id, "COMPLETED")
ns_instantiate_ok = True
except NSLCMException as e:
- logger.error("Failded to Create NS: %s", e.message)
+ logger.error("Failded to Create NS: %s", e.args[0])
update_job(job_id, JOB_ERROR, "255", "Failded to Create NS.")
+ NsLcmOpOcc.update(occ_id, operationState="FAILED", error=e.args[0])
post_deal(ns_inst_id, "false")
- except:
+ except Exception as e:
logger.error(traceback.format_exc())
update_job(job_id, JOB_ERROR, "255", "Failded to Create NS.")
+ NsLcmOpOcc.update(occ_id, operationState="FAILED", error=e.args[0])
post_deal(ns_inst_id, "false")
finally:
g_jobs_status.pop(job_id)
data = json.JSONEncoder().encode({
"nsInstanceId": ns_inst_id,
"vnfIndex": vnf_index,
- "additionalParamForVnf": nf_param
+ "additionalParamForVnf": json.JSONDecoder().decode(nf_param)
})
ret = restcall.req_by_msb(uri, "POST", data)
def post_deal(ns_inst_id, status):
- uri = "api/nslcm/v1/ns/{nsInstanceId}/postdeal".format(nsInstanceId=ns_inst_id)
+ uri = "api/nslcm/v1/ns/{nsInstanceId}/postdeal".format(nsInstanceId=ns_inst_id)
data = json.JSONEncoder().encode({
"status": status
})
"errcode": errcode,
"desc": desc
})
- restcall.req_by_msb(uri, "POST", data)
+ restcall.req_by_msb(uri, "POST", data)
class JobWaitThread(Thread):
"""
- Job Wait
+ Job Wait
"""
+
def __init__(self, inst_id, job_id, ns_job_id, index):
Thread.__init__(self)
self.inst_id = inst_id
self.job_id = job_id
self.ns_job_id = ns_job_id
self.index = index
- self.retry_count = 60
+ self.retry_count = 600
self.interval_second = 3
def run(self):
continue
job_result = json.JSONDecoder().decode(ret[1])
if "responseDescriptor" not in job_result:
- logger.error("Job(%s) does not exist.", self.job_id)
+ logger.debug("No new progress after response_id(%s) in job(%s)", response_id, self.job_id)
continue
progress = job_result["responseDescriptor"]["progress"]
new_response_id = job_result["responseDescriptor"]["responseId"]
sfc_status = ret[1]["sfcStatus"]
if sfc_status != "active":
raise NSLCMException("Status of SFC(%s) is not active" % sfc_inst_id)
+
+
+def create_pnf(pnf_param_json):
+ if pnf_param_json and len(pnf_param_json) > 0:
+ pnfs = json.JSONDecoder().decode(pnf_param_json)
+ for pnf in list(pnfs.values()):
+ uri = "/api/nslcm/v1/pnfs"
+ method = "POST"
+ content = json.JSONEncoder().encode(pnf["input"]["content"])
+ ret = restcall.req_by_msb(uri, method, content)
+ if ret[0] != 0:
+ logger.error("Failed to call create_pnf(%s) result %s", content, ret)
+ raise NSLCMException("Failed to call create_pnf(%s)" % content)
Code Review / vfc / nfvo / lcm.git / blobdiff