cleanup

django_code/apps/cloudmanager/admin.py

@@ -38,11 +38,6 @@ def scale_down_deploy(modeladmin, request, queryset):
         messages.SUCCESS,
         )
 
-@admin.action(description="create_entry")
-def create_entry(modeladmin, request, queryset):
-    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="create default schedule")
 def generate_default_day_schedule_admin(modeladmin, request, queryset):
     generate_default_day_schedule()
@@ -51,23 +46,11 @@ def generate_default_day_schedule_admin(modeladmin, request, queryset):
     
 @admin.action(description="import namespace")
 def import_namespace_admin(modeladmin, request, queryset):
-    #
+    import_namespace()
-    #
-    #
-    #       don't forgot to clear thge quyeryset before running this
-    #
-    import_namespace(Namespace_Data)
-    #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):
-    #
+    import_deployment()
-    #
-    #
-    #       don't forgot to clear thge quyeryset before running this
-    #
-    import_deployment(Deployment_Data)
 
 
 

django_code/apps/cloudmanager/utils.py

@@ -1,15 +1,15 @@
 from apps.kubernetes_connection.utils import get_namespace,get_deployments
-from .models import Schedule_Day_Data,Schedule_Week_Data
+from .models import Schedule_Day_Data,Schedule_Week_Data,Namespace_Data,Deployment_Data
 
-def import_namespace(queryset):
+def import_namespace():
     namespaces_list = get_namespace()
     for namespace in namespaces_list:
-        queryset.objects.create(namespace=namespace)
+        Namespace_Data.objects.update_or_create(namespace=namespace)
 
-def import_deployment(queryset):
+def import_deployment(Deployment_Data):
     deployment_list = get_deployments()
     for deployment in deployment_list:
-        queryset.objects.update_or_create(namespace=deployment[0],name=deployment[1],defaults={"replicas":deployment[2]})
+        Deployment_Data.objects.update_or_create(namespace=deployment[0],name=deployment[1],defaults={"replicas":deployment[2]})
                 
 def generate_default_day_schedule():
     Schedule_Day_Data.objects.update_or_create(name_schedule="Always_off",defaults={"state_at_0" : False ,"state_at_1" : False ,"state_at_2" : False ,"state_at_3" : False ,"state_at_4" : False ,"state_at_5" : False ,"state_at_6" : False ,"state_at_7" : False ,"state_at_8" : False ,"state_at_9" : False ,"state_at_10" : False ,"state_at_11" : False ,"state_at_12" : False ,"state_at_13" : False ,"state_at_14" : False ,"state_at_15" : False ,"state_at_16" : False ,"state_at_17" : False ,"state_at_18" : False ,"state_at_19" : False ,"state_at_20" : False ,"state_at_21" : False ,"state_at_22" : False ,"state_at_23" : False})