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

UCO Issue 629: Revise vocabulary pattern #172

Draft
wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

UCO Issue 629: Revise vocabulary pattern #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion dependencies/UCO
Open in desktop
Submodule UCO updated 16 files
+26 −56 ontology/uco/action/action.ttl
+14 −14 ontology/uco/core/core.ttl
+366 −696 ontology/uco/observable/observable.ttl
+21 −36 ontology/uco/types/types.ttl
+778 −778 ontology/uco/vocabulary/vocabulary.ttl
+2 −8 tests/examples/action_inheritance_PASS.json
+12 −5 tests/examples/action_inheritance_PASS_validation.ttl
+0 −61 tests/examples/action_inheritance_XFAIL_validation.ttl
+32 −0 tests/examples/hash_PASS.json
+146 −0 tests/examples/hash_PASS_validation.ttl
+3 −39 tests/examples/hash_XFAIL.json
+16 −141 tests/examples/hash_XFAIL_validation.ttl
+1 −4 tests/examples/object_status_PASS.json
+5 −25 tests/examples/object_status_XFAIL_validation.ttl
+13 −7 tests/examples/test_validation.py
+65 −32 tests/test_uco_monolithic.py
39 changes: 12 additions & 27 deletions ontology/investigation/investigation.ttl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,45 +128,30 @@ investigation:Investigation
sh:nodeKind sh:Literal ;
sh:path investigation:investigationStatus ;
] ,
[
sh:datatype xsd:string ;
sh:message "As of CASE 1.4.0, the datatype to use for investigation:investigationForm should be xsd:string. Not using xsd:string will be an error in CASE 2.0.0." ;
sh:path investigation:investigationForm ;
sh:severity sh:Warning ;
] ,
[
sh:datatype xsd:string ;
sh:nodeKind sh:Literal ;
sh:path investigation:focus ;
] ,
[
sh:datatype vocabulary:InvestigationFormVocab ;
sh:message "Value is outside the default vocabulary InvestigationFormVocab." ;
sh:in (
"case"
"incident"
"suspicious-activity"
) ;
sh:message "Value is not member of the vocabulary InvestigationFormVocab." ;
sh:path investigation:investigationForm ;
sh:severity sh:Info ;
] ,
[
sh:maxCount "1"^^xsd:integer ;
sh:nodeKind sh:Literal ;
sh:or (
[
sh:datatype vocabulary:InvestigationFormVocab ;
]
[
sh:datatype xsd:string ;
]
) ;
sh:path investigation:investigationForm ;
] ,
[
sh:message "Value is not member of the vocabulary InvestigationFormVocab." ;
sh:or (
[
sh:datatype vocabulary:InvestigationFormVocab ;
sh:in (
"case"^^vocabulary:InvestigationFormVocab
"incident"^^vocabulary:InvestigationFormVocab
"suspicious-activity"^^vocabulary:InvestigationFormVocab
) ;
]
[
sh:datatype xsd:string ;
]
) ;
sh:path investigation:investigationForm ;
]
;
Expand Down
6 changes: 3 additions & 3 deletions ontology/vocabulary/vocabulary.ttl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ vocab:InvestigationFormVocab
owl:equivalentClass [
a rdfs:Datatype ;
owl:oneOf (
"case"^^vocab:InvestigationFormVocab
"incident"^^vocab:InvestigationFormVocab
"suspicious-activity"^^vocab:InvestigationFormVocab
"case"
"incident"
"suspicious-activity"
) ;
] ;
.
Expand Down