Merge pull request #1091 from GNS3/bugfix-557

Bugfix 557

gns3server/compute/iou/iou_vm.py

@@ -86,6 +86,7 @@ class IOUVM(BaseNode):
         self._startup_config = ""
         self._private_config = ""
         self._ram = 256  # Megabytes
+        self._application_id = None
         self._l1_keepalives = False  # used to overcome the always-up Ethernet interfaces (not supported by all IOSes).
 
     def _config(self):
@@ -206,7 +207,8 @@ class IOUVM(BaseNode):
                        "nvram": self._nvram,
                        "l1_keepalives": self._l1_keepalives,
                        "use_default_iou_values": self._use_default_iou_values,
-                       "command_line": self.command_line}
+                       "command_line": self.command_line,
+                       "application_id": self.application_id}
 
         # return the relative path if the IOU image is in the images_path directory
         iou_vm_info["path"] = self.manager.get_relative_image_path(self.path)
@@ -306,11 +308,6 @@ class IOUVM(BaseNode):
 
         super(IOUVM, IOUVM).name.__set__(self, new_name)
 
-    @property
-    def application_id(self):
-
-        return self._manager.get_application_id(self.id)
-
     @property
     def iourc_content(self):
 
@@ -1065,6 +1062,27 @@ class IOUVM(BaseNode):
         else:
             return None
 
+    @property
+    def application_id(self):
+        """
+        Returns application_id which unique identifier for IOU running script. Value is between 1 and 512.
+        When it's not set returns value from the local manager.
+
+        :returns: integer between 1 and 512
+        """
+        if self._application_id is None:
+            return self._manager.get_application_id(self.id)
+        return self._application_id
+
+    @application_id.setter
+    def application_id(self, application_id):
+        """
+        Sets application_id for IOU.
+
+        :param: integer between 1 and 512
+        """
+        self._application_id = application_id
+
     def extract_configs(self):
         """
         Gets the contents of the config files

gns3server/compute/iou/utils/application_id.py

@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2017 GNS3 Technologies Inc.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+from ..iou_error import IOUError
+
+import logging
+log = logging.getLogger(__name__)
+
+
+def get_next_application_id(nodes):
+    """
+    Calculates free application_id from given nodes
+    :param nodes:
+    :raises IOUError when exceeds number
+    :return: integer first free id
+    """
+    used = set([n.properties.get('application_id') for n in nodes if n.node_type == 'iou'])
+    pool = set(range(1, 512))
+    try:
+        return (pool - used).pop()
+    except KeyError:
+        raise IOUError("Cannot create a new IOU VM (limit of 512 VMs reached)")

gns3server/controller/node.py

@@ -66,7 +66,7 @@ class Node:
         self.name = name
         self._console = None
         self._console_type = None
-        self._properties = {}
+        self._properties = None
         self._command_line = None
         self._node_directory = None
         self._status = "stopped"
@@ -88,6 +88,8 @@ class Node:
         # This properties will be recompute
         ignore_properties = ("width", "height")
 
+        self.properties = kwargs.pop('properties', {})
+
         # Update node properties with additional elements
         for prop in kwargs:
             if prop not in ignore_properties:

gns3server/controller/project.py

@@ -39,7 +39,7 @@ from ..utils.asyncio.pool import Pool
 from ..utils.asyncio import locked_coroutine
 from .export_project import export_project
 from .import_project import import_project
-
+from ..compute.iou.utils.application_id import get_next_application_id
 
 import logging
 log = logging.getLogger(__name__)
@@ -353,12 +353,9 @@ class Project:
         if node_id in self._nodes:
             return self._nodes[node_id]
 
-        # Due to a limitation all iou need to run on the same
-        # compute server otherwise you have mac address conflict
-        if node_type == "iou":
-            for node in self._nodes.values():
-                if node.node_type == node_type and node.compute != compute:
-                    raise aiohttp.web.HTTPConflict(text="All IOU nodes need to run on the same server.")
+        if node_type == "iou" and 'application_id' not in kwargs.keys():
+
+            kwargs['application_id'] = get_next_application_id(self._nodes.values())
 
         node = Node(self, compute, name, node_id=node_id, node_type=node_type, **kwargs)
         if compute not in self._project_created_on_compute:

gns3server/schemas/iou.py

@@ -86,6 +86,10 @@ IOU_CREATE_SCHEMA = {
             "description": "Private-config of IOU",
             "type": ["string", "null"]
         },
+        "application_id": {
+            "description": "Application ID for running IOU image",
+            "type": ["integer", "null"]
+        },
     },
     "additionalProperties": False,
     "required": ["name", "path"]
@@ -182,7 +186,11 @@ IOU_OBJECT_SCHEMA = {
         "command_line": {
             "description": "Last command line used by GNS3 to start QEMU",
             "type": "string"
-        }
+        },
+        "application_id": {
+            "description": "Application ID for running IOU image",
+            "type": "integer"
+        },
     },
     "additionalProperties": False
 }