diff --git a/inventory_provider/config.py b/inventory_provider/config.py index 0603b592cb68860703b18dcd6602d8f2ae981968..917f98cdf63b72a46a4d648011a2c09508e939be 100644 --- a/inventory_provider/config.py +++ b/inventory_provider/config.py @@ -102,26 +102,6 @@ def _load_oids(config_file): return result -# def _load_routers(config_file): -# """ -# :param config_file: file-like object -# :return: -# """ -# for line in config_file: -# m = re.match( -# r'^([a-z\d]+\.[a-z\d]{3,4}\.[a-z\d]{2}' -# r'\.(geant|eumedconnect)\d*\.net)\s*=([^,]+)\s*,(.*)\s*$', -# line) -# if not m: -# logging.warning("malformed config file line: '%s'" % line.strip()) -# continue -# yield { -# "hostname": m.group(1), -# "community": m.group(3), -# "address": m.group(4) -# } - - def load(f): """ loads, validates and returns configuration parameters @@ -133,6 +113,4 @@ def load(f): jsonschema.validate(config, CONFIG_SCHEMA) with open(config["oid_list.conf"]) as f: config["oids"] = _load_oids(f) - # with open(config["routers_community.conf"]) as f: - # config["routers"] = list(_load_routers(f)) return config diff --git a/inventory_provider/routers_community.conf b/inventory_provider/routers_community.conf deleted file mode 100644 index 2550f4a512c9d1dbc5c44f599e093bf970e8d77f..0000000000000000000000000000000000000000 --- a/inventory_provider/routers_community.conf +++ /dev/null @@ -1,41 +0,0 @@ -###################################################################################################################################### -## ## -## This is a configuration file that stores router names and the SNMP community name in <router>=<community>,<IP address> format. ## -## ## -###################################################################################################################################### - -mx2.ath.gr.geant.net=0pBiFbD,62.40.114.59 -mx1.tal.ee.geant.net=0pBiFbD,62.40.96.1 -mx2.tal.ee.geant.net=0pBiFbD,62.40.96.2 -mx2.rig.lv.geant.net=0pBiFbD,62.40.96.4 -mx1.kau.lt.geant.net=0pBiFbD,62.40.96.6 -mx2.kau.lt.geant.net=0pBiFbD,62.40.96.5 -mx2.zag.hr.geant.net=0pBiFbD,62.40.96.8 -mx2.lju.si.geant.net=0pBiFbD,62.40.96.10 -mx1.bud.hu.geant.net=0pBiFbD,62.40.97.1 -mx1.pra.cz.geant.net=0pBiFbD,62.40.97.2 -mx2.bra.sk.geant.net=0pBiFbD,62.40.97.4 -mx1.lon.uk.geant.net=0pBiFbD,62.40.97.5 -mx1.vie.at.geant.net=0pBiFbD,62.40.97.7 -mx2.bru.be.geant.net=0pBiFbD,62.40.96.20 -mx1.poz.pl.geant.net=0pBiFbD,62.40.97.10 -mx1.ams.nl.geant.net=0pBiFbD,62.40.97.11 -mx1.fra.de.geant.net=0pBiFbD,62.40.97.12 -mx1.par.fr.geant.net=0pBiFbD,62.40.97.13 -mx1.gen.ch.geant.net=0pBiFbD,62.40.97.14 -mx1.mil2.it.geant.net=0pBiFbD,62.40.97.15 -mx1.lis.pt.geant.net=0pBiFbD,62.40.96.16 -mx2.lis.pt.geant.net=0pBiFbD,62.40.96.17 -mx1.mad.es.geant.net=0pBiFbD,62.40.97.16 -mx1.sof.bg.geant.net=0pBiFbD,62.40.96.21 -mx1.buc.ro.geant.net=0pBiFbD,62.40.96.19 -mx1.ham.de.geant.net=0pBiFbD,62.40.96.26 -mx1.dub.ie.geant.net=0pBiFbD,62.40.96.3 -mx1.dub2.ie.geant.net=0pBiFbD,62.40.96.25 -mx1.mar.fr.geant.net=0pBiFbD,62.40.96.12 -mx1.lon2.uk.geant.net=0pBiFbD,62.40.96.15 -# rt1.clpk.us.geant.net=GEANT_RO,10.200.64.128 -# rt1.denv.us.geant.net=GEANT_RO,10.200.67.128 -mx1.ath2.gr.geant.net=0pBiFbD,62.40.96.39 -# qfx.par.fr.geant.net=0pBiFbD,62.40.117.170 -# qfx.fra.de.geant.net=0pBiFbD,62.40.117.162 diff --git a/test/data/routers_community.conf b/test/data/routers_community.conf deleted file mode 100644 index 8b95c7bdcffbd3a6228515b2b01f86f2943a7cb8..0000000000000000000000000000000000000000 --- a/test/data/routers_community.conf +++ /dev/null @@ -1,41 +0,0 @@ -###################################################################################################################################### -## ## -## This is a configuration file that stores router names and the SNMP community name in <router>=<community>,<IP address> format. ## -## ## -###################################################################################################################################### - -mx2.ath.gr.geant.net=0pBiFbD,62.40.114.59 -mx1.tal.ee.geant.net=0pBiFbD,62.40.96.1 -mx2.tal.ee.geant.net=0pBiFbD,62.40.96.2 -mx2.rig.lv.geant.net=0pBiFbD,62.40.96.4 -mx1.kau.lt.geant.net=0pBiFbD,62.40.96.6 -mx2.kau.lt.geant.net=0pBiFbD,62.40.96.5 -mx2.zag.hr.geant.net=0pBiFbD,62.40.96.8 -mx2.lju.si.geant.net=0pBiFbD,62.40.96.10 -mx1.bud.hu.geant.net=0pBiFbD,62.40.97.1 -mx1.pra.cz.geant.net=0pBiFbD,62.40.97.2 -mx2.bra.sk.geant.net=0pBiFbD,62.40.97.4 -mx1.lon.uk.geant.net=0pBiFbD,62.40.97.5 -mx1.vie.at.geant.net=0pBiFbD,62.40.97.7 -mx2.bru.be.geant.net=0pBiFbD,62.40.96.20 -mx1.poz.pl.geant.net=0pBiFbD,62.40.97.10 -mx1.ams.nl.geant.net=0pBiFbD,62.40.97.11 -mx1.fra.de.geant.net=0pBiFbD,62.40.97.12 -mx1.par.fr.geant.net=0pBiFbD,62.40.97.13 -mx1.gen.ch.geant.net=0pBiFbD,62.40.97.14 -mx1.mil2.it.geant.net=0pBiFbD,62.40.97.15 -mx1.lis.pt.geant.net=0pBiFbD,62.40.96.16 -mx2.lis.pt.geant.net=0pBiFbD,62.40.96.17 -mx1.mad.es.geant.net=0pBiFbD,62.40.97.16 -mx1.sof.bg.geant.net=0pBiFbD,62.40.96.21 -mx1.buc.ro.geant.net=0pBiFbD,62.40.96.19 -mx1.ham.de.geant.net=0pBiFbD,62.40.96.26 -mx1.dub.ie.geant.net=0pBiFbD,62.40.96.3 -mx1.dub2.ie.geant.net=0pBiFbD,62.40.96.25 -mx1.mar.fr.geant.net=0pBiFbD,62.40.96.12 -mx1.lon2.uk.geant.net=0pBiFbD,62.40.96.15 -# rt1.clpk.us.geant.net=GEANT_RO,10.200.64.128 -# rt1.denv.us.geant.net=GEANT_RO,10.200.67.128 -mx1.ath2.gr.geant.net=0pBiFbD,62.40.96.39 -# qfx.par.fr.geant.net=0pBiFbD,62.40.117.170 -# qfx.fra.de.geant.net=0pBiFbD,62.40.117.162 \ No newline at end of file