From 52658183656bc7dfb6d1ea9a3692d65298a65db3 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Sun, 4 Jan 2015 15:59:00 -0700 Subject: [PATCH] Support for IOURC file on the server side. --- gns3server/modules/iou/__init__.py | 7 ++++++- gns3server/modules/iou/iou_device.py | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/gns3server/modules/iou/__init__.py b/gns3server/modules/iou/__init__.py index ccafe2ee..4a6ceec6 100644 --- a/gns3server/modules/iou/__init__.py +++ b/gns3server/modules/iou/__init__.py @@ -99,6 +99,7 @@ class IOU(IModule): self._projects_dir = kwargs["projects_dir"] self._tempdir = kwargs["temp_dir"] self._working_dir = self._projects_dir + self._server_iourc_path = iou_config.get("iourc", "") self._iourc = "" # check every 5 seconds @@ -473,7 +474,11 @@ class IOU(IModule): try: iou_instance.iouyap = self._iouyap - iou_instance.iourc = self._iourc + if self._iourc: + iou_instance.iourc = self._iourc + else: + # if there is no IOURC file pushed by the client then use the server IOURC file + iou_instance.iourc = self._server_iourc_path iou_instance.start() except IOUError as e: self.send_custom_error(str(e)) diff --git a/gns3server/modules/iou/iou_device.py b/gns3server/modules/iou/iou_device.py index a593863e..dec395bb 100644 --- a/gns3server/modules/iou/iou_device.py +++ b/gns3server/modules/iou/iou_device.py @@ -562,7 +562,7 @@ class IOUDevice(object): self._library_check() if not self._iourc or not os.path.isfile(self._iourc): - raise IOUError("A iourc file is necessary to start IOU") + raise IOUError("A valid iourc file is necessary to start IOU") if not self._iouyap or not os.path.isfile(self._iouyap): raise IOUError("iouyap is necessary to start IOU")