From 94cce21a1902b60bd1f6b35de4b90bf78e032bc5 Mon Sep 17 00:00:00 2001 From: Julien Duponchelle Date: Thu, 28 May 2015 15:25:13 +0200 Subject: [PATCH] Directory organisation --- devices/{qemu => }/arista-veos.json | 0 devices/{qemu => }/hp-vsr1001.json | 0 devices/{qemu => }/microcore-linux.json | 0 test/test_config.py | 12 ++++++------ test/test_registry.py | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) rename devices/{qemu => }/arista-veos.json (100%) rename devices/{qemu => }/hp-vsr1001.json (100%) rename devices/{qemu => }/microcore-linux.json (100%) diff --git a/devices/qemu/arista-veos.json b/devices/arista-veos.json similarity index 100% rename from devices/qemu/arista-veos.json rename to devices/arista-veos.json diff --git a/devices/qemu/hp-vsr1001.json b/devices/hp-vsr1001.json similarity index 100% rename from devices/qemu/hp-vsr1001.json rename to devices/hp-vsr1001.json diff --git a/devices/qemu/microcore-linux.json b/devices/microcore-linux.json similarity index 100% rename from devices/qemu/microcore-linux.json rename to devices/microcore-linux.json diff --git a/test/test_config.py b/test/test_config.py index a56c5a8..d20c238 100644 --- a/test/test_config.py +++ b/test/test_config.py @@ -78,7 +78,7 @@ def empty_config(tmpdir): def test_add_images_guest(empty_config, linux_microcore_img): - with open("devices/qemu/microcore-linux.json") as f: + with open("devices/microcore-linux.json") as f: config = json.load(f) image = Image(linux_microcore_img) image.version = "3.4.1" @@ -109,7 +109,7 @@ def test_add_images_guest(empty_config, linux_microcore_img): def test_add_images_cdrom(empty_config, linux_microcore_img): - with open("devices/qemu/hp-vsr1001.json") as f: + with open("devices/hp-vsr1001.json") as f: config = json.load(f) hda = os.path.join(empty_config.images_dir, "QEMU", "vsr1000-hp.img") @@ -155,7 +155,7 @@ def test_add_images_cdrom(empty_config, linux_microcore_img): def test_add_images_router_two_disk(empty_config): - with open("devices/qemu/arista-veos.json") as f: + with open("devices/arista-veos.json") as f: config = json.load(f) image = MagicMock() @@ -198,7 +198,7 @@ def test_add_images_router_two_disk(empty_config): def test_add_images_uniq(empty_config, linux_microcore_img): - with open("devices/qemu/microcore-linux.json") as f: + with open("devices/microcore-linux.json") as f: config = json.load(f) image = Image(linux_microcore_img) @@ -213,7 +213,7 @@ def test_add_images_uniq(empty_config, linux_microcore_img): def test_add_images_two_disk_one_missing(empty_config): - with open("devices/qemu/arista-veos.json") as f: + with open("devices/arista-veos.json") as f: config = json.load(f) image = MagicMock() @@ -228,7 +228,7 @@ def test_add_images_two_disk_one_missing(empty_config): def test_save(empty_config, linux_microcore_img): - with open("devices/qemu/microcore-linux.json") as f: + with open("devices/microcore-linux.json") as f: config = json.load(f) image = Image(linux_microcore_img) diff --git a/test/test_registry.py b/test/test_registry.py index 2fb93c6..2714e53 100644 --- a/test/test_registry.py +++ b/test/test_registry.py @@ -25,7 +25,7 @@ from gns3registry.registry import Registry def test_detect_image(linux_microcore_img): - with open("devices/qemu/microcore-linux.json") as f: + with open("devices/microcore-linux.json") as f: config = json.load(f) registry = Registry() @@ -36,7 +36,7 @@ def test_detect_image(linux_microcore_img): def test_detect_two_image(linux_microcore_img): - with open("devices/qemu/microcore-linux.json") as f: + with open("devices/microcore-linux.json") as f: config = json.load(f) registry = Registry()