validate router fqdn

brian_polling_manager/interface_stats/cli.py

@@ -8,13 +8,12 @@ import click
 import jsonschema
 
 from brian_polling_manager.interface_stats import config, brian, errors, juniper
-from brian_polling_manager import influx
+from brian_polling_manager import influx, inventory
 
 
 import logging.config
 import os
 
-
 LOGGING_DEFAULT_CONFIG = {
     'version': 1,
     'disable_existing_loggers': False,
@@ -106,7 +105,7 @@ def _validate_hostname(_unused_ctx, _unused_param, hostname):
     except socket.error:
         raise click.BadParameter(f'{hostname} is not resolveable')
 
-    
+
 def _brian_points(router_fqdn, netconf_doc, timestamp, measurement_name):
     _ctr2point = partial(ctr2point, measurement_name, timestamp)
 
@@ -136,10 +135,18 @@ def _main(router_fqdn: str, app_config_params: dict):
     callable entry point, without click
     ... tmp, for testing
 
+    note: the optional inventory param is only used to validate the hostname
+
+    :param router_fqdn:
     :param app_config_params:
     :return:
     """
 
+    if 'inventory' in app_config_params:
+        all_routers = {_ifc['router'] for _ifc in inventory.load_interfaces()}
+        if router_fqdn not in all_routers:
+            raise ValueError(f'{router_fqdn} must be one of: {all_routers}')
+
     setup_logging()
 
     netconf_doc = juniper.get_interface_info_ncrpc(router_fqdn)

brian_polling_manager/interface_stats/config.py

@@ -54,7 +54,7 @@ CONFIG_SCHEMA = {
             'additionalProperties': False
         },
     },
-    'required': ['ssh-config', 'inventory', 'influx'],
+    'required': ['ssh-config', 'influx'],
     'additionalProperties': False
 }
 

test/test_interface_stats.py

@@ -195,6 +195,7 @@ def app_config_params(free_host_port):
     with tempfile.NamedTemporaryFile() as f:
         yield {
             'ssh-config': f.name,
+            'inventory': ['http://blah'],
             'influx': {
                 'brian-counters': {
                     'hostname': 'localhost',
@@ -422,8 +423,11 @@ def test_e2e(app_config_params, ifc_netconf_rpc, testenv_containers):
         # TODO: srx's are excluded for now, since there's no test data
         if not _h['router'].startswith('srx')
     }
-    for router_fqdn in managed_routers:
-        cli._main(router_fqdn=router_fqdn, app_config_params=app_config_params)
+
+    with patch('brian_polling_manager.inventory.load_interfaces') as inventory:
+        inventory.return_value = poller_interfaces()
+        for router_fqdn in managed_routers:
+            cli._main(router_fqdn=router_fqdn, app_config_params=app_config_params)
 
     def verify_influx_content(influx_config, expected_fields):
         # for each expected field, verify that there's