Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Re-type relationships relating one non-Observable as core:Relationship #142

Merged
merged 2 commits into from
Apr 29, 2024
Merged

Re-type relationships relating one non-Observable as core:Relationship #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fcfa00b
Re-type relationships relating one non-Observable as core:Relationship
ajnelson-nist Mar 14, 2024
b02a8ce
Regenerate Make-managed files
ajnelson-nist Mar 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions examples/illustrations/cell_site/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ The location of a Cell Site can change over time when it is moved by a telecommu
},
{
"@id": "kb:cdf48c35-c65d-41e4-843b-720f1ad24ab3",
"@type": "uco-observable:ObservableRelationship",
"@type": "uco-core:Relationship",
"uco-observable:startTime": {
"@type": "xsd:dateTime",
"@value": "2016-12-12T09:10:11Z"
Expand Down Expand Up @@ -334,7 +334,7 @@ Per practice of this example organization, the derivation of the relationship is
},
{
"@id": "kb:relationship-7cb73eaa-f2e5-45c1-b84e-0e97d0a828d4",
"@type": "uco-observable:ObservableRelationship",
"@type": "uco-core:Relationship",
"case-investigation:wasDerivedFrom": {
"@id": "kb:observation-21841f2a-6c14-48d7-b9d3-f081d43bc19b"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/illustrations/cell_site/cell_site.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@
},
{
"@id": "kb:cdf48c35-c65d-41e4-843b-720f1ad24ab3",
"@type": "uco-observable:ObservableRelationship",
"@type": "uco-core:Relationship",
"uco-core:isDirectional": true,
"uco-core:kindOfRelationship": "Located_At",
"uco-core:source": {
Expand Down Expand Up @@ -291,7 +291,7 @@
},
{
"@id": "kb:relationship-7cb73eaa-f2e5-45c1-b84e-0e97d0a828d4",
"@type": "uco-observable:ObservableRelationship",
"@type": "uco-core:Relationship",
"case-investigation:wasDerivedFrom": {
"@id": "kb:observation-21841f2a-6c14-48d7-b9d3-f081d43bc19b"
},
Expand Down
61 changes: 16 additions & 45 deletions examples/illustrations/cell_site/cell_site_validation-unstable-2.0.0.ttl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@prefix core: <https://ontology.unifiedcyberontology.org/uco/core/> .
@prefix observable: <https://ontology.unifiedcyberontology.org/uco/observable/> .
@prefix owl: <http://www.w3.org/2002/07/owl#> .
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
Expand All @@ -8,44 +7,17 @@

[]
a sh:ValidationReport ;
sh:conforms "false"^^xsd:boolean ;
sh:result
[
a sh:ValidationResult ;
sh:focusNode <http://example.org/kb/cdf48c35-c65d-41e4-843b-720f1ad24ab3> ;
sh:resultMessage "Value does not have class observable:Observable" ;
sh:resultPath core:target ;
sh:resultSeverity sh:Violation ;
sh:sourceConstraintComponent sh:ClassConstraintComponent ;
sh:sourceShape [
sh:class observable:Observable ;
sh:path core:target ;
] ;
sh:value <http://example.org/kb/f2e90997-16c9-4822-be30-fa4f36553768> ;
] ,
[
a sh:ValidationResult ;
sh:focusNode <http://example.org/kb/relationship-7cb73eaa-f2e5-45c1-b84e-0e97d0a828d4> ;
sh:resultMessage "Value does not have class observable:Observable" ;
sh:resultPath core:target ;
sh:resultSeverity sh:Violation ;
sh:sourceConstraintComponent sh:ClassConstraintComponent ;
sh:sourceShape [
sh:class observable:Observable ;
sh:path core:target ;
] ;
sh:value <http://example.org/kb/location-403d0147-f7ff-4f3e-aa43-19a988e8a3ee> ;
] ,
[
a sh:ValidationResult ;
sh:focusNode <urn:example:cell-site-kb:cell-cite-204-16-1014-13399> ;
sh:resultMessage "UcoThings are suggested to end with a UUID." ;
sh:resultSeverity sh:Info ;
sh:sourceConstraint [
a sh:SPARQLConstraint ;
rdfs:seeAlso <https://datatracker.ietf.org/doc/html/rfc4122#section-4.1.3> ;
sh:message "UcoThings are suggested to end with a UUID."@en ;
sh:select '''
sh:conforms "true"^^xsd:boolean ;
sh:result [
a sh:ValidationResult ;
sh:focusNode <urn:example:cell-site-kb:cell-cite-204-16-1014-13399> ;
sh:resultMessage "UcoThings are suggested to end with a UUID." ;
sh:resultSeverity sh:Info ;
sh:sourceConstraint [
a sh:SPARQLConstraint ;
rdfs:seeAlso <https://datatracker.ietf.org/doc/html/rfc4122#section-4.1.3> ;
sh:message "UcoThings are suggested to end with a UUID."@en ;
sh:select '''
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
PREFIX core: <https://ontology.unifiedcyberontology.org/uco/core/>
SELECT $this
Expand All @@ -60,11 +32,10 @@
)
}
''' ;
] ;
sh:sourceConstraintComponent sh:SPARQLConstraintComponent ;
sh:sourceShape core:UcoThing-identifier-regex-shape ;
sh:value <urn:example:cell-site-kb:cell-cite-204-16-1014-13399> ;
]
;
] ;
sh:sourceConstraintComponent sh:SPARQLConstraintComponent ;
sh:sourceShape core:UcoThing-identifier-regex-shape ;
sh:value <urn:example:cell-site-kb:cell-cite-204-16-1014-13399> ;
] ;
.

65 changes: 16 additions & 49 deletions examples/illustrations/cell_site/cell_site_validation-unstable.ttl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@prefix core: <https://ontology.unifiedcyberontology.org/uco/core/> .
@prefix observable: <https://ontology.unifiedcyberontology.org/uco/observable/> .
@prefix owl: <http://www.w3.org/2002/07/owl#> .
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
Expand All @@ -8,48 +7,17 @@

[]
a sh:ValidationReport ;
sh:conforms "false"^^xsd:boolean ;
sh:result
[
a sh:ValidationResult ;
sh:focusNode <http://example.org/kb/cdf48c35-c65d-41e4-843b-720f1ad24ab3> ;
sh:resultMessage "The target on an ObservableRelationship is expected to be typed as an Observable, and the noted value node is not. This will be an error in UCO 2.0.0."@en ;
sh:resultPath core:target ;
sh:resultSeverity sh:Warning ;
sh:sourceConstraintComponent sh:ClassConstraintComponent ;
sh:sourceShape [
sh:class observable:Observable ;
sh:message "The target on an ObservableRelationship is expected to be typed as an Observable, and the noted value node is not. This will be an error in UCO 2.0.0."@en ;
sh:path core:target ;
sh:severity sh:Warning ;
] ;
sh:value <http://example.org/kb/f2e90997-16c9-4822-be30-fa4f36553768> ;
] ,
[
a sh:ValidationResult ;
sh:focusNode <http://example.org/kb/relationship-7cb73eaa-f2e5-45c1-b84e-0e97d0a828d4> ;
sh:resultMessage "The target on an ObservableRelationship is expected to be typed as an Observable, and the noted value node is not. This will be an error in UCO 2.0.0."@en ;
sh:resultPath core:target ;
sh:resultSeverity sh:Warning ;
sh:sourceConstraintComponent sh:ClassConstraintComponent ;
sh:sourceShape [
sh:class observable:Observable ;
sh:message "The target on an ObservableRelationship is expected to be typed as an Observable, and the noted value node is not. This will be an error in UCO 2.0.0."@en ;
sh:path core:target ;
sh:severity sh:Warning ;
] ;
sh:value <http://example.org/kb/location-403d0147-f7ff-4f3e-aa43-19a988e8a3ee> ;
] ,
[
a sh:ValidationResult ;
sh:focusNode <urn:example:cell-site-kb:cell-cite-204-16-1014-13399> ;
sh:resultMessage "UcoThings are suggested to end with a UUID." ;
sh:resultSeverity sh:Info ;
sh:sourceConstraint [
a sh:SPARQLConstraint ;
rdfs:seeAlso <https://datatracker.ietf.org/doc/html/rfc4122#section-4.1.3> ;
sh:message "UcoThings are suggested to end with a UUID."@en ;
sh:select '''
sh:conforms "true"^^xsd:boolean ;
sh:result [
a sh:ValidationResult ;
sh:focusNode <urn:example:cell-site-kb:cell-cite-204-16-1014-13399> ;
sh:resultMessage "UcoThings are suggested to end with a UUID." ;
sh:resultSeverity sh:Info ;
sh:sourceConstraint [
a sh:SPARQLConstraint ;
rdfs:seeAlso <https://datatracker.ietf.org/doc/html/rfc4122#section-4.1.3> ;
sh:message "UcoThings are suggested to end with a UUID."@en ;
sh:select '''
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
PREFIX core: <https://ontology.unifiedcyberontology.org/uco/core/>
SELECT $this
Expand All @@ -64,11 +32,10 @@
)
}
''' ;
] ;
sh:sourceConstraintComponent sh:SPARQLConstraintComponent ;
sh:sourceShape core:UcoThing-identifier-regex-shape ;
sh:value <urn:example:cell-site-kb:cell-cite-204-16-1014-13399> ;
]
;
] ;
sh:sourceConstraintComponent sh:SPARQLConstraintComponent ;
sh:sourceShape core:UcoThing-identifier-regex-shape ;
sh:value <urn:example:cell-site-kb:cell-cite-204-16-1014-13399> ;
] ;
.

2 changes: 1 addition & 1 deletion examples/illustrations/cell_site/src/cell_site-cdr-site-location.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
},
{
"@id": "kb:relationship-7cb73eaa-f2e5-45c1-b84e-0e97d0a828d4",
"@type": "uco-observable:ObservableRelationship",
"@type": "uco-core:Relationship",
"case-investigation:wasDerivedFrom": {
"@id": "kb:observation-21841f2a-6c14-48d7-b9d3-f081d43bc19b"
},
Expand Down
2 changes: 1 addition & 1 deletion examples/illustrations/cell_site/src/cell_site-location-relationship.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
},
{
"@id": "kb:cdf48c35-c65d-41e4-843b-720f1ad24ab3",
"@type": "uco-observable:ObservableRelationship",
"@type": "uco-core:Relationship",
"uco-observable:startTime": {
"@type": "xsd:dateTime",
"@value": "2016-12-12T09:10:11Z"
Expand Down
Loading