Merge pull request #515 from oasis-open/infrastructure-type-ov

Add new infrastructure-type-ov entries
oasis-open · Jul 6, 2021 · bb1155e · bb1155e
2 parents be320ff + 5504001
commit bb1155e
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/stix2/v21/vocab.py b/stix2/v21/vocab.py
@@ -285,12 +285,16 @@
 INFRASTRUCTURE_TYPE_ANONYMIZATION = "anonymization"
 INFRASTRUCTURE_TYPE_BOTNET = "botnet"
 INFRASTRUCTURE_TYPE_COMMAND_AND_CONTROL = "command-and-control"
+INFRASTRUCTURE_TYPE_CONTROL_SYSTEM = "control-system"
 INFRASTRUCTURE_TYPE_EXFILTRATION = "exfiltration"
+INFRASTRUCTURE_TYPE_FIREWALL = "firewall"
 INFRASTRUCTURE_TYPE_HOSTING_MALWARE = "hosting-malware"
 INFRASTRUCTURE_TYPE_HOSTING_TARGET_LISTS = "hosting-target-lists"
 INFRASTRUCTURE_TYPE_PHISHING = "phishing"
 INFRASTRUCTURE_TYPE_RECONNAISSANCE = "reconnaissance"
+INFRASTRUCTURE_TYPE_ROUTERS_SWITCHES = "routers-switches"
 INFRASTRUCTURE_TYPE_STAGING = "staging"
+INFRASTRUCTURE_TYPE_WORKSTATION = "workstation"
 INFRASTRUCTURE_TYPE_UNKNOWN = "unknown"
 
 
@@ -299,12 +303,16 @@
     INFRASTRUCTURE_TYPE_ANONYMIZATION,
     INFRASTRUCTURE_TYPE_BOTNET,
     INFRASTRUCTURE_TYPE_COMMAND_AND_CONTROL,
+    INFRASTRUCTURE_TYPE_CONTROL_SYSTEM,
     INFRASTRUCTURE_TYPE_EXFILTRATION,
+    INFRASTRUCTURE_TYPE_FIREWALL,
     INFRASTRUCTURE_TYPE_HOSTING_MALWARE,
     INFRASTRUCTURE_TYPE_HOSTING_TARGET_LISTS,
     INFRASTRUCTURE_TYPE_PHISHING,
     INFRASTRUCTURE_TYPE_RECONNAISSANCE,
+    INFRASTRUCTURE_TYPE_ROUTERS_SWITCHES,
     INFRASTRUCTURE_TYPE_STAGING,
+    INFRASTRUCTURE_TYPE_WORKSTATION,
     INFRASTRUCTURE_TYPE_UNKNOWN,
 ]