From 2428af197f6a53dadb660c4f286a85bd55061be1 Mon Sep 17 00:00:00 2001
From: rebiffe <jean.rebiffe@orange.com>
Date: Thu, 9 Feb 2023 15:25:33 +0000
Subject: [PATCH] Update scripts/inventory/INV_PORT_01/ethernet_transform.xsl,
 scripts/inventory/INV_CARRIER_01/CT_transform.xsl,
 scripts/inventory/INV_CARRIER_01/RLT_transform.xsl

---
 .../inventory/INV_CARRIER_01/CT_transform.xsl | 22 +++++++++++++++----
 .../INV_CARRIER_01/RLT_transform.xsl          | 12 +++++++++-
 .../INV_PORT_01/ethernet_transform.xsl        |  7 +++++-
 3 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/scripts/inventory/INV_CARRIER_01/CT_transform.xsl b/scripts/inventory/INV_CARRIER_01/CT_transform.xsl
index d180833..9493bae 100644
--- a/scripts/inventory/INV_CARRIER_01/CT_transform.xsl
+++ b/scripts/inventory/INV_CARRIER_01/CT_transform.xsl
@@ -9,16 +9,28 @@
                 <interface>
                     <xsl:copy-of select="if:name" />
                     <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:tx-enabled" />
                     <xsl:copy-of select="mrl:tx-oper-status" />
                     <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: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: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-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)  -->
                     <xsl:copy-of select="mrl:rtpc/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:capabilities/mrl:available-min-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>
             </xsl:for-each>
         </interfaces>
diff --git a/scripts/inventory/INV_CARRIER_01/RLT_transform.xsl b/scripts/inventory/INV_CARRIER_01/RLT_transform.xsl
index e534207..99e08b1 100644
--- a/scripts/inventory/INV_CARRIER_01/RLT_transform.xsl
+++ b/scripts/inventory/INV_CARRIER_01/RLT_transform.xsl
@@ -9,9 +9,19 @@
                 <interface>
                     <xsl:copy-of select="if:name" />
                     <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: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>
             </xsl:for-each>
         </interfaces>
diff --git a/scripts/inventory/INV_PORT_01/ethernet_transform.xsl b/scripts/inventory/INV_PORT_01/ethernet_transform.xsl
index f303e74..3951561 100644
--- a/scripts/inventory/INV_PORT_01/ethernet_transform.xsl
+++ b/scripts/inventory/INV_PORT_01/ethernet_transform.xsl
@@ -9,14 +9,19 @@
                 <interface>
                     <xsl:copy-of select="if:name" />
                     <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="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>
                     <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>
             </xsl:for-each>
         </interfaces>
-- 
GitLab