introducing celeryconfig.py

requirements and encoding fix

celeryconfig.py

+CELERY_RESULT_BACKEND = 'amqp://'
+CELERY_TASK_RESULT_EXPIRES = 300
+CELERY_TIMEZONE = 'UTC'
+CELERY_ENABLE_UTC = True
+CELERY_ACCEPT_CONTENT = ['pickle', 'json', 'msgpack', 'yaml']
+

netcelery.py

@@ -36,11 +36,12 @@ celery = Celery('netcelery',
                 broker=AMQP_URI,
                 broker=AMQP_URI,
                 include=['netdriver'])
                 include=['netdriver'])
 
 
+celery.config_from_object('celeryconfig')
+
 celery.conf.update(
 celery.conf.update(
-    CELERY_RESULT_BACKEND='amqp://',
-    CELERY_TASK_RESULT_EXPIRES=300000,
     CELERY_QUEUES=(
     CELERY_QUEUES=(
         Queue(HOSTNAME, Exchange(
         Queue(HOSTNAME, Exchange(
             'netdriver', type='direct'), routing_key="netdriver"),
             'netdriver', type='direct'), routing_key="netdriver"),
     )
     )
 )
 )
+

requirements/base.txt

-celery
-decorator
-lxml
-psutil
-Pillow
-GitPython
+amqp==1.4.9
+billiard==3.3.0.23
+celery==3.1.18
+decorator==3.4.0
+future==0.18.2
+#GitPython==0.3.6
+GitPython==3.1.18
+importlib-metadata==4.8.3
+kombu==3.0.30
+lxml==3.4.2
+pillow==8.4.0
+psutil==4.4.2
+pytz==2021.3
+smmap==5.0.0
+typing_extensions==4.0.1
+vine==5.0.0
+zipp==3.6.0

vm.py

@@ -173,7 +173,7 @@ class VMInstance:
 
 
     def dump_xml(self):
     def dump_xml(self):
         return ET.tostring(self.build_xml(),
         return ET.tostring(self.build_xml(),
-                           encoding='utf8',
+                           encoding='unicode',
                            method='xml',
                            method='xml',
                            pretty_print=True)
                            pretty_print=True)
 
 
@@ -231,7 +231,7 @@ class VMDisk:
 
 
     def dump_xml(self):
     def dump_xml(self):
         return ET.tostring(self.build_xml(),
         return ET.tostring(self.build_xml(),
-                           encoding='utf8',
+                           encoding='unicode',
                            method='xml',
                            method='xml',
                            pretty_print=True)
                            pretty_print=True)
 
 
@@ -323,6 +323,6 @@ class VMNetwork:
         return xml_top
         return xml_top
 
 
     def dump_xml(self):
     def dump_xml(self):
-        return ET.tostring(self.build_xml(), encoding='utf8',
+        return ET.tostring(self.build_xml(), encoding='unicode',
                            method='xml',
                            method='xml',
                            pretty_print=True)
                            pretty_print=True)

vmcelery.py

@@ -42,11 +42,13 @@ celery = Celery('vmcelery',
                 broker=AMQP_URI,
                 broker=AMQP_URI,
                 include=['vmdriver'])
                 include=['vmdriver'])
 
 
+celery.config_from_object('celeryconfig')
+
 celery.conf.update(
 celery.conf.update(
-    CELERY_RESULT_BACKEND='amqp://',
-    CELERY_TASK_RESULT_EXPIRES=300000,
     CELERY_QUEUES=(
     CELERY_QUEUES=(
         Queue(HOSTNAME, Exchange(
         Queue(HOSTNAME, Exchange(
             'vmdriver', type='direct'), routing_key="vmdriver"),
             'vmdriver', type='direct'), routing_key="vmdriver"),
     )
     )
 )
 )
+
+

vmdriver.py

@@ -183,6 +183,7 @@ def create(vm_desc):
         domain.suspend()
         domain.suspend()
     # Real driver create
     # Real driver create
     else:
     else:
+        logging.info("Virtual machine %s being created from xml", vm.name)
         Connection.get().createXML(
         Connection.get().createXML(
             vm_xml_dump, libvirt.VIR_DOMAIN_START_PAUSED)
             vm_xml_dump, libvirt.VIR_DOMAIN_START_PAUSED)
         logging.info("Virtual machine %s is created from xml", vm.name)
         logging.info("Virtual machine %s is created from xml", vm.name)