Cambio de nuevo la gestión de la BD del servidor de MV para que la clave sea un campo llamado domainName
	modified:   database/DBTests/DBMainServerTests.py
	modified:   database/DBTests/DBVMServerTest.sql
	modified:   database/DBTests/DBVMServerTests.py
	modified:   database/DBTests/DBWebServerTests.py
	modified:   database/DBVMServer.sql
	modified:   database/VMServerDB/RuntimeData.py
Añado argumento domainName al método de registro

	modified:   database/DBTests/DBVMServerTests.py
	modified:   database/VMServerDB/RuntimeData.py
Subo descripción sencilla del funcionamiento del servidor principal.
 Committer: Luis Barrios <luis@luis-desktop.(none)>
 On branch mainserver-upstream
 Changes to be committed:

	new file:   Arquitectura/Procedimientos/Servidor principal.odt
Modifico ficheros básicos de la base de datos del servidor principal
para añadir funcionalidad extra, seguir los convenios de notación de
Python y para eliminar métodos sin utilidad.

 On branch mainserver-upstream
 Changes to be committed:

	deleted:    database/DBMainServer.sql
	deleted:    database/DBUtils/DBUtils.py
	new file:   database/MainServerDB.sql
	deleted:    database/MainServerDB/ImagesInServerManager.py
	deleted:    database/MainServerDB/ServerVMManager.py
	renamed:    database/DBUtils/__init__.py -> database/mainServer/__init__.py
	new file:   database/mainServer/imageManager.py
	new file:   database/mainServer/vmServerManager.py
	renamed:    database/MainServerDB/__init__.py -> database/utils/__init__.py
	new file:   database/utils/configuration.py
Muevo las pruebas de la base de datos al nuevo paquete tests.

 On branch mainserver-upstream
 Changes to be committed:

	renamed:    database/DBTests/DBMainServer.sql -> database/tests/DBMainServer.sql
	renamed:    database/DBTests/DBMainServerTest.sql -> database/tests/DBMainServerTest.sql
	renamed:    database/DBTests/DBMainServerTests.py -> database/tests/DBMainServerTests.py
	renamed:    database/DBTests/DBVMServer.sql -> database/tests/DBVMServer.sql
	renamed:    database/DBTests/DBVMServerTest.sql -> database/tests/DBVMServerTest.sql
	renamed:    database/DBTests/DBVMServerTests.py -> database/tests/DBVMServerTests.py
	renamed:    database/DBTests/DBWebServerTest.sql -> database/tests/DBWebServerTest.sql
	renamed:    database/DBTests/DBWebServerTests.py -> database/tests/DBWebServerTests.py
	renamed:    database/DBTests/__init__.py -> database/tests/__init__.py

 Changes not staged for commit:

	deleted:    database/DBTests/.DBWebServerTest.sql.kate-swp
Subo lo que he hecho esta mañana. Esta tarde, seguiré con el servidor principal.

 On branch mainserver-upstream

 Changes to be committed:

	deleted:    database/DBTests/.DBWebServerTest.sql.kate-swp
	modified:   database/MainServerDB.sql
	deleted:    database/mainServer/imageManager.py
	new file:   database/mainServer/vmServerDB.py
	deleted:    database/mainServer/vmServerManager.py
	deleted:    database/tests/DBMainServer.sql
	deleted:    database/tests/DBMainServerTest.sql
	deleted:    database/tests/DBMainServerTests.py
	new file:   database/tests/MainServerDB.sql
	new file:   database/tests/mainServerDB.py
	modified:   database/utils/configuration.py
	new file:   mainServer/__init__.py
	new file:   mainServer/packets.py
	modified:   network/packet.py
Subo lo que llevo hecho hasta ahora:
- Armazón para el servidor principal
- Módulo que interactúa con la base de datos con un par de métodos más (hacían falta).

 On branch mainserver-upstream
 Changes to be committed:

	modified:   src/CygnusCloud/database/MainServerDB.sql
	modified:   src/CygnusCloud/database/VMServerDB/ImageManager.py
	modified:   src/CygnusCloud/database/VMServerDB/RuntimeData.py
	modified:   src/CygnusCloud/database/WebServerDB/UserManagement.py
	modified:   src/CygnusCloud/database/mainServer/vmServerDB.py
	modified:   src/CygnusCloud/database/tests/MainServerDB.sql
	modified:   src/CygnusCloud/database/tests/mainServerDB.py
	new file:   src/CygnusCloud/mainServer/callbacks.py
	modified:   src/CygnusCloud/mainServer/packets.py
	new file:   src/CygnusCloud/mainServer/reactor.py
Subo:
- registro, borrado y apagado de servidores de máquinas virtuales implementado y probado.
- arranque de servidores de máquinas virtuales casi implementado.
- red con bug corregido y con mejora: los booleanos ocuparán 1 byte en lugar de 5
- clases de la base de datos del servidor principal con métodos extra para sacarlo todo y con
  restricciones de integridad corregidas.
- tester y módulo de arranque del servidor principal para probar todo lo que hay hecho.

Mañana terminaré de implementar esto y pasaré al conector de la web.

 On branch mainserver-upstream
 Changes to be committed:

	modified:   src/CygnusCloud/database/MainServerDB.sql
	renamed:    src/CygnusCloud/database/mainServer/vmServerDB.py -> src/CygnusCloud/database/mainServer/mainServerDB.py
	new file:   src/CygnusCloud/database/tests/.DBWebServerTest.sql.kate-swp
	modified:   src/CygnusCloud/database/tests/mainServerDB.py
	modified:   src/CygnusCloud/mainServer/callbacks.py
	new file:   src/CygnusCloud/mainServer/mainServer.py
	modified:   src/CygnusCloud/mainServer/packets.py
	modified:   src/CygnusCloud/mainServer/reactor.py
	modified:   src/CygnusCloud/network/packet.py
	modified:   src/CygnusCloud/network/tests/packet.py
	modified:   src/CygnusCloud/testing/dummyVMServer.py
	new file:   src/CygnusCloud/testing/mainServerTester.py
	modified:   src/CygnusCloud/virtualMachineServer/packets.py
Añadida la funcionalidad de parada brusca

	modified:   VMClient.py
	modified:   libvirtConnector.py
	modified:   packets.py
Vuelvo a subir este módulo con los cambios comentados.

 On branch mainserver-upstream
 Changes to be committed:

	modified:   src/CygnusCloud/database/mainServer/mainServerDB.py
Termino de renombrar los ficheros de las bases de datos y de hacer la limpieza.

 On branch mainserver-upstream
 Changes to be committed:

	renamed:    src/CygnusCloud/database/DBVMServer.sql -> src/CygnusCloud/database/VMServerDB.sql
	renamed:    src/CygnusCloud/database/DBWebServer.sql -> src/CygnusCloud/database/WebServerDB.sql
	modified:   src/CygnusCloud/database/mainServer/mainServerDB.py
	deleted:    src/CygnusCloud/database/tests/DBVMServer.sql
	renamed:    src/CygnusCloud/database/tests/DBVMServerTest.sql -> src/CygnusCloud/database/tests/VMServerDBTest.sql
	renamed:    src/CygnusCloud/database/tests/DBWebServerTest.sql -> src/CygnusCloud/database/tests/WebServerDBTest.sql
	renamed:    src/CygnusCloud/database/tests/mainServerDB.py -> src/CygnusCloud/database/tests/mainServerDBTests.py
	renamed:    src/CygnusCloud/database/tests/DBVMServerTests.py -> src/CygnusCloud/database/tests/vmServerDBTests.py
	renamed:    src/CygnusCloud/database/tests/DBWebServerTests.py -> src/CygnusCloud/database/tests/webServerDBTests.py
	modified:   src/CygnusCloud/database/utils/configuration.py
	new file:   src/CygnusCloud/database/utils/connector.py
	renamed:    src/CygnusCloud/database/VMServerDB/__init__.py -> src/CygnusCloud/database/vmServer/__init__.py
	renamed:    src/CygnusCloud/database/VMServerDB/ImageManager.py -> src/CygnusCloud/database/vmServer/imageManager.py
	renamed:    src/CygnusCloud/database/VMServerDB/RuntimeData.py -> src/CygnusCloud/database/vmServer/runtimeData.py
	renamed:    src/CygnusCloud/database/WebServerDB/__init__.py -> src/CygnusCloud/database/webServer/__init__.py
	renamed:    src/CygnusCloud/database/WebServerDB/UserAccess.py -> src/CygnusCloud/database/webServer/userAccess.py
	renamed:    src/CygnusCloud/database/WebServerDB/UserManagement.py -> src/CygnusCloud/database/webServer/userManagement.py
Finalizo la implementación del cliente del servidor de máquinas virtuales.
Arranque de servidores de máquinas virtuales terminado. Todo está a punto para arrancar
imágenes.

 On branch mainserver-upstream
 Changes to be committed:

	modified:   src/CygnusCloud/database/MainServerDB.sql
	modified:   src/CygnusCloud/database/mainServer/mainServerDB.py
	modified:   src/CygnusCloud/database/tests/MainServerDB.sql
	new file:   src/CygnusCloud/mainServer/data.sql
	modified:   src/CygnusCloud/mainServer/packets.py
	modified:   src/CygnusCloud/mainServer/reactor.py
	modified:   src/CygnusCloud/testing/mainServerTester.py
Añado los metodos a petición de Samuel con la extracción de la información a partir del nombre del dominio

	modified:   database/VMServerDB/RuntimeData.py
Completo la integracion con la base de datos y cambio como se ejecutan los comandos en background
Borro unas cosas que me había dejado
Subo servidor principal básico terminado.

 On branch mainserver-upstream
 Changes to be committed:

	modified:   src/CygnusCloud/database/mainServer/mainServerDB.py
	new file:   src/CygnusCloud/mainServer/loadBalancing/__init__.py
	new file:   src/CygnusCloud/mainServer/loadBalancing/loadBalancer.py
	new file:   src/CygnusCloud/mainServer/loadBalancing/simpleLoadBalancer.py
	modified:   src/CygnusCloud/mainServer/packets.py
	modified:   src/CygnusCloud/mainServer/reactor.py
	modified:   src/CygnusCloud/testing/mainServerTester.py
	modified:   src/CygnusCloud/virtualMachineServer/.directory
Borro ficheros conflictivos con vmserver-upstream.

 On branch mainserver-upstream
 Changes to be committed:

	deleted:    CygnusCloud/database/tests/VMServerDBTest.sql
	deleted:    CygnusCloud/database/tests/vmServerDBTests.py
	deleted:    CygnusCloud/database/vmServer/__init__.py
	deleted:    CygnusCloud/database/vmServer/imageManager.py
	deleted:    CygnusCloud/database/vmServer/runtimeData.py
	deleted:    CygnusCloud/utils/commands.py
Merge branch 'vmserver-upstream' into mainserver-upstream

Conflicts:
	src/CygnusCloud/database/DBTests/DBMainServerTests.py
	src/CygnusCloud/database/DBTests/DBVMServerTest.sql
	src/CygnusCloud/database/DBTests/DBVMServerTests.py
	src/CygnusCloud/database/VMServerDB/RuntimeData.py
	src/CygnusCloud/database/tests/webServerDBTests.py
	src/CygnusCloud/utils/commands.py
Termino de mezclar todas las ramas. Acabo con la limpieza de la base de datos.

 On branch mainserver-upstream
 Changes to be committed:

	modified:   src/CygnusCloud/database/mainServer/mainServerDB.py
	renamed:    src/CygnusCloud/database/DBTests/DBVMServerTest.sql -> src/CygnusCloud/database/tests/VMServerDBTest.sql
	renamed:    src/CygnusCloud/database/DBTests/DBVMServerTests.py -> src/CygnusCloud/database/tests/vmServerDBTests.py
	modified:   src/CygnusCloud/database/utils/connector.py
	new file:   src/CygnusCloud/database/vmServer/__init__.py
	new file:   src/CygnusCloud/database/vmServer/imageManager.py
	renamed:    src/CygnusCloud/database/VMServerDB/RuntimeData.py -> src/CygnusCloud/database/vmServer/runtimeData.py
	modified:   src/CygnusCloud/database/webServer/userAccess.py
	modified:   src/CygnusCloud/database/webServer/userManagement.py
	modified:   src/CygnusCloud/utils/commands.py
	modified:   src/CygnusCloud/virtualMachineServer/VMClient.py