From 09a84fc058e09ae65067f1a25c2ed5edcf298595 Mon Sep 17 00:00:00 2001 From: Andrey Vertiprahov Date: Mon, 31 May 2021 08:34:52 +0500 Subject: [PATCH] Add labels field to ETL Service Model. --- core/etl/loader/base.py | 2 ++ core/etl/models/service.py | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/core/etl/loader/base.py b/core/etl/loader/base.py index 71e2949906..9dcafe0cc0 100644 --- a/core/etl/loader/base.py +++ b/core/etl/loader/base.py @@ -455,6 +455,8 @@ class BaseLoader(object): self.pending_deletes += [(item.id, item)] def change_workflow(self, o, state: str, changed_date: Optional[datetime.datetime] = None): + if not o: + return state = self.clean_wf_state(o.profile.workflow, state) if state and o.state != state: self.logger.debug("Change workflow state: %s -> %s", o.state, state) diff --git a/core/etl/models/service.py b/core/etl/models/service.py index 05df4664a1..444a8d70b9 100644 --- a/core/etl/models/service.py +++ b/core/etl/models/service.py @@ -6,7 +6,7 @@ # ---------------------------------------------------------------------- # Python modules -from typing import Optional +from typing import Optional, List from datetime import datetime # NOC modules @@ -42,6 +42,7 @@ class Service(BaseModel): cpe_mac: Optional[str] cpe_model: Optional[str] cpe_group: Optional[str] + labels: Optional[List[str]] description: Optional[str] = None class Config: @@ -70,4 +71,5 @@ class Service(BaseModel): "cpe_model", "cpe_group", "description", + "labels", ] -- GitLab