Merge branch 'main' into 62-writeupdate-documentation

Signed-off-by: anjastrunk <119566837+anjastrunk@users.noreply.github.com>
SovereignCloudStack · Aug 29, 2024 · d24e634 · d24e634
2 parents 216a4cb + 1c896a1
commit d24e634
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 12 deletions.
diff --git a/config/config.yaml b/config/config.yaml
@@ -11,7 +11,7 @@ Credentials:
   # URL did resolver web service
   did_resolver: https://uniresolver.io/1.0/identifiers
 
-CPS:
+CSP:
   did: did:web:example.com
   legal-name: Example Corp
   # allowed values are country codes according to ISO 3166-2 alpha2, alpha-3 or numeric format.

diff --git a/generator/cli.py b/generator/cli.py
@@ -97,7 +97,7 @@ def openstack(cloud, timeout, config, out_dir, auto_sign):
 
 @click.command()
 def kubernetes():
-    """Generates Gaia-X Credentials for CPS and kubernetes."""
+    """Generates Gaia-X Credentials for CSP and Kubernetes."""
     pass
 
 
@@ -122,7 +122,7 @@ def kubernetes():
     default="config/config.yaml",
     help="Path to Configuration file for SCS GX Credential Generator.")
 def csp(config, out_dir, auto_sign):
-    """Generate Gaia-X Credential for CPS."""
+    """Generate Gaia-X Credential for CSP."""
     # load config file
     with open(config, "r") as config_file:
         conf = Config(yaml.safe_load(config_file))

diff --git a/generator/common/const.py b/generator/common/const.py
@@ -22,8 +22,8 @@
 CONFIG_IAAS_DATA_EXPORT_FORMAT_TYPE = "format-type"
 CONFIG_IAAS_SERVICE_POLICY = "service-policy"
 
-# CPS configuration keys
-CONFIG_CSP = "CPS"
+# CSP configuration keys
+CONFIG_CSP = "CSP"
 CONFIG_CSP_NAME = "legal-name"
 CONFIG_CSP_LEG_AD = "legal-address-country-code"
 CONFIG_CSP_HQ_ADR = "headquarter-address-country-code"

diff --git a/generator/common/credentials.py b/generator/common/credentials.py
@@ -3,7 +3,7 @@
 from generator.common import const
 
 
-def convert_to_vp(creds: List[dict]) -> str:
+def convert_to_vp(creds: List[dict]) -> dict:
     return {
         '@context': const.VP_CONTEXT,
         'type': "VerifiablePresentation",

diff --git a/generator/discovery/openstack/vm_images_discovery.py b/generator/discovery/openstack/vm_images_discovery.py
@@ -15,7 +15,7 @@
                                         DiskBusType, FirmType, HypervisorType,
                                         LatestN, MaintenanceSubscription,
                                         Memory, MemorySize, OperatingSystem,
-                                        RNGTypes, Signature,
+                                        OSDistribution, RNGTypes, Signature,
                                         SignatureAlgorithm, UpdateFrequency,
                                         UpdateStrategy, Validity1, Validity2,
                                         VMDiskType)
@@ -290,8 +290,12 @@ def _get_min_disk_req(os_image: OS_Image) -> Disk:
     def _get_operation_system(self, os_image: OS_Image) -> OperatingSystem:
         # Copyright owner and license not supported as Image properties, currently --> Default values from config are used
         if os_image.os_distro is None:
-            return None
-
+            return OperatingSystem(
+                version=os_image.os_version,
+                osDistribution=OSDistribution.others,
+                resourcePolicy=const.DEFAULT_RESOURCE_POLICY,
+                copyrightOwnedBy="TBA",
+                license="https://www.example.com/tba")
         if os_image.os_distro.lower() == "arch":
             return OperatingSystem(
                 version=os_image.os_version,

diff --git a/tests/test_vm_image_discovery.py b/tests/test_vm_image_discovery.py
@@ -7,8 +7,9 @@
 from generator.common.gx_schema import (CPU, CheckSum, ChecksumAlgorithm, Disk,
                                         FirmType, HypervisorType, LatestN,
                                         MaintenanceSubscription, Memory,
-                                        MemorySize, OperatingSystem, RNGTypes,
-                                        Signature, UpdateStrategy, VMDiskType)
+                                        MemorySize, OperatingSystem,
+                                        OSDistribution, RNGTypes, Signature,
+                                        UpdateStrategy, VMDiskType)
 from generator.common.gx_schema import VMImage as GX_Image
 from generator.common.gx_schema import WatchDogActions
 from generator.common.json_ld import JsonLdObject
@@ -871,7 +872,18 @@ def test_get_operating_system(self):
                 OS_Image(os_version="1", os_distro="windows")
             ),
         )
-        self.assertIsNone(self.discovery._get_operation_system(OS_Image()))
+        self.assertEqual(
+            OperatingSystem(
+                version="1",
+                osDistribution=OSDistribution.others,
+                resourcePolicy=const.DEFAULT_RESOURCE_POLICY,
+                copyrightOwnedBy="TBA",
+                license=["https://www.example.com/tba"]
+            ),
+            self.discovery._get_operation_system(
+                OS_Image(os_version="1")
+            ),
+        )
 
 
 if __name__ == "__main__":