Merge branch 'feature/REPORTING-306-add-config' into feature/REPORTING-297-msr-mdvpn-endpoint

inventory_provider/config.py

@@ -226,7 +226,8 @@ CONFIG_SCHEMA = {
                 'redis-databases',
                 'ims',
                 'managed-routers',
-                'gws-direct']
+                'gws-direct',
+                'nren-asn-map']
         },
         {
             'required': [
@@ -236,7 +237,8 @@ CONFIG_SCHEMA = {
                 'redis-databases',
                 'ims',
                 'managed-routers',
-                'gws-direct']
+                'gws-direct',
+                'nren-asn-map']
         }
     ],
     'additionalProperties': False

test/conftest.py

@@ -65,7 +65,12 @@ def data_config_filename():
                     "router": "another.bogus.host.name"
                 }
             ],
-            'gws-direct': {}
+            'gws-direct': {},
+            'nren-asn-map': {
+                "100": "BogusNREN",
+                "200": "FoobarNREN",
+                "300": "AlsoNET"
+            }
         }
 
         with open(os.path.join(TEST_DATA_DIRNAME, 'gws-direct.json')) as gws: