Commit ccbf8139 authored by Pablo Armingol's avatar Pablo Armingol
Browse files

Merge branch 'develop' of https://labs.etsi.org/rep/tfs/controller into... 

Merge branch 'develop' of https://labs.etsi.org/rep/tfs/controller into 77-tid-visual-inventory-management-2
parents 7bf22705 faa30fbf

src/device/service/drivers/openconfig/OpenConfigDriver.py

+4 −1
Original line number Diff line number Diff line
@@ -109,6 +109,9 @@ class NetconfSessionHandler: 
    @RETRY_DECORATOR

    def get(self, filter=None, with_defaults=None): # pylint: disable=redefined-builtin

        with self.__lock:

            if self.__vendor == 'JUNIPER'and not 'component' in str(filter):

                return self.__manager.get_config(source="running", filter=filter, with_defaults=with_defaults)

            else:

                return self.__manager.get(filter=filter, with_defaults=with_defaults)



    @RETRY_DECORATOR

src/device/service/drivers/openconfig/templates/Inventory.py

+1 −3
Original line number Diff line number Diff line
@@ -89,9 +89,7 @@ def parse(xml_data : ET.Element) -> List[Tuple[str, Dict[str, Any]]]: 
            add_value_from_tag(inventory['attributes'], 'empty', component_empty)



        component_parent = xml_component.find('ocp:state/ocp:parent', namespaces=NAMESPACES)

        if component_parent is None or component_parent.text is None:

            add_value_from_tag(inventory, 'parent-component-references', component_type)

        else:

        if not component_parent is None: 

            add_value_from_tag(inventory, 'parent-component-references', component_parent)



        component_HW = xml_component.find('ocp:state/ocp:hardware-version', namespaces=NAMESPACES)