Merge pull request #1 from andreacv98/master

REAR Data models improved according to FLUIDOS Node implementation

.github/workflows/build-plantuml.yml

@@ -17,23 +17,33 @@ jobs:
  run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT
  id: extract_branch
 
- - name: Run script
+ - name: Set execute permission for all the scripts
  run: |
- cd models/schemas/
- bash ./generate_puml.sh 
- cd ../examples
- bash ./generate_puml.sh
- # Add any additional commands your script might need (e.g., install dependencies)
+ chmod +x scripts/*.sh
+ chmod +x scripts/*.py
+
+ - name: Generate PlantUML
+ run: |
+ bash ./scripts/generate_puml.sh ./models/schemas/
+ bash ./scripts/generate_puml.sh ./models/examples/
+
+ - name: Set up Python
+ uses: actions/setup-python@v4
+ with:
+ python-version: '3.x'
+
+ - name: Install Python dependencies
+ run: |
+ python -m pip install --upgrade pip
+ pip install -r scripts/requirements.txt
 
  - name: Generate SVG
  run: |
- cd models/
- python3 generate_svg.py ${{ steps.extract_branch.outputs.branch }}
+ python scripts/generate_svg.py ./puml
 
  - name: Generate Docs
- run: | 
- cd docs
- python3 generate_docs.py 
+ run: |
+ python scripts/generate_docs.py ./models/schemas/ ./svg/models/schemas/ ./svg/models/examples/
 
  - name: Check for changes
  id: git-check

models/examples/configuration-types/k8slice-configuration.json

@@ -0,0 +1,11 @@
+{
+ "cpu": "2",
+ "pods": "5",
+ "memory": "4Gi",
+ "gpu": {
+ "model": "NVIDIA Tesla V100",
+ "cores": "1",
+ "memory": "16Gi"
+ },
+ "storage": "100Gi"
+}

models/examples/configuration.json

@@ -0,0 +1,6 @@
+{
+ "type": "k8slice",
+ "data": {
+ "$ref": "./configurationTypes/k8slice-configuration.schema.json"
+ }
+}

models/examples/contract.json

@@ -0,0 +1,16 @@
+{
+ "ContractID": "12345-abcde",
+ "Flavor": {
+ "$ref": "./flavor.schema.json"
+ },
+ "Buyer": {
+ "$ref": "node-identity.schema.json"
+ },
+ "Seller": {
+ "$ref": "node-identity.schema.json"
+ },
+ "ExpirationTime": "2024-12-31T23:59:59Z",
+ "Credentials": {
+ "$ref": "credentials/liqo-credentials.schema.json"
+ }
+}

models/examples/credentials/liqo-credentials.json

@@ -0,0 +1,6 @@
+{
+ "clusterID": "cluster-123",
+ "clusterName": "ExampleCluster",
+ "endpoint": "https://example.cluster.endpoint",
+ "token": "abc123token"
+}

models/examples/flavor-types/k8slice.json

@@ -0,0 +1,35 @@
+{
+ "name": "ExampleK8Slice",
+ "characteristics": {
+ "cpu": "2",
+ "pods": "5",
+ "memory": "4Gi",
+ "gpu": {
+ "model": "NVIDIA Tesla K80",
+ "cores": "1",
+ "memory": "12Gi"
+ },
+ "storage": "100Gi"
+ },
+ "properties": {
+ "latency": 50,
+ "securityStandards": [
+ "GDPR",
+ "HIPAA"
+ ],
+ "carbonFootprint": {
+ "embodied": 2000,
+ "operational": []
+ }
+ },
+ "policies": {
+ "partitionability": {
+ "cpuMin": "500m",
+ "memoryMin": "1Gi",
+ "podsMin": "1",
+ "cpuStep": "250m",
+ "memoryStep": "512Mi",
+ "podsStep": "1"
+ }
+ }
+}

models/examples/flavor-types/sensor.json

@@ -0,0 +1,31 @@
+{
+ "Characteristics": {
+ "SensorType": "Temperature",
+ "SensorModel": "T1000",
+ "SensorManufacturer": "SensorCorp",
+ "SensorMarket": "Industrial",
+ "SamplingRate": 1000,
+ "Accuracy": 95,
+ "Consumption": 50,
+ "Interface": "I2C",
+ "SecurityStandards": [
+ "ISO 27001",
+ "GDPR"
+ ],
+ "Latency": 10,
+ "additionalProperties": {
+ "MeasurementUnit": "Celsius",
+ "ConsumptionUnit": "mW",
+ "SamplingRateUnit": "milliseconds",
+ "AccessProtocol": "HTTP"
+ }
+ },
+ "AccessType": {
+ "HTTP": {
+ "method": [
+ "GET",
+ "POST"
+ ]
+ }
+ }
+}

models/examples/flavor-types/service.json

@@ -0,0 +1,17 @@
+{
+ "Characteristics": {
+ "Name": "Database Service",
+ "Description": "A scalable database service for applications.",
+ "Tags": [
+ "database",
+ "scalable",
+ "managed"
+ ],
+ "Plan": "Premium",
+ "Latency": 20,
+ "SecurityStandards": [
+ "ISO 27001",
+ "GDPR"
+ ]
+ }
+}

models/examples/flavor-types/vm.json

@@ -0,0 +1,30 @@
+{
+ "Characteristics": {
+ "Architecture": "x86_64",
+ "OS": "Ubuntu 20.04",
+ "CPU": 4,
+ "Memory": 8192,
+ "GPU": {
+ "GPUModel": "NVIDIA RTX 3080",
+ "GPUCores": 10
+ },
+ "Storage": 100
+ },
+ "Properties": {
+ "Latency": 30,
+ "SecurityStandards": [
+ "GDPR",
+ "ISO 27001"
+ ],
+ "CarbonFootprint": {
+ "Embodied": 1500,
+ "Operational": []
+ }
+ },
+ "Policy": {
+ "Aggregatable": {
+ "MinCount": 1,
+ "MaxCount": 10
+ }
+ }
+}