From 388d0a6cf990fc99a7b6ca06eb819713ca288f3f Mon Sep 17 00:00:00 2001
From: Erik Reid <erik.reid@geant.org>
Date: Sun, 19 Mar 2023 17:51:52 +0100
Subject: [PATCH] moved juniper.py to top-level
---
resource_management/hardware/__init__.py | 0
resource_management/{hardware => }/juniper.py | 0
resource_management/router_interfaces.py | 3 +-
test/conftest.py | 102 +++++++++---------
test/test_db_model.py | 2 +-
test/test_parse_router.py | 3 +-
6 files changed, 54 insertions(+), 56 deletions(-)
delete mode 100644 resource_management/hardware/__init__.py
rename resource_management/{hardware => }/juniper.py (100%)
diff --git a/resource_management/hardware/__init__.py b/resource_management/hardware/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/resource_management/hardware/juniper.py b/resource_management/juniper.py
similarity index 100%
rename from resource_management/hardware/juniper.py
rename to resource_management/juniper.py
diff --git a/resource_management/router_interfaces.py b/resource_management/router_interfaces.py
index 33fcc07..77a08c7 100644
--- a/resource_management/router_interfaces.py
+++ b/resource_management/router_interfaces.py
@@ -1,7 +1,6 @@
import logging
-from resource_management.hardware import juniper
-from resource_management import db, config
+from resource_management import db, config, juniper
from resource_management.db import model
logger = logging.getLogger(__name__)
diff --git a/test/conftest.py b/test/conftest.py
index 5090be1..87e8413 100644
--- a/test/conftest.py
+++ b/test/conftest.py
@@ -21,58 +21,58 @@ import resource_management
RPC_DATA_DIR = os.path.join(os.path.dirname(__file__), 'rpc-data')
HOSTNAMES = [
# # 'vmx',
- 'mx1.lab.office.geant.net',
- 'mx2.lab.office.geant.net',
- 'mx3.lab.office.geant.net',
- 'mx4.lab.office.geant.net',
- 'mx5.lab.office.geant.net',
+ # 'mx1.lab.office.geant.net',
+ # 'mx2.lab.office.geant.net',
+ # 'mx3.lab.office.geant.net',
+ # 'mx4.lab.office.geant.net',
+ # 'mx5.lab.office.geant.net',
'mx1.ams.nl.geant.net',
- 'mx1.ath2.gr.geant.net',
- 'mx1.buc.ro.geant.net',
- 'mx1.bud.hu.geant.net',
- 'mx1.dub.ie.geant.net',
- 'mx1.dub2.ie.geant.net',
- 'mx1.fra.de.geant.net',
- 'mx1.gen.ch.geant.net',
- 'mx1.ham.de.geant.net',
- 'mx1.lon.uk.geant.net',
- 'mx1.lon2.uk.geant.net',
- 'mx1.mad.es.geant.net',
- # 'mx1.mil2.it.geant.net',
- 'mx1.par.fr.geant.net',
- 'mx1.poz.pl.geant.net',
- 'mx1.sof.bg.geant.net',
- 'mx1.vie.at.geant.net',
- 'mx2.ath.gr.geant.net',
- 'mx2.bra.sk.geant.net',
- 'mx2.bru.be.geant.net',
- 'mx2.lis.pt.geant.net',
- 'mx2.lju.si.geant.net',
- 'mx2.zag.hr.geant.net',
- 'rt1.bil.es.geant.net',
- 'rt1.por.pt.geant.net',
- 'rt2.ams.nl.geant.net',
- 'rt1.kau.lt.geant.net',
- 'rt2.kau.lt.geant.net',
- 'rt1.rig.lv.geant.net',
- 'rt2.rig.lv.geant.net',
- 'rt1.tal.ee.geant.net',
- 'rt2.tal.ee.geant.net',
- # 'qfx.fra.de.geant.net',
- # 'qfx.par.fr.geant.net',
- # 'qfx.lon2.uk.geant.net',
- # 'srx1.am.office.geant.net',
- # 'srx2.am.office.geant.net',
- # 'srx1.ch.office.geant.net',
- # 'srx2.ch.office.geant.net',
- 'rt1.kie.ua.geant.net',
- 'rt2.kie.ua.geant.net',
- 'rt1.chi.md.geant.net',
- 'rt2.chi.md.geant.net',
- 'rt1.bra.sk.geant.net',
- 'rt1.mil2.it.geant.net',
- 'rt1.mar.fr.geant.net',
- 'rt1.pra.cz.geant.net'
+ # 'mx1.ath2.gr.geant.net',
+ # 'mx1.buc.ro.geant.net',
+ # 'mx1.bud.hu.geant.net',
+ # 'mx1.dub.ie.geant.net',
+ # 'mx1.dub2.ie.geant.net',
+ # 'mx1.fra.de.geant.net',
+ # 'mx1.gen.ch.geant.net',
+ # 'mx1.ham.de.geant.net',
+ # 'mx1.lon.uk.geant.net',
+ # 'mx1.lon2.uk.geant.net',
+ # 'mx1.mad.es.geant.net',
+ # # 'mx1.mil2.it.geant.net',
+ # 'mx1.par.fr.geant.net',
+ # 'mx1.poz.pl.geant.net',
+ # 'mx1.sof.bg.geant.net',
+ # 'mx1.vie.at.geant.net',
+ # 'mx2.ath.gr.geant.net',
+ # 'mx2.bra.sk.geant.net',
+ # 'mx2.bru.be.geant.net',
+ # 'mx2.lis.pt.geant.net',
+ # 'mx2.lju.si.geant.net',
+ # 'mx2.zag.hr.geant.net',
+ # 'rt1.bil.es.geant.net',
+ # 'rt1.por.pt.geant.net',
+ # 'rt2.ams.nl.geant.net',
+ # 'rt1.kau.lt.geant.net',
+ # 'rt2.kau.lt.geant.net',
+ # 'rt1.rig.lv.geant.net',
+ # 'rt2.rig.lv.geant.net',
+ # 'rt1.tal.ee.geant.net',
+ # 'rt2.tal.ee.geant.net',
+ # # 'qfx.fra.de.geant.net',
+ # # 'qfx.par.fr.geant.net',
+ # # 'qfx.lon2.uk.geant.net',
+ # # 'srx1.am.office.geant.net',
+ # # 'srx2.am.office.geant.net',
+ # # 'srx1.ch.office.geant.net',
+ # # 'srx2.ch.office.geant.net',
+ # 'rt1.kie.ua.geant.net',
+ # 'rt2.kie.ua.geant.net',
+ # 'rt1.chi.md.geant.net',
+ # 'rt2.chi.md.geant.net',
+ # 'rt1.bra.sk.geant.net',
+ # 'rt1.mil2.it.geant.net',
+ # 'rt1.mar.fr.geant.net',
+ # 'rt1.pra.cz.geant.net'
]
diff --git a/test/test_db_model.py b/test/test_db_model.py
index 23d4943..7f87026 100644
--- a/test/test_db_model.py
+++ b/test/test_db_model.py
@@ -1,7 +1,7 @@
from resource_management.db import model
from resource_management.db import session_scope
from resource_management.router_interfaces import _save_router_info
-from resource_management.hardware.juniper import load_router_ports
+from resource_management.juniper import load_router_ports
#
# def test_model_sanity_check(resources_db, router_name):
diff --git a/test/test_parse_router.py b/test/test_parse_router.py
index 6b79bc8..3aac494 100644
--- a/test/test_parse_router.py
+++ b/test/test_parse_router.py
@@ -3,8 +3,7 @@ import re
from jsonschema import validate
from lxml import etree
-from resource_management.hardware import juniper
-from resource_management import router_interfaces
+from resource_management import router_interfaces, juniper
from resource_management import db
from resource_management.db import model
--
GitLab