Rename modules => hypervisor

gns3server/handlers/api/hypervisor/docker_handler.py

@@ -19,7 +19,7 @@ import os
 from aiohttp.web import HTTPConflict
 
 from ....web.route import Route
-from ....modules.docker import Docker
+from ....hypervisor.docker import Docker
 
 from ....schemas.docker import (
     DOCKER_CREATE_SCHEMA,

gns3server/handlers/api/hypervisor/dynamips_device_handler.py

@@ -23,7 +23,7 @@ from ....schemas.dynamips_device import DEVICE_UPDATE_SCHEMA
 from ....schemas.dynamips_device import DEVICE_OBJECT_SCHEMA
 from ....schemas.dynamips_device import DEVICE_NIO_SCHEMA
 from ....schemas.vm import VM_CAPTURE_SCHEMA
-from ....modules.dynamips import Dynamips
+from ....hypervisor.dynamips import Dynamips
 
 
 class DynamipsDeviceHandler:

gns3server/handlers/api/hypervisor/dynamips_vm_handler.py

@@ -27,9 +27,9 @@ from ....schemas.dynamips_vm import VM_UPDATE_SCHEMA
 from ....schemas.dynamips_vm import VM_OBJECT_SCHEMA
 from ....schemas.dynamips_vm import VM_CONFIGS_SCHEMA
 from ....schemas.vm import VM_CAPTURE_SCHEMA
-from ....modules.dynamips import Dynamips
-from ....modules.dynamips.dynamips_error import DynamipsError
-from ....modules.project_manager import ProjectManager
+from ....hypervisor.dynamips import Dynamips
+from ....hypervisor.dynamips.dynamips_error import DynamipsError
+from ....hypervisor.project_manager import ProjectManager
 
 DEFAULT_CHASSIS = {
     "c1700": "1720",

gns3server/handlers/api/hypervisor/iou_handler.py

@@ -27,7 +27,7 @@ from ....schemas.iou import IOU_OBJECT_SCHEMA
 from ....schemas.iou import IOU_CONFIGS_SCHEMA
 from ....schemas.vm import VM_LIST_IMAGES_SCHEMA
 from ....schemas.vm import VM_CAPTURE_SCHEMA
-from ....modules.iou import IOU
+from ....hypervisor.iou import IOU
 
 
 class IOUHandler:

gns3server/handlers/api/hypervisor/network_handler.py

@@ -16,8 +16,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from ....web.route import Route
-from ....modules.port_manager import PortManager
-from ....modules.project_manager import ProjectManager
+from ....hypervisor.port_manager import PortManager
+from ....hypervisor.project_manager import ProjectManager
 from ....utils.interfaces import interfaces
 
 

gns3server/handlers/api/hypervisor/project_handler.py

@@ -23,8 +23,8 @@ import psutil
 
 from ....web.route import Route
 from ....schemas.project import PROJECT_OBJECT_SCHEMA, PROJECT_CREATE_SCHEMA, PROJECT_UPDATE_SCHEMA, PROJECT_FILE_LIST_SCHEMA, PROJECT_LIST_SCHEMA
-from ....modules.project_manager import ProjectManager
-from ....modules import MODULES
+from ....hypervisor.project_manager import ProjectManager
+from ....hypervisor import MODULES
 
 import logging
 log = logging.getLogger()

gns3server/handlers/api/hypervisor/qemu_handler.py

@@ -20,7 +20,7 @@ import os.path
 
 from aiohttp.web import HTTPConflict
 from ....web.route import Route
-from ....modules.project_manager import ProjectManager
+from ....hypervisor.project_manager import ProjectManager
 from ....schemas.nio import NIO_SCHEMA
 from ....schemas.qemu import QEMU_CREATE_SCHEMA
 from ....schemas.qemu import QEMU_UPDATE_SCHEMA
@@ -30,7 +30,7 @@ from ....schemas.qemu import QEMU_BINARY_LIST_SCHEMA
 from ....schemas.qemu import QEMU_CAPABILITY_LIST_SCHEMA
 from ....schemas.qemu import QEMU_IMAGE_CREATE_SCHEMA
 from ....schemas.vm import VM_LIST_IMAGES_SCHEMA
-from ....modules.qemu import Qemu
+from ....hypervisor.qemu import Qemu
 from ....config import Config
 
 

gns3server/handlers/api/hypervisor/virtualbox_handler.py

@@ -24,8 +24,8 @@ from ....schemas.virtualbox import VBOX_CREATE_SCHEMA
 from ....schemas.virtualbox import VBOX_UPDATE_SCHEMA
 from ....schemas.virtualbox import VBOX_OBJECT_SCHEMA
 from ....schemas.vm import VM_CAPTURE_SCHEMA
-from ....modules.virtualbox import VirtualBox
-from ....modules.project_manager import ProjectManager
+from ....hypervisor.virtualbox import VirtualBox
+from ....hypervisor.project_manager import ProjectManager
 
 
 class VirtualBoxHandler:

gns3server/handlers/api/hypervisor/vmware_handler.py

@@ -24,8 +24,8 @@ from ....schemas.vmware import VMWARE_UPDATE_SCHEMA
 from ....schemas.vmware import VMWARE_OBJECT_SCHEMA
 from ....schemas.vm import VM_CAPTURE_SCHEMA
 from ....schemas.nio import NIO_SCHEMA
-from ....modules.vmware import VMware
-from ....modules.project_manager import ProjectManager
+from ....hypervisor.vmware import VMware
+from ....hypervisor.project_manager import ProjectManager
 
 
 class VMwareHandler:

gns3server/handlers/api/hypervisor/vpcs_handler.py

@@ -21,7 +21,7 @@ from ....schemas.nio import NIO_SCHEMA
 from ....schemas.vpcs import VPCS_CREATE_SCHEMA
 from ....schemas.vpcs import VPCS_UPDATE_SCHEMA
 from ....schemas.vpcs import VPCS_OBJECT_SCHEMA
-from ....modules.vpcs import VPCS
+from ....hypervisor.vpcs import VPCS
 
 
 class VPCSHandler: