Merge pull request #256 from catborise/master

Some fixes and updates 2

.travis.yml

@@ -2,14 +2,14 @@ language: python
 python:
   - "2.7"
 env:
-  - DJANGO=1.11.21
+  - DJANGO=1.11.23
 install:
   - pip install -r dev/requirements.txt
 script:
   - pep8 --exclude=IPy.py --ignore=E501 vrtManager accounts computes \
-                                        console create instances interfaces \
+                                        console create datasource instances interfaces \
-                                        networks secrets storages
+                                        logs networks nwfilters secrets storages
-  - pyflakes vrtManager accounts computes console create instances interfaces \
+  - pyflakes vrtManager accounts computes console create datasource instances interfaces \
-             networks secrets storages
+             nwfilters networks secrets storages logs
   - python manage.py migrate
   - python manage.py test --settings=webvirtcloud.settings-dev

conf/requirements.txt

@@ -1,5 +1,5 @@
-Django==1.11.23
+Django==1.11.25
-websockify==0.8.0
+websockify==0.9.0
 gunicorn==19.9.0
 lxml==4.2.5
 libvirt-python==5.3.0

instances/templates/add_instance_volume.html

@@ -99,7 +99,7 @@
                                               <button id="select_storage" class="btn btn-default dropdown-toggle form-control" type="button" data-toggle="dropdown">{% trans 'Select Pool...' %}
                                               <span class="caret"></span></button>
                                               <ul class="dropdown-menu">
-                                                  {% for storage in storages %}
+                                                  {% for storage in storages_host %}
                                                       <li><a href="#" onclick="get_volumes({{ compute_id }}, '{{ storage }}')">{{ storage }}</a></li>
                                                   {% endfor %}
                                               </ul>
@@ -120,7 +120,7 @@
                                         <label class="col-sm-3 control-label">{% trans "Bus" %}</label>
                                         <div class="col-sm-4">
                                             <select name="bus" class="form-control image-format">
-                                                {% for bus in busses %}
+                                                {% for bus in bus_host %}
                                                     <option value="{{ bus }}" {% if bus == default_bus %}selected{% endif %}>{% trans bus %}</option>
                                                 {% endfor %}
                                             </select>

instances/views.py

@@ -576,10 +576,14 @@ def instance(request, compute_id, vname):
                 path = request.POST.get('path', '')
                 name = request.POST.get('name', '')
 
-                conn.detach_disk(dev)
-                conn_delete.del_volume(name)
-
                 msg = _('Delete disk: ' + dev)
+                conn.detach_disk(dev)
+                try:
+                    conn_delete.del_volume(name)
+                except libvirtError as err:
+                    msg = _('The disk: ' + dev + ' is detached but not deleted. ' + err.message)
+                    messages.warning(request, msg)
+
                 addlogmsg(request.user.username, instance.name, msg)
                 return HttpResponseRedirect(request.get_full_path() + '#disks')
 

storages/templates/storage.html

@@ -44,11 +44,12 @@
 
     <div class="row">
         <div class="col-xs-6 col-sm-6">
-            <p>{% trans "Pool name" %}:</p>
+            <p>{% trans "Pool Name" %}:</p>
-            <p>{% trans "Pool type" %}:</p>
+            <p>{% trans "Pool Type" %}:</p>
-            <p>{% trans "Pool path" %}:</p>
+            <p>{% trans "Pool Path" %}:</p>
-            <p>{% trans "Pool status" %}:</p>
+            <p>{% trans "Pool Status" %}:</p>
-            <p>{% trans "Size" %}: ({{ size|filesizeformat }} / {{ used|filesizeformat }})</p>
+            <p>{% trans "Size" %}:</p>
+            <p>{% trans "Usage" %}({{ percent }}%):</p>
             <p>{% trans "State" %}:</p>
             <p>{% trans "Autostart" %}:</p>
         </div>
@@ -57,7 +58,8 @@
             <p>{% if not type %}{% trans "None" %}{% else %}{{ type }}{% endif %}</p>
             <p>{% if not path %}{% trans "None" %}{% else %}{{ path }}{% endif %}</p>
             <p>{% if not status %}{% trans "None" %}{% else %}{{ status }}{% endif %}</p>
-            <p>{% trans "Usage" %}: {{ percent }}%</p>
+            <p>{{ size|filesizeformat }}</p>
+            <p>{{ used|filesizeformat }}</p>
             <p>
             <form action="" method="post" role="form">{% csrf_token %}
                 {% ifequal state 0 %}

templates/404.html

@@ -4,12 +4,12 @@
 {% block content %}
     <div class="row">
         <div class="col-xs-12" style="text-align: center;">
-            <h1>Oops!</h1>
+            <h1>{% trans 'Oops!'%}</h1>
 
             <p class="lead">{% trans "404 Not Found" %}</p>
 
             <p>{% trans "The requested page was not found on this server." %}</p>
-            <a class="btn btn-medium btn-success" href="javascript:history.back()">&larr; Back</a>
+            <a class="btn btn-medium btn-success" href="javascript:history.back()">&larr; {% trans 'Back'%}</a>
         </div>
     </div>
 {% endblock %}

templates/500.html

@@ -4,12 +4,12 @@
 {% block content %}
     <div class="row">
         <div class="col-xs-12" style="text-align: center;">
-            <h1>Oops!</h1>
+            <h1>{% trans 'Oops!' %}</h1>
 
             <p class="lead">{% trans "500 Internal Server Error" %}</p>
 
             <p>{% trans "The server encountered an internal error or misconfiguration and was unable to complete you request." %}</p>
-            <a class="btn btn-medium btn-success" href="javascript:history.back()">&larr; Back</a>
+            <a class="btn btn-medium btn-success" href="javascript:history.back()">&larr; {% trans 'Back'%}</a>
         </div>
     </div>
 {% endblock %}

templates/base.html

@@ -5,7 +5,7 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <meta name="description" content="WebVirtMgr panel for manage virtual machine">
+    <meta name="description" content="WebVirtCloud panel for manage virtual machine">
     <meta name="author" content="anatoliy.guskov@gmail.com">
 
     <title>{% block title %}{% endblock %}</title>

templates/errors_block.html

@@ -1,3 +1,4 @@
+{% load i18n %}
 {% if error_messages %}
     {% for error in error_messages %}
         <!-- Error Messages -->
@@ -5,7 +6,7 @@
             <div class="col-lg-12">
                 <div class="alert alert-danger alert-dismissible" role="danger">
                   <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                  <strong>Error:</strong> {{ error }}
+                  <strong>{% trans 'Error' %}:</strong> {{ error }}
                 </div>
             </div>
         </div>

templates/messages_block.html

@@ -1,3 +1,4 @@
+{% load i18n %}
 {% if messages %}
     {% for message in messages %}
         <!-- Success Messages -->
@@ -5,7 +6,7 @@
             <div class="col-lg-12">
                 <div class="alert alert-success alert-dismissible" role="susses">
                   <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                  <strong>Success:</strong> {{ message }}
+                  <strong>{% trans 'Success' %}:</strong> {{ message }}
                 </div>
             </div>
         </div>

vrtManager/instance.py

@@ -528,8 +528,8 @@ class wvmInstance(wvmConnect):
         mem_usage = {}
         if self.get_status() == 1:
             mem_stats = self.instance.memoryStats()
-            rss = mem_stats['rss'] if mem_stats['rss'] else 0
+            rss = mem_stats['rss'] if 'rss' in mem_stats else 0
-            total = mem_stats['actual'] if mem_stats['actual'] else 0
+            total = mem_stats['actual'] if 'actual' in mem_stats else 0
             available = total - rss
             if available < 0: available = 0