Added additionalProperties subfield to K8Slice Property field (#4) (#120)

Author: andreacv98

apis/nodecore/v1alpha1/flavor_types_common.go

@@ -14,6 +14,8 @@
 
 package v1alpha1
 
+import "k8s.io/apimachinery/pkg/runtime"
+
 // CarbonFootprint represents the carbon footprint of a Flavor.
 type CarbonFootprint struct {
 	Embodied    int   `json:"embodied"`
@@ -38,4 +40,6 @@ type Properties struct {
 	CarbonFootprint *CarbonFootprint `json:"carbon-footprint,omitempty"`
 	// Network authorization policies of the K8Slice Flavor
 	NetworkAuthorizations *NetworkAuthorizations `json:"networkAuthorizations,omitempty"`
+	// AdditionalProperties represents the additional properties of the K8Slice Flavor.
+	AdditionalProperties map[string]runtime.RawExtension `json:"additionalProperties,omitempty"`
 }

apis/nodecore/v1alpha1/zz_generated.deepcopy.go

@@ -15,6 +15,7 @@
 package models
 
 import (
+	"encoding/json"
 	"strings"
 
 	"k8s.io/apimachinery/pkg/api/resource"
@@ -52,10 +53,11 @@ type K8SliceCharacteristics struct {
 
 // K8SliceProperties represents the properties of a Kubernetes slice.
 type K8SliceProperties struct {
-	Latency               int                    `json:"latency,omitempty"`
-	SecurityStandards     []string               `json:"securityStandards,omitempty"`
-	CarbonFootprint       *CarbonFootprint       `json:"carbonFootprint,omitempty"`
-	NetworkAuthorizations *NetworkAuthorizations `json:"networkAuthorizations,omitempty"`
+	Latency               int                        `json:"latency,omitempty"`
+	SecurityStandards     []string                   `json:"securityStandards,omitempty"`
+	CarbonFootprint       *CarbonFootprint           `json:"carbonFootprint,omitempty"`
+	NetworkAuthorizations *NetworkAuthorizations     `json:"networkAuthorizations,omitempty"`
+	AdditionalProperties  map[string]json.RawMessage `json:"additionalProperties,omitempty"`
 }
 
 // K8SlicePartitionability represents the partitionability of a Kubernetes slice.

pkg/utils/models/flavor-k8slice-models.go

@@ -626,6 +626,14 @@ func ParseFlavor(flavor *nodecorev1alpha1.Flavor) *models.Flavor {
 			},
 		}
 
+		if err := parseK8SlicePropertyAdditionalProperties(
+			&flavorTypeStruct.Properties,
+			&modelFlavorTypeData.Properties,
+		); err != nil {
+			klog.Errorf("Error parsing K8Slice additional properties: %s", err)
+			return nil
+		}
+
 		// Encode the K8Slice data into JSON
 		encodedFlavorTypeData, err := json.Marshal(modelFlavorTypeData)
 		if err != nil {
@@ -709,6 +717,39 @@ func ParseFlavor(flavor *nodecorev1alpha1.Flavor) *models.Flavor {
 	return &modelFlavor
 }
 
+func parseK8SlicePropertyAdditionalProperties(k8SliceProperty *nodecorev1alpha1.Properties, k8SliceObjProperty *models.K8SliceProperties) error {
+	if k8SliceProperty == nil {
+		klog.Info("K8Slice property is nil")
+		return nil
+	}
+
+	if k8SliceObjProperty == nil {
+		klog.Info("K8Slice object property is nil")
+		return nil
+	}
+
+	// Check the additional properties
+	if k8SliceProperty.AdditionalProperties == nil {
+		klog.Info("Additional properties is nil")
+		return nil
+	}
+
+	// Initialize the additional properties map
+	k8SliceObjProperty.AdditionalProperties = make(map[string]json.RawMessage)
+
+	// Parse the additional properties
+	for key, value := range k8SliceProperty.AdditionalProperties {
+		// Parse runtime.RawExtension to json.RawMessage
+		jsonValue, err := json.Marshal(value)
+		if err != nil {
+			return err
+		}
+		k8SliceObjProperty.AdditionalProperties[key] = jsonValue
+	}
+
+	return nil
+}
+
 // ParseContract creates a Contract Object.
 func ParseContract(contract *reservationv1alpha1.Contract) *models.Contract {
 	return &models.Contract{

pkg/utils/parseutil/parseutil.go

@@ -915,6 +915,12 @@ func ForgeFlavorFromObj(flavor *models.Flavor) (*nodecorev1alpha1.Flavor, error)
 				},
 			},
 		}
+
+		if err := forgeK8SlicePropertyAdditionalPropertiesFromObj(&flavorTypeDataModel.Properties, &flavorTypeData.Properties); err != nil {
+			klog.Errorf("Error when forging K8Slice additional properties: %s", err)
+			return nil, err
+		}
+
 		flavorTypeDataJSON, err := json.Marshal(flavorTypeData)
 		if err != nil {
 			klog.Errorf("Error when marshaling K8SliceType: %s", err)
@@ -995,6 +1001,43 @@ func ForgeFlavorFromObj(flavor *models.Flavor) (*nodecorev1alpha1.Flavor, error)
 	return f, nil
 }
 
+func forgeK8SlicePropertyAdditionalPropertiesFromObj(k8SliceObjProperties *models.K8SliceProperties,
+	k8SliceProperties *nodecorev1alpha1.Properties) error {
+	if k8SliceObjProperties == nil {
+		klog.Info("K8Slice properties not found")
+		return nil
+	}
+
+	if k8SliceProperties == nil {
+		klog.Info("K8Slice additional properties not found")
+		return nil
+	}
+
+	// Check additional properties
+	if k8SliceObjProperties.AdditionalProperties == nil {
+		klog.Info("K8Slice additional properties not found")
+		return nil
+	}
+
+	// Initialize additional properties
+	k8SliceProperties.AdditionalProperties = make(map[string]runtime.RawExtension)
+
+	// Forge additional properties
+	for key, value := range k8SliceObjProperties.AdditionalProperties {
+		// Check for empty value
+		if value == nil {
+			klog.Errorf("Empty value for additional property %s", key)
+			return fmt.Errorf("empty value for additional property %s", key)
+		}
+		// Convert json.RawMessage to runtime.RawExtension
+		rawExtension := runtime.RawExtension{Raw: value}
+		// Add additional property to K8SliceProperties
+		k8SliceProperties.AdditionalProperties[key] = rawExtension
+	}
+
+	return nil
+}
+
 // ForgeK8SliceConfiguration creates a Configuration from a FlavorSelector.
 func ForgeK8SliceConfiguration(selector nodecorev1alpha1.K8SliceSelector, flavor *nodecorev1alpha1.K8Slice) *nodecorev1alpha1.K8SliceConfiguration {
 	var cpu, memory, pods resource.Quantity