Finished release 0.29.

changelog

@@ -43,3 +43,5 @@
 0.26: NOT SUITABLE FOR PRODUCTION! filter qfx* routers until space is synced with opsdb
 0.27: added some status flags to the latch structure
 0.28: added latch to version response
+0.29: DBOARD3-170 (don't return 404 for unrecognized peer addresses)
+      removed filter on qfx* routers
\ No newline at end of file

inventory_provider/juniper.py

@@ -56,6 +56,7 @@ CONFIG_SCHEMA = """<?xml version="1.1" encoding="UTF-8" ?>
               <xs:sequence>
                 <xs:choice minOccurs="1" maxOccurs="unbounded">
                     <xs:element name="apply-groups" minOccurs="0" type="xs:string" />
+                    <xs:element name="interface-range" minOccurs="0" type="generic-sequence" />
                     <xs:element name="interface" minOccurs="1" maxOccurs="unbounded" type="juniper-interface" />
                 </xs:choice>
               </xs:sequence>
@@ -70,6 +71,9 @@ CONFIG_SCHEMA = """<?xml version="1.1" encoding="UTF-8" ?>
           <xs:element name="firewall" minOccurs="0" type="generic-sequence" />
           <xs:element name="routing-instances" minOccurs="0" type="generic-sequence" />
           <xs:element name="bridge-domains" minOccurs="0" type="generic-sequence" />
+          <xs:element name="virtual-chassis" minOccurs="0" type="generic-sequence" />
+          <xs:element name="vlans" minOccurs="0" type="generic-sequence" />
+          <xs:element name="comment" minOccurs="0" type="xs:string" />
         </xs:choice>
       </xs:sequence>
       <xs:attribute name="changed-seconds" type="xs:string" />

inventory_provider/routes/classifier.py

@@ -272,11 +272,11 @@ def peer_info(address):
         if interfaces:
             result['interfaces'] = interfaces
 
-        if not result:
-            return Response(
-                response='no peering info found for %s' % address,
-                status=404,
-                mimetype="text/html")
+        # if not result:
+        #     return Response(
+        #         response='no peering info found for %s' % address,
+        #         status=404,
+        #         mimetype="text/html")
 
         result = json.dumps(result)
         # cache this data for the next call

inventory_provider/tasks/worker.py

@@ -491,11 +491,6 @@ def launch_refresh_cache_all(config):
         update_equipment_locations.apply_async(),
     ]
     for hostname in _derive_router_hostnames(config):
-        # TODO: remove this filter when the qfx* switches are configured
-        if not hostname.startswith('mx'):
-            logger.error(
-                'TEMP TEMP!!! skipping loading of host: %r' % hostname)
-            continue
         logger.debug('queueing router refresh jobs for %r' % hostname)
         subtasks.append(reload_router_config.apply_async(args=[hostname]))
 

setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='inventory-provider',
-    version="0.28",
+    version="0.29",
     author='GEANT',
     author_email='swd@geant.org',
     description='Dashboard inventory provider',

test/test_classifier_routes.py

@@ -299,7 +299,9 @@ def test_peer_not_found(client):
     rv = client.get(
         '/classifier/peer-info/1.2.3.4',
         headers=DEFAULT_REQUEST_HEADERS)
-    assert rv.status_code == 404
+    assert rv.status_code == 200
+    response_data = json.loads(rv.data.decode('utf-8'))
+    assert response_data == {}
 
 
 @pytest.mark.parametrize('equipment,entity_name,card_id,port_number', [

test/test_netconf_validation.py

+import os
+import pytest
+from lxml import etree
+from inventory_provider.juniper import validate_netconf_config
+
+
+@pytest.mark.parametrize('hostname', [
+    '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.kau.lt.geant.net',
+    'mx1.lis.pt.geant.net',
+    'mx1.lon.uk.geant.net',
+    'mx1.lon2.uk.geant.net',
+    'mx1.mad.es.geant.net',
+    'mx1.mar.fr.geant.net',
+    'mx1.mil2.it.geant.net',
+    'mx1.par.fr.geant.net',
+    'mx1.poz.pl.geant.net',
+    'mx1.pra.cz.geant.net',
+    'mx1.sof.bg.geant.net',
+    'mx1.tal.ee.geant.net',
+    'mx1.vie.at.geant.net',
+    'mx2.ath.gr.geant.net',
+    'mx2.bra.sk.geant.net',
+    'mx2.bru.be.geant.net',
+    'mx2.kau.lt.geant.net',
+    'mx2.lis.pt.geant.net',
+    'mx2.lju.si.geant.net',
+    'mx2.rig.lv.geant.net',
+    'mx2.tal.ee.geant.net',
+    'mx2.zag.hr.geant.net',
+    'qfx.fra.de.geant.net',
+    'qfx.lon2.uk.geant.net',
+    'qfx.par.fr.geant.net'
+])
+def test_netconf_docs(hostname):
+    filename = os.path.join(
+        os.path.dirname(__file__),
+        'data',
+        hostname + '-netconf.xml')
+
+    doc = etree.parse(filename)
+    validate_netconf_config(doc)