From 951bf0a80792dd66ef5ad61eb61f987b37b41997 Mon Sep 17 00:00:00 2001 From: "pierre.geeraert" Date: Wed, 9 Sep 2026 10:29:10 +0100 Subject: [PATCH] creating the function to display the expected state list --- django_code/apps/cloudmanager/admin.py | 12 +++++++--- django_code/apps/cloudmanager/utils.py | 32 +++++++++++++------------- 2 files changed, 25 insertions(+), 19 deletions(-) diff --git a/django_code/apps/cloudmanager/admin.py b/django_code/apps/cloudmanager/admin.py index 56bab4e..c25b7e1 100644 --- a/django_code/apps/cloudmanager/admin.py +++ b/django_code/apps/cloudmanager/admin.py @@ -1,7 +1,7 @@ from django.contrib import admin,messages from django.utils.translation import ngettext from .models import Deployment_Data,Schedule_Day_Data,Schedule_Week_Data,Namespace_Data -from .utils import import_namespace,import_deployment,generate_default_day_schedule,generate_default_week_schedule +from .utils import import_namespace,import_deployment,generate_default_day_schedule,generate_default_week_schedule,Check_server_supposed_XXX from apps.kubernetes_connection.utils import scale_up,scale_down DB = 'cloudmanager_db' @@ -38,6 +38,12 @@ def scale_down_deploy(modeladmin, request, queryset): messages.SUCCESS, ) +@admin.action(description="Expected False") +def Check_server_supposed_False(modeladmin, request, queryset): + servers_supposed_false = Check_server_supposed_XXX(False) + for server in servers_supposed_false: + messages.add_message(request, messages.INFO, server) + @admin.action(description="create default schedule") def generate_default_day_schedule_admin(modeladmin, request, queryset): generate_default_day_schedule() @@ -52,7 +58,7 @@ def import_namespace_admin(modeladmin, request, queryset): def import_deployment_admin(modeladmin, request, queryset): import_deployment() - + class ActiveAtHourFilter(admin.SimpleListFilter): title = 'Active at hour' @@ -89,7 +95,7 @@ class MultiDBModelAdmin(admin.ModelAdmin): class DeploymentDataAdmin(MultiDBModelAdmin): list_display = ('name', 'namespace', 'schedule_week', 'schedule_day', 'replicas') list_filter = (ActiveAtHourFilter,) - actions = [scale_up_deploy,scale_down_deploy,import_deployment_admin,generate_default_day_schedule_admin] + actions = [scale_up_deploy,scale_down_deploy,import_deployment_admin,generate_default_day_schedule_admin,Check_server_supposed_False] @admin.register(Schedule_Day_Data) diff --git a/django_code/apps/cloudmanager/utils.py b/django_code/apps/cloudmanager/utils.py index 66877c5..df9cdee 100644 --- a/django_code/apps/cloudmanager/utils.py +++ b/django_code/apps/cloudmanager/utils.py @@ -37,12 +37,6 @@ def Give_current_hour(): return now.hour def Check_server_supposed_XXX(expected_status): - # - # testing matrix - # bitwarden-admin week always off - # bitwarden-api days always off - # bitwarden-attachments day except 19 20 - #just for testing #expected_status = True @@ -64,18 +58,24 @@ def Check_server_supposed_XXX(expected_status): deployments = Deployment_Data.objects.filter(schedule_week__in=schedules_week, schedule_day__in=schedules_day) else: deployments = Deployment_Data.objects.filter(schedule_week__in=schedules_week) | Deployment_Data.objects.filter(schedule_day__in=schedules_day) - + print("---------------------------------------------------------") print("-----------------Expected status: -----------------------") print("-----------------"+str(expected_status)+"-----------------------") print("---------------------------------------------------------") - - for deployment in deployments: - name = deployment.name - namespace = deployment.namespace - replicas = deployment.replicas - print("name: "+str(name)) - print("namespace: "+str(namespace)) - print("replicas: "+str(replicas)) - return 0 \ No newline at end of file + + deployments_list = [] + for deployment in deployments: + display_list = [] + name = deployment.name + display_list.append(name) + print("name: "+str(name)) + namespace = deployment.namespace + display_list.append(namespace) + print("namespace: "+str(namespace)) + replicas = deployment.replicas + display_list.append(replicas) + print("replicas: "+str(replicas)) + deployments_list.append(display_list) + return deployments_list \ No newline at end of file