Auto-generated files

fluidos-project · Mar 21, 2024 · f494a6d · f494a6d
1 parent 77072f7
commit f494a6d
Show file tree

Hide file tree

Showing 5 changed files with 106 additions and 32 deletions.
diff --git a/README.md b/README.md
@@ -46,8 +46,13 @@ The FlavorType describes the actual flavor that is adverised.
   - **Memory**. The amount of memory ['integer']
   - **GPU**. The amount of GPU ['integer']
   - **Storage**. The amount of storage ['integer']
-  - **SecurityStandards**. Security standards supported by the Flavor (e.g., GDPR). ['array']
+- **Properties**:
   - **Latency**. The latency of the Flavor. ['integer']
+  - **SecurityStandards**. Security standards supported by the Flavor (e.g., GDPR). ['array']
+  - **CarbonFootprint**:
+    - **Embodied**. Embodied carbon of the node hardware normalized by its expected lifetime. ['integer']
+    - **Operational**. Forecasted average carbon intensity of the node for the next N windows/hours. ['integer']
+  - **WorkloadCaracteristics**. Forecasted average utilization of the node for the next N windows/hours. ['array']
 - **Policy**:
   - **Aggregatable**:
     - **MinCount**. Minimum required number of instances of the Flavor. ['integer']
@@ -77,8 +82,13 @@ The FlavorType describes the actual flavor that is adverised.
   - **Memory**. Amount of RAM of the Flavor. ['integer']
   - **GPU**. Number of GPU cores of the Flavor. ['integer']
   - **Storage**. The amount of storage ['integer']
-  - **SecurityStandards**. Security standards supported by the Flavor (e.g., GDPR). ['array']
+- **Properties**:
   - **Latency**. The latency of the Flavor. ['integer']
+  - **SecurityStandards**. Security standards supported by the Flavor (e.g., GDPR). ['array']
+  - **CarbonFootprint**:
+    - **Embodied**. Embodied carbon of the node hardware normalized by its expected lifetime. ['integer']
+    - **Operational**. Forecasted average carbon intensity of the node for the next N windows/hours. ['integer']
+  - **WorkloadCaracteristics**. Forecasted average utilization of the node for the next N windows/hours. ['array']
 - **Policy**:
   - **Aggregatable**:
     - **MinCount**. Minimum required number of instances of the Flavor. ['integer']

diff --git a/models/examples/puml/flavor-types/k8slice.txt b/models/examples/puml/flavor-types/k8slice.txt
@@ -3,14 +3,25 @@
   "K8Slice": {
     "Characteristics": {
       "CPU": 4,
-      "Pods": 10,
+      "Pods": 20,
       "Memory": 8192,
       "GPU": 1,
-      "Storage": 500,
+      "Storage": 500
+    },
+    "Properties": {
+      "Latency": 20,
       "SecurityStandards": [
         "GDPR"
       ],
-      "Latency": 25
+      "CarbonFootprint": {
+        "Embodied": 100,
+        "Operational": 25
+      },
+      "WorkloadCaracteristics": [
+        70,
+        65,
+        80
+      ]
     },
     "Policy": {
       "Aggregatable": {

diff --git a/models/examples/puml/flavor-types/vm.txt b/models/examples/puml/flavor-types/vm.txt
@@ -3,19 +3,30 @@
   "vm": {
     "Characteristics": {
       "Architecture": "x86_64",
-      "CPU": 2,
-      "Memory": 4096,
-      "GPU": 0,
-      "Storage": 100,
+      "CPU": 4,
+      "Memory": 8192,
+      "GPU": 1,
+      "Storage": 500
+    },
+    "Properties": {
+      "Latency": 20,
       "SecurityStandards": [
         "GDPR"
       ],
-      "Latency": 10
+      "CarbonFootprint": {
+        "Embodied": 100,
+        "Operational": 25
+      },
+      "WorkloadCaracteristics": [
+        70,
+        65,
+        80
+      ]
     },
     "Policy": {
       "Aggregatable": {
-        "MinCount": 1,
-        "MaxCount": 4
+        "MinCount": 2,
+        "MaxCount": 5
       }
     }
   }

diff --git a/models/schemas/puml/flavor-types/k8slice.txt b/models/schemas/puml/flavor-types/k8slice.txt
@@ -27,6 +27,15 @@
                 "Storage": {
                     "type": "integer",
                     "description": "The amount of storage"
+                }
+            }
+        },
+        "Properties": {
+            "type": "object",
+            "properties": {
+                "Latency": {
+                    "type": "integer",
+                    "description": "The latency of the Flavor."
                 },
                 "SecurityStandards": {
                     "type": "array",
@@ -35,12 +44,27 @@
                         "type": "string"
                     }
                 },
-                "Latency": {
-                    "type": "integer",
-                    "description": "The latency of the Flavor."
+                "CarbonFootprint": {
+                    "type": "object",
+                    "properties": {
+                        "Embodied": {
+                            "type": "integer",
+                            "description": "Embodied carbon of the node hardware normalized by its expected lifetime."
+                        },
+                        "Operational": {
+                            "type": "integer",
+                            "description": "Forecasted average carbon intensity of the node for the next N windows/hours."
+                        }
+                    }
+                },
+                "WorkloadCaracteristics": {
+                    "type": "array",
+                    "description": "Forecasted average utilization of the node for the next N windows/hours.",
+                    "items": {
+                        "type": "integer"
+                    }
                 }
-            },
-            "additionalProperties": false
+            }
         },
         "Policy": {
             "type": "object",
@@ -56,8 +80,7 @@
                             "type": "integer",
                             "description": "Maximum required number of instances of the Flavor."
                         }
-                    },
-                    "additionalProperties": false
+                    }
                 },
                 "Partitionable": {
                     "type": "object",
@@ -78,8 +101,7 @@
                             "type": "integer",
                             "description": "Incremental value of RAM of the Flavor."
                         }
-                    },
-                    "additionalProperties": false
+                    }
                 }
             }
         }

diff --git a/models/schemas/puml/flavor-types/vm.txt b/models/schemas/puml/flavor-types/vm.txt
@@ -27,6 +27,15 @@
                 "Storage": {
                     "type": "integer",
                     "description": "The amount of storage"
+                }
+            }
+        },
+        "Properties": {
+            "type": "object",
+            "properties": {
+                "Latency": {
+                    "type": "integer",
+                    "description": "The latency of the Flavor."
                 },
                 "SecurityStandards": {
                     "type": "array",
@@ -35,12 +44,27 @@
                         "type": "string"
                     }
                 },
-                "Latency": {
-                    "type": "integer",
-                    "description": "The latency of the Flavor."
+                "CarbonFootprint": {
+                    "type": "object",
+                    "properties": {
+                        "Embodied": {
+                            "type": "integer",
+                            "description": "Embodied carbon of the node hardware normalized by its expected lifetime."
+                        },
+                        "Operational": {
+                            "type": "integer",
+                            "description": "Forecasted average carbon intensity of the node for the next N windows/hours."
+                        }
+                    }
+                },
+                "WorkloadCaracteristics": {
+                    "type": "array",
+                    "description": "Forecasted average utilization of the node for the next N windows/hours.",
+                    "items": {
+                        "type": "integer"
+                    }
                 }
-            },
-            "additionalProperties": false
+            }
         },
         "Policy": {
             "type": "object",
@@ -56,13 +80,9 @@
                             "type": "integer",
                             "description": "Maximum required number of instances of the Flavor."
                         }
-                    },
-                    "additionalProperties": false
+                    }
                 }
-            },
-            "required": [
-                "Aggregatable"
-            ]
+            }
         }
     }
 }