Merge pull request #259 from catborise/master

Add Qos for Network Functions

README.md

@@ -2,10 +2,19 @@
 
 
 ## Features
-
+* QEMU/KVM Hypervisor Management
+* QEMU/KVM Instance Management - Create, Delete, Update
+* Hypervisor & Instance web based stats
+* Manage Multiple QEMU/KVM Hypervisor
+* Manage Hypervisor Datastore pools
+* Manage Hypervisor Networks
+* Instance Console Access with Browsers
+* Libvirt API based web management UI
+* User Based Authorization and Authentication 
 * User can add SSH public key to root in Instance (Tested only Ubuntu)
 * User can change root password in Instance (Tested only Ubuntu)
 * Supports cloud-init datasource interface
+ 
 
 ### Warning!!!
 
@@ -67,7 +76,7 @@ wget -O - https://clck.ru/9V9fH | sudo sh
 ### Install WebVirtCloud panel (CentOS)
 
 ```bash
-sudo yum -y install python-virtualenv python-devel libvirt-devel glibc gcc nginx supervisor python-lxml git python-libguestfs
+sudo yum -y install python-virtualenv python-devel libvirt-devel glibc gcc nginx supervisor python-lxml git python-libguestfs iproute-tc
 ```
 
 #### Creating directories and cloning repo

networks/templates/add_inbound_qos.html

@@ -0,0 +1,49 @@
+{% load i18n %}
+{% if request.user.is_superuser %}
+    <a href="#AddInboundQos" type="button" class="btn btn-success pull-right" data-toggle="modal" title="add inbound qos">
+        <span class="glyphicon glyphicon-arrow-down" aria-hidden="true"></span>
+    </a>
+
+    <!-- Modal pool -->
+    <div class="modal fade" id="AddInboundQos" tabindex="-1" role="dialog" aria-labelledby="AddInboundQosLabel"
+         aria-hidden="true">
+        <div class="modal-dialog">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+                    <h4 class="modal-title">{% trans "Add Inbound Qos for Network" %}</h4>
+                </div>
+
+                <div class="modal-body">
+                    <form class="form-horizontal" method="post" name="set_qos" role="form">{% csrf_token %}
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">{% trans "Average" %}:</label>
+                        <div class="col-sm-6">
+                        <input class="form-control" name="qos_inbound_average" required pattern="[0-9]+"/>
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">{% trans "Peak" %}:</label>
+                        <div class="col-sm-6">
+                        <input class="form-control" name="qos_inbound_peak"
+                               required pattern="[0-9]+"/>
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">{% trans "Burst" %}:</label>
+                        <div class="col-sm-6">
+                        <input class="form-control" name="qos_inbound_burst" required pattern="[0-9]+"/>
+                        </div>
+                    </div>
+                    <input name="qos_direction" value="inbound" hidden/>
+                </div>
+
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-default" data-dismiss="modal">{% trans 'Close' %}</button>
+                    <button type="submit" class="btn btn-primary" name="set_qos">{% trans 'Save' %}</button>
+                </div>
+                    </form>
+            </div>
+        </div> <!-- /.modal-dialog -->
+    </div> <!-- /.modal -->
+{% endif %}

networks/templates/add_outbound_qos.html

@@ -0,0 +1,49 @@
+{% load i18n %}
+{% if request.user.is_superuser %}
+    <a href="#AddOutboundQos" type="button" class="btn btn-success pull-right" data-toggle="modal"  title="add outbound qos">
+        <span class="glyphicon glyphicon-arrow-up" aria-hidden="true"></span>
+    </a>
+
+    <!-- Modal pool -->
+    <div class="modal fade" id="AddOutboundQos" tabindex="-1" role="dialog" aria-labelledby="AddOutboundQosLabel"
+         aria-hidden="true">
+        <div class="modal-dialog">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+                    <h4 class="modal-title">{% trans "Add Outbound Qos for Network" %}</h4>
+                </div>
+
+                <div class="modal-body">
+                    <form class="form-horizontal" method="post" name="set_qos" role="form">{% csrf_token %}
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">{% trans "Average" %}:</label>
+                        <div class="col-sm-6">
+                        <input class="form-control" name="qos_outbound_average" required pattern="[0-9]+"/>
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">{% trans "Peak" %}:</label>
+                        <div class="col-sm-6">
+                        <input class="form-control" name="qos_outbound_peak"
+                               required pattern="[0-9]+"/>
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">{% trans "Burst" %}:</label>
+                        <div class="col-sm-6">
+                        <input class="form-control" name="qos_outbound_burst" required pattern="[0-9]+"/>
+                        </div>
+                    </div>
+                    <input name="qos_direction" value="outbound" hidden/>
+                </div>
+
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-default" data-dismiss="modal">{% trans 'Close' %}</button>
+                    <button type="submit" class="btn btn-primary" name="set_qos">{% trans 'Save' %}</button>
+                </div>
+                    </form>
+            </div>
+        </div> <!-- /.modal-dialog -->
+    </div> <!-- /.modal -->
+{% endif %}

networks/templates/network.html

@@ -97,7 +97,7 @@
         </div>
     </div>
 
-     <div class="row">
+    <div class="row">
         <h3 class="page-header">{% trans "IPv4 Configuration" %}</h3>
     </div>
     <div class="row">
@@ -172,7 +172,6 @@
                         </div>
                         <div id="collapseTwo" class="panel-collapse collapse">
                             <div class="panel-body">
-
                                 <div class="input-append form-inline pull-right">
                                     <div class="form-group">
                                         <input type="text" class="form-control" id="filter_input">
@@ -339,6 +338,60 @@
             </div>
         </div>
     {% endif %}
+
+        {% ifequal state 0 %}
+        {% include 'add_outbound_qos.html' %}
+        {% include 'add_inbound_qos.html' %}
+    {% endifequal %}
+
+    <div class="row">
+        <h3 class="page-header">{% trans "Qos Configuration" %}
+        </h3>
+    </div>
+
+    <div class="row">
+        <div class="col-sm-12">
+            <table class="table table-hover">
+                <thead>
+                <tr>
+                    <th style="text-align: center">{% trans "Direction" %}</th>
+                    <th style="text-align: center">{% trans "Average" %}</th>
+                    <th style="text-align: center">{% trans "Peak" %}</th>
+                    <th style="text-align: center">{% trans "Burst" %}</th>
+                    <th style="text-align: center">{% trans "Actions" %}</th>
+                </tr>
+                </thead>
+                <tbody>
+                {% for q, att in qos.items %}
+                    <form method="post" role="form">{% csrf_token %}
+                        <tr>
+                            <td><label class="control-label">{{ q | capfirst }}</label></td>
+                            <td><input id="qos_{{ q }}_av" class="form-control" name="qos_{{ q }}_average"
+                                       value="{{ att.average }}"/></td>
+                            <td><input id="qos_{{ q }}_peak" class="form-control" name="qos_{{ q }}_peak"
+                                       value="{{ att.peak }}"/></td>
+                            <td><input id="qos_{{ q }}_burst" class="form-control" name="qos_{{ q }}_burst"
+                                       value="{{ att.burst }}"/></td>
+                            <td>
+                                <input name="qos_direction" value="{{ q }}" hidden/>
+                                <button type="submit" class="btn btn-sm btn-primary"
+                                        name="set_qos"
+                                        title="Edit Qos" onclick="return confirm('{% trans "Are you sure?" %}')">
+                                    <i class="glyphicon glyphicon-save"></i>
+                                </button>
+                                <button type="submit" class="btn btn-sm btn-danger"
+                                        name="unset_qos"
+                                        title="Delete Qos" onclick="return confirm('{% trans "Are you sure?" %}')">
+                                    <i class="glyphicon glyphicon-trash"></i>
+                                </button>
+                            </td>
+                        </tr>
+                    </form>
+                {% endfor %}
+                </tbody>
+            </table>
+        </div>
+    </div>
 {% endblock %}
 {% block script %}
 <script>

networks/views.py

@@ -97,6 +97,7 @@ def network(request, compute_id, pool):
         autostart = conn.get_autostart()
         net_mac = conn.get_network_mac()
         net_forward = conn.get_network_forward()
+        qos = conn.get_qos()
         dhcp_range_start = ipv4_dhcp_range_end = dict()
 
         ip_networks = conn.get_ip_networks()
@@ -187,20 +188,37 @@ def network(request, compute_id, pool):
         if 'edit_network' in request.POST:
             edit_xml = request.POST.get('edit_xml', '')
             if edit_xml:
-                try:
+                conn.edit_network(edit_xml)
-                    new_conn = wvmNetworks(compute.hostname,
+                if conn.is_active():
-                                           compute.login,
+                    messages.success(request, _("Network XML is changed. \\"
-                                           compute.password,
+                                                "Stop and start network to activate new config."))
-                                           compute.type)
+                else:
-                    new_conn.define_network(edit_xml)
+                    messages.success(request, _("Network XML is changed."))
-                    if conn.is_active():
+                return HttpResponseRedirect(request.get_full_path())
-                        messages.success(request, _("Network XML is changed. Stop and start network to activate new config."))
-                    else:
-                        messages.success(request, _("Network XML is changed."))
-                    return HttpResponseRedirect(request.get_full_path())
-                except libvirtError as lib_err:
-                    error_messages.append(lib_err.message)
 
+        if 'set_qos' in request.POST:
+            qos_dir = request.POST.get('qos_direction', '')
+            average = request.POST.get('qos_{}_average'.format(qos_dir), '')
+            peak = request.POST.get('qos_{}_peak'.format(qos_dir), '')
+            burst = request.POST.get('qos_{}_burst'.format(qos_dir), '')
+
+            conn.set_qos(qos_dir, average, peak, burst)
+            if conn.is_active():
+                messages.success(request, "{} Qos is set. Network XML is changed.".format(qos_dir.capitalize()) +
+                                 "Stop and start network to activate new config")
+            else:
+                messages.success(request, "{} Qos is set".format(qos_dir.capitalize()))
+            return HttpResponseRedirect(request.get_full_path())
+        if 'unset_qos' in request.POST:
+            qos_dir = request.POST.get('qos_direction', '')
+            conn.unset_qos(qos_dir)
+
+            if conn.is_active():
+                messages.success(request, "{} Qos is deleted. Network XML is changed. ".format(qos_dir.capitalize()) +
+                                 "Stop and start network to activate new config.")
+            else:
+                messages.success(request, "{} Qos is deleted".format(qos_dir.capitalize()))
+            return HttpResponseRedirect(request.get_full_path())
     conn.close()
 
     return render(request, 'network.html', locals())

vrtManager/network.py

@@ -290,3 +290,60 @@ class wvmNetwork(wvmConnect):
                             parent_index,
                             VIR_NETWORK_UPDATE_AFFECT_LIVE | VIR_NETWORK_UPDATE_AFFECT_CONFIG)
 
+    def get_qos(self):
+        qos_values = dict()
+        tree = etree.fromstring(self._XMLDesc(0))
+        qos = tree.xpath("/network/bandwidth")
+        if qos:
+            qos = qos[0]
+
+            in_qos = qos.find('inbound')
+            if in_qos is not None:
+                in_av = in_qos.get('average')
+                in_peak = in_qos.get('peak')
+                in_burst = in_qos.get('burst')
+                qos_values['inbound'] = {'average': in_av, 'peak': in_peak, 'burst': in_burst}
+
+            out_qos = qos.find('outbound')
+            if out_qos is not None:
+                out_av = out_qos.get('average')
+                out_peak = out_qos.get('peak')
+                out_burst = out_qos.get('burst')
+                qos_values['outbound'] = {'average': out_av, 'peak': out_peak, 'burst': out_burst}
+        return qos_values
+
+    def set_qos(self, direction, average, peak, burst):
+        if direction == "inbound":
+            xml = "<inbound average='{}' peak='{}' burst='{}'/>".format(average, peak, burst)
+        elif direction == "outbound":
+            xml = "<outbound average='{}' peak='{}' burst='{}'/>".format(average, peak, burst)
+        else:
+            raise Exception('Direction must be inbound or outbound')
+
+        tree = etree.fromstring(self._XMLDesc(0))
+
+        band = tree.xpath("/network/bandwidth")
+        if len(band) == 0:
+            xml = "<bandwidth>" + xml + "</bandwidth>"
+            tree.append(etree.fromstring(xml))
+        else:
+            direct = band[0].find(direction)
+            if direct is not None:
+                parent = direct.getparent()
+                parent.remove(direct)
+                parent.append(etree.fromstring(xml))
+            else:
+                band[0].append(etree.fromstring(xml))
+        new_xml = etree.tostring(tree)
+        self.wvm.networkDefineXML(new_xml)
+
+    def unset_qos(self, direction):
+        tree = etree.fromstring(self._XMLDesc(0))
+        for direct in tree.xpath("/network/bandwidth/{}".format(direction)):
+            parent = direct.getparent()
+            parent.remove(direct)
+
+        self.wvm.networkDefineXML(etree.tostring(tree))
+
+    def edit_network(self, new_xml):
+        self.wvm.networkDefineXML(new_xml)