Hostname management refactoring.

gns3server/modules/iou/__init__.py

@@ -315,7 +315,7 @@ class IOU(IModule):
         if not self.validate_request(request, IOU_CREATE_SCHEMA):
             return
 
-        name = request.get("name")
+        name = request["name"]
         console = request.get("console")
         iou_path = request["path"]
 
@@ -327,10 +327,10 @@ class IOU(IModule):
             except OSError as e:
                 raise IOUError("Could not create working directory {}".format(e))
 
-            iou_instance = IOUDevice(iou_path,
+            iou_instance = IOUDevice(name,
+                                     iou_path,
                                      self._working_dir,
                                      self._host,
-                                     name,
                                      console,
                                      self._console_start_port_range,
                                      self._console_end_port_range)

gns3server/modules/iou/iou_device.py

@@ -58,10 +58,11 @@ class IOUDevice(object):
     _instances = []
     _allocated_console_ports = []
 
-    def __init__(self, path,
+    def __init__(self,
+                 name,
+                 path,
                  working_dir,
                  host="127.0.0.1",
-                 name=None,
                  console=None,
                  console_start_port_range=4001,
                  console_end_port_range=4512):
@@ -77,10 +78,7 @@ class IOUDevice(object):
         if self._id == 0:
             raise IOUError("Maximum number of IOU instances reached")
 
-        if name:
-            self._name = name
-        else:
-            self._name = "IOU{}".format(self._id)
+        self._name = name
         self._path = path
         self._iourc = ""
         self._iouyap = ""

gns3server/modules/iou/schemas.py

@@ -39,7 +39,7 @@ IOU_CREATE_SCHEMA = {
         }
     },
     "additionalProperties": False,
-    "required": ["path"],
+    "required": ["name", "path"],
 }
 
 IOU_DELETE_SCHEMA = {