[issue-426] update model: decision and justification type

to 7ecb523ea152ed40c09ff6451b47ceefad148164

Signed-off-by: Armin Tänzer <armin.taenzer@tngtech.com>

Author: armintaenzertng

README.md

@@ -50,7 +50,7 @@ additional installation of optional dependencies
 * Serialize to JSON-LD
 
 See [Quickstart to SPDX 3.0](#quickstart-to-spdx-30) below.  
-The implementation is based on the descriptive markdown files in the repository https://github.com/spdx/spdx-3-model (latest commit: ea2e1446ae937c6722b3f599f95813f8747d54b4).
+The implementation is based on the descriptive markdown files in the repository https://github.com/spdx/spdx-3-model (latest commit: 7ecb523ea152ed40c09ff6451b47ceefad148164).
 
 
 # Installation

src/spdx_tools/spdx3/model/security/ssvc_vuln_assessment_relationship.py

@@ -28,15 +28,15 @@ class SsvcDecisionType(Enum):
 
 @dataclass_with_properties
 class SsvcVulnAssessmentRelationship(VulnAssessmentRelationship):
-    decision: SsvcDecisionType = None
+    decision_type: SsvcDecisionType = None
 
     def __init__(
         self,
         spdx_id: str,
         from_element: str,
         relationship_type: RelationshipType,
         to: List[str],
-        decision: SsvcDecisionType,
+        decision_type: SsvcDecisionType,
         creation_info: Optional[CreationInfo] = None,
         name: Optional[str] = None,
         summary: Optional[str] = None,

src/spdx_tools/spdx3/model/security/vex_not_affected_vuln_assessment_relationship.py

@@ -29,7 +29,7 @@ class VexJustificationType(Enum):
 
 @dataclass_with_properties
 class VexNotAffectedVulnAssessmentRelationship(VexVulnAssessmentRelationship):
-    justification: Optional[VexJustificationType] = None
+    justification_type: Optional[VexJustificationType] = None
     impact_statement: Optional[str] = None
     impact_statement_time: Optional[datetime] = None
 
@@ -58,7 +58,7 @@ def __init__(
         withdrawn_time: Optional[datetime] = None,
         vex_version: Optional[str] = None,
         status_notes: Optional[str] = None,
-        justification: Optional[VexJustificationType] = None,
+        justification_type: Optional[VexJustificationType] = None,
         impact_statement: Optional[str] = None,
         impact_statement_time: Optional[datetime] = None,
     ):

tests/spdx3/fixtures.py

@@ -314,7 +314,7 @@ def listed_license_fixture(
 }
 
 SSVC_VULN_ASSESSMENT_RELATIONSHIP_DICT = {
-    "decision": SsvcDecisionType.ACT,
+    "decision_type": SsvcDecisionType.ACT,
     "relationship_type": RelationshipType.HAS_SSVC_ASSESSMENT_FOR,
 }
 
@@ -337,7 +337,7 @@ def listed_license_fixture(
 }
 
 VEX_NOT_AFFECTED_VULN_ASSESSMENT_RELATIONSHIP_DICT = {
-    "justification": VexJustificationType.COMPONENT_NOT_PRESENT,
+    "justification_type": VexJustificationType.COMPONENT_NOT_PRESENT,
     "impact_statement": "Not using this vulnerable part of this library.",
     "impact_statement_time": datetime(2015, 10, 15),
     "relationship_type": RelationshipType.DOES_NOT_AFFECT,