* [misc] merge method and adjust unit test.

module/instance/model.php

@@ -995,7 +995,7 @@ class instanceModel extends model
     }
 
     /**
-     * 打印内存使用信息。
+     * 打印存储使用信息。
      * Print memory usage.
      *
      * @param  object $instance
@@ -1004,32 +1004,7 @@ class instanceModel extends model
      * @access public
      * @return array
      */
-    public static function printMemUsage(object $instance, object $metrics): array
-    {
-        if($instance->source === 'user') return array('color' => '', 'tip' => '', 'rate' => '', 'usage' => '', 'limit' => '');
-        $rate = $instance->status == 'stopped' ? 0 : $metrics->rate;
-        $tip  = "{$rate}% = " . helper::formatKB($metrics->usage) . ' / ' . helper::formatKB($metrics->limit);
-
-        if(empty($color) && $rate == 0)               $color = 'gray';
-        if(empty($color) && $rate > 0 && $rate < 50)  $color = 'secondary';
-        if(empty($color) && $rate >= 0 && $rate < 70) $color = 'warning';
-        if(empty($color) && $rate >= 0 && $rate < 90) $color = 'important';
-        if(empty($color) && $rate >= 80)              $color = 'danger';
-
-        return array('color' => $color, 'tip' => $tip, 'rate' => $rate . '%', 'usage' => helper::formatKB($metrics->usage), 'limit' => helper::formatKB($metrics->limit));
-    }
-
-    /**
-     * 打印存储使用信息。
-     * Print the volume usage.
-     *
-     * @param  object $instance
-     * @param  object $metrics
-     * @static
-     * @access public
-     * @return array
-     */
-    public static function printVolUsage(object $instance, object $metrics): array
+    public static function printStorageUsage(object $instance, object $metrics): array
     {
         if($instance->source === 'user') return array('color' => '', 'tip' => '', 'rate' => '', 'usage' => '', 'limit' => '');
         $rate = $instance->status == 'stopped' ? 0 : $metrics->rate;

module/instance/test/model/printstorageusage.php

@@ -6,7 +6,7 @@ zenData('instance')->gen(1);
 
 /**
 
-title=instanceModel->printMemUsage();
+title=instanceModel->printStorageUsage();
 timeout=0
 cid=1
 
@@ -25,8 +25,8 @@ $metrics->rate  = 10;
 $metrics->usage = 10;
 $metrics->limit = 100;
 
-$result = instanceModel::printMemUsage($instance, $metrics);
+$result = instanceModel::printStorageUsage($instance, $metrics);
 
 r(count($result)) && p()        && e('5');              // 查看获取到的数量
 r($result)        && p('color') && e('secondary');      // 查看获取到的颜色
-r($result)        && p('tip')   && e('10% = 10B / 100B'); // 查看获取到的提示
+r($result)        && p('tip')   && e('10% = 10B / 100B'); // 查看获取到的提示

module/instance/ui/view.html.php

@@ -21,8 +21,8 @@ jsVar('inQuickon',      $config->inQuickon);
 
 $instance->appName = strtolower($instance->appName);
 $cpuInfo    = $this->instance->printCpuUsage($instance, (object)$instanceMetric->cpu);
-$memoryInfo = $this->instance->printMemUsage($instance, (object)$instanceMetric->memory);
-$volumeInfo = $this->instance->printVolUsage($instance, (object)$instanceMetric->disk);
+$memoryInfo = $this->instance->printStorageUsage($instance, (object)$instanceMetric->memory);
+$volumeInfo = $this->instance->printStorageUsage($instance, (object)$instanceMetric->disk);
 $actions    = $this->loadModel('common')->buildOperateMenu($instance);
 
 if($type !== 'store')

module/system/control.php

@@ -53,8 +53,8 @@ class system extends control
         foreach($instances as $instance)
         {
             $metrics       = zget($instancesMetrics, $instance->id);
-            $instance->cpu = $this->instance->printCpuUsage($instance, $metrics->cpu, 'array');
-            $instance->mem = $this->instance->printMemUsage($instance, $metrics->memory, 'array');
+            $instance->cpu = $this->instance->printCpuUsage($instance, $metrics->cpu);
+            $instance->mem = $this->instance->printStorageUsage($instance, $metrics->memory);
         }
 
         $actions = $this->loadModel('action')->getDynamic('all', 'today');