feat: verify deeploy resources with what has been paid in bc (#263)

* feat: verify deeploy resources with what has been paid in bc

* feat: add storage limits in resource specs

* chore: inc ver

Author: aledefra

extensions/business/deeploy/deeploy_const.py

@@ -100,6 +100,7 @@ class DEEPLOY_RESOURCES:
   # Resource types
   CPU = 'cpu'
   MEMORY = 'memory'
+  STORAGE = 'storage'
 
   # Units
   CORES = 'cores'
@@ -128,6 +129,53 @@ class DEFAULT_CONTAINER_RESOURCES:
   CPU = 1
   MEMORY = '512m'
 
+JOB_TYPE_RESOURCE_SPECS = {
+  # Generic Apps
+  1: {DEEPLOY_RESOURCES.CPU: 1, DEEPLOY_RESOURCES.MEMORY: '2g', DEEPLOY_RESOURCES.STORAGE: '8g'}, # entry
+  2: {DEEPLOY_RESOURCES.CPU: 2, DEEPLOY_RESOURCES.MEMORY: '4g', DEEPLOY_RESOURCES.STORAGE: '16g'}, # low1
+  3: {DEEPLOY_RESOURCES.CPU: 2, DEEPLOY_RESOURCES.MEMORY: '8g', DEEPLOY_RESOURCES.STORAGE: '32g'}, # low2
+  4: {DEEPLOY_RESOURCES.CPU: 3, DEEPLOY_RESOURCES.MEMORY: '12g', DEEPLOY_RESOURCES.STORAGE: '48g'}, # med1
+  5: {DEEPLOY_RESOURCES.CPU: 6, DEEPLOY_RESOURCES.MEMORY: '14g', DEEPLOY_RESOURCES.STORAGE: '56g'}, # med2
+  6: {DEEPLOY_RESOURCES.CPU: 8, DEEPLOY_RESOURCES.MEMORY: '22g', DEEPLOY_RESOURCES.STORAGE: '88g'}, # high1
+  7: {DEEPLOY_RESOURCES.CPU: 12, DEEPLOY_RESOURCES.MEMORY: '30g', DEEPLOY_RESOURCES.STORAGE: '120g'}, # high2
+  8: {DEEPLOY_RESOURCES.CPU: 16, DEEPLOY_RESOURCES.MEMORY: '62g', DEEPLOY_RESOURCES.STORAGE: '248g'}, # ultra1
+  9: {DEEPLOY_RESOURCES.CPU: 22, DEEPLOY_RESOURCES.MEMORY: '124g', DEEPLOY_RESOURCES.STORAGE: '496g'}, # ultra2
+  # Services
+  10: {DEEPLOY_RESOURCES.CPU: 1, DEEPLOY_RESOURCES.MEMORY: '2g', DEEPLOY_RESOURCES.STORAGE: '50g'}, # pgsql_low
+  11: {DEEPLOY_RESOURCES.CPU: 2, DEEPLOY_RESOURCES.MEMORY: '4g', DEEPLOY_RESOURCES.STORAGE: '200g'}, # pgsql_med
+  12: {DEEPLOY_RESOURCES.CPU: 1, DEEPLOY_RESOURCES.MEMORY: '2g', DEEPLOY_RESOURCES.STORAGE: '50g'}, # mysql_low
+  13: {DEEPLOY_RESOURCES.CPU: 2, DEEPLOY_RESOURCES.MEMORY: '4g', DEEPLOY_RESOURCES.STORAGE: '200g'}, # mysql_med
+  14: {DEEPLOY_RESOURCES.CPU: 1, DEEPLOY_RESOURCES.MEMORY: '2g', DEEPLOY_RESOURCES.STORAGE: '50g'}, # nosql_low
+  15: {DEEPLOY_RESOURCES.CPU: 2, DEEPLOY_RESOURCES.MEMORY: '4g', DEEPLOY_RESOURCES.STORAGE: '200g'}, # nosql_med
+  # Native Apps
+  16: {DEEPLOY_RESOURCES.CPU: 3, DEEPLOY_RESOURCES.MEMORY: '14g'}, # n_entry
+  17: {DEEPLOY_RESOURCES.CPU: 8, DEEPLOY_RESOURCES.MEMORY: '22g'}, # n_med1
+  18: {DEEPLOY_RESOURCES.CPU: 12, DEEPLOY_RESOURCES.MEMORY: '30g'}, # n_med2
+  19: {DEEPLOY_RESOURCES.CPU: 16, DEEPLOY_RESOURCES.MEMORY: '60g'}, # n_high
+  20: {DEEPLOY_RESOURCES.CPU: 22, DEEPLOY_RESOURCES.MEMORY: '124g'}, # n_ultra
+  # GPU Extra
+  21: {DEEPLOY_RESOURCES.CPU: 3, DEEPLOY_RESOURCES.MEMORY: '12g', DEEPLOY_RESOURCES.STORAGE: '48g'}, # g_entry + med1
+  22: {DEEPLOY_RESOURCES.CPU: 6, DEEPLOY_RESOURCES.MEMORY: '14g', DEEPLOY_RESOURCES.STORAGE: '56g'}, # g_entry + med2
+  23: {DEEPLOY_RESOURCES.CPU: 3, DEEPLOY_RESOURCES.MEMORY: '14g'}, # g_entry + n_entry
+  24: {DEEPLOY_RESOURCES.CPU: 8, DEEPLOY_RESOURCES.MEMORY: '22g'}, # g_entry + n_med1
+  25: {DEEPLOY_RESOURCES.CPU: 6, DEEPLOY_RESOURCES.MEMORY: '14g', DEEPLOY_RESOURCES.STORAGE: '56g'}, # g_med + med2
+  26: {DEEPLOY_RESOURCES.CPU: 8, DEEPLOY_RESOURCES.MEMORY: '22g', DEEPLOY_RESOURCES.STORAGE: '88g'}, # g_med + high1
+  27: {DEEPLOY_RESOURCES.CPU: 12, DEEPLOY_RESOURCES.MEMORY: '30g', DEEPLOY_RESOURCES.STORAGE: '120g'}, # g_med + high2
+  28: {DEEPLOY_RESOURCES.CPU: 16, DEEPLOY_RESOURCES.MEMORY: '62g', DEEPLOY_RESOURCES.STORAGE: '248g'}, # g_med + ultra1
+  29: {DEEPLOY_RESOURCES.CPU: 8, DEEPLOY_RESOURCES.MEMORY: '22g'}, # g_med + n_med1
+  30: {DEEPLOY_RESOURCES.CPU: 12, DEEPLOY_RESOURCES.MEMORY: '30g'}, # g_med + n_med2
+  31: {DEEPLOY_RESOURCES.CPU: 16, DEEPLOY_RESOURCES.MEMORY: '60g'}, # g_med + n_high
+  32: {DEEPLOY_RESOURCES.CPU: 12, DEEPLOY_RESOURCES.MEMORY: '30g', DEEPLOY_RESOURCES.STORAGE: '120g'}, # g_high + high2
+  33: {DEEPLOY_RESOURCES.CPU: 16, DEEPLOY_RESOURCES.MEMORY: '62g', DEEPLOY_RESOURCES.STORAGE: '248g'}, # g_high + ultra1
+  34: {DEEPLOY_RESOURCES.CPU: 22, DEEPLOY_RESOURCES.MEMORY: '124g', DEEPLOY_RESOURCES.STORAGE: '496g'}, # g_high + ultra2
+  35: {DEEPLOY_RESOURCES.CPU: 12, DEEPLOY_RESOURCES.MEMORY: '30g'}, # g_high + n_med2
+  36: {DEEPLOY_RESOURCES.CPU: 16, DEEPLOY_RESOURCES.MEMORY: '60g'}, # g_high + n_high
+  37: {DEEPLOY_RESOURCES.CPU: 22, DEEPLOY_RESOURCES.MEMORY: '124g'}, # g_high + n_ultra
+  38: {DEEPLOY_RESOURCES.CPU: 16, DEEPLOY_RESOURCES.MEMORY: '62g', DEEPLOY_RESOURCES.STORAGE: '248g'}, # g_ultra + ultra1
+  39: {DEEPLOY_RESOURCES.CPU: 22, DEEPLOY_RESOURCES.MEMORY: '124g', DEEPLOY_RESOURCES.STORAGE: '496g'}, # g_ultra + ultra2
+  40: {DEEPLOY_RESOURCES.CPU: 22, DEEPLOY_RESOURCES.MEMORY: '124g'}, # g_ultra + n_ultra
+}
+
 class DEEPLOY_PLUGIN_DATA:
   PLUGIN_SIGNATURE = "plugin_signature"
   PLUGIN_INSTANCE = "plugin_instance"

extensions/business/deeploy/deeploy_mixin.py

@@ -3,7 +3,8 @@
 from naeural_core import constants as ct
 
 from extensions.business.deeploy.deeploy_const import DEEPLOY_ERRORS, DEEPLOY_KEYS, \
-  DEEPLOY_STATUS, DEEPLOY_PLUGIN_DATA, DEEPLOY_FORBIDDEN_SIGNATURES, CONTAINER_APP_RUNNER_SIGNATURE, DEEPLOY_RESOURCES
+  DEEPLOY_STATUS, DEEPLOY_PLUGIN_DATA, DEEPLOY_FORBIDDEN_SIGNATURES, CONTAINER_APP_RUNNER_SIGNATURE, \
+  DEEPLOY_RESOURCES, JOB_TYPE_RESOURCE_SPECS
 
 DEEPLOY_DEBUG = True
 
@@ -505,12 +506,43 @@ def deeploy_check_payment_and_job_owner(self, inputs, sender, debug=False):
       if job:
         job_owner = job.get('escrowOwner', None)
         is_valid = (sender == job_owner) if sender and job_owner else False
-        if debug:
-          self.P(f"Job {job_id} is paid:\n{self.json_dumps(job, indent=2)}")
-      else:
-        if debug:
-          self.P(f"Job {job_id} is not paid or does not exist.")
-      # endif
+        if is_valid:
+          job_type = job.get('jobType')
+          if job_type is None:
+            self.P(f"Job type missing or invalid for job {job_id}. Cannot validate resources.")
+            return False
+          #endif
+          expected_resources = JOB_TYPE_RESOURCE_SPECS.get(job_type)
+          if expected_resources is None:
+            self.P(f"No resource specs configured for job type {job_type}. Cannot validate resources.")
+            return False
+          #endif
+          if expected_resources:
+            required_resources = inputs.app_params.get(DEEPLOY_RESOURCES.CONTAINER_RESOURCES, {})
+            requested_cpu = required_resources.get(DEEPLOY_RESOURCES.CPU)
+            requested_memory = required_resources.get(DEEPLOY_RESOURCES.MEMORY)
+            expected_cpu = expected_resources.get(DEEPLOY_RESOURCES.CPU)
+            expected_memory = expected_resources.get(DEEPLOY_RESOURCES.MEMORY)
+            #TODO should also check disk and gpu as soon as they are supported and sent in the request
+            resources_match = (
+              requested_cpu is not None and
+              requested_memory is not None and
+              requested_cpu == expected_cpu and
+              requested_memory == expected_memory
+            )
+            if not resources_match:
+              self.P(
+                f"Requested resources {required_resources} do not match paid resources "
+                f"{expected_resources} for job type {job_type}."
+              )
+              is_valid = False
+            #endif resources match
+          #endif expected resources
+        # endif is valid
+      else: # job not found
+        self.P(f"Job {job_id} not found.")
+        is_valid = False
+      # endif job found
     except Exception as e:
       self.P(f"Error checking payment for job {job_id}: {e}")
       is_valid = False

ver.py

@@ -1,2 +1,2 @@
-__VER__ = '2.9.708'
+__VER__ = '2.9.709'