From 3e89543ab98906c4068cddf1ba9e4da0ac266b41 Mon Sep 17 00:00:00 2001 From: grossmj Date: Sat, 21 May 2016 15:19:32 -0600 Subject: [PATCH] Fixes wrong exception in Docker VM implementation. --- gns3server/modules/docker/docker_vm.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gns3server/modules/docker/docker_vm.py b/gns3server/modules/docker/docker_vm.py index 71ee58aa..6cc689b4 100644 --- a/gns3server/modules/docker/docker_vm.py +++ b/gns3server/modules/docker/docker_vm.py @@ -27,7 +27,6 @@ import aiohttp import json import os -from ...ubridge.hypervisor import Hypervisor from .docker_error import * from ..base_vm import BaseVM from ..adapters.ethernet_adapter import EthernetAdapter @@ -765,7 +764,7 @@ class DockerVM(BaseVM): adapter = "bridge{}".format(adapter_number) if not self._ubridge_hypervisor or not self._ubridge_hypervisor.is_running(): - raise VMwareError("Cannot start the packet capture: uBridge is not running") + raise DockerError("Cannot start the packet capture: uBridge is not running") yield from self._ubridge_hypervisor.send('bridge start_capture {name} "{output_file}"'.format(name=adapter, output_file=output_file)) @asyncio.coroutine @@ -778,7 +777,7 @@ class DockerVM(BaseVM): adapter = "bridge{}".format(adapter_number) if not self._ubridge_hypervisor or not self._ubridge_hypervisor.is_running(): - raise VMwareError("Cannot stop the packet capture: uBridge is not running") + raise DockerError("Cannot stop the packet capture: uBridge is not running") yield from self._ubridge_hypervisor.send("bridge stop_capture {name}".format(name=adapter)) @asyncio.coroutine