[JIRA:LICO-7126] Add endpoint to retrieve billing group information f…

…or each user
lenovo · Jul 20, 2023 · c9f36e7 · c9f36e7
1 parent 9ac65e9
commit c9f36e7
Show file tree

Hide file tree

Showing 42 changed files with 105 additions and 37 deletions.
diff --git a/.gitignore b/.gitignore
@@ -69,3 +69,6 @@ target/
 
 # generate by setuptools_scm
 _version.py
+
+# Temporary files
+.*.swp
diff --git a/core/apps/accounting/lico/core/accounting/serializers.py b/core/apps/accounting/lico/core/accounting/serializers.py
@@ -0,0 +1,32 @@
+# Copyright 2015-2023 Lenovo
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+from rest_framework import serializers
+
+from .models import BillGroup, UserBillGroupMapping
+
+
+class BillGroupSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = BillGroup
+        fields = ('id', 'name', 'balance')
+
+
+class UserBillGroupSerializer(serializers.ModelSerializer):
+    bill_group = BillGroupSerializer()
+
+    class Meta:
+        model = UserBillGroupMapping
+        fields = ('id', 'username', 'bill_group')
diff --git a/core/apps/accounting/lico/core/accounting/views/user_billgroup.py b/core/apps/accounting/lico/core/accounting/views/user_billgroup.py
@@ -17,6 +17,7 @@
 import logging
 
 from django.db import IntegrityError, transaction
+from rest_framework import status
 from rest_framework.response import Response
 from rest_framework.views import APIView as BaseAPIView
 
@@ -28,6 +29,8 @@
 from lico.core.contrib.schema import json_schema_validate
 from lico.core.contrib.views import APIView, InternalAPIView
 
+from ..serializers import UserBillGroupSerializer
+
 logger = logging.getLogger(__name__)
 
 
@@ -87,6 +90,26 @@ def put(self, request):
 class UserBillGroupView(BaseUserBillGroupView, APIView):
     permission_classes = (AsAdminRole,)
 
+    @AsUserRole
+    def get(self, request):
+        try:
+            ubg_mapping = UserBillGroupMapping.objects.get(
+                username=self.request.user.username
+            )
+            return Response(
+                UserBillGroupSerializer(ubg_mapping).data,
+                status=status.HTTP_200_OK
+            )
+        except UserBillGroupMapping.DoesNotExist:
+            # user does not belong to any billing group
+            return Response(
+                {
+                    'username': self.request.user.username,
+                    'bill_group': None,
+                },
+                status=status.HTTP_200_OK
+            )
+
     @AsUserRole
     @json_schema_validate({
         "type": "object",

diff --git a/core/apps/template/lico/core/template/views/user_templates.py b/core/apps/template/lico/core/template/views/user_templates.py
@@ -16,6 +16,7 @@
 
 import base64
 import imghdr
+import json
 import logging
 import os
 import tempfile
@@ -215,6 +216,13 @@ def validate_job_template_params(  # noqa:C901
                 data['logo'] = 'data:image/jpeg;base64,' \
                                + base64.b64encode(f.read()).decode()
             os.remove(tmp_img_file)
+
+    # set default run time if no value was provided
+    params = json.loads(data["parameters_json"])
+    for p in params:
+        if p["id"] == "run_time" and not p["defaultValue"]:
+            p["defaultValue"] = settings.TEMPLATE.DEFAULT_RUN_TIME
+    data["parameters_json"] = json.dumps(params)
     return data
 
 

diff --git a/core/etc/lico.ini.d/template.ini b/core/etc/lico.ini.d/template.ini
@@ -6,3 +6,5 @@ MODULE_PATH = "/opt/ohpc/pub/modulefiles"
 
 NOTIFY_RESTAPI_TIMEOUT = 30
 STATEFUL_TIMEOUT = 300
+
+DEFAULT_RUN_TIME = "24h"
diff --git a/core/templates/ai_caffe/template.json b/core/templates/ai_caffe/template.json
@@ -146,7 +146,7 @@
         "en": "Please input run time limit for the job,Format is 'Xd Xh Xm',which 'Xd' represents X days,'Xh' represents X hours and 'Xm' represents X minutes.",
         "zh": "请输入job的运行时间限制，格式为“Xd Xh Xm”，“Xd”表示X天，“Xh”表示X小时，“Xm”表示X分钟。"
       },
-      "defaultValue": "24h",
+      "defaultValue": "",
       "must": false
     },
     {

diff --git a/core/templates/ai_chainer/template.json b/core/templates/ai_chainer/template.json
@@ -174,7 +174,7 @@
         "en": "Please input run time limit for the job,Format is 'Xd Xh Xm',which 'Xd' represents X days,'Xh' represents X hours and 'Xm' represents X minutes.",
         "zh": "请输入job的运行时间限制，格式为“Xd Xh Xm”，“Xd”表示X天，“Xh”表示X小时，“Xm”表示X分钟。"
       },
-      "defaultValue": "24h",
+      "defaultValue": "",
       "must": false
     },
     {

diff --git a/core/templates/ai_intel_caffe/template.json b/core/templates/ai_intel_caffe/template.json
@@ -146,7 +146,7 @@
         "en": "Please input run time limit for the job,Format is 'Xd Xh Xm',which 'Xd' represents X days,'Xh' represents X hours and 'Xm' represents X minutes.",
         "zh": "请输入job的运行时间限制，格式为“Xd Xh Xm”，“Xd”表示X天，“Xh”表示X小时，“Xm”表示X分钟。"
       },
-      "defaultValue": "24h",
+      "defaultValue": "",
       "must": false
     },
     {

diff --git a/core/templates/ai_mxnet/template.json b/core/templates/ai_mxnet/template.json
@@ -175,7 +175,7 @@
         "en": "Please input run time limit for the job,Format is 'Xd Xh Xm',which 'Xd' represents X days,'Xh' represents X hours and 'Xm' represents X minutes.",
         "zh": "请输入job的运行时间限制，格式为“Xd Xh Xm”，“Xd”表示X天，“Xh”表示X小时，“Xm”表示X分钟。"
       },
-      "defaultValue": "24h",
+      "defaultValue": "",
       "must": false
     },
     {

diff --git a/core/templates/ai_neon/template.json b/core/templates/ai_neon/template.json
@@ -153,7 +153,7 @@
         "en": "Please input run time limit for the job,Format is 'Xd Xh Xm',which 'Xd' represents X days,'Xh' represents X hours and 'Xm' represents X minutes.",
         "zh": "请输入job的运行时间限制，格式为“Xd Xh Xm”，“Xd”表示X天，“Xh”表示X小时，“Xm”表示X分钟。"
       },
-      "defaultValue": "24h",
+      "defaultValue": "",
       "must": false
     },
     {

diff --git a/core/templates/ai_nvidia_tensorrt/template.json b/core/templates/ai_nvidia_tensorrt/template.json
@@ -149,7 +149,7 @@
         "en": "Please input run time limit for the job,Format is 'Xd Xh Xm',which 'Xd' represents X days,'Xh' represents X hours and 'Xm' represents X minutes.",
         "zh": "请输入job的运行时间限制，格式为“Xd Xh Xm”，“Xd”表示X天，“Xh”表示X小时，“Xm”表示X分钟。"
       },
-      "defaultValue": "24h",
+      "defaultValue": "",
       "must": false
     },
     {

diff --git a/core/templates/ai_paddlepaddle/template.json b/core/templates/ai_paddlepaddle/template.json
@@ -186,7 +186,7 @@
         "en": "Please input run time limit for the job,Format is 'Xd Xh Xm',which 'Xd' represents X days,'Xh' represents X hours and 'Xm' represents X minutes.",
         "zh": "请输入job的运行时间限制，格式为“Xd Xh Xm”，“Xd”表示X天，“Xh”表示X小时，“Xm”表示X分钟。"
       },
-      "defaultValue": "24h",
+      "defaultValue": "",
       "must": false
     },
     {

diff --git a/core/templates/ai_pytorch/template.json b/core/templates/ai_pytorch/template.json
@@ -185,7 +185,7 @@
         "en": "Please input run time limit for the job,Format is 'Xd Xh Xm',which 'Xd' represents X days,'Xh' represents X hours and 'Xm' represents X minutes.",
         "zh": "请输入job的运行时间限制，格式为“Xd Xh Xm”，“Xd”表示X天，“Xh”表示X小时，“Xm”表示X分钟。"
       },
-      "defaultValue": "24h",
+      "defaultValue": "",
       "must": false
     },
     {

diff --git a/core/templates/ai_scikit/template.json b/core/templates/ai_scikit/template.json
@@ -131,7 +131,7 @@
         "en": "Please input run time limit for the job,Format is 'Xd Xh Xm',which 'Xd' represents X days,'Xh' represents X hours and 'Xm' represents X minutes.",
         "zh": "请输入job的运行时间限制，格式为“Xd Xh Xm”，“Xd”表示X天，“Xh”表示X小时，“Xm”表示X分钟。"
       },
-      "defaultValue": "24h",
+      "defaultValue": "",
       "must": false
     },
     {

diff --git a/core/templates/ai_tensorflow/template.json b/core/templates/ai_tensorflow/template.json
@@ -174,7 +174,7 @@
         "en": "Please input run time limit for the job,Format is 'Xd Xh Xm',which 'Xd' represents X days,'Xh' represents X hours and 'Xm' represents X minutes.",
         "zh": "请输入job的运行时间限制，格式为“Xd Xh Xm”，“Xd”表示X天，“Xh”表示X小时，“Xm”表示X分钟。"
       },
-      "defaultValue": "24h",
+      "defaultValue": "",
       "must": false
     },
     {

diff --git a/core/templates/ai_tensorflow2/template.json b/core/templates/ai_tensorflow2/template.json
@@ -174,7 +174,7 @@
         "en": "Please input run time limit for the job,Format is 'Xd Xh Xm',which 'Xd' represents X days,'Xh' represents X hours and 'Xm' represents X minutes.",
         "zh": "请输入job的运行时间限制，格式为“Xd Xh Xm”，“Xd”表示X天，“Xh”表示X小时，“Xm”表示X分钟。"
       },
-      "defaultValue": "24h",
+      "defaultValue": "",
       "must": false
     },
     {

diff --git a/core/templates/charliecloud/template.json b/core/templates/charliecloud/template.json
@@ -111,7 +111,7 @@
         "en": "Please input run time limit for the job,Format is 'Xd Xh Xm',which 'Xd' represents X days,'Xh' represents X hours and 'Xm' represents X minutes.",
         "zh": "请输入job的运行时间限制，格式为“Xd Xh Xm”，“Xd”表示X天，“Xh”表示X小时，“Xm”表示X分钟。"
       },
-      "defaultValue": "24h",
+      "defaultValue": "",
       "must": false
     },
     {

diff --git a/core/templates/charliecloud_mpi/template.json b/core/templates/charliecloud_mpi/template.json
@@ -158,7 +158,7 @@
         "en": "Please input run time limit for the job,Format is 'Xd Xh Xm',which 'Xd' represents X days,'Xh' represents X hours and 'Xm' represents X minutes.",
         "zh": "请输入job的运行时间限制，格式为“Xd Xh Xm”，“Xd”表示X天，“Xh”表示X小时，“Xm”表示X分钟。"
       },
-      "defaultValue": "24h",
+      "defaultValue": "",
       "must": false
     },
     {

diff --git a/core/templates/common/template.json b/core/templates/common/template.json
@@ -130,7 +130,7 @@
         "en": "Please input run time limit for the job,Format is 'Xd Xh Xm',which 'Xd' represents X days,'Xh' represents X hours and 'Xm' represents X minutes.",
         "zh": "请输入job的运行时间限制，格式为“Xd Xh Xm”，“Xd”表示X天，“Xh”表示X小时，“Xm”表示X分钟。"
       },
-      "defaultValue": "24h",
+      "defaultValue": "",
       "must": false
     },
     {

diff --git a/core/templates/comsol/template.json b/core/templates/comsol/template.json
@@ -179,7 +179,7 @@
         "en": "Please input run time limit for the job,Format is 'Xd Xh Xm',which 'Xd' represents X days,'Xh' represents X hours and 'Xm' represents X minutes.",
         "zh": "请输入job的运行时间限制，格式为“Xd Xh Xm”，“Xd”表示X天，“Xh”表示X小时，“Xm”表示X分钟。"
       },
-      "defaultValue": "24h",
+      "defaultValue": "",
       "must": false
     },
     {

diff --git a/core/templates/jupyter/template.json b/core/templates/jupyter/template.json
@@ -153,7 +153,7 @@
         "en": "Please input run time limit for the job,Format is 'Xd Xh Xm',which 'Xd' represents X days,'Xh' represents X hours and 'Xm' represents X minutes.",
         "zh": "请输入job的运行时间限制，格式为“Xd Xh Xm”，“Xd”表示X天，“Xh”表示X小时，“Xm”表示X分钟。"
       },
-      "defaultValue": "24h",
+      "defaultValue": "",
       "must": false
     },
     {

diff --git a/core/templates/linpack_hpl/template.json b/core/templates/linpack_hpl/template.json
@@ -148,7 +148,7 @@
           "en": "Please input run time limit for the job,Format is 'Xd Xh Xm',which 'Xd' represents X days,'Xh' represents X hours and 'Xm' represents X minutes.",
           "zh": "请输入job的运行时间限制，格式为“Xd Xh Xm”，“Xd”表示X天，“Xh”表示X小时，“Xm”表示X分钟。"
         },
-        "defaultValue": "24h",
+        "defaultValue": "",
         "must": false
       },
       {

diff --git a/core/templates/mpi/template.json b/core/templates/mpi/template.json
@@ -162,7 +162,7 @@
         "en": "Please input run time limit for the job,Format is 'Xd Xh Xm',which 'Xd' represents X days,'Xh' represents X hours and 'Xm' represents X minutes.",
         "zh": "请输入job的运行时间限制，格式为“Xd Xh Xm”，“Xd”表示X天，“Xh”表示X小时，“Xm”表示X分钟。"
       },
-      "defaultValue": "24h",
+      "defaultValue": "",
       "must": false
     },
     {

diff --git a/core/templates/oneapi_intel_gdb/template.json b/core/templates/oneapi_intel_gdb/template.json
@@ -86,7 +86,7 @@
         "en": "Please input run time limit for the job,Format is 'Xd Xh Xm',which 'Xd' represents X days,'Xh' represents X hours and 'Xm' represents X minutes.",
         "zh": "请输入job的运行时间限制，格式为“Xd Xh Xm”，“Xd”表示X天，“Xh”表示X小时，“Xm”表示X分钟。"
       },
-      "defaultValue": "24h",
+      "defaultValue": "",
       "must": false
     }
   ]

diff --git a/core/templates/oneapi_intel_modelzoo_pytorch_image_recognition/template.json b/core/templates/oneapi_intel_modelzoo_pytorch_image_recognition/template.json
@@ -346,7 +346,7 @@
         "en": "Please input run time limit for the job,Format is 'Xd Xh Xm',which 'Xd' represents X days,'Xh' represents X hours and 'Xm' represents X minutes.",
         "zh": "请输入job的运行时间限制，格式为“Xd Xh Xm”，“Xd”表示X天，“Xh”表示X小时，“Xm”表示X分钟。"
       },
-      "defaultValue": "24h",
+      "defaultValue": "",
       "must": false
     },
     {

diff --git a/core/templates/oneapi_intel_modelzoo_pytorch_object_detection/template.json b/core/templates/oneapi_intel_modelzoo_pytorch_object_detection/template.json
@@ -214,7 +214,7 @@
         "en": "Please input run time limit for the job,Format is 'Xd Xh Xm',which 'Xd' represents X days,'Xh' represents X hours and 'Xm' represents X minutes.",
         "zh": "请输入job的运行时间限制，格式为“Xd Xh Xm”，“Xd”表示X天，“Xh”表示X小时，“Xm”表示X分钟。"
       },
-      "defaultValue": "24h",
+      "defaultValue": "",
       "must": false
     },
     {

diff --git a/core/templates/oneapi_intel_modelzoo_tensorflow_image_recognition/template.json b/core/templates/oneapi_intel_modelzoo_tensorflow_image_recognition/template.json
@@ -251,7 +251,7 @@
         "en": "Please input run time limit for the job,Format is 'Xd Xh Xm',which 'Xd' represents X days,'Xh' represents X hours and 'Xm' represents X minutes.",
         "zh": "请输入job的运行时间限制，格式为“Xd Xh Xm”，“Xd”表示X天，“Xh”表示X小时，“Xm”表示X分钟。"
       },
-      "defaultValue": "24h",
+      "defaultValue": "",
       "must": false
     },
     {

diff --git a/core/templates/oneapi_intel_modelzoo_tensorflow_object_detection/template.json b/core/templates/oneapi_intel_modelzoo_tensorflow_object_detection/template.json
@@ -203,7 +203,7 @@
         "en": "Please input run time limit for the job,Format is 'Xd Xh Xm',which 'Xd' represents X days,'Xh' represents X hours and 'Xm' represents X minutes.",
         "zh": "请输入job的运行时间限制，格式为“Xd Xh Xm”，“Xd”表示X天，“Xh”表示X小时，“Xm”表示X分钟。"
       },
-      "defaultValue": "24h",
+      "defaultValue": "",
       "must": false
     },
     {

diff --git a/core/templates/oneapi_intel_modin/template.json b/core/templates/oneapi_intel_modin/template.json
@@ -135,7 +135,7 @@
         "en": "Please input run time limit for the job,Format is 'Xd Xh Xm',which 'Xd' represents X days,'Xh' represents X hours and 'Xm' represents X minutes.",
         "zh": "请输入job的运行时间限制，格式为“Xd Xh Xm”，“Xd”表示X天，“Xh”表示X小时，“Xm”表示X分钟。"
       },
-      "defaultValue": "24h",
+      "defaultValue": "",
       "must": false
     },
     {

diff --git a/core/templates/oneapi_intel_modin_multi/template.json b/core/templates/oneapi_intel_modin_multi/template.json
@@ -150,7 +150,7 @@
         "en": "Please input run time limit for the job,Format is 'Xd Xh Xm',which 'Xd' represents X days,'Xh' represents X hours and 'Xm' represents X minutes.",
         "zh": "请输入job的运行时间限制，格式为“Xd Xh Xm”，“Xd”表示X天，“Xh”表示X小时，“Xm”表示X分钟。"
       },
-      "defaultValue": "24h",
+      "defaultValue": "",
       "must": false
     },
     {

diff --git a/core/templates/oneapi_intel_mpi/template.json b/core/templates/oneapi_intel_mpi/template.json
@@ -334,7 +334,7 @@
         "en": "Please input run time limit for the job,Format is 'Xd Xh Xm',which 'Xd' represents X days,'Xh' represents X hours and 'Xm' represents X minutes.",
         "zh": "请输入job的运行时间限制，格式为“Xd Xh Xm”，“Xd”表示X天，“Xh”表示X小时，“Xm”表示X分钟。"
       },
-      "defaultValue": "24h",
+      "defaultValue": "",
       "must": false
     },
     {

diff --git a/core/templates/oneapi_intel_neural_compressor/template.json b/core/templates/oneapi_intel_neural_compressor/template.json
@@ -85,7 +85,7 @@
         "en": "Please input run time limit for the job,Format is 'Xd Xh Xm',which 'Xd' represents X days,'Xh' represents X hours and 'Xm' represents X minutes.",
         "zh": "请输入job的运行时间限制，格式为“Xd Xh Xm”，“Xd”表示X天，“Xh”表示X小时，“Xm”表示X分钟。"
       },
-      "defaultValue": "24h",
+      "defaultValue": "",
       "must": false
     }
   ]

diff --git a/core/templates/oneapi_intel_python/template.json b/core/templates/oneapi_intel_python/template.json
@@ -235,7 +235,7 @@
         "en": "Please input run time limit for the job,Format is 'Xd Xh Xm',which 'Xd' represents X days,'Xh' represents X hours and 'Xm' represents X minutes.",
         "zh": "请输入job的运行时间限制，格式为“Xd Xh Xm”，“Xd”表示X天，“Xh”表示X小时，“Xm”表示X分钟。"
       },
-      "defaultValue": "24h",
+      "defaultValue": "",
       "must": false
     },
     {

diff --git a/core/templates/oneapi_intel_pytorch/template.json b/core/templates/oneapi_intel_pytorch/template.json
@@ -135,7 +135,7 @@
         "en": "Please input run time limit for the job,Format is 'Xd Xh Xm',which 'Xd' represents X days,'Xh' represents X hours and 'Xm' represents X minutes.",
         "zh": "请输入job的运行时间限制，格式为“Xd Xh Xm”，“Xd”表示X天，“Xh”表示X小时，“Xm”表示X分钟。"
       },
-      "defaultValue": "24h",
+      "defaultValue": "",
       "must": false
     },
     {

diff --git a/core/templates/oneapi_intel_tensorflow2/template.json b/core/templates/oneapi_intel_tensorflow2/template.json
@@ -163,7 +163,7 @@
         "en": "Please input run time limit for the job,Format is 'Xd Xh Xm',which 'Xd' represents X days,'Xh' represents X hours and 'Xm' represents X minutes.",
         "zh": "请输入job的运行时间限制，格式为“Xd Xh Xm”，“Xd”表示X天，“Xh”表示X小时，“Xm”表示X分钟。"
       },
-      "defaultValue": "24h",
+      "defaultValue": "",
       "must": false
     },
     {

diff --git a/core/templates/oneapi_intel_vtune_profiler/template.json b/core/templates/oneapi_intel_vtune_profiler/template.json
@@ -111,7 +111,7 @@
         "en": "Please input run time limit for the job,Format is 'Xd Xh Xm',which 'Xd' represents X days,'Xh' represents X hours and 'Xm' represents X minutes.",
         "zh": "请输入job的运行时间限制，格式为“Xd Xh Xm”，“Xd”表示X天，“Xh”表示X小时，“Xm”表示X分钟。"
       },
-      "defaultValue": "24h",
+      "defaultValue": "",
       "must": false
     },
     {

diff --git a/core/templates/oneapi_mpitune/template.json b/core/templates/oneapi_mpitune/template.json
@@ -136,7 +136,7 @@
         "en": "Please input run time limit for the job,Format is 'Xd Xh Xm',which 'Xd' represents X days,'Xh' represents X hours and 'Xm' represents X minutes.",
         "zh": "请输入job的运行时间限制，格式为“Xd Xh Xm”，“Xd”表示X天，“Xh”表示X小时，“Xm”表示X分钟。"
       },
-      "defaultValue": "24h",
+      "defaultValue": "",
       "must": false
     },
     {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,3 +6,5 @@ MODULE_PATH = "/opt/ohpc/pub/modulefiles"

		NOTIFY_RESTAPI_TIMEOUT = 30
		STATEFUL_TIMEOUT = 300

		DEFAULT_RUN_TIME = "24h"