Commit 5d5fb1ad authored by Jean Rebiffe's avatar Jean Rebiffe
Browse files

Merge branch 'rebiffe-main-patch-27841' into 'main' 

Import of 7 fields from ietf-interfaces in 3 XSL transformers: CT, RTL and ethernet

See merge request sdn/mwt/mwt-sdn-plugtests-4-materials!18
parents f41a3d55 2428af19

scripts/inventory/INV_CARRIER_01/CT_transform.xsl

+18 −4
Original line number Original line Diff line number Diff line
@@ -9,16 +9,28 @@ 
                <interface>

                <interface>

                    <xsl:copy-of select="if:name" />

                    <xsl:copy-of select="if:name" />

                    <xsl:copy-of select="if:type" />

                    <xsl:copy-of select="if:type" />

                    <xsl:copy-of select="if:enabled" />

                    <xsl:copy-of select="if:if-index" />

                    <xsl:copy-of select="if:description" />

                    <xsl:copy-of select="if:admin-status" />

                    <xsl:copy-of select="if:oper-status" />

                    <xsl:copy-of select="if:phys-address" />

                    <xsl:copy-of select="if:speed" />

                    <xsl:copy-of select="mrl:carrier-id" />

                    <xsl:copy-of select="mrl:carrier-id" />

                    <xsl:copy-of select="mrl:tx-enabled" />

                    <xsl:copy-of select="mrl:tx-enabled" />

                    <xsl:copy-of select="mrl:tx-oper-status" />

                    <xsl:copy-of select="mrl:tx-oper-status" />

                    <xsl:copy-of select="mrl:tx-frequency" />

                    <xsl:copy-of select="mrl:tx-frequency" />

                    <xsl:copy-of select="mrl:duplex-distance" />

                    <xsl:copy-of select="mrl:rx-frequency" />

                    <xsl:copy-of select="mrl:rx-frequency" />

                    <xsl:copy-of select="mrl:duplex-distance" />

                    <xsl:copy-of select="mrl:actual-rx-frequency" />

                    <xsl:copy-of select="mrl:actual-duplex-distance" />

                    <xsl:copy-of select="mrl:channel-separation" />

                    <xsl:copy-of select="mrl:channel-separation" />

                    <xsl:copy-of select="mrl:polarization" />

                    <xsl:copy-of select="mrl:actual-tx-cm" />

                    <xsl:copy-of select="mrl:actual-snir" />

                    <xsl:copy-of select="mrl:actual-xpi" />

                    <xsl:copy-of select="mrl:actual-transmitted-level" />

                    <xsl:copy-of select="mrl:actual-transmitted-level" />

                    <xsl:copy-of select="mrl:actual-received-level" />

                    <xsl:copy-of select="mrl:actual-received-level" />

                    <xsl:copy-of select="mrl:actual-snir" />

                    <!--  get what is inside a child attribute (ex: mrl:maximum-nominal-power is inside mrl:rtpc)  -->

                    <!--  get what is inside a child attribute (ex: mrl:maximum-nominal-power is inside mrl:rtpc)  -->

                    <xsl:copy-of select="mrl:rtpc/mrl:maximum-nominal-power" />

                    <xsl:copy-of select="mrl:rtpc/mrl:maximum-nominal-power" />

                    <xsl:copy-of select="mrl:atpc/mrl:maximum-nominal-power" />

                    <xsl:copy-of select="mrl:atpc/mrl:maximum-nominal-power" />
@@ -29,8 +41,10 @@ 
                    <xsl:copy-of select="mrl:adaptive/mrl:selected-max-acm" />

                    <xsl:copy-of select="mrl:adaptive/mrl:selected-max-acm" />

                    <xsl:copy-of select="mrl:capabilities/mrl:available-min-acm" />

                    <xsl:copy-of select="mrl:capabilities/mrl:available-min-acm" />

                    <xsl:copy-of select="mrl:capabilities/mrl:available-max-acm" />

                    <xsl:copy-of select="mrl:capabilities/mrl:available-max-acm" />

                    <xsl:copy-of select="mrl:actual-tx-cm" />



                    <xsl:copy-of select="mrl:actual-rx-frequency" />

                    <!-- Numerous mrl leaves are ignored -->

                    <!-- Ignored if leaves: link-up-down-trap-enable, last-change, if-index, higher-layer-if, lower-layer-if -->

                    <!-- Ignored if container: statistics -->

                </interface>

                </interface>

            </xsl:for-each>

            </xsl:for-each>

        </interfaces>

        </interfaces>

scripts/inventory/INV_CARRIER_01/RLT_transform.xsl

+11 −1
Original line number Original line Diff line number Diff line
@@ -9,9 +9,19 @@ 
                <interface>

                <interface>

                    <xsl:copy-of select="if:name" />

                    <xsl:copy-of select="if:name" />

                    <xsl:copy-of select="if:type" />

                    <xsl:copy-of select="if:type" />

                    <xsl:copy-of select="if:enabled" />

                    <xsl:copy-of select="if:if-index" />

                    <xsl:copy-of select="if:description" />

                    <xsl:copy-of select="if:admin-status" />

                    <xsl:copy-of select="if:oper-status" />

                    <xsl:copy-of select="if:phys-address" />

                    <xsl:copy-of select="if:speed" />

                    <xsl:copy-of select="mrl:id" />

                    <xsl:copy-of select="mrl:id" />

                    <xsl:copy-of select="mrl:mode" />

                    <xsl:copy-of select="mrl:mode" />

                    <!-- Should we list "mrl:carrier-terminations" ? -->

                    <!-- Ignored mrl leaf-list: carrier-terminations, rlp-groups, xpic-pairs, mimo-groups -->



                    <!-- Ignored if leaves: link-up-down-trap-enable, last-change, if-index, higher-layer-if, lower-layer-if -->

                    <!-- Ignored if container: statistics -->

                </interface>

                </interface>

            </xsl:for-each>

            </xsl:for-each>

        </interfaces>

        </interfaces>

scripts/inventory/INV_PORT_01/ethernet_transform.xsl

+6 −1
Original line number Original line Diff line number Diff line
@@ -9,14 +9,19 @@ 
                <interface>

                <interface>

                    <xsl:copy-of select="if:name" />

                    <xsl:copy-of select="if:name" />

                    <xsl:copy-of select="if:type" />

                    <xsl:copy-of select="if:type" />

                    <xsl:copy-of select="if:enabled" />

                    <xsl:copy-of select="if:if-index" />

                    <xsl:copy-of select="if:description" />

                    <xsl:copy-of select="if:description" />

                    <xsl:copy-of select="if:admin-status" />

                    <xsl:copy-of select="if:admin-status" />

                    <xsl:copy-of select="if:oper-status" />

                    <xsl:copy-of select="if:oper-status" />

                    <xsl:copy-of select="if:phys-address" />

                    <xsl:copy-of select="if:phys-address" />

                    <xsl:copy-of select="if:speed" />

                    <xsl:copy-of select="ieee802-eth-if:ethernet/ieee802-eth-if:duplex" />

                    <xsl:copy-of select="ieee802-eth-if:ethernet/ieee802-eth-if:duplex" />

                    <xsl:copy-of select="ieee802-eth-if:ethernet/ieee802-eth-if:speed" />

                    <configured-speed><xsl:value-of select="ieee802-eth-if:ethernet/ieee802-eth-if:speed" /></configured-speed>

                    <auto-negotiation><xsl:value-of select="ieee802-eth-if:ethernet/ieee802-eth-if:auto-negotiation/ieee802-eth-if:enable" /></auto-negotiation>

                    <auto-negotiation><xsl:value-of select="ieee802-eth-if:ethernet/ieee802-eth-if:auto-negotiation/ieee802-eth-if:enable" /></auto-negotiation>

                    <xsl:copy-of select="ieee802-eth-if:ethernet/ieee802-eth-if:auto-negotiation/ieee802-eth-if:negotiation-status" />

                    <xsl:copy-of select="ieee802-eth-if:ethernet/ieee802-eth-if:auto-negotiation/ieee802-eth-if:negotiation-status" />

                    <!-- Ignored if leaves: link-up-down-trap-enable, last-change, if-index, higher-layer-if, lower-layer-if -->

                    <!-- Ignored if container: statistics -->

                </interface>

                </interface>

            </xsl:for-each>

            </xsl:for-each>

        </interfaces>

        </interfaces>