Commit 3a82d9e1 authored by douomo's avatar douomo
Browse files

removed carrier-id check ininvetory test

parent c7ad29ea

validateInventory.py

+1 −3
Original line number Original line Diff line number Diff line
@@ -121,7 +121,7 @@ def check_carrier_inventory(xml_reply): 
    if not carrier_ifaces:

    if not carrier_ifaces:

        return "No carrier found"

        return "No carrier found"

    for iface in carrier_ifaces:

    for iface in carrier_ifaces:

        carrier_id = iface.findall(".//ns1:carrier-id", namespaces={"ns1": "urn:ietf:params:xml:ns:yang:ietf-microwave-radio-link"})

        #carrier_id = iface.findall(".//ns1:carrier-id", namespaces={"ns1": "urn:ietf:params:xml:ns:yang:ietf-microwave-radio-link"})

        tx_enabled = iface.findall(".//ns1:tx-enabled", namespaces={"ns1": "urn:ietf:params:xml:ns:yang:ietf-microwave-radio-link"})

        tx_enabled = iface.findall(".//ns1:tx-enabled", namespaces={"ns1": "urn:ietf:params:xml:ns:yang:ietf-microwave-radio-link"})

        oper_status = iface.findall(".//ns1:tx-oper-status", namespaces={"ns1": "urn:ietf:params:xml:ns:yang:ietf-microwave-radio-link"})

        oper_status = iface.findall(".//ns1:tx-oper-status", namespaces={"ns1": "urn:ietf:params:xml:ns:yang:ietf-microwave-radio-link"})

        tx_freq = tree.findall(".//ns1:tx-frequency", namespaces={"ns1": "urn:ietf:params:xml:ns:yang:ietf-microwave-radio-link"})

        tx_freq = tree.findall(".//ns1:tx-frequency", namespaces={"ns1": "urn:ietf:params:xml:ns:yang:ietf-microwave-radio-link"})
@@ -150,8 +150,6 @@ def check_carrier_inventory(xml_reply): 
        actual_snir = iface.findall(".//ns1:actual-snir", namespaces={"ns1": "urn:ietf:params:xml:ns:yang:ietf-microwave-radio-link"})

        actual_snir = iface.findall(".//ns1:actual-snir", namespaces={"ns1": "urn:ietf:params:xml:ns:yang:ietf-microwave-radio-link"})

        if len(rtpc)==0 and len(atpc)==0:

        if len(rtpc)==0 and len(atpc)==0:

            return "No rtpc nor atpc found. At least one of the two must be defined"

            return "No rtpc nor atpc found. At least one of the two must be defined"

        if len(carrier_id)==0:

            return "No carrier id found"

        if len(tx_enabled)==0:

        if len(tx_enabled)==0:

            return "No tx_enable found"

            return "No tx_enable found"

        if len(oper_status)==0:

        if len(oper_status)==0: