gns3-server 3.0.0rc1__py3-none-any.whl → 3.0.1__py3-none-any.whl

gns3server/appliances/vyos.gns3a

@@ -1,181 +1,178 @@
 {
     "appliance_id": "f82b74c4-0f30-456f-a582-63daca528502",
-    "name": "VyOS",
+    "name": "VyOS Universal Router",
     "category": "router",
-    "description": "VyOS is a community fork of Vyatta, a Linux-based network operating system that provides software-based network routing, firewall, and VPN functionality.",
-    "vendor_name": "Linux",
-    "vendor_url": "https://vyos.net/",
+    "description": "VyOS is an open-source network operating system that provides a comprehensive suite of features for routing, firewalling, and VPN functionality. VyOS offers a robust and flexible solution for both small-scale and large-scale network environments. It is designed to support enterprise-grade networking with the added benefits of community-driven development and continuous updates.\n\nThe VyOS Universal Router, when used in GNS3, brings the power and versatility of VyOS to network simulation and emulation. GNS3 users can deploy the VyOS Universal Router to create and test complex network topologies in a virtual environment. This appliance provides a rich set of features, including dynamic routing protocols, stateful firewall capabilities, various VPNs, as well as high availability configurations.\n\nThe seamless integration with GNS3 allows network engineers and architects to validate network designs, perform testing and troubleshooting, and enhance their skill sets in a controlled, risk-free environment.",
+    "vendor_name": "VyOS Inc.",
+    "vendor_url": "https://vyos.io/",
+    "vendor_logo_url": "https://raw.githubusercontent.com/GNS3/gns3-registry/master/vendor-logos/VyOS.png",
     "documentation_url": "https://docs.vyos.io/",
-    "product_name": "VyOS",
-    "product_url": "https://vyos.net/",
+    "product_name": "VyOS Universal Router",
+    "product_url": "https://vyos.io/vyos-universal-router",
     "registry_version": 4,
     "status": "stable",
-    "maintainer": "GNS3 Team",
-    "maintainer_email": "developers@gns3.net",
-    "usage": "Default username/password is vyos/vyos.\n\nThe -KVM versions are ready to use, no installation is required.\nThe other images will start the router from the CDROM on initial boot. Login and then type \"install image\" and follow the instructions.",
+    "availability": "service-contract",
+    "maintainer": "VyOS Inc.",
+    "maintainer_email": "support@vyos.io",
+    "usage": "\nDefault credentials:\nUser: vyos\nPassword: vyos",
     "symbol": "vyos.svg",
     "port_name_format": "eth{0}",
     "qemu": {
-        "adapter_type": "e1000",
-        "adapters": 3,
-        "ram": 512,
-        "hda_disk_interface": "scsi",
+        "adapter_type": "virtio-net-pci",
+        "adapters": 10,
+        "ram": 2048,
+        "cpus": 4,
+        "hda_disk_interface": "virtio",
         "arch": "x86_64",
         "console_type": "telnet",
-        "boot_priority": "cd",
-        "kvm": "allow"
+        "boot_priority": "c",
+        "kvm": "require",
+        "on_close": "shutdown_signal"
     },
     "images": [
         {
-            "filename": "vyos-1.3.2-amd64.iso",
+            "filename": "vyos-1.4.0-kvm-amd64.qcow2",
+            "version": "1.4.0",
+            "md5sum": "a130e446bc5bf87391981f183ee3694b",
+            "filesize": 468320256,
+            "download_url": "https://support.vyos.io/"
+        },
+        {
+            "filename": "vyos-1.3.7-qemu-amd64.qcow2",
+            "version": "1.3.7",
+            "md5sum": "f4663b1e2df115bfa5c7ec17584514d6",
+            "filesize": 359792640,
+            "download_url": "https://support.vyos.io/"
+        },
+        {
+            "filename": "vyos-1.3.2-10G-qemu.qcow2",
             "version": "1.3.2",
-            "md5sum": "070743faac800f9e5197058a8b6b3ba1",
-            "filesize": 334495744,
-            "download_url": "https://support.vyos.io/en/downloads/files/vyos-1-3-2-generic-iso-image"
+            "md5sum": "68ad3fb530213189ac9ed496d5fe7897",
+            "filesize": 326893568,
+            "download_url": "https://support.vyos.io/"
         },
         {
-            "filename": "vyos-1.3.1-S1-amd64.iso",
+            "filename": "vyos-1.3.1-S1-10G-qemu.qcow2",
             "version": "1.3.1-S1",
-            "md5sum": "781f345e8a4ab9eb9e075ce5c87c8817",
-            "filesize": 351272960,
-            "download_url": "https://support.vyos.io/en/downloads/files/vyos-1-3-1-s1-generic-iso-image"
+            "md5sum": "d8ed9f82a983295b94b07f8e37c48ed0",
+            "filesize": 343801856,
+            "download_url": "https://support.vyos.io/"
         },
         {
-            "filename": "vyos-1.3.1-amd64.iso",
+            "filename": "vyos-1.3.1-10G-qemu.qcow2",
             "version": "1.3.1",
-            "md5sum": "b6f57bd0cf9b60cdafa337b08ba4f2bc",
-            "filesize": 350224384,
-            "download_url": "https://support.vyos.io/en/downloads/files/vyos-1-3-1-generic-iso-image"
+            "md5sum": "482367c833990fb2b9350e3708d33dc9",
+            "filesize": 342556672,
+            "download_url": "https://support.vyos.io/"
         },
         {
-            "filename": "vyos-1.3.0-amd64.iso",
+            "filename": "vyos-1.3.0-10G-qemu.qcow2",
             "version": "1.3.0",
-            "md5sum": "2019bd9c5efa6194e2761de678d0073f",
-            "filesize": 338690048,
-            "download_url": "https://support.vyos.io/en/downloads/files/vyos-1-3-0-generic-iso-image"
-        },
-        {
-            "filename": "vyos-1.2.9-S1-amd64.iso",
-            "version": "1.2.9-S1",
-            "md5sum": "3fece6363f9766f862e26d292d0ed5a3",
-            "filesize": 430964736,
-            "download_url": "https://support.vyos.io/en/downloads/files/vyos-1-2-9-s1-generic-iso-image",
-            "direct_download_url": "https://legacy-lts-images.vyos.io/1.2.9-S1/vyos-1.2.9-S1-amd64.iso"
+            "md5sum": "086e95e992e9b4d014c5f154cd01a6e6",
+            "filesize": 330956800,
+            "download_url": "https://support.vyos.io/"
         },
         {
             "filename": "vyos-1.2.9-S1-10G-qemu.qcow2",
-            "version": "1.2.9-S1-KVM",
+            "version": "1.2.9-S1",
             "md5sum": "0a70d78b80a3716d42487c02ef44f41f",
             "filesize": 426967040,
-            "download_url": "https://support.vyos.io/en/downloads/files/vyos-1-2-9-s1-for-kvm",
-            "direct_download_url": "https://legacy-lts-images.vyos.io/1.2.9-S1/vyos-1.2.9-S1-10G-qemu.qcow2"
-        },
-        {
-            "filename": "vyos-1.2.9-amd64.iso",
-            "version": "1.2.9",
-            "md5sum": "586be23b6256173e174c82d8f1f699a1",
-            "filesize": 430964736,
-            "download_url": "https://support.vyos.io/en/downloads/files/vyos-1-2-9-generic-iso-image",
-            "direct_download_url": "https://legacy-lts-images.vyos.io/1.2.9/vyos-1.2.9-amd64.iso"
+            "download_url": "https://support.vyos.io/"
         },
         {
-            "filename": "vyos-1.2.9-10G-qemu.qcow2",
-            "version": "1.2.9-KVM",
-            "md5sum": "76871c7b248c32f75177c419128257ac",
-            "filesize": 427360256,
-            "download_url": "https://support.vyos.io/en/downloads/files/vyos-1-2-9-10g-qemu-qcow2",
-            "direct_download_url": "https://legacy-lts-images.vyos.io/1.2.9/vyos-1.2.9-10G-qemu.qcow2"
+            "filename": "vyos-1.2.8-10G-qemu.qcow2",
+            "version": "1.2.8",
+            "md5sum": "96c76f619d0f8ea11dc8a3a18ed67b98",
+            "filesize": 425852928,
+            "download_url": "https://support.vyos.io/"
         },
         {
-            "filename": "vyos-1.2.8-amd64.iso",
-            "version": "1.2.8",
-            "md5sum": "0ad879db903efdbf1c39dc945e165931",
-            "filesize": 429916160,
-            "download_url": "https://support.vyos.io/en/downloads/files/vyos-1-2-8-generic-iso-image"
+            "filename": "vyos-1.2.7-qemu.qcow2",
+            "version": "1.2.7",
+            "md5sum": "1be4674c970fcdd65067e504baea5d74",
+            "filesize": 424607744,
+            "download_url": "https://support.vyos.io/"
         },
         {
-            "filename": "vyos-1.1.8-amd64.iso",
-            "version": "1.1.8",
-            "md5sum": "95a141d4b592b81c803cdf7e9b11d8ea",
-            "filesize": 241172480,
-            "direct_download_url": "https://legacy-lts-images.vyos.io/vyos-1.1.8-amd64.iso"
+            "filename": "vyos-1.2.6-qemu.qcow2",
+            "version": "1.2.6",
+            "md5sum": "d8010d79889ca0ba5cb2634665e548e3",
+            "filesize": 424607744,
+            "download_url": "https://support.vyos.io/"
         },
         {
-            "filename": "empty8G.qcow2",
-            "version": "1.0",
-            "md5sum": "f1d2c25b6990f99bd05b433ab603bdb4",
-            "filesize": 197120,
-            "download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/",
-            "direct_download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/empty8G.qcow2/download"
+            "filename": "vyos-1.2.5-amd64.qcow2",
+            "version": "1.2.5",
+            "md5sum": "110c22309ec480600446fd2fb4f27a0d",
+            "filesize": 411500544 ,
+            "download_url": "https://support.vyos.io/"
         }
     ],
     "versions": [
+        {
+            "name": "1.4.0",
+            "images": {
+                "hda_disk_image": "vyos-1.4.0-kvm-amd64.qcow2"
+            }
+        },
+        {
+            "name": "1.3.7",
+            "images": {
+                "hda_disk_image": "vyos-1.3.7-qemu-amd64.qcow2"
+            }
+        },
         {
             "name": "1.3.2",
             "images": {
-                "hda_disk_image": "empty8G.qcow2",
-                "cdrom_image": "vyos-1.3.2-amd64.iso"
+                "hda_disk_image": "vyos-1.3.2-10G-qemu.qcow2"
             }
         },
         {
             "name": "1.3.1-S1",
             "images": {
-                "hda_disk_image": "empty8G.qcow2",
-                "cdrom_image": "vyos-1.3.1-S1-amd64.iso"
+                "hda_disk_image": "vyos-1.3.1-S1-10G-qemu.qcow2"
             }
         },
         {
             "name": "1.3.1",
             "images": {
-                "hda_disk_image": "empty8G.qcow2",
-                "cdrom_image": "vyos-1.3.1-amd64.iso"
+                "hda_disk_image": "vyos-1.3.1-10G-qemu.qcow2"
             }
         },
         {
             "name": "1.3.0",
             "images": {
-                "hda_disk_image": "empty8G.qcow2",
-                "cdrom_image": "vyos-1.3.0-amd64.iso"
+                "hda_disk_image": "vyos-1.3.0-10G-qemu.qcow2"
             }
         },
         {
             "name": "1.2.9-S1",
-            "images": {
-                "hda_disk_image": "empty8G.qcow2",
-                "cdrom_image": "vyos-1.2.9-S1-amd64.iso"
-            }
-        },
-        {
-            "name": "1.2.9-S1-KVM",
             "images": {
                 "hda_disk_image": "vyos-1.2.9-S1-10G-qemu.qcow2"
             }
         },
         {
-            "name": "1.2.9",
+            "name": "1.2.8",
             "images": {
-                "hda_disk_image": "empty8G.qcow2",
-                "cdrom_image": "vyos-1.2.9-amd64.iso"
+                "hda_disk_image": "vyos-1.2.8-10G-qemu.qcow2"
             }
         },
         {
-            "name": "1.2.9-KVM",
+            "name": "1.2.7",
             "images": {
-                "hda_disk_image": "vyos-1.2.9-10G-qemu.qcow2"
+                "hda_disk_image": "vyos-1.2.7-qemu.qcow2"
             }
         },
         {
-            "name": "1.2.8",
+            "name": "1.2.6",
             "images": {
-                "hda_disk_image": "empty8G.qcow2",
-                "cdrom_image": "vyos-1.2.8-amd64.iso"
+                "hda_disk_image": "vyos-1.2.6-qemu.qcow2"
             }
         },
         {
-            "name": "1.1.8",
+            "name": "1.2.5",
             "images": {
-                "hda_disk_image": "empty8G.qcow2",
-                "cdrom_image": "vyos-1.1.8-amd64.iso"
+                "hda_disk_image": "vyos-1.2.5-amd64.qcow2"
             }
         }
     ]

gns3server/compute/base_node.py

@@ -742,6 +742,7 @@ class BaseNode:
         path = shutil.which(self._manager.config.settings.Server.ubridge_path)
         return path
 
+    @locking
     async def _ubridge_send(self, command):
         """
         Sends a command to uBridge hypervisor.

gns3server/compute/docker/docker_vm.py

@@ -34,6 +34,7 @@ from gns3server.utils.asyncio import wait_for_file_creation
 from gns3server.utils.asyncio import monitor_process
 from gns3server.utils.get_resource import get_resource
 from gns3server.utils.hostname import is_rfc1123_hostname_valid
+from gns3server.utils import macaddress_to_int, int_to_macaddress
 
 from gns3server.compute.ubridge.ubridge_error import UbridgeError, UbridgeNamespaceError
 from ..base_node import BaseNode
@@ -78,6 +79,7 @@ class DockerVM(BaseNode):
         aux=None,
         start_command=None,
         adapters=None,
+        mac_address="",
         environment=None,
         console_type="telnet",
         aux_type="none",
@@ -130,6 +132,8 @@ class DockerVM(BaseNode):
         else:
             self.adapters = adapters
 
+        self.mac_address = mac_address
+
         log.debug(
             "{module}: {name} [{image}] initialized.".format(
                 module=self.manager.module_name, name=self.name, image=self._image
@@ -145,6 +149,7 @@ class DockerVM(BaseNode):
             "project_id": self._project.id,
             "image": self._image,
             "adapters": self.adapters,
+            "mac_address": self.mac_address,
             "console": self.console,
             "console_type": self.console_type,
             "console_resolution": self.console_resolution,
@@ -190,6 +195,36 @@ class DockerVM(BaseNode):
     def ethernet_adapters(self):
         return self._ethernet_adapters
 
+    @property
+    def mac_address(self):
+        """
+        Returns the MAC address for this Docker container.
+
+        :returns: adapter type (string)
+        """
+
+        return self._mac_address
+
+    @mac_address.setter
+    def mac_address(self, mac_address):
+        """
+        Sets the MAC address for this Docker container.
+
+        :param mac_address: MAC address
+        """
+
+        if not mac_address:
+            # use the node UUID to generate a random MAC address
+            self._mac_address = "02:42:%s:%s:%s:00" % (self.id[2:4], self.id[4:6], self.id[6:8])
+        else:
+            self._mac_address = mac_address
+
+        log.info('Docker container "{name}" [{id}]: MAC address changed to {mac_addr}'.format(
+            name=self._name,
+            id=self._id,
+            mac_addr=self._mac_address)
+        )
+
     @property
     def start_command(self):
         return self._start_command
@@ -429,6 +464,7 @@ class DockerVM(BaseNode):
                 "Mounts": self._mount_binds(image_infos),
                 "Memory": self._memory * (1024 * 1024),  # convert memory to bytes
                 "NanoCpus": int(self._cpus * 1e9),  # convert cpus to nano cpus
+                "UsernsMode": "host"
             },
             "Volumes": {},
             "Env": ["container=docker"],  # Systemd compliant: https://github.com/GNS3/gns3-server/issues/573
@@ -799,7 +835,10 @@ class DockerVM(BaseNode):
         """
 
         # resize the container TTY.
-        await self._manager.query("POST", f"containers/{self._cid}/resize?h={rows}&w={columns}")
+        try:
+            await self._manager.query("POST", f"containers/{self._cid}/resize?h={rows}&w={columns}")
+        except DockerError as e:
+            log.warning(f"Could not resize the container TTY: {e}")
 
     async def _start_console(self):
         """
@@ -1058,7 +1097,20 @@ class DockerVM(BaseNode):
                 adapter_number=adapter_number, hostif=adapter.host_ifc
             )
         )
-        log.debug("Move container %s adapter %s to namespace %s", self.name, adapter.host_ifc, self._namespace)
+
+        mac_address = int_to_macaddress(macaddress_to_int(self._mac_address) + adapter_number)
+        custom_adapter = self._get_custom_adapter_settings(adapter_number)
+        custom_mac_address = custom_adapter.get("mac_address")
+        if custom_mac_address:
+            mac_address = custom_mac_address
+
+        try:
+            await self._ubridge_send('docker set_mac_addr {ifc} {mac}'.format(ifc=adapter.host_ifc, mac=mac_address))
+        except UbridgeError:
+            log.warning(f"Could not set MAC address {mac_address} on interface {adapter.host_ifc}")
+
+
+        log.debug(f"Move container {self.name} adapter {adapter.host_ifc} to namespace {self._namespace}")
         try:
             await self._ubridge_send(
                 "docker move_to_ns {ifc} {ns} eth{adapter}".format(
@@ -1067,6 +1119,8 @@ class DockerVM(BaseNode):
             )
         except UbridgeError as e:
             raise UbridgeNamespaceError(e)
+        else:
+            log.info(f"Created adapter {adapter_number} with MAC address {mac_address} in namespace {self._namespace}")
 
         if nio:
             await self._connect_nio(adapter_number, nio)

gns3server/compute/docker/resources/init.sh

@@ -25,7 +25,10 @@ PATH=/gns3/bin:/tmp/gns3/bin:/sbin:$PATH
 # bootstrap busybox commands
 if [ ! -d /tmp/gns3/bin ]; then
 	busybox mkdir -p /tmp/gns3/bin
-	/gns3/bin/busybox --install -s /tmp/gns3/bin
+	for applet in `busybox --list`
+	do
+	  ln -s /gns3/bin/busybox "/tmp/gns3/bin/$applet"
+	done
 fi
 
 #  Restore file permission and mount volumes
@@ -75,7 +78,7 @@ ip link set dev lo up
 while true 
 do
     grep $GNS3_MAX_ETHERNET /proc/net/dev > /dev/null && break
-    sleep 0.5
+    usleep 500000  # wait 0.5 seconds
 done  
 
 # activate eth interfaces

gns3server/compute/dynamips/__init__.py

@@ -521,10 +521,6 @@ class Dynamips(BaseManager):
         if usage is not None and usage != vm.usage:
             vm.usage = usage
 
-        aux_type = settings.get("aux_type")
-        if aux_type is not None and aux_type != vm.aux_type:
-            vm.aux_type = aux_type
-
         # update the configs if needed
         await self.set_vm_configs(vm, settings)
 

gns3server/compute/dynamips/nodes/router.py

@@ -1030,6 +1030,26 @@ class Router(BaseNode):
         self.aux = aux
         await self._hypervisor.send(f'vm set_aux_tcp_port "{self._name}" {aux}')
 
+    async def set_aux_type(self, aux_type):
+        """
+        Sets the aux type.
+
+        :param aux_type: auxiliary console type
+        """
+
+        if self.aux_type != aux_type:
+            status = await self.get_status()
+            if status == "running":
+                raise DynamipsError('"{name}" must be stopped to change the auxiliary console type to {aux_type}'.format(
+                    name=self._name,
+                    aux_type=aux_type)
+                )
+
+        self.aux_type = aux_type
+
+        if self._aux and aux_type == "telnet":
+            await self._hypervisor.send(f'vm set_aux_tcp_port "{self._name}" {self._aux}')
+
     async def reset_console(self):
         """
         Reset console

gns3server/compute/iou/iou_vm.py

@@ -436,14 +436,16 @@ class IOUVM(BaseNode):
                 )
             )
 
-    async def _check_iou_licence(self):
+    def _is_iou_license_check_enabled(self):
         """
-        Checks for a valid IOU key in the iourc file (paranoid mode).
+        Returns if IOU license check is enabled.
+
+        :return: boolean
         """
 
         # license check is sent by the controller
         if self.license_check is False:
-            return
+            return False
 
         try:
             # we allow license check to be disabled server wide
@@ -453,7 +455,14 @@ class IOUVM(BaseNode):
 
         if server_wide_license_check is False:
             log.warning("License check is explicitly disabled on this server")
-            return
+            return False
+
+        return True
+
+    async def _check_iou_license(self):
+        """
+        Checks for a valid IOU key in the iourc file (paranoid mode).
+        """
 
         config = configparser.ConfigParser()
         try:
@@ -559,15 +568,16 @@ class IOUVM(BaseNode):
             except OSError as e:
                 raise IOUError(f"Could not rename nvram files: {e}")
 
-            iourc_path = self.iourc_path
-            if not iourc_path:
-                raise IOUError("Could not find an iourc file (IOU license), please configure an IOU license")
-            if not os.path.isfile(iourc_path):
-                raise IOUError(f"The iourc path '{iourc_path}' is not a regular file")
+            iourc_path = None
+            if self._is_iou_license_check_enabled():
+                iourc_path = self.iourc_path
+                if not iourc_path:
+                    raise IOUError("Could not find an iourc file (IOU license), please configure an IOU license")
+                if not os.path.isfile(iourc_path):
+                    raise IOUError(f"The iourc path '{iourc_path}' is not a regular file")
+                await self._check_iou_license()
 
-            await self._check_iou_licence()
             await self._start_ubridge()
-
             self._create_netmap_config()
             if self.use_default_iou_values:
                 # make sure we have the default nvram amount to correctly push the configs
@@ -579,7 +589,7 @@ class IOUVM(BaseNode):
 
             self._nvram_watcher = FileWatcher(self._nvram_file(), self._nvram_changed, delay=2)
 
-            # created a environment variable pointing to the iourc file.
+            # created an environment variable pointing to the iourc file.
             env = os.environ.copy()
             if "IOURC" not in os.environ and iourc_path:
                 env["IOURC"] = iourc_path

gns3server/compute/notification_manager.py

@@ -15,7 +15,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-
+import asyncio
 from contextlib import contextmanager
 from gns3server.utils.notification_queue import NotificationQueue
 
@@ -54,7 +54,7 @@ class NotificationManager:
         """
 
         for listener in self._listeners:
-            listener.put_nowait((action, event, kwargs))
+            asyncio.get_running_loop().call_soon_threadsafe(listener.put_nowait, (action, event, kwargs))
 
     @staticmethod
     def reset():

gns3server/compute/qemu/qemu_vm.py

@@ -2157,11 +2157,6 @@ class QemuVM(BaseNode):
                 continue
 
             interface = getattr(self, f"hd{drive}_disk_interface")
-            # fail-safe: use "ide" if there is a disk image and no interface type has been explicitly configured
-            if interface == "none":
-                interface = "ide"
-                setattr(self, f"hd{drive}_disk_interface", interface)
-
             disk_name = f"hd{drive}"
             if not os.path.isfile(disk_image) or not os.path.exists(disk_image):
                 if os.path.islink(disk_image):