GH-188: WIP: Converting all IDs to be valid UUID v4.

oasis-open · Jun 27, 2018 · 845625c · 845625c
1 parent b2c6acf
commit 845625c
Show file tree

Hide file tree

Showing 26 changed files with 194 additions and 170 deletions.
diff --git a/docs/guide/custom.ipynb b/docs/guide/custom.ipynb
@@ -415,7 +415,7 @@
     "\n",
     "input_string = \"\"\"{\n",
     "    \"type\": \"identity\",\n",
-    "    \"id\": \"identity--311b2d2d-f010-5473-83ec-1edf84858f4c\",\n",
+    "    \"id\": \"identity--311b2d2d-f010-4473-83ec-1edf84858f4c\",\n",
     "    \"created\": \"2015-12-21T19:59:11Z\",\n",
     "    \"modified\": \"2015-12-21T19:59:11Z\",\n",
     "    \"name\": \"John Smith\",\n",

diff --git a/docs/guide/environment.ipynb b/docs/guide/environment.ipynb
@@ -112,7 +112,7 @@
    "source": [
     "from stix2 import Indicator\n",
     "\n",
-    "indicator = Indicator(id=\"indicator--01234567-89ab-cdef-0123-456789abcdef\",\n",
+    "indicator = Indicator(id=\"indicator--a740531e-63ff-4e49-a9e1-a0a3eed0e3e7\",\n",
     "                      labels=[\"malicious-activity\"],\n",
     "                      pattern=\"[file:hashes.md5 = 'd41d8cd98f00b204e9800998ecf8427e']\")\n",
     "env.add(indicator)"
@@ -203,7 +203,7 @@
        ".highlight .vm { color: #19177C } /* Name.Variable.Magic */\n",
        ".highlight .il { color: #666666 } /* Literal.Number.Integer.Long */</style><div class=\"highlight\"><pre><span></span><span class=\"p\">{</span>\n",
        "    <span class=\"nt\">&quot;type&quot;</span><span class=\"p\">:</span> <span class=\"s2\">&quot;indicator&quot;</span><span class=\"p\">,</span>\n",
-       "    <span class=\"nt\">&quot;id&quot;</span><span class=\"p\">:</span> <span class=\"s2\">&quot;indicator--01234567-89ab-cdef-0123-456789abcdef&quot;</span><span class=\"p\">,</span>\n",
+       "    <span class=\"nt\">&quot;id&quot;</span><span class=\"p\">:</span> <span class=\"s2\">&quot;indicator--a740531e-63ff-4e49-a9e1-a0a3eed0e3e7&quot;</span><span class=\"p\">,</span>\n",
        "    <span class=\"nt\">&quot;created&quot;</span><span class=\"p\">:</span> <span class=\"s2\">&quot;2018-04-05T19:27:53.923Z&quot;</span><span class=\"p\">,</span>\n",
        "    <span class=\"nt\">&quot;modified&quot;</span><span class=\"p\">:</span> <span class=\"s2\">&quot;2018-04-05T19:27:53.923Z&quot;</span><span class=\"p\">,</span>\n",
        "    <span class=\"nt\">&quot;pattern&quot;</span><span class=\"p\">:</span> <span class=\"s2\">&quot;[file:hashes.md5 = &#39;d41d8cd98f00b204e9800998ecf8427e&#39;]&quot;</span><span class=\"p\">,</span>\n",
@@ -224,7 +224,7 @@
     }
    ],
    "source": [
-    "print(env.get(\"indicator--01234567-89ab-cdef-0123-456789abcdef\"))"
+    "print(env.get(\"indicator--a740531e-63ff-4e49-a9e1-a0a3eed0e3e7\"))"
    ]
   },
   {
@@ -244,7 +244,7 @@
    "source": [
     "from stix2 import Indicator, ObjectFactory\n",
     "\n",
-    "factory = ObjectFactory(created_by_ref=\"identity--311b2d2d-f010-5473-83ec-1edf84858f4c\")"
+    "factory = ObjectFactory(created_by_ref=\"identity--311b2d2d-f010-4473-83ec-1edf84858f4c\")"
    ]
   },
   {
@@ -335,7 +335,7 @@
        ".highlight .il { color: #666666 } /* Literal.Number.Integer.Long */</style><div class=\"highlight\"><pre><span></span><span class=\"p\">{</span>\n",
        "    <span class=\"nt\">&quot;type&quot;</span><span class=\"p\">:</span> <span class=\"s2\">&quot;indicator&quot;</span><span class=\"p\">,</span>\n",
        "    <span class=\"nt\">&quot;id&quot;</span><span class=\"p\">:</span> <span class=\"s2\">&quot;indicator--c1b421c0-9c6b-4276-9b73-1b8684a5a0d2&quot;</span><span class=\"p\">,</span>\n",
-       "    <span class=\"nt\">&quot;created_by_ref&quot;</span><span class=\"p\">:</span> <span class=\"s2\">&quot;identity--311b2d2d-f010-5473-83ec-1edf84858f4c&quot;</span><span class=\"p\">,</span>\n",
+       "    <span class=\"nt\">&quot;created_by_ref&quot;</span><span class=\"p\">:</span> <span class=\"s2\">&quot;identity--311b2d2d-f010-4473-83ec-1edf84858f4c&quot;</span><span class=\"p\">,</span>\n",
        "    <span class=\"nt\">&quot;created&quot;</span><span class=\"p\">:</span> <span class=\"s2\">&quot;2018-04-05T19:28:48.776Z&quot;</span><span class=\"p\">,</span>\n",
        "    <span class=\"nt\">&quot;modified&quot;</span><span class=\"p\">:</span> <span class=\"s2\">&quot;2018-04-05T19:28:48.776Z&quot;</span><span class=\"p\">,</span>\n",
        "    <span class=\"nt\">&quot;pattern&quot;</span><span class=\"p\">:</span> <span class=\"s2\">&quot;[file:hashes.md5 = &#39;d41d8cd98f00b204e9800998ecf8427e&#39;]&quot;</span><span class=\"p\">,</span>\n",
@@ -477,7 +477,7 @@
     }
    ],
    "source": [
-    "factory2 = ObjectFactory(created_by_ref=\"identity--311b2d2d-f010-5473-83ec-1edf84858f4c\",\n",
+    "factory2 = ObjectFactory(created_by_ref=\"identity--311b2d2d-f010-4473-83ec-1edf84858f4c\",\n",
     "                         created=\"2017-09-25T18:07:46.255472Z\")\n",
     "env2 = Environment(factory=factory2)\n",
     "\n",
@@ -683,7 +683,7 @@
        ".highlight .il { color: #666666 } /* Literal.Number.Integer.Long */</style><div class=\"highlight\"><pre><span></span><span class=\"p\">{</span>\n",
        "    <span class=\"nt\">&quot;type&quot;</span><span class=\"p\">:</span> <span class=\"s2\">&quot;indicator&quot;</span><span class=\"p\">,</span>\n",
        "    <span class=\"nt\">&quot;id&quot;</span><span class=\"p\">:</span> <span class=\"s2\">&quot;indicator--d1b8c3f6-1de1-44c1-b079-3df307224a0d&quot;</span><span class=\"p\">,</span>\n",
-       "    <span class=\"nt\">&quot;created_by_ref&quot;</span><span class=\"p\">:</span> <span class=\"s2\">&quot;identity--311b2d2d-f010-5473-83ec-1edf84858f4c&quot;</span><span class=\"p\">,</span>\n",
+       "    <span class=\"nt\">&quot;created_by_ref&quot;</span><span class=\"p\">:</span> <span class=\"s2\">&quot;identity--311b2d2d-f010-4473-83ec-1edf84858f4c&quot;</span><span class=\"p\">,</span>\n",
        "    <span class=\"nt\">&quot;created&quot;</span><span class=\"p\">:</span> <span class=\"s2\">&quot;2018-04-05T19:29:59.605Z&quot;</span><span class=\"p\">,</span>\n",
        "    <span class=\"nt\">&quot;modified&quot;</span><span class=\"p\">:</span> <span class=\"s2\">&quot;2018-04-05T19:29:59.605Z&quot;</span><span class=\"p\">,</span>\n",
        "    <span class=\"nt\">&quot;pattern&quot;</span><span class=\"p\">:</span> <span class=\"s2\">&quot;[file:hashes.md5 = &#39;d41d8cd98f00b204e9800998ecf8427e&#39;]&quot;</span><span class=\"p\">,</span>\n",
@@ -704,7 +704,7 @@
     }
    ],
    "source": [
-    "environ = Environment(ObjectFactory(created_by_ref=\"identity--311b2d2d-f010-5473-83ec-1edf84858f4c\"),\n",
+    "environ = Environment(ObjectFactory(created_by_ref=\"identity--311b2d2d-f010-4473-83ec-1edf84858f4c\"),\n",
     "                      MemoryStore())\n",
     "\n",
     "i = environ.create(Indicator,\n",

diff --git a/docs/guide/parsing.ipynb b/docs/guide/parsing.ipynb
@@ -447,7 +447,7 @@
        ".highlight .vm { color: #19177C } /* Name.Variable.Magic */\n",
        ".highlight .il { color: #666666 } /* Literal.Number.Integer.Long */</style><div class=\"highlight\"><pre><span></span><span class=\"p\">{</span>\n",
        "    <span class=\"nt\">&quot;type&quot;</span><span class=\"p\">:</span> <span class=\"s2\">&quot;identity&quot;</span><span class=\"p\">,</span>\n",
-       "    <span class=\"nt\">&quot;id&quot;</span><span class=\"p\">:</span> <span class=\"s2\">&quot;identity--311b2d2d-f010-5473-83ec-1edf84858f4c&quot;</span><span class=\"p\">,</span>\n",
+       "    <span class=\"nt\">&quot;id&quot;</span><span class=\"p\">:</span> <span class=\"s2\">&quot;identity--311b2d2d-f010-4473-83ec-1edf84858f4c&quot;</span><span class=\"p\">,</span>\n",
        "    <span class=\"nt\">&quot;created&quot;</span><span class=\"p\">:</span> <span class=\"s2\">&quot;2015-12-21T19:59:11.000Z&quot;</span><span class=\"p\">,</span>\n",
        "    <span class=\"nt\">&quot;modified&quot;</span><span class=\"p\">:</span> <span class=\"s2\">&quot;2015-12-21T19:59:11.000Z&quot;</span><span class=\"p\">,</span>\n",
        "    <span class=\"nt\">&quot;name&quot;</span><span class=\"p\">:</span> <span class=\"s2\">&quot;Cole Powers&quot;</span><span class=\"p\">,</span>\n",
@@ -467,7 +467,7 @@
    "source": [
     "input_dict = {\n",
     "    \"type\": \"identity\",\n",
-    "    \"id\": \"identity--311b2d2d-f010-5473-83ec-1edf84858f4c\",\n",
+    "    \"id\": \"identity--311b2d2d-f010-4473-83ec-1edf84858f4c\",\n",
     "    \"created\": \"2015-12-21T19:59:11Z\",\n",
     "    \"modified\": \"2015-12-21T19:59:11Z\",\n",
     "    \"name\": \"Cole Powers\",\n",

diff --git a/docs/guide/taxii.ipynb b/docs/guide/taxii.ipynb
@@ -82,7 +82,7 @@
      "text": [
       "{\n",
       "    \"type\": \"malware\",\n",
-      "    \"id\": \"malware--fdd60b30-b67c-11e3-b0b9-f01faf20d111\",\n",
+      "    \"id\": \"malware--fdd60b30-b67c-41e3-b0b9-f01faf20d111\",\n",
       "    \"created\": \"2017-01-27T13:49:53.997Z\",\n",
       "    \"modified\": \"2017-01-27T13:49:53.997Z\",\n",
       "    \"name\": \"Poison Ivy\",\n",
@@ -94,7 +94,7 @@
       "-------\n",
       "{\n",
       "    \"type\": \"indicator\",\n",
-      "    \"id\": \"indicator--a932fcc6-e032-176c-126f-cb970a5a1ade\",\n",
+      "    \"id\": \"indicator--a932fcc6-e032-476c-826f-cb970a5a1ade\",\n",
       "    \"created\": \"2014-05-08T09:00:00.000Z\",\n",
       "    \"modified\": \"2014-05-08T09:00:00.000Z\",\n",
       "    \"name\": \"File hash for Poison Ivy variant\",\n",
@@ -117,8 +117,8 @@
     "tc_source = TAXIICollectionSource(collection)\n",
     "\n",
     "#retrieve STIX objects by id\n",
-    "stix_obj = tc_source.get(\"malware--fdd60b30-b67c-11e3-b0b9-f01faf20d111\")\n",
-    "stix_obj_versions = tc_source.all_versions(\"indicator--a932fcc6-e032-176c-126f-cb970a5a1ade\")\n",
+    "stix_obj = tc_source.get(\"malware--fdd60b30-b67c-41e3-b0b9-f01faf20d111\")\n",
+    "stix_obj_versions = tc_source.all_versions(\"indicator--a932fcc6-e032-476c-826f-cb970a5a1ade\")\n",
     "\n",
     "#for visual purposes\n",
     "print(stix_obj)\n",
@@ -138,7 +138,7 @@
      "text": [
       "{\n",
       "    \"type\": \"indicator\",\n",
-      "    \"id\": \"indicator--a932fcc6-e032-176c-126f-cb970a5a1ade\",\n",
+      "    \"id\": \"indicator--a932fcc6-e032-476c-826f-cb970a5a1ade\",\n",
       "    \"created\": \"2014-05-08T09:00:00.000Z\",\n",
       "    \"modified\": \"2014-05-08T09:00:00.000Z\",\n",
       "    \"name\": \"File hash for Poison Ivy variant\",\n",
@@ -220,7 +220,7 @@
      "text": [
       "{\n",
       "    \"type\": \"malware\",\n",
-      "    \"id\": \"malware--fdd60b30-b67c-11e3-b0b9-f01faf20d111\",\n",
+      "    \"id\": \"malware--fdd60b30-b67c-41e3-b0b9-f01faf20d111\",\n",
       "    \"created\": \"2017-01-27T13:49:53.997Z\",\n",
       "    \"modified\": \"2017-01-27T13:49:53.997Z\",\n",
       "    \"name\": \"Poison Ivy\",\n",
@@ -241,7 +241,7 @@
     "\n",
     "# retrieve STIX object by id from TAXII Collection through\n",
     "# TAXIICollectionStore\n",
-    "stix_obj2 = tc_source.get(\"malware--fdd60b30-b67c-11e3-b0b9-f01faf20d111\")\n",
+    "stix_obj2 = tc_source.get(\"malware--fdd60b30-b67c-41e3-b0b9-f01faf20d111\")\n",
     "\n",
     "print(stix_obj2)"
    ]

diff --git a/docs/guide/workbench.ipynb b/docs/guide/workbench.ipynb
@@ -218,7 +218,7 @@
        ".highlight .vg { color: #19177C } /* Name.Variable.Global */\n",
        ".highlight .vi { color: #19177C } /* Name.Variable.Instance */\n",
        ".highlight .vm { color: #19177C } /* Name.Variable.Magic */\n",
-       ".highlight .il { color: #666666 } /* Literal.Number.Integer.Long */</style><div class=\"highlight\"><pre><span></span>indicator--a932fcc6-e032-176c-126f-cb970a5a1ade\n",
+       ".highlight .il { color: #666666 } /* Literal.Number.Integer.Long */</style><div class=\"highlight\"><pre><span></span>indicator--a932fcc6-e032-476c-826f-cb970a5a1ade\n",
        "</pre></div>\n"
       ],
       "text/plain": [
@@ -382,7 +382,7 @@
        ".highlight .vg { color: #19177C } /* Name.Variable.Global */\n",
        ".highlight .vi { color: #19177C } /* Name.Variable.Instance */\n",
        ".highlight .vm { color: #19177C } /* Name.Variable.Magic */\n",
-       ".highlight .il { color: #666666 } /* Literal.Number.Integer.Long */</style><div class=\"highlight\"><pre><span></span>malware--fdd60b30-b67c-11e3-b0b9-f01faf20d111\n",
+       ".highlight .il { color: #666666 } /* Literal.Number.Integer.Long */</style><div class=\"highlight\"><pre><span></span>malware--fdd60b30-b67c-41e3-b0b9-f01faf20d111\n",
        "</pre></div>\n"
       ],
       "text/plain": [
@@ -480,7 +480,7 @@
        ".highlight .vm { color: #19177C } /* Name.Variable.Magic */\n",
        ".highlight .il { color: #666666 } /* Literal.Number.Integer.Long */</style><div class=\"highlight\"><pre><span></span><span class=\"p\">{</span>\n",
        "    <span class=\"nt\">&quot;type&quot;</span><span class=\"p\">:</span> <span class=\"s2\">&quot;malware&quot;</span><span class=\"p\">,</span>\n",
-       "    <span class=\"nt\">&quot;id&quot;</span><span class=\"p\">:</span> <span class=\"s2\">&quot;malware--fdd60b30-b67c-11e3-b0b9-f01faf20d111&quot;</span><span class=\"p\">,</span>\n",
+       "    <span class=\"nt\">&quot;id&quot;</span><span class=\"p\">:</span> <span class=\"s2\">&quot;malware--fdd60b30-b67c-41e3-b0b9-f01faf20d111&quot;</span><span class=\"p\">,</span>\n",
        "    <span class=\"nt\">&quot;created&quot;</span><span class=\"p\">:</span> <span class=\"s2\">&quot;2017-01-27T13:49:53.997Z&quot;</span><span class=\"p\">,</span>\n",
        "    <span class=\"nt\">&quot;modified&quot;</span><span class=\"p\">:</span> <span class=\"s2\">&quot;2017-01-27T13:49:53.997Z&quot;</span><span class=\"p\">,</span>\n",
        "    <span class=\"nt\">&quot;name&quot;</span><span class=\"p\">:</span> <span class=\"s2\">&quot;Poison Ivy&quot;</span><span class=\"p\">,</span>\n",
@@ -591,7 +591,7 @@
        ".highlight .vm { color: #19177C } /* Name.Variable.Magic */\n",
        ".highlight .il { color: #666666 } /* Literal.Number.Integer.Long */</style><div class=\"highlight\"><pre><span></span><span class=\"p\">{</span>\n",
        "    <span class=\"nt\">&quot;type&quot;</span><span class=\"p\">:</span> <span class=\"s2\">&quot;indicator&quot;</span><span class=\"p\">,</span>\n",
-       "    <span class=\"nt\">&quot;id&quot;</span><span class=\"p\">:</span> <span class=\"s2\">&quot;indicator--a932fcc6-e032-176c-126f-cb970a5a1ade&quot;</span><span class=\"p\">,</span>\n",
+       "    <span class=\"nt\">&quot;id&quot;</span><span class=\"p\">:</span> <span class=\"s2\">&quot;indicator--a932fcc6-e032-476c-826f-cb970a5a1ade&quot;</span><span class=\"p\">,</span>\n",
        "    <span class=\"nt\">&quot;created&quot;</span><span class=\"p\">:</span> <span class=\"s2\">&quot;2014-05-08T09:00:00.000Z&quot;</span><span class=\"p\">,</span>\n",
        "    <span class=\"nt\">&quot;modified&quot;</span><span class=\"p\">:</span> <span class=\"s2\">&quot;2014-05-08T09:00:00.000Z&quot;</span><span class=\"p\">,</span>\n",
        "    <span class=\"nt\">&quot;name&quot;</span><span class=\"p\">:</span> <span class=\"s2\">&quot;File hash for Poison Ivy variant&quot;</span><span class=\"p\">,</span>\n",
@@ -613,7 +613,7 @@
     }
    ],
    "source": [
-    "malware = get('malware--fdd60b30-b67c-11e3-b0b9-f01faf20d111')\n",
+    "malware = get('malware--fdd60b30-b67c-41e3-b0b9-f01faf20d111')\n",
     "indicator = malware.related(filters=Filter('type', '=', 'indicator'))\n",
     "print(indicator[0])"
    ]

diff --git a/examples/taxii_example.py b/examples/taxii_example.py
@@ -14,12 +14,12 @@ def main():
     taxii = stix2.TAXIICollectionSource(collection)
 
     # get (url watch indicator)
-    indicator_fw = taxii.get("indicator--d81f86b9-975b-bc0b-775e-810c5ad45a4f")
+    indicator_fw = taxii.get("indicator--00000000-0000-4000-8000-000000000001")
     print("\n\n-------Queried for Indicator - got:")
     print(indicator_fw.serialize(indent=4))
 
     # all versions (url watch indicator - currently two)
-    indicator_fw_versions = taxii.all_versions("indicator--d81f86b9-975b-bc0b-775e-810c5ad45a4f")
+    indicator_fw_versions = taxii.all_versions("indicator--00000000-0000-4000-8000-000000000001")
     print("\n\n------Queried for indicator (all_versions()) - got:")
     for indicator in indicator_fw_versions:
         print(indicator.serialize(indent=4))

diff --git a/stix2/test/conftest.py b/stix2/test/conftest.py
@@ -27,7 +27,7 @@ def wrapper():
 
         def wrapped():
             data[0] += 1
-            return "00000000-0000-0000-0000-00000000%04x" % data[0]
+            return "00000000-0000-4000-8000-00000000%04x" % data[0]
 
         return wrapped
     monkeypatch.setattr(uuid, "uuid4", wrapper())
@@ -52,7 +52,7 @@ def relationship(uuid4, clock):
 def stix_objs1():
     ind1 = {
         "created": "2017-01-27T13:49:53.935Z",
-        "id": "indicator--d81f86b9-975b-bc0b-775e-810c5ad45a4f",
+        "id": "indicator--00000000-0000-4000-8000-000000000001",
         "labels": [
             "url-watchlist"
         ],
@@ -64,7 +64,7 @@ def stix_objs1():
     }
     ind2 = {
         "created": "2017-01-27T13:49:53.935Z",
-        "id": "indicator--d81f86b9-975b-bc0b-775e-810c5ad45a4f",
+        "id": "indicator--00000000-0000-4000-8000-000000000001",
         "labels": [
             "url-watchlist"
         ],
@@ -76,7 +76,7 @@ def stix_objs1():
     }
     ind3 = {
         "created": "2017-01-27T13:49:53.935Z",
-        "id": "indicator--d81f86b9-975b-bc0b-775e-810c5ad45a4f",
+        "id": "indicator--00000000-0000-4000-8000-000000000001",
         "labels": [
             "url-watchlist"
         ],
@@ -88,7 +88,7 @@ def stix_objs1():
     }
     ind4 = {
         "created": "2017-01-27T13:49:53.935Z",
-        "id": "indicator--d81f86b8-975b-bc0b-775e-810c5ad45a4f",
+        "id": "indicator--00000000-0000-4000-8000-000000000002",
         "labels": [
             "url-watchlist"
         ],
@@ -100,7 +100,7 @@ def stix_objs1():
     }
     ind5 = {
         "created": "2017-01-27T13:49:53.935Z",
-        "id": "indicator--d81f86b8-975b-bc0b-775e-810c5ad45a4f",
+        "id": "indicator--00000000-0000-4000-8000-000000000002",
         "labels": [
             "url-watchlist"
         ],
@@ -117,7 +117,7 @@ def stix_objs1():
 def stix_objs2():
     ind6 = {
         "created": "2017-01-27T13:49:53.935Z",
-        "id": "indicator--d81f86b9-975b-bc0b-775e-810c5ad45a4f",
+        "id": "indicator--00000000-0000-4000-8000-000000000001",
         "labels": [
             "url-watchlist"
         ],
@@ -129,7 +129,7 @@ def stix_objs2():
     }
     ind7 = {
         "created": "2017-01-27T13:49:53.935Z",
-        "id": "indicator--d81f86b8-975b-bc0b-775e-810c5ad45a4f",
+        "id": "indicator--00000000-0000-4000-8000-000000000002",
         "labels": [
             "url-watchlist"
         ],
@@ -141,7 +141,7 @@ def stix_objs2():
     }
     ind8 = {
         "created": "2017-01-27T13:49:53.935Z",
-        "id": "indicator--d81f86b8-975b-bc0b-775e-810c5ad45a4f",
+        "id": "indicator--00000000-0000-4000-8000-000000000002",
         "labels": [
             "url-watchlist"
         ],

diff --git a/stix2/test/constants.py b/stix2/test/constants.py
@@ -7,14 +7,14 @@
 ATTACK_PATTERN_ID = "attack-pattern--0c7b5b88-8ff7-4a4d-aa9d-feb398cd0061"
 CAMPAIGN_ID = "campaign--8e2e2d2b-17d4-4cbf-938f-98ee46b3cd3f"
 COURSE_OF_ACTION_ID = "course-of-action--8e2e2d2b-17d4-4cbf-938f-98ee46b3cd3f"
-IDENTITY_ID = "identity--311b2d2d-f010-5473-83ec-1edf84858f4c"
-INDICATOR_ID = "indicator--01234567-89ab-cdef-0123-456789abcdef"
+IDENTITY_ID = "identity--311b2d2d-f010-4473-83ec-1edf84858f4c"
+INDICATOR_ID = "indicator--a740531e-63ff-4e49-a9e1-a0a3eed0e3e7"
 INTRUSION_SET_ID = "intrusion-set--4e78f46f-a023-4e5f-bc24-71b3ca22ec29"
-MALWARE_ID = "malware--fedcba98-7654-3210-fedc-ba9876543210"
+MALWARE_ID = "malware--9c4638ec-f1de-4ddb-abf4-1b760417654e"
 MARKING_DEFINITION_ID = "marking-definition--613f2e26-407d-48c7-9eca-b8e91df99dc9"
 OBSERVED_DATA_ID = "observed-data--b67d30ff-02ac-498a-92f9-32f845f448cf"
 REPORT_ID = "report--84e4d88f-44ea-4bcd-bbf3-b2c1c320bcb3"
-RELATIONSHIP_ID = "relationship--00000000-1111-2222-3333-444444444444"
+RELATIONSHIP_ID = "relationship--df7c87eb-75d2-4948-af81-9d49d246f301"
 THREAT_ACTOR_ID = "threat-actor--8e2e2d2b-17d4-4cbf-938f-98ee46b3cd3f"
 TOOL_ID = "tool--8e2e2d2b-17d4-4cbf-938f-98ee46b3cd3f"
 SIGHTING_ID = "sighting--bfbc19db-ec35-4e45-beed-f8bde2a772fb"