First 3.6 version

fe4837f7 · Kohl Krisztofer · b6d5c41a · fe4837f7 · fe4837f7 · fe4837f7
Commit fe4837f7 authored Jan 07, 2022 by Kohl Krisztofer
10 changed files
--- a/docs/install-node.rst
+++ b/docs/install-node.rst
@@ -28,9 +28,8 @@ Configure Open vSwitch bridge that handle vitual connections::
 Enable passwordless Open vSwitch commands::
-  $ sudo tee /etc/sudoers.d/netdriver <<END
+  $ sudo tee /etc/sudoers.d/netdriver <<END cloud            ALL = (ALL) NOPASSWD: /usr/bin/ovs-ofctl, /usr/bin/ovs-vsctl, /sbin/ip link set * END
-    cloud            ALL = (ALL) NOPASSWD: /usr/bin/ovs-ofctl, /usr/bin/ovs-vsctl, /sbin/ip link set *
-    END
  $ sudo chmod 660 /etc/sudoers.d/netdriver
 Configuring the libvirt daemon

--- a/miscellaneous/netcelery.conf
+++ b/miscellaneous/netcelery.conf
@@ -8,8 +8,8 @@ setgid libvirtd
 instance $NAME
 script
-    cd /home/cloud/vmdriver
+    cd /home/kohlkriszto/Documents/vmdriver
-    . /home/cloud/.virtualenvs/vmdriver/local/bin/activate
+    . /home/kohlkriszto/Documents/vmdriver_venv/bin/activate
-    . /home/cloud/.virtualenvs/vmdriver/local/bin/postactivate
+    . /home/kohlkriszto/Documents/vmdriver_venv/bin/postactivate
    exec celery -A netcelery worker --loglevel=info -n ${NAME}
 end script
--- a/miscellaneous/netcelery@.service
+++ b/miscellaneous/netcelery@.service
@@ -12,4 +12,5 @@ Restart=always
 WorkingDirectory=/home/cloud/vmdriver
-ExecStart=/bin/bash -c "source /etc/profile; workon vmdriver; exec celery -A netcelery worker --loglevel=info -n $(/bin/hostname -s).%I"
+ExecStart=/bin/bash -c "source /home/cloud/.virtualenvs/vmdriver/bin/activate; source /home/cloud/.virtualenvs/vmdriver/bin/activate; exec celery -A netcelery worker --loglevel=info -n $(/bin/hostname -s).%I"
--- a/miscellaneous/vmcelery.conf
+++ b/miscellaneous/vmcelery.conf
@@ -8,8 +8,8 @@ setgid libvirtd
 instance $NAME
 script
-    cd /home/cloud/vmdriver
+    cd /home/kohlkriszto/Documents/vmdriver
-    . /home/cloud/.virtualenvs/vmdriver/local/bin/activate
+    . /home/kohlkriszto/Documents/vmdriver_venv/bin/activate
-    . /home/cloud/.virtualenvs/vmdriver/local/bin/postactivate
+    . /home/kohlkriszto/Documents/vmdriver_venv/bin/postactivate
    exec celery -A vmcelery worker --loglevel=info -n $NAME
 end script
--- a/miscellaneous/vmcelery@.service
+++ b/miscellaneous/vmcelery@.service
@@ -12,4 +12,5 @@ Restart=always
 WorkingDirectory=/home/cloud/vmdriver
-ExecStart=/bin/bash -c "source /etc/profile; workon vmdriver; exec celery -A vmcelery worker --loglevel=info -n $(/bin/hostname -s).%I"
+ExecStart=/bin/bash -c "source /home/cloud/.virtualenvs/vmdriver/bin/activate; source /home/cloud/.virtualenvs/vmdriver/bin/activate; exec celery -A vmcelery worker --loglevel=info -n $(/bin/hostname -s).%I"
--- a/netcelery.py
+++ b/netcelery.py
@@ -37,8 +37,8 @@ celery = Celery('netcelery',
                include=['netdriver'])
 celery.conf.update(
-    CELERY_RESULT_BACKEND='amqp',
+    CELERY_RESULT_BACKEND='amqp://',
-    CELERY_TASK_RESULT_EXPIRES=300,
+    CELERY_TASK_RESULT_EXPIRES=300000,
    CELERY_QUEUES=(
        Queue(HOSTNAME, Exchange(
            'netdriver', type='direct'), routing_key="netdriver"),

--- a/requirements/base.txt
+++ b/requirements/base.txt
-celery==3.1.17
+celery
-decorator==3.4.0
+decorator
-lxml==3.4.2
+lxml
-psutil==1.1.3
+psutil
-Pillow==2.3.0
+Pillow
-GitPython==0.3.6
+GitPython
--- a/tests/test.py
+++ b/tests/test.py
@@ -26,12 +26,12 @@ vmdict = {
    'graphics': graphics
 }
-print vm.VMNetwork.deserialize(netdict).dump_xml()
+print((vm.VMNetwork.deserialize(netdict).dump_xml()))
-print vm.VMDisk.deserialize(diskdict).dump_xml()
+print((vm.VMDisk.deserialize(diskdict).dump_xml()))
 asd = vm.VMInstance.deserialize(vmdict)
-print asd.dump_xml()
+print((asd.dump_xml()))
 # Enable logging
 # logging.basicConfig(filename='example.log', level=logging.DEBUG)

--- a/vmcelery.py
+++ b/vmcelery.py
 """ Celery module for libvirt RPC calls. """
 from celery import Celery
 from kombu import Queue, Exchange
 from os import getenv
@@ -42,8 +43,8 @@ celery = Celery('vmcelery',
                include=['vmdriver'])
 celery.conf.update(
-    CELERY_RESULT_BACKEND='amqp',
+    CELERY_RESULT_BACKEND='amqp://',
-    CELERY_TASK_RESULT_EXPIRES=300,
+    CELERY_TASK_RESULT_EXPIRES=300000,
    CELERY_QUEUES=(
        Queue(HOSTNAME, Exchange(
            'vmdriver', type='direct'), routing_key="vmdriver"),

--- a/vmdriver.py
+++ b/vmdriver.py
@@ -8,7 +8,7 @@ import json
 from decorator import decorator
 import lxml.etree as ET
-from psutil import NUM_CPUS, virtual_memory, cpu_percent
+from psutil import cpu_count, virtual_memory, cpu_percent
 from celery.contrib.abortable import AbortableTask
@@ -419,7 +419,7 @@ def node_info():
    keys = ['model', 'memory', 'cpus', 'mhz',
            'nodes', 'sockets', 'cores', 'threads']
    values = Connection.get().getInfo()
-    return dict(zip(keys, values))
+    return dict(list(zip(keys, values)))
 def _parse_info(values):
@@ -430,7 +430,7 @@ def _parse_info(values):
    """
    keys = ['state', 'maxmem', 'memory', 'virtcpunum', 'cputime']
-    info = dict(zip(keys, values))
+    info = dict(list(zip(keys, values)))
    # Change state to proper ENUM
    info['state'] = state_dict[info['state']]
    return info
@@ -474,7 +474,7 @@ def network_info(name, network):
            'tx_bytes', 'tx_packets', 'tx_errs', 'tx_drop']
    dom = lookupByName(name)
    values = dom.interfaceStats(network)
-    info = dict(zip(keys, values))
+    info = dict(list(zip(keys, values)))
    return info
@@ -579,7 +579,7 @@ def __check_detach(domain, disk):
    root = ET.fromstring(xml)
    devices = root.find('devices')
    for d in devices.findall("disk"):
-        if disk in d.find('source').attrib.values()[0]:
+        if disk in list(d.find('source').attrib.values())[0]:
            raise Exception("Disk could not been detached. "
                            "Check if hot plug support is "
                            "enabled (acpiphp module on Linux).")
@@ -631,7 +631,7 @@ def get_architecture():
 @celery.task
 def get_core_num():
-    return NUM_CPUS
+    return cpu_count
 @celery.task