Merge pull request #950 from ge-high-assurance/sri-ss_to_core

pulling SRI-SS.sadl into the core data model
ge-high-assurance · May 2, 2023 · e454889 · e454889
2 parents 781b74c + 57ad5cc
commit e454889
Show file tree

Hide file tree

Showing 13 changed files with 380 additions and 390 deletions.
diff --git a/RACK-Ontology/OwlModels/model.yaml b/RACK-Ontology/OwlModels/model.yaml
@@ -17,7 +17,7 @@ files:
 - PROV-S.owl
 - REQUIREMENTS.owl
 - REVIEW.owl
-- SECURITY.owl
+- SAFETY-SECURITY.owl
 - SOFTWARE.owl
 - SYSTEM.owl
 - TESTING.owl

diff --git a/RACK-Ontology/ontology/GeneratePropInfoCSV.sadl b/RACK-Ontology/ontology/GeneratePropInfoCSV.sadl
@@ -23,7 +23,7 @@ import "http://arcos.rack/MODEL".
 import "http://arcos.rack/PROCESS".
 import "http://arcos.rack/REQUIREMENTS".
 import "http://arcos.rack/REVIEW".
-import "http://arcos.rack/SECURITY".
+import "http://arcos.rack/SAFETY-SECURITY".
 import "http://arcos.rack/SOFTWARE".
 import "http://arcos.rack/SYSTEM".
 import "http://arcos.rack/TESTING".

diff --git a/RACK-Ontology/ontology/REQUIREMENTS.sadl b/RACK-Ontology/ontology/REQUIREMENTS.sadl
@@ -38,6 +38,14 @@ REQUIREMENT
 
 	wasGeneratedBy of REQUIREMENT only has values of type REQUIREMENT_DEVELOPMENT.
 
+// DB 2/27/22: Added new class RequirementSet with common properties for all types of requirement sets
+REQUIREMENT_SET 
+	(note "a set of requirements that together defines the required behavior of a SYSTEM (or part thereof)")
+	is a type of COLLECTION.
+	content of REQUIREMENT_SET only has values of type REQUIREMENT.
+	// note: 'specifies' is not a subtype of 'wasImpactedBy, which has the reverse meaning. RequirementSet occurs before the SYSTEM is constructed.
+	specifies (note "the system or component this requirement set governs/specifies") describes REQUIREMENT_SET with values of type ENTITY.
+
 DATA_DICTIONARY_TERM
 	(note "Defines some conceptual data that may be collected somewhere and used somewhere else")
 	is a type of ENTITY.

diff --git a/RACK-Ontology/ontology/SAFETY-SECURITY.sadl b/RACK-Ontology/ontology/SAFETY-SECURITY.sadl
diff --git a/RACK-Ontology/ontology/SECURITY.sadl b/RACK-Ontology/ontology/SECURITY.sadl
diff --git a/overlays/GE-Ontology/ontology/CPS.sadl b/overlays/GE-Ontology/ontology/CPS.sadl
@@ -12,7 +12,7 @@
 
 uri "http://arcos.turnstile/CPS" alias CPS.
 import "http://arcos.rack/SYSTEM".
-import "http://arcos.rack/SECURITY".
+import "http://arcos.rack/SAFETY-SECURITY".
 
 // In https://www.faa.gov/documentLibrary/media/Advisory_Circular/AC%2023.1309-1E.pdf
 // the DALs (Catastrophic, Hazardous, Major,Minor, No Safety Effect) are mapped to
@@ -32,14 +32,14 @@ Cps (note "A cyber physical system") is a type of SYSTEM
 	described by canReceiveConfigUpdate with a single value of type boolean
 	described by hasSensitiveInfo with a single value of type boolean	
 	described by insideTrustedBoundary with a single value of type boolean
-	described by pedigree with a single value of type Pedigree
+	described by CPS:pedigree with a single value of type Pedigree
 
 	// properties that allow for mitigating of threats
 	described by implControl with values of type ImplControl.
 
 ImplControl (note "CONTROL implemented in a SYSTEM") is a type of THING
 	described by control with a single value of type CONTROL
-	described by dal with a single value of type int.
+	described by CPS:dal with a single value of type int.
 
 CpsType (note "An open/extensible set of CPS types") is a type of THING.
 

diff --git a/overlays/SRI-Ontology/OwlModels/model.yaml b/overlays/SRI-Ontology/OwlModels/model.yaml
@@ -1,3 +1,2 @@
 files:
 - SRI.owl
-- SRI-SS.owl