Skip to content
Snippets Groups Projects
Commit 8f1f783b authored by Erik Reid's avatar Erik Reid
Browse files

removed some obsolete tests

parent 51b2bf44
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
test/conftest.py
+ 51
− 51
View file @ 8f1f783b
......@@ -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'
]
......
test/test_cli.py deleted 100644 → 0
+ 0
− 16
View file @ 51b2bf44
from unittest.mock import patch
from click.testing import CliRunner
from resource_management.router_interfaces import cli
@patch('resource_management.db.init_db_model')
@patch('resource_management.cli.load_router_ports')
@patch('resource_management.cli._save_router_info')
def test_cli_happy_flow(
_unused1, _unused2, _unused3,
router_name, config_filename):
runner = CliRunner()
result = runner.invoke(cli, [
'--config', config_filename,
'--fqdn', router_name])
assert result.exit_code == 0
test/test_db_model.py deleted 100644 → 0
+ 0
− 72
View file @ 51b2bf44
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.juniper import load_router_ports
#
# def test_model_sanity_check(resources_db, router_name):
#
# test_node = [randint(1, 50) for _ in range(randint(1, 50))]
#
# with session_scope() as session:
#
# node = model.Node(fqdn=router_name)
# session.add(node)
#
# for position, num_ports in enumerate(test_node):
# line_card = model.LineCard(
# model=f'XYZ-{position}', position=position, node=node)
# session.add(line_card)
# for idx in range(num_ports):
# port = model.Port(
# name=str(idx), line_card=line_card, speed=1000)
# session.add(port)
#
# # new session - previous rows should have been committed
# with session_scope() as session:
# node = session.query(model.Node) \
# .filter(model.Node.fqdn == router_name).one()
# assert len(node.line_cards) == len(test_node)
# for expected_num_ports, line_card in zip(test_node, node.line_cards):
# assert expected_num_ports == len(line_card.ports)
def test_save_router_info(resources_db, router_name, mocked_router):
ssh = {
'username': 'bogus',
'private-key': 'no file'
}
fpcs = list(load_router_ports(hostname=router_name, ssh_config=ssh))
_save_router_info(fqdn=router_name, fpcs=fpcs)
fpc_slot_dict = {f['slot']: f['ports'] for f in fpcs}
with session_scope() as session:
node = session.query(model.Node) \
.filter(model.Node.fqdn == router_name).one()
expected_fpc_slots = set(fpc_slot_dict.keys())
fpc_slots = {fpc.slot for fpc in node.line_cards}
assert expected_fpc_slots == fpc_slots
for fpc in node.line_cards:
expected_ports = {
(p['pic'], p['position']) for p in fpc_slot_dict[fpc.slot]}
db_ports = {(p.pic, p.position) for p in fpc.ports}
assert expected_ports == db_ports
# TODO: do this in a tmp container ...
# from resource_management.db import mysql_dsn
# from resource_management.migrations import migration_utils
#
#
# def test_migration():
# dsn = mysql_dsn(
# username='dummy',
# password='dummy-pass',
# hostname='localhost',
# db_name='resources_test')
# migration_utils.upgrade(dsn=dsn)
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment