[client] Migrate vocabulary to be handled like labels

Author: richard-julien

pycti/entities/opencti_vocabulary.py

@@ -87,8 +87,15 @@ def handle_vocab(self, vocab, cache, field):
         return vocab_data
 
     def create(self, **kwargs):
+        stix_id = kwargs.get("stix_id", None)
         name = kwargs.get("name", None)
         category = kwargs.get("category", None)
+        description = kwargs.get("description", None)
+        created = kwargs.get("created", None)
+        modified = kwargs.get("modified", None)
+        aliases = kwargs.get("aliases", None)
+        x_opencti_stix_ids = kwargs.get("x_opencti_stix_ids", None)
+        update = kwargs.get("update", False)
 
         if name is not None and category is not None:
             self.opencti.log(
@@ -109,8 +116,15 @@ def create(self, **kwargs):
                 query,
                 {
                     "input": {
+                        "stix_id": stix_id,
+                        "x_opencti_stix_ids": x_opencti_stix_ids,
                         "name": name,
+                        "description": description,
                         "category": category,
+                        "created": created,
+                        "modified": modified,
+                        "aliases": aliases,
+                        "update": update,
                     }
                 },
             )

pycti/utils/opencti_stix2.py

@@ -694,7 +694,6 @@ def import_object(
             "tool": self.opencti.tool.import_from_stix2,
             "channel": self.opencti.channel.import_from_stix2,
             "narrative": self.opencti.narrative.import_from_stix2,
-            "Vocabulary": self.opencti.vocabulary.import_from_stix2,
             "vulnerability": self.opencti.vulnerability.import_from_stix2,
             "incident": self.opencti.incident.import_from_stix2,
         }
@@ -1764,7 +1763,6 @@ def export_entity(
             "Tool": self.opencti.tool.read,
             "Channel": self.opencti.channel.read,
             "Narrative": self.opencti.narrative.read,
-            "Vocabulary": self.opencti.vocabulary.read,
             "Vulnerability": self.opencti.vulnerability.read,
             "Incident": self.opencti.incident.read,
             "Stix-Cyber-Observable": self.opencti.stix_cyber_observable.read,
@@ -1863,7 +1861,6 @@ def export_list(
             "Tool": self.opencti.tool.list,
             "Channel": self.opencti.channel.list,
             "Narrative": self.opencti.narrative.list,
-            "Vocabulary": self.opencti.vocabulary.list,
             "Vulnerability": self.opencti.vulnerability.list,
             "Incident": self.opencti.incident.list,
             "Stix-Cyber-Observable": self.opencti.stix_cyber_observable.list,
@@ -1965,6 +1962,17 @@ def import_bundle(
                         x_opencti_stix_ids=stix_ids,
                         update=update,
                     )
+                elif item["type"] == "vocabulary":
+                    stix_ids = self.opencti.get_attribute_in_extension("stix_ids", item)
+                    self.opencti.vocabulary.create(
+                        stix_id=item["id"],
+                        name=item["name"],
+                        category=item["category"],
+                        description=item["description"],
+                        aliases=item["aliases"],
+                        x_opencti_stix_ids=stix_ids,
+                        update=update,
+                    )
                 elif item["type"] == "external-reference":
                     stix_ids = self.opencti.get_attribute_in_extension("stix_ids", item)
                     self.opencti.external_reference.create(