Generate VirtualMaschineServiceOffering

Signed-off-by: Anja Strunk <[email protected]>

config/config.yaml

@@ -1,41 +1,24 @@
 # Mandatory attributes required by Gaia-X
 CPS:
   did: did:web:example.com
-  legal-name: ACME Coorp.
-  # allowed values are country codes according to ISO 3166-2 alpha2, alpha-3 or numeric format.
-  legal-address-country-code: DE-SN
-  # allowed values are country codes according to ISO 3166-2 alpha2, alpha-3 or numeric format.
-  headquarter-address-country-code: DE-SN
-  # CSP VAT number
-  vat-id: DE281093504
-  # absolute path to key to sign verifiable credentials
-  signing-key: path-to-key
 
 IaaS:
   did: did:web:example.com:iaas
   terms-and-conditions:
-    - www.example.com
-  resource-policy:
+    - https://www.cloudandheat.com/allgemeine-geschaeftsbedingungen/
+    #- www.example.com/tan1
+    - www.example.com/tan2
+  service-policy:
+    - "default: allow intent"
     - "default: allow intent"
   data-account-export:
     # Allowed values are: API, email, webform,  unregisteredLetter, registeredLetter, supportCenter
-    request-type: email
+    request-type: API
     # allowed values are: digital, physical
     access-type: digital
     # Allowed values are MIME types
     format-type: "application/plain"
 
-# Endpoints of Gaia-X Digital Clearing House
-gxdch:
-  notary-service:
-    - https://registrationnumber.notary.gaia-x.eu/v1/registrationNumberVC
-    - https://gx-notary.gxdch.dih.telekom.com/v1/registrationNumberVC
-    - https://gx-notary.airenetworks.es/v1/registrationNumberVC
-    - https://x-notary.aruba.it/v1/registrationNumberVC
-  compliance-service:
-    - https://gx-compliance.aruba.it/v1/api/credential-offers
-
-
 
 # CAUTION: Do not change these values, unless you want to overwrite default behaviour
 software resources:
@@ -175,18 +158,4 @@ software resources:
     copyright-owner: "Microsoft Corporation"
     resource-policy: "default: allow intent"
     license:
-      - https://www.microsoft.com/windows-server/pricing
-#cloud resources:
-#  own images:
-#    AlmaLinux 8:
-#      aggregation of:
-#        - web:did:provider.de
-#      copyright-owner:
-#        - "AlmaLinux OS Foundation"
-#        - "ABC"
-#      resource-policy: "abc"
-#      license:
-#          - https://www.abc.org
-#wallets:
-#  filesystem:
-#    path: /etc/wallet/gx-credentials/
+      - https://www.microsoft.com/windows-server/pricing

generator/cli.py

@@ -12,11 +12,9 @@
 
 import json
 import sys
-
 import click
 import openstack as os
 import yaml
-
 import generator.common.json_ld as json_ld
 from generator.common.config import Config
 from generator.discovery.openstack.openstack_discovery import OsCloud

generator/common/config.py

@@ -23,7 +23,7 @@ def get_value(self, keys: List[str]):
         try:
             return _get_value(self.config, keys)
         except KeyError as ke:
-            raise KeyError("Config file missing following key chain: " + str(keys))
+            raise KeyError("Config file missing following keys: " + str(keys))
 
 
     def get_copyright_owner(self, software: str) -> List[str]:

generator/common/const.py

@@ -3,36 +3,27 @@
 """
 CONFIG_FILE = "config/config.yaml"
 
-# General key
+# General keys
 CONFIG_DID = "did"
-CONFIG_TaC = "terms-and-conditions"
-
-# Signing keys
-CONFIG_SIGN = "Signing"
-CONFIG_SIGN_KEY = "key"
-CONFIG_SIGN_VER_METH = "verification-method"
-CONFIG_SIGN_BASE_CRED_URL = "base_credential_url"
 
+# Credentials keys
+CONFIG_CRED = "Credentials"
+CONFIG_CRED_KEY = "key"
+CONFIG_CRED_VER_METH = "verification-method"
+CONFIG_CRED_BASE_CRED_URL = "base_credential_url"
 
 # CPS configuration keys
 CONFIG_CSP = "CPS"
-CONFIG_CSP_NAME = "legal-name"
-CONFIG_CSP_LEG_AD = "legal-address-country-code"
-CONFIG_CSP_HQ_ADR = "headquarter-address-country-code"
-CONFIG_CSP_VAT_ID = "vat-id"
-#CONFIG_CSP_SIGN_KEY = "signing-key"
 
 # IaaS configuration keys
-CONFIG_IAAS = "iaas"
+CONFIG_IAAS = "IaaS"
 CONFIG_IAAS_DATA_EXPORT = "data-account-export"
 CONFIG_IAAS_DATA_EXPORT_REQ_TYPE = "request-type"
 CONFIG_IAAS_DATA_EXPORT_ACCESS_TYPE = "access-type"
 CONFIG_IAAS_DATA_EXPORT_FORMAT_TYPE = "format-type"
+CONFIG_IAAS_SERVICE_POLICY = "service-policy"
+CONFIG_IAAS_T_AND_C = "terms-and-conditions"
 
-# GXDCH
-CONST_GXDCH = "gxdch"
-CONST_GXDCH_NOT = "notary-service"
-CONST_GXDCH_COMP = "compliance-service"
 
 # Default values
 DEFAULT_RESOURCE_POLICY = "default: allow intent"