django_code/apps/cloudmanager/utils.py

@@ -37,6 +37,14 @@ 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 
+
+    
+    expected_status = False
     
     # Get week schedule
     
@@ -52,7 +60,7 @@ def Check_server_supposed_XXX(expected_status):
     
     schedules_day = Schedule_Day_Data.objects.filter(**query_day)
         
-    deployments = Deployment_Data.objects.filter(schedule_week__in=schedules_week,schedule_day__in=schedules_day)
+    deployments = Deployment_Data.objects.filter(schedule_week__in=schedules_week) | Deployment_Data.objects.filter(schedule_day__in=schedules_day)
     
     for deployment in deployments:
         name = deployment.name