Migrate software properties of operating systems into new objects; ad…

…d relationships A follow-on patch will regenerate Make-managed files. References: * ucoProject/UCO#632 Signed-off-by: Alex Nelson <[email protected]>
casework · Oct 17, 2024 · da056fc · da056fc
1 parent 57e2fbc
commit da056fc
Show file tree

Hide file tree

Showing 8 changed files with 225 additions and 81 deletions.
diff --git a/examples/illustrations/Oresteia/src/Oresteia_base.json b/examples/illustrations/Oresteia/src/Oresteia_base.json
@@ -219,6 +219,12 @@
                 {
                     "@id": "kb:clytemnestra-device-3a61cb3a-422d-4953-af70-25a860456e50"
                 },
+                {
+                    "@id": "kb:relationship-3707f6c4-b90a-4c70-9482-bb208d332e85"
+                },
+                {
+                    "@id": "kb:operating-system-9eea07c7-c348-4fa3-aef6-67f2fe651204"
+                },
                 {
                     "@id": "kb:clytemnestra-mobileaccount-363dd368-94bd-4dbb-af1d-f53d0085791e"
                 },
@@ -794,15 +800,6 @@
                     "drafting:uniqueID": "B3858A69A29375E6C706226B3633A3A11EB2A774",
                     "drafting:ownerName": "Clytemnestras iPhone"
                 },
-                {
-                    "@id": "kb:operating-system-facet-ad90e7e5-c692-4c59-87c6-d36c463ff1b0",
-                    "@type": "uco-observable:OperatingSystemFacet",
-                    "uco-core:name": "iOS",
-                    "uco-observable:manufacturer": {
-                        "@id": "kb:organization-0645704f-fc66-4d90-810a-dc0fb8a95fa4"
-                    },
-                    "uco-observable:version": "10.3"
-                },
                 {
                     "@id": "kb:wifi-address-facet-00ec20e0-4af9-45c0-9246-7a87e8c47f3d",
                     "@type": "uco-observable:WifiAddressFacet",
@@ -815,6 +812,34 @@
                 }
             ]
         },
+        {
+            "@id": "kb:operating-system-9eea07c7-c348-4fa3-aef6-67f2fe651204",
+            "@type": [
+                "uco-observable:OperatingSystem",
+                "uco-observable:Software"
+            ],
+            "uco-core:name": "iOS",
+            "uco-core:hasFacet": {
+                "@id": "kb:software-facet-906f160c-bbc0-48a5-bb0c-7338ebabf1e9",
+                "@type": "uco-observable:SoftwareFacet",
+                "uco-observable:manufacturer": {
+                    "@id": "kb:organization-0645704f-fc66-4d90-810a-dc0fb8a95fa4"
+                },
+                "uco-observable:version": "10.3"
+            }
+        },
+        {
+            "@id": "kb:relationship-3707f6c4-b90a-4c70-9482-bb208d332e85",
+            "@type": "uco-observable:ObservableRelationship",
+            "uco-core:isDirectional": true,
+            "uco-core:kindOfRelationship": "Has_Operating_System",
+            "uco-core:source": {
+                "@id": "kb:clytemnestra-device-3a61cb3a-422d-4953-af70-25a860456e50"
+            },
+            "uco-core:target": {
+                "@id": "kb:operating-system-9eea07c7-c348-4fa3-aef6-67f2fe651204"
+            }
+        },
         {
             "@id": "kb:clytemnestra-mobileaccount-363dd368-94bd-4dbb-af1d-f53d0085791e",
             "@type": "uco-observable:MobileAccount",

diff --git a/examples/illustrations/cell_site/src/cell_site_base.json b/examples/illustrations/cell_site/src/cell_site_base.json
@@ -36,15 +36,6 @@
                     "@type": "uco-observable:MobileDeviceFacet",
                     "uco-observable:IMEI": "356420075722843"
                 },
-                {
-                    "@id": "kb:operating-system-facet-407e9113-cb7c-45af-b456-6de8df391d6f",
-                    "@type": "uco-observable:OperatingSystemFacet",
-                    "uco-core:name": "Android",
-                    "uco-observable:manufacturer": {
-                        "@id": "kb:organization-fb6c05a0-b6be-4a10-ba62-0e7b1da4c0ec"
-                    },
-                    "uco-observable:version": "6.0.1"
-                },
                 {
                     "@id": "kb:bluetooth-address-facet-1206416f-2397-49e9-9606-3ce78b1ea0fd",
                     "@type": "uco-observable:BluetoothAddressFacet",
@@ -58,6 +49,34 @@
                 }
             ]
         },
+        {
+            "@id": "kb:operating-system-66ff1c3d-8cf0-439c-b8b0-5697df555b55",
+            "@type": [
+                "uco-observable:OperatingSystem",
+                "uco-observable:Software"
+            ],
+            "uco-core:name": "Android",
+            "uco-core:hasFacet": {
+                "@id": "kb:software-facet-9796be5d-172d-4c84-aaa1-92daa24d49d7",
+                "@type": "uco-observable:SoftwareFacet",
+                "uco-observable:manufacturer": {
+                    "@id": "kb:organization-fb6c05a0-b6be-4a10-ba62-0e7b1da4c0ec"
+                },
+                "uco-observable:version": "6.0.1"
+            }
+        },
+        {
+            "@id": "kb:relationship-ae5bc717-1bef-433c-8753-4bc19adae8db",
+            "@type": "uco-observable:ObservableRelationship",
+            "uco-core:isDirectional": true,
+            "uco-core:kindOfRelationship": "Has_Operating_System",
+            "uco-core:source": {
+                "@id": "kb:6e2c8413-f681-4bc6-a66e-b70a7ecd9d3a"
+            },
+            "uco-core:target": {
+                "@id": "kb:operating-system-66ff1c3d-8cf0-439c-b8b0-5697df555b55"
+            }
+        },
         {
             "@id": "kb:2ca4e1c6-9d27-4ba3-fe34-6da3c591b5e2",
             "@type": "uco-observable:ObservableRelationship",

diff --git a/examples/illustrations/device/device.json b/examples/illustrations/device/device.json
@@ -37,19 +37,6 @@
                     "uco-observable:model": "Inspiron 5000",
                     "uco-observable:serialNumber": "D1234567"
                 },
-                {
-                    "@id": "kb:operating-system-facet-429e8d0f-4974-421b-a01e-2b54437e4287",
-                    "@type": "uco-observable:OperatingSystemFacet",
-                    "uco-core:name": "Windows 7 Ultimate Edition",
-                    "uco-observable:manufacturer": {
-                        "@id": "kb:organization-cc0e0667-eadf-4b2e-9618-3f62b1bdae26"
-                    },
-                    "uco-observable:version": "6.1.7601 Service Pack 1 Build 7601",
-                    "uco-observable:installDate": {
-                        "@type": "xsd:dateTime",
-                        "@value": "2019-07-10T16:33:42Z"
-                    }
-                },
                 {
                     "@id": "kb:computer-specification-facet-d02adab1-cbaa-4ec5-b98c-4fe128e7281f",
                     "@type": "uco-observable:ComputerSpecificationFacet",
@@ -78,6 +65,44 @@
                     "acme:inventoryNumber": "10503"
                 }
             ]
+        },
+        {
+            "@id": "kb:operating-system-6c71847e-0569-48c4-9587-772e18c45d9f",
+            "@type": [
+                "uco-observable:OperatingSystem",
+                "uco-observable:Software"
+            ],
+            "uco-core:name": "Windows 7 Ultimate Edition",
+            "uco-core:hasFacet": [
+                {
+                    "@id": "kb:operating-system-facet-2ebffd0a-4d07-4313-8be2-cca326cbd547",
+                    "@type": "uco-observable:OperatingSystemFacet",
+                    "uco-observable:installDate": {
+                        "@type": "xsd:dateTime",
+                        "@value": "2019-07-10T16:33:42Z"
+                    }
+                },
+                {
+                    "@id": "kb:software-facet-bb00a67a-4f64-4275-a818-01192b0934bf",
+                    "@type": "uco-observable:SoftwareFacet",
+                    "uco-observable:manufacturer": {
+                        "@id": "kb:organization-cc0e0667-eadf-4b2e-9618-3f62b1bdae26"
+                    },
+                    "uco-observable:version": "6.1.7601 Service Pack 1 Build 7601"
+                }
+            ]
+        },
+        {
+            "@id": "kb:relationship-b96f493a-806b-4914-b522-5f8c4456da3b",
+            "@type": "uco-observable:ObservableRelationship",
+            "uco-core:isDirectional": true,
+            "uco-core:kindOfRelationship": "Has_Operating_System",
+            "uco-core:source": {
+                "@id": "kb:forensic_lab_computer-a730c324-49e6-4b12-869e-6addd946545d"
+            },
+            "uco-core:target": {
+                "@id": "kb:operating-system-6c71847e-0569-48c4-9587-772e18c45d9f"
+            }
         }
     ]
 }
diff --git a/examples/illustrations/file/file.json b/examples/illustrations/file/file.json
@@ -517,15 +517,6 @@
                     "uco-observable:model": "Inspiron 5000",
                     "uco-observable:serialNumber": "D1234567"
                 },
-                {
-                    "@id": "kb:operating-system-facet-83153006-3432-4538-a0d7-871a6e879d76",
-                    "@type": "uco-observable:OperatingSystemFacet",
-                    "uco-core:name": "Windows 7 Ultimate Edition",
-                    "uco-observable:manufacturer": {
-                        "@id": "kb:organization-cc0e0667-eadf-4b2e-9618-3f62b1bdae26"
-                    },
-                    "uco-observable:version": "6.1.7601 Service Pack 1 Build 7601"
-                },
                 {
                     "@id": "kb:computer-specification-facet-fd3be213-cb78-4130-8888-323a259f3509",
                     "@type": "uco-observable:ComputerSpecificationFacet",
@@ -544,6 +535,34 @@
                 }
             ]
         },
+        {
+            "@id": "kb:operating-system-8a0026cb-2f40-460d-baac-e5b8dc2da0e0",
+            "@type": [
+                "uco-observable:OperatingSystem",
+                "uco-observable:Software"
+            ],
+            "uco-core:name": "Windows 7 Ultimate Edition",
+            "uco-core:hasFacet": {
+                "@id": "kb:software-facet-de8739b6-74ba-486e-b452-49a990ffbb22",
+                "@type": "uco-observable:SoftwareFacet",
+                "uco-observable:manufacturer": {
+                    "@id": "kb:organization-cc0e0667-eadf-4b2e-9618-3f62b1bdae26"
+                },
+                "uco-observable:version": "6.1.7601 Service Pack 1 Build 7601"
+            }
+        },
+        {
+            "@id": "kb:relationship-a66eba82-1224-422e-a427-73895cab5b5a",
+            "@type": "uco-observable:ObservableRelationship",
+            "uco-core:isDirectional": true,
+            "uco-core:kindOfRelationship": "Has_Operating_System",
+            "uco-core:source": {
+                "@id": "kb:forensic_lab_computer-89c30df0-5e7f-4076-8f74-3271e730a013"
+            },
+            "uco-core:target": {
+                "@id": "kb:operating-system-8a0026cb-2f40-460d-baac-e5b8dc2da0e0"
+            }
+        },
         {
             "@id": "kb:organization-2b3b98e2-aea2-4270-876a-7f9917623cb7",
             "@type": "uco-identity:Organization",
@@ -572,15 +591,6 @@
                     "uco-observable:model": "I9500 Galaxy S4",
                     "uco-observable:serialNumber": "123456SAM"
                 },
-                {
-                    "@id": "kb:operating-system-facet-f1c16acb-44f7-4728-8f5e-72bcc0f3f3f8",
-                    "@type": "uco-observable:OperatingSystemFacet",
-                    "uco-core:name": "Android",
-                    "uco-observable:manufacturer": {
-                        "@id": "kb:organization-2b3b98e2-aea2-4270-876a-7f9917623cb7"
-                    },
-                    "uco-observable:version": "4.2.2"
-                },
                 {
                     "@id": "kb:computer-specification-facet-0f10db33-9374-467c-bb2d-04172ab05a34",
                     "@type": "uco-observable:ComputerSpecificationFacet",
@@ -590,6 +600,34 @@
                     "uco-observable:totalRam": 2147483648
                 }
             ]
+        },
+        {
+            "@id": "kb:operating-system-1d468d48-3ac2-4242-a9cb-61bd47319d43",
+            "@type": [
+                "uco-observable:OperatingSystem",
+                "uco-observable:Software"
+            ],
+            "uco-core:name": "Android",
+            "uco-core:hasFacet": {
+                "@id": "kb:software-facet-9c9aa4ea-9e84-45e8-8437-ac97327d651b",
+                "@type": "uco-observable:SoftwareFacet",
+                "uco-observable:manufacturer": {
+                    "@id": "kb:organization-2b3b98e2-aea2-4270-876a-7f9917623cb7"
+                },
+                "uco-observable:version": "4.2.2"
+            }
+        },
+        {
+            "@id": "kb:relationship-7a75a470-b017-424b-a81b-d1411172c0c6",
+            "@type": "uco-observable:ObservableRelationship",
+            "uco-core:isDirectional": true,
+            "uco-core:kindOfRelationship": "Has_Operating_System",
+            "uco-core:source": {
+                "@id": "kb:android_device-814c2229-d163-47af-87be-6437b205dde4"
+            },
+            "uco-core:target": {
+                "@id": "kb:operating-system-1d468d48-3ac2-4242-a9cb-61bd47319d43"
+            }
         }
     ]
 }
diff --git a/examples/illustrations/message/message.json b/examples/illustrations/message/message.json
@@ -23,11 +23,11 @@
                 "uco-observable:OperatingSystem",
                 "uco-observable:Software"
             ],
+            "uco-core:name": "Android",
             "uco-core:hasFacet": [
                 {
-                    "@id": "kb:operating-system-facet-04d6b0b1-b491-4438-b889-d16a28dffaa4",
-                    "@type": "uco-observable:OperatingSystemFacet",
-                    "uco-core:name": "Android",
+                    "@id": "kb:software-facet-e331aa04-4403-4560-a759-c07a993791ec",
+                    "@type": "uco-observable:SoftwareFacet",
                     "uco-observable:manufacturer": {
                         "@id": "kb:organization-2b3b98e2-aea2-4270-876a-7f9917623cb7"
                     },

diff --git a/examples/illustrations/mobile_device_and_sim_card/mobile_device_and_sim_card.json b/examples/illustrations/mobile_device_and_sim_card/mobile_device_and_sim_card.json
@@ -24,19 +24,6 @@
                     "uco-observable:model": "MG472ZD/A",
                     "uco-observable:serialNumber": "F17RN4DXXXXX"
                 },
-                {
-                    "@id": "kb:operating-system-facet-48f9672f-c16c-4137-b9cd-1e99bd368335",
-                    "@type": "uco-observable:OperatingSystemFacet",
-                    "uco-core:name": "iOS",
-                    "uco-observable:manufacturer": {
-                        "@id": "kb:organization-0645704f-fc66-4d90-810a-dc0fb8a95fa4"
-                    },
-                    "uco-observable:version": "11.2.6",
-                    "uco-observable:installDate": {
-                        "@type": "xsd:dateTime",
-                        "@value": "2018-04-09T16:33:42Z"
-                    }
-                },
                 {
                     "@id": "kb:mobile-device-facet-78f46f74-0ae8-49b2-b126-7cf5221a52ad",
                     "@type": "uco-observable:MobileDeviceFacet",
@@ -60,6 +47,44 @@
                 }
             ]
         },
+        {
+            "@id": "kb:operating-system-be32618a-dade-4284-9435-f18be7e035c6",
+            "@type": [
+                "uco-observable:OperatingSystem",
+                "uco-observable:Software"
+            ],
+            "uco-core:name": "iOS",
+            "uco-core:hasFacet": [
+                {
+                    "@id": "kb:operating-system-facet-27d37081-422b-466d-b19b-8a338917f230",
+                    "@type": "uco-observable:OperatingSystemFacet",
+                    "uco-observable:installDate": {
+                        "@type": "xsd:dateTime",
+                        "@value": "2018-04-09T16:33:42Z"
+                    }
+                },
+                {
+                    "@id": "kb:software-facet-0be3dc19-f97e-4d10-ba8e-d551bfd2ea28",
+                    "@type": "uco-observable:SoftwareFacet",
+                    "uco-observable:manufacturer": {
+                        "@id": "kb:organization-0645704f-fc66-4d90-810a-dc0fb8a95fa4"
+                    },
+                    "uco-observable:version": "11.2.6"
+                }
+            ]
+        },
+        {
+            "@id": "kb:relationship-5d4c09d2-2109-4828-948f-aa449d07ead9",
+            "@type": "uco-observable:ObservableRelationship",
+            "uco-core:source": {
+                "@id": "kb:mobile-device-d5143a67-8b61-491b-a5e9-863b606e296a"
+            },
+            "uco-core:target": {
+                "@id": "kb:operating-system-be32618a-dade-4284-9435-f18be7e035c6"
+            },
+            "uco-core:kindOfRelationship": "Has_Operating_System",
+            "uco-core:isDirectional": true
+        },
         {
             "@id": "kb:organization-0645704f-fc66-4d90-810a-dc0fb8a95fa4",
             "@type": "uco-identity:Organization",

diff --git a/examples/illustrations/partitions/src/partitions-supplemental.json b/examples/illustrations/partitions/src/partitions-supplemental.json
@@ -15,15 +15,21 @@
             "uco-observable:Software"
         ],
         "uco-core:name": "Windows 11 Pro",
-        "uco-core:hasFacet": {
-            "@id": "kb:OperatingSystemFacet-aeb7c83f-3fc6-4775-806a-a83b7a875623",
-            "@type": "uco-observable:OperatingSystemFacet",
-            "uco-observable:manufacturer": {
-                "@id": "kb:Organization-a94338c2-030a-493f-9d26-55cade656276"
+        "uco-core:hasFacet": [
+            {
+                "@id": "kb:OperatingSystemFacet-aeb7c83f-3fc6-4775-806a-a83b7a875623",
+                "@type": "uco-observable:OperatingSystemFacet",
+                "drafting:buildID": "22621.2283"
             },
-            "uco-observable:version": "22H2",
-            "drafting:buildID": "22621.2283"
-        }
+            {
+                "@id": "kb:SoftwareFacet-247fe7a7-8434-4fca-8f9b-ac7e136f6ca5",
+                "@type": "uco-observable:SoftwareFacet",
+                "uco-observable:manufacturer": {
+                    "@id": "kb:Organization-a94338c2-030a-493f-9d26-55cade656276"
+                },
+                "uco-observable:version": "22H2"
+            }
+        ]
     },
     {
         "@id": "kb:Tool-e7ce892b-8a19-4f62-b43d-4736ccb6b696",