minor testing changes

sample.xml

-<domain type='kvm' xmlns:qemu='http://libvirt.org/schemas/domain/qemu/1.0'>
+<domain type='test' xmlns:qemu='http://libvirt.org/schemas/domain/qemu/1.0'>
         <name>one-2273</name>
         <name>one-2273</name>
         <vcpu>1</vcpu>
         <vcpu>1</vcpu>
         <cputune>
         <cputune>
@@ -6,7 +6,7 @@
         </cputune>
         </cputune>
         <memory>1048576</memory>
         <memory>1048576</memory>
         <os>
         <os>
-                <type arch='x86_64'>hvm</type>
+                <type arch='i686'>hvm</type>
                 <boot dev='hd'/>
                 <boot dev='hd'/>
         </os>
         </os>
         <devices>
         <devices>

test.py

@@ -2,7 +2,7 @@
 
 
 import vm
 import vm
 import vmdriver
 import vmdriver
-import logging
+#import logging
 from nose.tools import raises
 from nose.tools import raises
 
 
 graphics = {'type': 'vnc', 'listen':
 graphics = {'type': 'vnc', 'listen':
@@ -15,19 +15,37 @@ testvm = vm.VMInstance(name="Thisthename", vcpu="1",
                        network_list=[b],
                        network_list=[b],
                        graphics=graphics)
                        graphics=graphics)
 
 
+netdict = {'name': "vm-88", 'mac': "02:00:00:00:00:00"}
+diskdict = {'name': "asd", 'source': '/asdasd/adasds/asd'}
+vmdict = {
+    'name': "Thisthename",
+    'vcpu': 1,
+    'memory_max': 2048,
+    'disk_list': [diskdict],
+    'network_list': [netdict],
+    'graphics': graphics
+}
+
+print vm.VMNetwork.deserialize(netdict).dump_xml()
+print vm.VMDisk.deserialize(diskdict).dump_xml()
+
+
+asd = vm.VMInstance.deserialize(vmdict)
+print asd.dump_xml()
+
 # Enable logging
 # Enable logging
-logging.basicConfig(filename='example.log', level=logging.DEBUG)
-print testvm.dump_xml()
-vm_driver = vmdriver.VMDriver()
-vm_driver.connect()
-vm_driver.vm_define(testvm)
-print '%(name)s defined.' % {'name': testvm.name}
-for i in vm_driver.list_domains():
-    print i
-    #vm_driver.vm_start(i)
-    vm_driver.vm_undefine(i)
-    print '%(name)s undefined.' % {'name': i}
-vm_driver.disconnect()
+#logging.basicConfig(filename='example.log', level=logging.DEBUG)
+#print testvm.dump_xml()
+#vm_driver = vmdriver.VMDriver()
+#vm_driver.connect()
+#vm_driver.vm_define(testvm)
+#print '%(name)s defined.' % {'name': testvm.name}
+#for i in vm_driver.list_domains():
+#    print i
+#    #vm_driver.vm_start(i)
+#    vm_driver.vm_undefine(i)
+#    print '%(name)s undefined.' % {'name': i}
+#vm_driver.disconnect()
 
 
 
 
 @raises(AttributeError)
 @raises(AttributeError)

vmcelery.py

@@ -5,6 +5,8 @@ import os
 
 
 HOSTNAME = gethostname()
 HOSTNAME = gethostname()
 
 
+lib_connection = None
+
 celery = Celery('vmcelery', backend='amqp',
 celery = Celery('vmcelery', backend='amqp',
                 broker='amqp://cloud:test@10.9.1.31/vmdriver',
                 broker='amqp://cloud:test@10.9.1.31/vmdriver',
                 include=['tasks'])
                 include=['tasks'])

vmdriver.py

@@ -5,7 +5,7 @@ import logging
 import os
 import os
 import sys
 import sys
 from decorator import decorator
 from decorator import decorator
-from vmcelery import celery
+from vmcelery import celery, lib_connection
 
 
 sys.path.append(os.path.dirname(os.path.basename(__file__)))
 sys.path.append(os.path.dirname(os.path.basename(__file__)))
 
 
@@ -63,6 +63,7 @@ def connect(connection_string='qemu:///system'):
         connection = lib_connection
         connection = lib_connection
         logging.debug("Using celery libvirt connection connection.")
         logging.debug("Using celery libvirt connection connection.")
 
 
+
 @celery.task
 @celery.task
 def disconnect():
 def disconnect():
     '''Disconnect from the active libvirt daemon connection.
     '''Disconnect from the active libvirt daemon connection.