From 898aad32293198c2cf2cb44e73cbc46f49044f4c Mon Sep 17 00:00:00 2001
From: leebaok <leebaok@163.com>
Date: Mon, 18 Apr 2016 10:35:04 +0800
Subject: [PATCH] fix quota info failed

---
 web/templates/monitor/status.html | 4 ++--
 web/webViews/monitor.py           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/templates/monitor/status.html b/web/templates/monitor/status.html
index cd6c5dc..452a2b9 100644
--- a/web/templates/monitor/status.html
+++ b/web/templates/monitor/status.html
@@ -35,7 +35,7 @@
 				                <th>CPU</th>
 				                <th>Memory</th>
                                 <th>Disk</th>
-                                <th>Network</th>
+                                <th>Vnode</th>
                                 <th>Image</th>
                                 <th>Idletime</th>
                              </tr>
@@ -49,7 +49,7 @@
                                 {% endif %}
                                 <th>{{ quotainfo['memory'] }} MB</th>
                                 <th>{{ quotainfo['disk'] }} MB</th>
-                                <th>{{ quotainfo['network'] }} IP addresses</th>
+                                <th>{{ quotainfo['vnode'] }}</th>
                                 <th>{{ quotainfo['image'] }}</th>
                                 <th>{{ quotainfo['idletime'] }} hours</th>
 			                 </tr>
diff --git a/web/webViews/monitor.py b/web/webViews/monitor.py
index acc2330..c65a7c1 100755
--- a/web/webViews/monitor.py
+++ b/web/webViews/monitor.py
@@ -15,7 +15,7 @@ class statusView(normalView):
         clusters = result.get('clusters')
         result = dockletRequest.post('/monitor/user/quotainfo/', data)
         quotainfo = result.get('quotainfo')
-        quotainfo['cpu'] = int(int(quotainfo['cpu'])/100000)
+        quotainfo['cpu'] = int(int(quotainfo['cpu']))
         print(quotainfo)
         if (result):
             containers = {}