X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=NG-RO%2Fosm_ng_ro%2Fns_thread.py;h=de16dc95757f862f6c9b5ba23610fc74522e2774;hb=01619d5b596e01ac8cd6d27bf01a1174e6b3f97b;hp=50843206ec6f09e77a64e898efa72a008d3f6786;hpb=6986244790d12f4ce734fd5cd2599e84b29c3f84;p=osm%2FRO.git diff --git a/NG-RO/osm_ng_ro/ns_thread.py b/NG-RO/osm_ng_ro/ns_thread.py index 50843206..de16dc95 100644 --- a/NG-RO/osm_ng_ro/ns_thread.py +++ b/NG-RO/osm_ng_ro/ns_thread.py @@ -1942,128 +1942,6 @@ class NsWorker(threading.Thread): return None - def _get_db_all_tasks(self): - """ - Read all content of table ro_tasks to log it - :return: None - """ - try: - # Checking the content of the BD: - - # read and return - ro_task = self.db.get_list("ro_tasks") - for rt in ro_task: - self._log_ro_task(rt, None, None, "TASK_WF", "GET_ALL_TASKS") - return ro_task - - except DbException as e: - self.logger.error("Database exception at _get_db_all_tasks: {}".format(e)) - except Exception as e: - self.logger.critical( - "Unexpected exception at _get_db_all_tasks: {}".format(e), exc_info=True - ) - - return None - - def _log_ro_task(self, ro_task, db_ro_task_update, db_ro_task_delete, mark, event): - """ - Generate a log with the following format: - - Mark;Event;ro_task_id;locked_at;modified_at;created_at;to_check_at;locked_by; - target_id;vim_info.refresh_at;vim_info;no_of_tasks;task_status;action_id; - task_array_index;task_id;task_action;task_item;task_args - - Example: - - TASK_WF;GET_TASK;888f1864-749a-4fc2-bc1a-97c0fffd6a6f:2;1642158724.8210013; - 1642158640.7986135;1642158640.7986135;1642158640.7986135;b134c9494e75:0a - ;vim:b7ff9e24-8868-4d68-8a57-a59dc11d0327;None;{'created': False, - 'created_items': None, 'vim_id': None, 'vim_name': None, 'vim_status': None, - 'vim_details': None, 'vim_message': None, 'refresh_at': None};1;SCHEDULED; - 888f1864-749a-4fc2-bc1a-97c0fffd6a6f;0;888f1864-749a-4fc2-bc1a-97c0fffd6a6f:2; - CREATE;image;{'filter_dict': {'name': 'ubuntu-os-cloud:image-family:ubuntu-1804-lts'}} - """ - try: - line = [] - i = 0 - if ro_task is not None and isinstance(ro_task, dict): - for t in ro_task["tasks"]: - line.clear() - line.append(mark) - line.append(event) - line.append(ro_task.get("_id", "")) - line.append(str(ro_task.get("locked_at", ""))) - line.append(str(ro_task.get("modified_at", ""))) - line.append(str(ro_task.get("created_at", ""))) - line.append(str(ro_task.get("to_check_at", ""))) - line.append(str(ro_task.get("locked_by", ""))) - line.append(str(ro_task.get("target_id", ""))) - line.append(str(ro_task.get("vim_info", {}).get("refresh_at", ""))) - line.append(str(ro_task.get("vim_info", ""))) - line.append(str(ro_task.get("tasks", ""))) - if isinstance(t, dict): - line.append(str(t.get("status", ""))) - line.append(str(t.get("action_id", ""))) - line.append(str(i)) - line.append(str(t.get("task_id", ""))) - line.append(str(t.get("action", ""))) - line.append(str(t.get("item", ""))) - line.append(str(t.get("find_params", ""))) - line.append(str(t.get("params", ""))) - else: - line.extend([""] * 2) - line.append(str(i)) - line.extend([""] * 5) - - i += 1 - self.logger.debug(";".join(line)) - elif db_ro_task_update is not None and isinstance(db_ro_task_update, dict): - i = 0 - while True: - st = "tasks.{}.status".format(i) - if st not in db_ro_task_update: - break - line.clear() - line.append(mark) - line.append(event) - line.append(db_ro_task_update.get("_id", "")) - line.append(str(db_ro_task_update.get("locked_at", ""))) - line.append(str(db_ro_task_update.get("modified_at", ""))) - line.append("") - line.append(str(db_ro_task_update.get("to_check_at", ""))) - line.append(str(db_ro_task_update.get("locked_by", ""))) - line.append("") - line.append(str(db_ro_task_update.get("vim_info.refresh_at", ""))) - line.append("") - line.append(str(db_ro_task_update.get("vim_info", ""))) - line.append(str(str(db_ro_task_update).count(".status"))) - line.append(db_ro_task_update.get(st, "")) - line.append("") - line.append(str(i)) - line.extend([""] * 3) - i += 1 - self.logger.debug(";".join(line)) - - elif db_ro_task_delete is not None and isinstance(db_ro_task_delete, dict): - line.clear() - line.append(mark) - line.append(event) - line.append(db_ro_task_delete.get("_id", "")) - line.append("") - line.append(db_ro_task_delete.get("modified_at", "")) - line.extend([""] * 13) - self.logger.debug(";".join(line)) - - else: - line.clear() - line.append(mark) - line.append(event) - line.extend([""] * 16) - self.logger.debug(";".join(line)) - - except Exception as e: - self.logger.error("Error logging ro_task: {}".format(e)) - def _delete_task(self, ro_task, task_index, task_depends, db_update): """ Determine if this task need to be done or superseded @@ -2211,18 +2089,15 @@ class NsWorker(threading.Thread): return ro_task_dependency, task_index raise NsWorkerException("Cannot get depending task {}".format(task_id)) - def update_vm_refresh(self): + def update_vm_refresh(self, ro_task): """Enables the VM status updates if self.refresh_config.active parameter - is not -1 and than updates the DB accordingly + is not -1 and then updates the DB accordingly """ try: self.logger.debug("Checking if VM status update config") next_refresh = time.time() - if self.refresh_config.active == -1: - next_refresh = -1 - else: - next_refresh += self.refresh_config.active + next_refresh = self._get_next_refresh(ro_task, next_refresh) if next_refresh != -1: db_ro_task_update = {} @@ -2257,6 +2132,23 @@ class NsWorker(threading.Thread): except Exception as e: self.logger.error(f"Error updating tasks to enable VM status updates: {e}") + def _get_next_refresh(self, ro_task: dict, next_refresh: float): + """Decide the next_refresh according to vim type and refresh config period. + Args: + ro_task (dict): ro_task details + next_refresh (float): next refresh time as epoch format + + Returns: + next_refresh (float) -1 if vm updates are disabled or vim type is openstack. + """ + target_vim = ro_task["target_id"] + vim_type = self.db_vims[target_vim]["vim_type"] + if self.refresh_config.active == -1 or vim_type == "openstack": + next_refresh = -1 + else: + next_refresh += self.refresh_config.active + return next_refresh + def _process_pending_tasks(self, ro_task): ro_task_id = ro_task["_id"] now = time.time() @@ -2278,10 +2170,7 @@ class NsWorker(threading.Thread): elif new_status == "BUILD": next_refresh += self.refresh_config.build elif new_status == "DONE": - if self.refresh_config.active == -1: - next_refresh = -1 - else: - next_refresh += self.refresh_config.active + next_refresh = self._get_next_refresh(ro_task, next_refresh) else: next_refresh += self.refresh_config.error @@ -2296,7 +2185,7 @@ class NsWorker(threading.Thread): self._log_ro_task(ro_task, None, None, "TASK_WF", "GET_TASK") """ # Check if vim status refresh is enabled again - self.update_vm_refresh() + self.update_vm_refresh(ro_task) # 0: get task_status_create lock_object = None task_status_create = None