chore(manager): rename usages to usage for clarity

Author: duanhongyi

rootfs/api/clients.py

@@ -85,7 +85,7 @@ class UserAPI(WorkspaceAPI):
 
 class UsageAPI(ManagerAPI):
 
-    def post(self, usages: List[Dict[str, str]]):
+    def post(self, usage: List[Dict[str, str]]):
         """
         [
             {
@@ -99,8 +99,8 @@ def post(self, usages: List[Dict[str, str]]):
             }
         ]
         """
-        url = "%s/usages/" % settings.WORKFLOW_MANAGER_URL
-        return super().post(url=url, json=usages)
+        url = "%s/usage/" % settings.WORKFLOW_MANAGER_URL
+        return super().post(url=url, json=usage)
 
 
 class PassportAPI(object):

rootfs/api/management/commands/upload_app_usage.py

@@ -21,7 +21,7 @@ def handle(self, *args, **options):
             logger.info(f"pushing {task_id} resources to workflow_manager when {now}")
             app_list = []
             for app in App.objects.all():
-                app_list.extend(app.to_usages(timestamp))
+                app_list.extend(app.to_usage(timestamp))
                 if len(app_list) % 1000 == 0:
                     logger.info(f"bulk sent: {len(app_list)}")
                     send_usage.apply_async(

rootfs/api/management/commands/upload_gateway_usage.py

@@ -21,7 +21,7 @@ def handle(self, *args, **options):
             logger.info(f"pushing {task_id} gateways to workflow_manager when {now}")
             gateway_list = []
             for gateway in Gateway.objects.all():
-                gateway_list.extend(gateway.to_usages(timestamp))
+                gateway_list.extend(gateway.to_usage(timestamp))
                 if len(gateway_list) % 1000 == 0:
                     logger.info(f"bulk sent: {len(gateway_list)}")
                     send_usage.apply_async(

rootfs/api/management/commands/upload_resource_usage.py

@@ -21,7 +21,7 @@ def handle(self, *args, **options):
             logger.info(f"pushing {task_id} resources to workflow_manager when {now}")
             resource_list = []
             for resource in Resource.objects.filter(status="Ready"):
-                resource_list.extend(resource.to_usages(timestamp))
+                resource_list.extend(resource.to_usage(timestamp))
                 if len(resource_list) % 1000 == 0:
                     logger.info(f"bulk sent: {len(resource_list)}")
                     send_usage.apply_async(

rootfs/api/models/app.py

@@ -691,7 +691,7 @@ def set_application_config(self, release, ptype):
         else:
             self.scheduler.secret.update(self.id, secret_name, secrets_env, labels=labels)
 
-    def to_usages(self, timestamp: float):
+    def to_usage(self, timestamp: float):
         usage = []
         config = self.config_set.latest()
         for ptype, scale in self.structure.items():

rootfs/api/models/gateway.py

@@ -144,7 +144,7 @@ def delete(self, *args, **kwargs):
             )
         return super().delete(*args, **kwargs)
 
-    def to_usages(self, timestamp: float):
+    def to_usage(self, timestamp: float):
         return [{
             "app_id": str(self.app_id),
             "workspace": self.app.workspace_id,

rootfs/api/models/resource.py

@@ -206,7 +206,7 @@ def retrieve(self, *args, **kwargs):
             self.save()
         return self.status == self.binding == "Ready"
 
-    def to_usages(self, timestamp: float):
+    def to_usage(self, timestamp: float):
         return [{
             "app_id": str(self.app_id),
             "workspace": self.app.workspace_id,

rootfs/api/models/volume.py

@@ -71,7 +71,7 @@ def log(self, message, level=logging.INFO):
         send_app_log.delay(self.app.id, message, level)
         logger.log(level, "[{}]: {}".format(self.app.id, message))
 
-    def to_usages(self, timestamp: float):
+    def to_usage(self, timestamp: float):
         return [{
             "app_id": str(self.app_id),
             "workspace": self.app.workspace_id,

rootfs/api/signals.py

@@ -146,7 +146,7 @@ def app_changed_handle(sender, instance: App, created=False, update_fields=None,
             update_fields is not None and "structure" in update_fields):
         timestamp = time.time()
         send_usage.apply_async(
-            args=[instance.to_usages(timestamp), ],
+            args=[instance.to_usage(timestamp), ],
         )
 
 
@@ -232,7 +232,7 @@ def config_changed_handle(sender, instance: Config, created=False, update_fields
             created or (update_fields is not None and "limits" in update_fields)):
         timestamp = time.time()
         send_usage.apply_async(
-            args=[instance.app.to_usages(timestamp), ],
+            args=[instance.app.to_usage(timestamp), ],
         )
 
 
@@ -242,7 +242,7 @@ def volume_changed_handle(sender, instance: Volume, created=False, update_fields
     if settings.WORKFLOW_MANAGER_URL and created:
         timestamp = time.time()
         send_usage.apply_async(
-            args=[instance.to_usages(timestamp), ],
+            args=[instance.to_usage(timestamp), ],
         )
 
 
@@ -257,5 +257,5 @@ def resource_changed_handle(
             ))):
         timestamp = time.time()
         send_usage.apply_async(
-            args=[instance.to_usages(timestamp), ],
+            args=[instance.to_usage(timestamp), ],
         )