updated router loading data test

resource_management/hardware/router.py

@@ -39,7 +39,7 @@ LINE_CARDS_LIST_SCHEMA = {
                         'type': 'string',
                         # TODO: enum not really needed, but \
                         #  make it strict for now, during development
-                        'enum': ['40GE', '4x10GE', '100GE', '4x25GE', '4x100GE', '400GE']
+                        'enum': ['10GE', '40GE', '4x10GE', '100GE', '4x25GE', '4x100GE', '400GE']
                     }
                 },
                 'cable': {'type': 'string'},

test/test_parse_router.py

+import re
+
 from jsonschema import validate
+from lxml import etree
 
 from resource_management.hardware.router \
-    import load_line_cards, LINE_CARDS_LIST_SCHEMA
+    import load_router_ports, LINE_CARDS_LIST_SCHEMA
+
+
+def _remove_ns(xml):
+    # cf. https://stackoverflow.com/a/51972010
+    doc = etree.fromstring(xml)
+    for elem in doc.getiterator():
+        if hasattr(elem, 'tag'):
+            elem.tag = etree.QName(elem).localname
 
+    # Remove unused namespace declarations
+    etree.cleanup_namespaces(doc)
+    return doc
 
-def test_load_line_cards(mocked_router, mocked_router_input_tables):
+# def _expected_fpcs(all_replies):
+#     # root rpc-replly element has complicated namespaces definitions
+#     # which mess up xpath queries ... strip these
+#     full_inventory_reply = etree.fromstring(all_replies['inventory'])
+#     chassis_inventory = full_inventory_reply[0][0]
+#     x = etree.tostring(chassis_inventory)
+#     return list(chassis_inventory.xpath(".//name[starts-with(.,'FPC')]/parent::*"))
+
+
+def test_router_ports(mocked_router, netconf_rpc_replies):
 
     ssh = {
         'username': 'bogus',
         'private-key': 'no file'
     }
-    fpcs = load_line_cards(hostname='bogus', ssh_config=ssh)
+    fpcs = load_router_ports(hostname='bogus', ssh_config=ssh)
     fpcs = list(fpcs)
     validate(fpcs, LINE_CARDS_LIST_SCHEMA)
 
-    expected_line_cards = set(mocked_router_input_tables['FpcHwTable'].keys())
-    expected_ports = set(mocked_router_input_tables['PhyPortTable'].keys())
+    inventory = _remove_ns(netconf_rpc_replies['inventory'])
+    expected_fpcs = list(inventory.xpath(".//name[starts-with(.,'FPC')]/parent::*"))
+
+    assert len(expected_fpcs) == len(fpcs)
 
-    line_cards = {f['name'] for f in fpcs}
-    ports = set()
-    for f in fpcs:
-        ports |= {p['name'] for p in f['ports']}
+    def _slot_number(node):
+        name = node.xpath('./name/text()')[0]
+        m = re.match(r'^(FPC|PIC) (\d+)$', name)
+        assert m, f"can't parse fpc/pic name: {name}"
+        return int(m.group(2))
 
-    assert line_cards == expected_line_cards
-    assert ports == expected_ports
+    # not a strong test, maybe TODO: pre-compute the expected interfaces
+    # (but wait before trying this, since that
+    # would be hard to maintain against code changes)
+    assert set(map(_slot_number, expected_fpcs)) \
+           == {f['slot'] for f in fpcs}