Merge pull request #693 from ge-high-assurance/SW-HW-component

Sw hw component

RACK-Ontology/ontology/Data/PropInfo.csv

@@ -11,8 +11,8 @@
 "belief",null,"CONFIDENCE_ASSESSMENT","float","belief that an assessment is true"
 "commodity",null,"INTERFACE","string","the thing conveyed by the interface"
 "compileInput","used","COMPILE","FILE","Source files that contributed to the compilation"
-"componentType",null,"HWCOMPONENT","HWCOMPONENT_TYPE","Type of component"
-"componentType",null,"SWCOMPONENT","COMPONENT_TYPE","Type of component"
+"componentType",null,"HWCOMPONENT","HWCOMPONENT_TYPE","Type of hardware component"
+"componentType",null,"SWCOMPONENT","SWCOMPONENT_TYPE","Type of software component"
 "confirms","wasImpactedBy","TEST_RESULT","TEST","Parent test(s) of this test result"
 "consumedBy","wasImpactedBy","DATA_DICTIONARY_TERM","ENTITY","ENTITY(s) (e.g. REQUIREMENT) that consumes this information"
 "content",null,"COLLECTION","ENTITY","An entity in a collection."
@@ -23,7 +23,7 @@
 "destination","wasImpactedBy","INTERFACE","SYSTEM","SYSTEM that requires what the INTERFACE offers"
 "disbelief",null,"CONFIDENCE_ASSESSMENT","float","belief that an assessment is false"
 "effect",null,"HAZARD","string","consequence(s) of the HAZARD"
-"effect",null,"THREAT","string","consequence(s) of the HAZARD"
+"effect",null,"THREAT","string","consequence(s) of the THREAT"
 "emailAddress",null,"PERSON","string","Email address of person"
 "employedBy","actedOnBehalfOf","PERSON","AGENT","Relates people to the company they were acting on behalf of."
 "endedAtTime",null,"ACTIVITY","dateTime","The time an activity was ended"
@@ -40,7 +40,7 @@
 "governs","wasImpactedBy","REQUIREMENT","ENTITY","ENTITY(s) that are the subject of the requirement"
 "hashType",null,"FILE_HASH","HASH_TYPE","Hash algorithm"
 "hashValue",null,"FILE_HASH","string","Hash value"
-"identified",null,"THREAT","THREAT_IDENTIFICATION","how this HAZARD was identified"
+"identified",null,"THREAT","THREAT_IDENTIFICATION","how this THREAT was identified"
 "identifier",null,"THING","string","identifier is any data item that is used to associate items on when loading into the data store."
 "instantiates",null,"HWCOMPONENT","ENTITY","What logical component (system) does this physical component instantiate or implement?"
 "instantiates",null,"SWCOMPONENT","ENTITY","What logical component (system) does this physical component (code) instantiate or implement?"
@@ -59,6 +59,8 @@
 "nextStep",null,"TEST_STEP","TEST_STEP","The next TEST_STEP in a sequence"
 "packageInput","used","PACKAGE","FILE","Source files used when generating the package output"
 "parentFunction",null,"FUNCTION","FUNCTION","allows for decomposition of functionality"
+"partOf",null,"HWCOMPONENT","HWCOMPONENT","A structural subcomponent / part of a component."
+"partOf",null,"SWCOMPONENT","SWCOMPONENT","A structural sub-component, e.g., a function might be a subcomponent / part of a module."
 "partOf",null,"SYSTEM","SYSTEM","Used to define a relationship to a higher level system"
 "partiallySupports",null,"PROPERTY","OBJECTIVE","One or more PROPERTY may be needed to address an OBJECTIVE."
 "providedBy","wasImpactedBy","DATA_DICTIONARY_TERM","ENTITY","ENTITY(s) (e.g. REQUIREMENT) that provides this information"
@@ -78,14 +80,13 @@
 "satisfies","wasImpactedBy","REQUIREMENT","ENTITY","Parent ENTITY(s) (e.g. REQUIREMENT) that this REQUIREMENT is derived from"
 "scopeOf","wasImpactedBy","PROPERTY","ENTITY","ENTITY(s) over which the PROPERTY holds"
 "severity",null,"HAZARD","float","the severity of the HAZARD"
-"severity",null,"THREAT","float","the severity of the HAZARD"
+"severity",null,"THREAT","float","the severity of the THREAT"
 "source","wasImpactedBy","HAZARD","ENTITY","ENTITY(s) that participate in causing this HAZARD"
-"source","wasImpactedBy","THREAT","ENTITY","ENTITY(s) that participate in causing this HAZARD"
+"source","wasImpactedBy","THREAT","ENTITY","ENTITY(s) that participate in causing this THREAT"
 "source","wasImpactedBy","INTERFACE","SYSTEM","SYSTEM that provides what the INTERFACE offers"
 "startedAtTime",null,"ACTIVITY","dateTime","The time an activity was started"
 "status",null,"DOCUMENT","DOC_STATUS","Identifies the maturity of the document, In_Development, Released, Withdrawn."
 "step","wasInformedBy","BUILD","ACTIVITY","A BUILD may be comprised of any number of sub-ACTIVITY(s)"
-"subcomponentOf",null,"SWCOMPONENT","SWCOMPONENT","A structural sub-component, e.g., a function might be a subcomponent of module."
 "testProcedure","used","TEST_EXECUTION","TEST_PROCEDURE","TEST_PROCEDURE that was executed."
 "title",null,"THING","string","A short, human-readable identifying label."
 "toolVersion",null,"TOOL","string","The release version of the tool"

RACK-Ontology/ontology/HARDWARE.sadl

@@ -14,9 +14,11 @@ uri "http://arcos.rack/HARDWARE" alias hw.
 import "http://arcos.rack/PROV-S".
 
 HWCOMPONENT (note "A generic physical hardware component") is a type of ENTITY.
+    partOf (note "A structural subcomponent / part of a component.")
+        describes HWCOMPONENT with values of type HWCOMPONENT.
     instantiates (note "What logical component (system) does this physical component instantiate or implement?")
         describes HWCOMPONENT with values of type ENTITY.
-    componentType (note "Type of component")
+    componentType (note "Type of hardware component")
         describes HWCOMPONENT with a single value of type HWCOMPONENT_TYPE.
 	partitions describes HWCOMPONENT with values of type PARTITION.
 

RACK-Ontology/ontology/SECURITY.sadl

@@ -27,15 +27,15 @@ From: NCSD Glossary. NTSSI 4009 (2000), CNSSI 4009
 
 // We model THREAT only as an ATTACK is an activity on say a fielded system.
 THREAT (note "A threat / vulnerability to be assessed for certification") is a type of ENTITY.
-	Sec:source (note "ENTITY(s) that participate in causing this HAZARD") describes THREAT with values of type ENTITY.
+	Sec:source (note "ENTITY(s) that participate in causing this THREAT") describes THREAT with values of type ENTITY.
 	Sec:source is a type of wasImpactedBy.
 
-	identified (note "how this HAZARD was identified") describes THREAT with values of type THREAT_IDENTIFICATION.
+	identified (note "how this THREAT was identified") describes THREAT with values of type THREAT_IDENTIFICATION.
 
-	effect (note "consequence(s) of the HAZARD") describes THREAT with values of type string.
+	effect (note "consequence(s) of the THREAT") describes THREAT with values of type string.
    	effect describes THREAT with at most 1 value.
 
-	severity (note "the severity of the HAZARD") describes THREAT with values of type float. // [0,1].
+	severity (note "the severity of the THREAT") describes THREAT with values of type float. // [0,1].
 	severity describes THREAT with at most 1 value.
 
 	likelihood (note "probability value between 0 and 1") describes THREAT with values of type float. // [0,1].

RACK-Ontology/ontology/SOFTWARE.sadl

@@ -49,62 +49,62 @@ PACKAGE
 	packageInput (note "Source files used when generating the package output") describes PACKAGE with values of type FILE.
 	packageInput is a type of used.
 
-COMPONENT_TYPE
+SWCOMPONENT_TYPE
     (note "An open/extensible set of types of software components")
     is a type of THING.
 
 // A few common instances:
 SourceFunction
     (note "A function or procedure declared or defined in source code.")
-    is a COMPONENT_TYPE
+    is a SWCOMPONENT_TYPE
     has identifier "SourceFunction".
 BinaryFunction
     (note "A function in a binary, as defined by the appropriate ABI.")
-    is a COMPONENT_TYPE
+    is a SWCOMPONENT_TYPE
     has identifier "BinaryFunction".
 SourceGlobalVariable
     (note "A global variable declared or defined in source code.")
-    is a COMPONENT_TYPE
+    is a SWCOMPONENT_TYPE
     has identifier "SourceGlobalVariable".
 BinaryGlobalVariable
     (note "A global variable (generally in the .data or .bss sections).")
-    is a COMPONENT_TYPE
+    is a SWCOMPONENT_TYPE
     has identifier "BinaryGlobalVariable".
 BinaryBasicBlock
     (note "A basic block at the binary level.")
-    is a COMPONENT_TYPE
+    is a SWCOMPONENT_TYPE
     has identifier "BinaryBasicBlock".
 ClassDefinition
     (note "A class in an object-oriented language.")
-    is a COMPONENT_TYPE
+    is a SWCOMPONENT_TYPE
     has identifier "ClassDefinition".
 ClassMethod
     (note "A method attached to a class in an object-oriented language.")
-    is a COMPONENT_TYPE
+    is a SWCOMPONENT_TYPE
     has identifier "ClassMethod".
 ClassMemberVariable
     (note "A variable attached to the instances of a class in an object-oriented language.")
-    is a COMPONENT_TYPE
+    is a SWCOMPONENT_TYPE
     has identifier "ClassMemberVariable".
 ClassConstructor
     (note "A constructor in an object-oriented language.")
-    is a COMPONENT_TYPE
+    is a SWCOMPONENT_TYPE
     has identifier "ClassConstructor".
 Module
     (note "A collection of related code, usually grouped in a lexical scope.")
-    is a COMPONENT_TYPE
+    is a SWCOMPONENT_TYPE
     has identifier "Module".
 Namespace
     (note "A collection of related code, usually grouped in a lexical scope.")
-    is a COMPONENT_TYPE
+    is a SWCOMPONENT_TYPE
     has identifier "Namespace".
 
 SWCOMPONENT
     (note "A concrete software component")
     is a type of ENTITY.
 
-    componentType (note "Type of component")
-        describes SWCOMPONENT with a single value of type COMPONENT_TYPE.
+    componentType (note "Type of software component")
+        describes SWCOMPONENT with a single value of type SWCOMPONENT_TYPE.
 
     valueType (note "The type of this value, if applicable (e.g. for functions or variables).")
         describes SWCOMPONENT with values of type string.
@@ -114,7 +114,7 @@ SWCOMPONENT
     mentions (note "A component referenced by this one, e.g., a callee or variable being used.")
         describes SWCOMPONENT with values of type SWCOMPONENT.
 
-    subcomponentOf (note "A structural sub-component, e.g., a function might be a subcomponent of module.")
+    partOf (note "A structural sub-component, e.g., a function might be a subcomponent / part of a module.")
         describes SWCOMPONENT with values of type SWCOMPONENT.
 
     /* How components relate to the system as a whole */

SRI-Ontology/ontology/SRI-SS.sadl

@@ -132,11 +132,11 @@ SoftwareComponent is a type of SWCOMPONENT.
 
 KernelAPI
    (note "API call to kernel (RTOS), used by other software components.")
-   is a COMPONENT_TYPE
+   is a SWCOMPONENT_TYPE
    has identifier "KernelAPI".
 DeviceDriver
    (note "software device driver managed by the kernel (RTOS)")
-   is a COMPONENT_TYPE
+   is a SWCOMPONENT_TYPE
    has identifier "DeviceDriver".
 
 PhysicalInterface is a type of ENTITY.