From f0b700a688650197219f53d7ec8c36c6b38ceaa0 Mon Sep 17 00:00:00 2001 From: "pierre.geeraert" Date: Tue, 8 Sep 2026 10:08:35 +0100 Subject: [PATCH] big untested try of cmm --- django_code/apps/cloudmanager/admin.py | 16 +++++++++++++--- django_code/apps/cloudmanager/models.py | 3 +-- django_code/apps/cloudmanager/utils.py | 8 ++++---- django_code/apps/streaming/models.py | 2 +- 4 files changed, 19 insertions(+), 10 deletions(-) diff --git a/django_code/apps/cloudmanager/admin.py b/django_code/apps/cloudmanager/admin.py index 1ef5a86..b2a3f33 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,namespace_cmm_data_object -from .utils import import_namespace +from .utils import import_namespace,import_deployment from apps.kubernetes_connection.utils import scale_up,scale_down DB = 'cloudmanager_db' @@ -50,10 +50,20 @@ def import_namespace_admin(modeladmin, request, queryset): # # don't forgot to clear thge quyeryset before running this # - import_namespace(namespace_cmm_data_object) - print("simpsons_data_object.create(season=2, episode=3, url='google.com'', seen=True)") + import_namespace(Namespace_Data.objects) + #print("simpsons_data_object.create(season=2, episode=3, url='google.com'', seen=True)") #call function to trigger refresh of all deploy +@admin.action(description="import deployment") +def import_deployment_admin(modeladmin, request, queryset): + # + # + # + # don't forgot to clear thge quyeryset before running this + # + import_deployment(Deployment_Data.objects) + + class ActiveAtHourFilter(admin.SimpleListFilter): title = 'Active at hour' diff --git a/django_code/apps/cloudmanager/models.py b/django_code/apps/cloudmanager/models.py index 032a558..d7757ee 100644 --- a/django_code/apps/cloudmanager/models.py +++ b/django_code/apps/cloudmanager/models.py @@ -2,6 +2,7 @@ from django.db import models + class Schedule_Week_Data(models.Model): name_schedule = models.CharField(max_length=100,unique=True) state_Monday = models.BooleanField() @@ -61,5 +62,3 @@ class Namespace_Data(models.Model): #deployments = models.ForeignKey(Schedule_Week_Data,null=True, blank=True, on_delete=models.SET_NULL) class Meta: db_table = 'namespace' - -namespace_cmm_data_object = Namespace_Data.objects.using('cloudmanager_db') \ No newline at end of file diff --git a/django_code/apps/cloudmanager/utils.py b/django_code/apps/cloudmanager/utils.py index 6bc6b56..6c94736 100644 --- a/django_code/apps/cloudmanager/utils.py +++ b/django_code/apps/cloudmanager/utils.py @@ -4,10 +4,10 @@ from apps.kubernetes_connection.utils import get_namespace def import_namespace(queryset): namespaces_list = get_namespace() for namespace in namespaces_list: - queryset.create(namespace=namespace) + queryset.objects.create(namespace=namespace) def import_deployment(queryset): - namespaces_list = get_namespace() - #for namespace in namespaces_list: - # queryset.create(namespace=namespace) + deployment_list = get_deployments() + for deployment in deployment_list: + queryset.objects.create(deployment=deployment) \ No newline at end of file diff --git a/django_code/apps/streaming/models.py b/django_code/apps/streaming/models.py index f4e0789..0d36f13 100644 --- a/django_code/apps/streaming/models.py +++ b/django_code/apps/streaming/models.py @@ -38,7 +38,7 @@ class StreamingRedirectData(models.Model): def season_information(self, serie_name): betaserie = betaserieUtils() print(serie_name) - print(betaserie.identify_serie(serie_name)) + print(betaserie.identify_serie(serie_name,True)) return betaserie.series_information(betaserie.identify_serie(serie_name))[0] def maximum_Number_Season(self, serie_name):