Merge pull request #165 from nokia/guide-1.1

Version 1.1 of the Guide in messages.

Author: vargenau

tools/openchain_telco_sbom_validator/README.md

@@ -1,6 +1,6 @@
 # openchain-telco-sbom-validator
 
-A script to validate SBOMs against version 1.0 of
+A script to validate SBOMs against version 1.1 of
 the [OpenChain Telco SBOM Guide](https://github.com/OpenChain-Project/Telco-WG/blob/main/OpenChain-Telco-SBOM-Guide_EN.md).
 
 # Installation
@@ -51,7 +51,7 @@ options:
                         “checksum-all” (externalrefs are identified by their checksum),
                         “yocto-all” (all externalrefs are investigated) and
                         “yocto-contains-only” (only those files are investigated which are in
-                        CONTAIN relationships). It is possible to register more reference
+                        CONTAINS relationships). It is possible to register more reference
                         logics in library mode.
 ```
 

tools/openchain_telco_sbom_validator/src/openchain_telco_sbom_validator/cli.py

@@ -83,7 +83,7 @@ def __getitem__(self, index):
         return self.items[index]
 
 def parseArguments(additionalArguments: AdditionalArguments = AdditionalArguments()):
-    parser = argparse.ArgumentParser(description='A script to validate an SPDX file against version 1.0 of the OpenChain Telco SBOM Guide.')
+    parser = argparse.ArgumentParser(description='A script to validate an SPDX file against version 1.1 of the OpenChain Telco SBOM Guide.')
     # TODO: This should go in without any parameter.
     parser.add_argument('input',
                         help='The input SPDX file.',
@@ -113,7 +113,7 @@ def parseArguments(additionalArguments: AdditionalArguments = AdditionalArgument
                         ' “checksum-all” (externalrefs are identified by their checksum),'
                         ' “yocto-all” (all externalrefs are investigated) and'
                         ' “yocto-contains-only” (only those files are investigated which are in'
-                        ' CONTAIN relationships). It is possible to register more reference'
+                        ' CONTAINS relationships). It is possible to register more reference'
                         ' logics in library mode')
 
     for argument in additionalArguments:

tools/openchain_telco_sbom_validator/src/openchain_telco_sbom_validator/reporter.py

@@ -40,15 +40,15 @@ def reportCli(result, problems, nr_of_errors, input):
 
         print(resultTable)
         if len(problems.checked_files) == 1:
-            print(f"The SPDX file {input} is not compliant with the OpenChain Telco SBOM Guide version 1.0")
+            print(f"The SPDX file {input} is not compliant with the OpenChain Telco SBOM Guide version 1.1")
         else:
-            print(f"One or more of the SPDX files {problems.get_files_as_string()} are not compliant with the OpenChain Telco SBOM Guide version 1.0")
+            print(f"One or more of the SPDX files {problems.get_files_as_string()} are not compliant with the OpenChain Telco SBOM Guide version 1.1")
         return 1
     else:
         if len(problems.checked_files) == 1:
-            print(f"The SPDX file {input} is compliant with the OpenChain Telco SBOM Guide version 1.0")
+            print(f"The SPDX file {input} is compliant with the OpenChain Telco SBOM Guide version 1.1")
         else:
-            print(f"All of the SPDX files {problems.get_files_as_string()} are compliant with the OpenChain Telco SBOM Guide version 1.0")
+            print(f"All of the SPDX files {problems.get_files_as_string()} are compliant with the OpenChain Telco SBOM Guide version 1.1")
         return 0
 
 def reportVersion():

tools/openchain_telco_sbom_validator/src/openchain_telco_sbom_validator/validator.py

@@ -177,7 +177,7 @@ function test_linked_yocto_all
     assert_exit_fail
     assert_has_output
     assert_output_contains "29 | SPDX"
-    assert_output_contains "One or more of the SPDX files linked-sbom-01.spdx.json, alarm.spdx.json, recipe-alarm.spdx.json, runtime-alarm.spdx.json, em-accessories.spdx.json, alignmentpavendors.spdx.json, recipe-alignmentpavendors.spdx.json, runtime-alignmentpavendors.spdx.json, alps.spdx.json, runtime-alps.spdx.json, kernel-5.15.155-r42.spdx.json, runtime-kernel-5.15.155-r42.spdx.json are not compliant with the OpenChain Telco SBOM Guide version 1.0"
+    assert_output_contains "One or more of the SPDX files linked-sbom-01.spdx.json, alarm.spdx.json, recipe-alarm.spdx.json, runtime-alarm.spdx.json, em-accessories.spdx.json, alignmentpavendors.spdx.json, recipe-alignmentpavendors.spdx.json, runtime-alignmentpavendors.spdx.json, alps.spdx.json, runtime-alps.spdx.json, kernel-5.15.155-r42.spdx.json, runtime-kernel-5.15.155-r42.spdx.json are not compliant with the OpenChain Telco SBOM Guide version 1.1"
 }
 
 function test_linked_yocto-contains-only
@@ -218,4 +218,4 @@ function test_linked_checksum_all
 
 
 
-testrunner
+testrunner