ci: cram: update expected output after integration of SFP manager changes

References: PCF-1924

Signed-off-by: Matthias Franck <matthias.franck@softathome.com>

.gitlab/tests/cram/arcadyan-mozart/005-build-config.t

@@ -145,6 +145,7 @@ Assure expected build configuration (PCF-1413):
   CONFIG_PACKAGE_iptables-mod-nfqueue=y
   CONFIG_PACKAGE_iptables-zz-legacy=y
   CONFIG_PACKAGE_iputils-ping=y
+  # CONFIG_PACKAGE_jansson is not set
   CONFIG_PACKAGE_kmod-asn1-decoder=y
   CONFIG_PACKAGE_kmod-ebtables=y
   CONFIG_PACKAGE_kmod-ebtables-ipv4=y
@@ -382,6 +383,7 @@ Assure expected build configuration (PCF-1413):
   CONFIG_PACKAGE_netmodel-iprouter=y
   CONFIG_PACKAGE_netmodel-logical=y
   CONFIG_PACKAGE_netmodel-netdev=y
+  CONFIG_PACKAGE_netmodel-optical=y
   CONFIG_PACKAGE_netmodel-ppp=y
   CONFIG_PACKAGE_netmodel-radio=y
   CONFIG_PACKAGE_netmodel-ssid=y

.gitlab/tests/cram/generic/obuspa.t

@@ -810,6 +810,7 @@ Check that obuspa has expected datamodel available (minus the platform specific
   Device.Ethernet.Interface.{i}.MACAddress                                                             proto::ethernet-manager
   Device.Ethernet.Interface.{i}.MaxBitRate                                                             proto::ethernet-manager
   Device.Ethernet.Interface.{i}.Name                                                                   proto::ethernet-manager
+  Device.Ethernet.Interface.{i}.SFPReferenceList                                                       proto::ethernet-manager
   Device.Ethernet.Interface.{i}.Stats.                                                                 proto::ethernet-manager
   Device.Ethernet.Interface.{i}.Stats.BroadcastPacketsReceived                                         proto::ethernet-manager
   Device.Ethernet.Interface.{i}.Stats.BroadcastPacketsSent                                             proto::ethernet-manager
@@ -834,7 +835,6 @@ Check that obuspa has expected datamodel available (minus the platform specific
   Device.Ethernet.Interface.{i}.X_PRPLWARE-COM_LED.Status                                              proto::ethernet-manager
   Device.Ethernet.Interface.{i}.X_PRPLWARE-COM_MTU                                                     proto::ethernet-manager
   Device.Ethernet.Interface.{i}.X_PRPLWARE-COM_MTUMode                                                 proto::ethernet-manager
-  Device.Ethernet.Interface.{i}.X_PRPLWARE-COM_SFPReference                                            proto::ethernet-manager
   Device.Ethernet.InterfaceNumberOfEntries                                                             proto::ethernet-manager
   Device.Ethernet.Link.{i}.                                                                            proto::ethernet-manager
   Device.Ethernet.Link.{i}.Alias                                                                       proto::ethernet-manager
@@ -4496,114 +4496,124 @@ Check that obuspa has expected datamodel available (minus the platform specific
   Device.X_PRPLWARE-COM_PersistentConfiguration.unregisterSvc()                                        proto::pcm-manager
   Device.X_PRPLWARE-COM_PersistentConfiguration.unregisterSvc() input:name
   Device.X_PRPLWARE-COM_SFPs.                                                                          proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.                                                                 proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.                                                             proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.                                                 proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Alarms.                                          proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Alarms.RxPowerHigh                               proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Alarms.RxPowerLow                                proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Alarms.TemperatureHigh                           proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Alarms.TemperatureLow                            proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Alarms.TxBiasHigh                                proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Alarms.TxBiasLow                                 proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Alarms.TxPowerHigh                               proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Alarms.TxPowerLow                                proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Alarms.VccHigh                                   proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Alarms.VccLow                                    proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.BRMax                                            proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.BRMin                                            proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.BRNominal                                        proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Connector                                        proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.DMCtypeExternalCal                               proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.DMCtypeImplemented                               proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.DMCtypeInternalCal                               proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.DMCtypeRxAvgPwr                                  proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.DateCode                                         proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.EMCSPowerLvlOp                                   proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.EMCSPowerLvlSelect                               proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.EMCSSoftRS1Select                                proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.EOCSoftRateSelect                                proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.EOCSoftRxLOS                                     proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.EOCSoftTxDisable                                 proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.EOCSoftTxFault                                   proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.EOCalarmsImplemented                             proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Encoding                                         proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Length50uM                                       proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Length62dot5uM                                   proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.LengthOM3                                        proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.LengthSMF                                        proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.LengthSMFkm                                      proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.OptInvertedLOS                                   proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.OptLOS                                           proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.OptRateSelect                                    proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.OptTxDisable                                     proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.OptTxFault                                       proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.OptlCooledTrans                                  proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.OptlLinearRcvr                                   proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.OptlPowerlvl                                     proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.RateIdentifier                                   proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.SFF8079AppSelect                                 proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.SFF8431SoftRateSelect                            proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.SFPType                                          proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Status.                                          proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Status.DataReadyBarState                         proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Status.RS1State                                  proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Status.RateSelectState                           proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Status.RxLOSState                                proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Status.RxPower                                   proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Status.SoftRateSelectSelect                      proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Status.SoftTxDisableSelect                       proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Status.TXFaultState                              proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Status.Temperature                               proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Status.TxBias                                    proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Status.TxDisableState                            proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Status.TxPower                                   proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Status.Vcc                                       proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Thresholds.                                      proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Thresholds.HighRxPowerAlarm                      proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Thresholds.HighRxPowerWarning                    proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Thresholds.HighTempAlarm                         proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Thresholds.HighTempWarning                       proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Thresholds.HighTxBiasAlarm                       proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Thresholds.HighTxBiasWarning                     proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Thresholds.HighTxPowerAlarm                      proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Thresholds.HighTxPowerWarning                    proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Thresholds.HighVccAlarm                          proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Thresholds.HighVccWarning                        proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Thresholds.LowRxPowerAlarm                       proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Thresholds.LowRxPowerWarning                     proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Thresholds.LowTempAlarm                          proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Thresholds.LowTempWarning                        proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Thresholds.LowTxBiasAlarm                        proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Thresholds.LowTxBiasWarning                      proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Thresholds.LowTxPowerAlarm                       proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Thresholds.LowTxPowerWarning                     proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Thresholds.LowVccAlarm                           proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Thresholds.LowVccWarning                         proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Transceiver                                      proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.TransceiverType                                  proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.VendorName                                       proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.VendorOUI                                        proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.VendorPN                                         proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.VendorRev                                        proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.VendorSN                                         proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.VerCompliance                                    proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Warnings.                                        proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Warnings.RxPowerHigh                             proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Warnings.RxPowerLow                              proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Warnings.TemperatureHigh                         proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Warnings.TemperatureLow                          proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Warnings.TxBiasHigh                              proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Warnings.TxBiasLow                               proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Warnings.TxPowerHigh                             proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Warnings.TxPowerLow                              proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Warnings.VccHigh                                 proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Warnings.VccLow                                  proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Wavelength                                       proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.sfpmgr_get_ifname()                              proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.sfpmgr_get_ifname() input:index
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.sfpmgr_get_ifname() output:ifname
-  Device.X_PRPLWARE-COM_SFPs.CageNumberOfEntries                                                       proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.                                                                     proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.                                                         proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Alias                                                    proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Name                                                     proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.                                             proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Alarms.                                      proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Alarms.RxPowerHigh                           proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Alarms.RxPowerLow                            proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Alarms.TemperatureHigh                       proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Alarms.TemperatureLow                        proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Alarms.TxBiasHigh                            proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Alarms.TxBiasLow                             proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Alarms.TxPowerHigh                           proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Alarms.TxPowerLow                            proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Alarms.VccHigh                               proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Alarms.VccLow                                proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.BRMax                                        proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.BRMin                                        proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.BRNominal                                    proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Connector                                    proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.DMCtypeExternalCal                           proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.DMCtypeImplemented                           proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.DMCtypeInternalCal                           proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.DMCtypeRxAvgPwr                              proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.DateCode                                     proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.EMCSPowerLvlOp                               proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.EMCSPowerLvlSelect                           proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.EOCSoftRateSelect                            proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.EOCSoftRxLOS                                 proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.EOCSoftTxDisable                             proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.EOCSoftTxFault                               proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.EOCalarmsImplemented                         proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Encoding                                     proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.LengthOM1                                    proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.LengthOM2                                    proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.LengthOM3                                    proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.LengthSMF                                    proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.LengthSMFkm                                  proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.OptCooledTrans                               proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.OptInvertedLOS                               proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.OptLOS                                       proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.OptLinearRcvr                                proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.OptPowerlvl                                  proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.OptRateSelect                                proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.OptTxDisable                                 proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.OptTxFault                                   proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.RateIdentifier                               proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.SFF8079AppSelect                             proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.SFF8431SoftRateSelect                        proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Status.                                      proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Status.DataReadyBarState                     proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Status.RS1State                              proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Status.RateSelectState                       proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Status.RxLOSState                            proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Status.RxPower                               proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Status.SoftRateSelectSelect                  proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Status.SoftTxDisableSelect                   proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Status.TXFaultState                          proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Status.Temperature                           proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Status.TxBias                                proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Status.TxDisableState                        proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Status.TxPower                               proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Status.Vcc                                   proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Thresholds.                                  proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Thresholds.HighRxPowerAlarm                  proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Thresholds.HighRxPowerWarning                proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Thresholds.HighTempAlarm                     proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Thresholds.HighTempWarning                   proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Thresholds.HighTxBiasAlarm                   proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Thresholds.HighTxBiasWarning                 proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Thresholds.HighTxPowerAlarm                  proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Thresholds.HighTxPowerWarning                proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Thresholds.HighVccAlarm                      proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Thresholds.HighVccWarning                    proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Thresholds.LowRxPowerAlarm                   proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Thresholds.LowRxPowerWarning                 proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Thresholds.LowTempAlarm                      proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Thresholds.LowTempWarning                    proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Thresholds.LowTxBiasAlarm                    proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Thresholds.LowTxBiasWarning                  proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Thresholds.LowTxPowerAlarm                   proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Thresholds.LowTxPowerWarning                 proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Thresholds.LowVccAlarm                       proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Thresholds.LowVccWarning                     proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Transceiver                                  proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.VendorName                                   proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.VendorOUI                                    proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.VendorPN                                     proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.VendorRev                                    proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.VendorSN                                     proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.VerCompliance                                proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Warnings.                                    proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Warnings.RxPowerHigh                         proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Warnings.RxPowerLow                          proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Warnings.TemperatureHigh                     proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Warnings.TemperatureLow                      proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Warnings.TxBiasHigh                          proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Warnings.TxBiasLow                           proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Warnings.TxPowerHigh                         proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Warnings.TxPowerLow                          proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Warnings.VccHigh                             proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Warnings.VccLow                              proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Wavelength                                   proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472NumberOfEntries                                               proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.SFPCage.{i}.                                                              proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.SFPCage.{i}.Alias                                                         proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.SFPCage.{i}.MgmtInterface                                                 proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.SFPCage.{i}.Name                                                          proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.SFPCage.{i}.SFF8024Identifier                                             proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.SFPCage.{i}.SFPPresent                                                    proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.SFPCage.{i}.SFPReference                                                  proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.SFPCage.{i}.SFPType                                                       proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.SFPCageNumberOfEntries                                                    proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.SFPDatabaseNumberOfEntries                                                proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.X_PRPLWARE-COM_SFPDatabase.{i}.                                           proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.X_PRPLWARE-COM_SFPDatabase.{i}.SFPType                                    proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.X_PRPLWARE-COM_SFPDatabase.{i}.VendorName                                 proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.X_PRPLWARE-COM_SFPDatabase.{i}.VendorPN                                   proto::tr181-sfp
   Device.X_PRPLWARE-COM_WANManager.                                                                    proto::wan-manager
   Device.X_PRPLWARE-COM_WANManager.OperationMode                                                       proto::wan-manager
   Device.X_PRPLWARE-COM_WANManager.Reset()                                                             proto::wan-manager
@@ -5507,6 +5517,7 @@ Check that obuspa provides the same datamodel again (minus the platform specific
   Device.Ethernet.Interface.{i}.MACAddress                                                             proto::ethernet-manager
   Device.Ethernet.Interface.{i}.MaxBitRate                                                             proto::ethernet-manager
   Device.Ethernet.Interface.{i}.Name                                                                   proto::ethernet-manager
+  Device.Ethernet.Interface.{i}.SFPReferenceList                                                       proto::ethernet-manager
   Device.Ethernet.Interface.{i}.Stats.                                                                 proto::ethernet-manager
   Device.Ethernet.Interface.{i}.Stats.BroadcastPacketsReceived                                         proto::ethernet-manager
   Device.Ethernet.Interface.{i}.Stats.BroadcastPacketsSent                                             proto::ethernet-manager
@@ -5531,7 +5542,6 @@ Check that obuspa provides the same datamodel again (minus the platform specific
   Device.Ethernet.Interface.{i}.X_PRPLWARE-COM_LED.Status                                              proto::ethernet-manager
   Device.Ethernet.Interface.{i}.X_PRPLWARE-COM_MTU                                                     proto::ethernet-manager
   Device.Ethernet.Interface.{i}.X_PRPLWARE-COM_MTUMode                                                 proto::ethernet-manager
-  Device.Ethernet.Interface.{i}.X_PRPLWARE-COM_SFPReference                                            proto::ethernet-manager
   Device.Ethernet.InterfaceNumberOfEntries                                                             proto::ethernet-manager
   Device.Ethernet.Link.{i}.                                                                            proto::ethernet-manager
   Device.Ethernet.Link.{i}.Alias                                                                       proto::ethernet-manager
@@ -9193,114 +9203,124 @@ Check that obuspa provides the same datamodel again (minus the platform specific
   Device.X_PRPLWARE-COM_PersistentConfiguration.unregisterSvc()                                        proto::pcm-manager
   Device.X_PRPLWARE-COM_PersistentConfiguration.unregisterSvc() input:name
   Device.X_PRPLWARE-COM_SFPs.                                                                          proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.                                                                 proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.                                                             proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.                                                 proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Alarms.                                          proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Alarms.RxPowerHigh                               proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Alarms.RxPowerLow                                proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Alarms.TemperatureHigh                           proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Alarms.TemperatureLow                            proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Alarms.TxBiasHigh                                proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Alarms.TxBiasLow                                 proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Alarms.TxPowerHigh                               proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Alarms.TxPowerLow                                proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Alarms.VccHigh                                   proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Alarms.VccLow                                    proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.BRMax                                            proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.BRMin                                            proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.BRNominal                                        proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Connector                                        proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.DMCtypeExternalCal                               proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.DMCtypeImplemented                               proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.DMCtypeInternalCal                               proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.DMCtypeRxAvgPwr                                  proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.DateCode                                         proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.EMCSPowerLvlOp                                   proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.EMCSPowerLvlSelect                               proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.EMCSSoftRS1Select                                proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.EOCSoftRateSelect                                proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.EOCSoftRxLOS                                     proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.EOCSoftTxDisable                                 proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.EOCSoftTxFault                                   proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.EOCalarmsImplemented                             proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Encoding                                         proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Length50uM                                       proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Length62dot5uM                                   proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.LengthOM3                                        proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.LengthSMF                                        proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.LengthSMFkm                                      proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.OptInvertedLOS                                   proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.OptLOS                                           proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.OptRateSelect                                    proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.OptTxDisable                                     proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.OptTxFault                                       proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.OptlCooledTrans                                  proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.OptlLinearRcvr                                   proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.OptlPowerlvl                                     proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.RateIdentifier                                   proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.SFF8079AppSelect                                 proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.SFF8431SoftRateSelect                            proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.SFPType                                          proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Status.                                          proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Status.DataReadyBarState                         proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Status.RS1State                                  proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Status.RateSelectState                           proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Status.RxLOSState                                proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Status.RxPower                                   proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Status.SoftRateSelectSelect                      proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Status.SoftTxDisableSelect                       proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Status.TXFaultState                              proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Status.Temperature                               proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Status.TxBias                                    proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Status.TxDisableState                            proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Status.TxPower                                   proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Status.Vcc                                       proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Thresholds.                                      proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Thresholds.HighRxPowerAlarm                      proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Thresholds.HighRxPowerWarning                    proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Thresholds.HighTempAlarm                         proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Thresholds.HighTempWarning                       proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Thresholds.HighTxBiasAlarm                       proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Thresholds.HighTxBiasWarning                     proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Thresholds.HighTxPowerAlarm                      proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Thresholds.HighTxPowerWarning                    proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Thresholds.HighVccAlarm                          proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Thresholds.HighVccWarning                        proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Thresholds.LowRxPowerAlarm                       proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Thresholds.LowRxPowerWarning                     proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Thresholds.LowTempAlarm                          proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Thresholds.LowTempWarning                        proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Thresholds.LowTxBiasAlarm                        proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Thresholds.LowTxBiasWarning                      proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Thresholds.LowTxPowerAlarm                       proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Thresholds.LowTxPowerWarning                     proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Thresholds.LowVccAlarm                           proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Thresholds.LowVccWarning                         proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Transceiver                                      proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.TransceiverType                                  proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.VendorName                                       proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.VendorOUI                                        proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.VendorPN                                         proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.VendorRev                                        proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.VendorSN                                         proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.VerCompliance                                    proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Warnings.                                        proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Warnings.RxPowerHigh                             proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Warnings.RxPowerLow                              proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Warnings.TemperatureHigh                         proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Warnings.TemperatureLow                          proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Warnings.TxBiasHigh                              proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Warnings.TxBiasLow                               proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Warnings.TxPowerHigh                             proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Warnings.TxPowerLow                              proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Warnings.VccHigh                                 proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Warnings.VccLow                                  proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.Wavelength                                       proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.sfpmgr_get_ifname()                              proto::tr181-sfp
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.sfpmgr_get_ifname() input:index
-  Device.X_PRPLWARE-COM_SFPs.Cage.{i}.SFP.Transceiver.sfpmgr_get_ifname() output:ifname
-  Device.X_PRPLWARE-COM_SFPs.CageNumberOfEntries                                                       proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.                                                                     proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.                                                         proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Alias                                                    proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Name                                                     proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.                                             proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Alarms.                                      proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Alarms.RxPowerHigh                           proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Alarms.RxPowerLow                            proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Alarms.TemperatureHigh                       proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Alarms.TemperatureLow                        proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Alarms.TxBiasHigh                            proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Alarms.TxBiasLow                             proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Alarms.TxPowerHigh                           proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Alarms.TxPowerLow                            proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Alarms.VccHigh                               proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Alarms.VccLow                                proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.BRMax                                        proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.BRMin                                        proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.BRNominal                                    proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Connector                                    proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.DMCtypeExternalCal                           proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.DMCtypeImplemented                           proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.DMCtypeInternalCal                           proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.DMCtypeRxAvgPwr                              proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.DateCode                                     proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.EMCSPowerLvlOp                               proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.EMCSPowerLvlSelect                           proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.EOCSoftRateSelect                            proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.EOCSoftRxLOS                                 proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.EOCSoftTxDisable                             proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.EOCSoftTxFault                               proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.EOCalarmsImplemented                         proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Encoding                                     proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.LengthOM1                                    proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.LengthOM2                                    proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.LengthOM3                                    proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.LengthSMF                                    proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.LengthSMFkm                                  proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.OptCooledTrans                               proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.OptInvertedLOS                               proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.OptLOS                                       proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.OptLinearRcvr                                proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.OptPowerlvl                                  proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.OptRateSelect                                proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.OptTxDisable                                 proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.OptTxFault                                   proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.RateIdentifier                               proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.SFF8079AppSelect                             proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.SFF8431SoftRateSelect                        proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Status.                                      proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Status.DataReadyBarState                     proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Status.RS1State                              proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Status.RateSelectState                       proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Status.RxLOSState                            proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Status.RxPower                               proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Status.SoftRateSelectSelect                  proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Status.SoftTxDisableSelect                   proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Status.TXFaultState                          proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Status.Temperature                           proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Status.TxBias                                proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Status.TxDisableState                        proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Status.TxPower                               proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Status.Vcc                                   proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Thresholds.                                  proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Thresholds.HighRxPowerAlarm                  proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Thresholds.HighRxPowerWarning                proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Thresholds.HighTempAlarm                     proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Thresholds.HighTempWarning                   proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Thresholds.HighTxBiasAlarm                   proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Thresholds.HighTxBiasWarning                 proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Thresholds.HighTxPowerAlarm                  proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Thresholds.HighTxPowerWarning                proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Thresholds.HighVccAlarm                      proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Thresholds.HighVccWarning                    proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Thresholds.LowRxPowerAlarm                   proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Thresholds.LowRxPowerWarning                 proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Thresholds.LowTempAlarm                      proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Thresholds.LowTempWarning                    proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Thresholds.LowTxBiasAlarm                    proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Thresholds.LowTxBiasWarning                  proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Thresholds.LowTxPowerAlarm                   proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Thresholds.LowTxPowerWarning                 proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Thresholds.LowVccAlarm                       proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Thresholds.LowVccWarning                     proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Transceiver                                  proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.VendorName                                   proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.VendorOUI                                    proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.VendorPN                                     proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.VendorRev                                    proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.VendorSN                                     proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.VerCompliance                                proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Warnings.                                    proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Warnings.RxPowerHigh                         proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Warnings.RxPowerLow                          proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Warnings.TemperatureHigh                     proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Warnings.TemperatureLow                      proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Warnings.TxBiasHigh                          proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Warnings.TxBiasLow                           proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Warnings.TxPowerHigh                         proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Warnings.TxPowerLow                          proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Warnings.VccHigh                             proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Warnings.VccLow                              proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472.{i}.Transceiver.Wavelength                                   proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.Mgmt.SFF8472NumberOfEntries                                               proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.SFPCage.{i}.                                                              proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.SFPCage.{i}.Alias                                                         proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.SFPCage.{i}.MgmtInterface                                                 proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.SFPCage.{i}.Name                                                          proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.SFPCage.{i}.SFF8024Identifier                                             proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.SFPCage.{i}.SFPPresent                                                    proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.SFPCage.{i}.SFPReference                                                  proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.SFPCage.{i}.SFPType                                                       proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.SFPCageNumberOfEntries                                                    proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.SFPDatabaseNumberOfEntries                                                proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.X_PRPLWARE-COM_SFPDatabase.{i}.                                           proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.X_PRPLWARE-COM_SFPDatabase.{i}.SFPType                                    proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.X_PRPLWARE-COM_SFPDatabase.{i}.VendorName                                 proto::tr181-sfp
+  Device.X_PRPLWARE-COM_SFPs.X_PRPLWARE-COM_SFPDatabase.{i}.VendorPN                                   proto::tr181-sfp
   Device.X_PRPLWARE-COM_WANManager.                                                                    proto::wan-manager
   Device.X_PRPLWARE-COM_WANManager.OperationMode                                                       proto::wan-manager
   Device.X_PRPLWARE-COM_WANManager.Reset()                                                             proto::wan-manager

.gitlab/tests/cram/generic/ubus-datamodel-list.t

@@ -90,12 +90,14 @@ Check that ubus has expected datamodels available:
   Device.ManagementServer
   Device.NAT
   Device.NeighborDiscovery
+  Device.Optical
   Device.PCP
   Device.PPP
   Device.PacketInterception
   Device.QoS
   Device.RouterAdvertisement
   Device.Routing
+  Device.SFPs
   Device.SSH
   Device.Security
   Device.SoftwareModules
@@ -113,7 +115,6 @@ Check that ubus has expected datamodels available:
   Device.X_PRPLWARE-COM_MultiSettings
   Device.X_PRPLWARE-COM_PeriodicFileUpload
   Device.X_PRPLWARE-COM_PersistentConfiguration
-  Device.X_PRPLWARE-COM_SFPs
   Device.X_PRPLWARE-COM_SoftwareModules
   Device.X_PRPLWARE-COM_WANManager
   Device.X_PRPLWARE-COM_WiFiScheduler
@@ -301,7 +302,10 @@ Check that ubus has expected datamodels available:
   Routing.RouteInformation.InterfaceSetting
   Routing.Router
   SFPs
-  SFPs.Cage
+  SFPs.Mgmt
+  SFPs.Mgmt.SFF8472
+  SFPs.SFPCage
+  SFPs.X_PRPLWARE-COM_SFPDatabase
   SSH
   SSH.AuthorizedKey
   SSH.Server

.gitlab/tests/cram/mxl25641-hdk-6/005-build-config.t

@@ -259,6 +259,7 @@ Assure expected build configuration (PCF-1413):
   CONFIG_PACKAGE_iwlwav-hostap-ng-uci=y
   CONFIG_PACKAGE_iwlwav-iw=y
   CONFIG_PACKAGE_iwlwav-tools-osp=y
+  CONFIG_PACKAGE_jansson=m
   CONFIG_PACKAGE_keyutils=y
   CONFIG_PACKAGE_kmod-asn1-decoder=y
   CONFIG_PACKAGE_kmod-crypto-acompress=y
@@ -636,6 +637,7 @@ Assure expected build configuration (PCF-1413):
   CONFIG_PACKAGE_netmodel-iprouter=y
   CONFIG_PACKAGE_netmodel-logical=y
   CONFIG_PACKAGE_netmodel-netdev=y
+  CONFIG_PACKAGE_netmodel-optical=y
   CONFIG_PACKAGE_netmodel-ppp=y
   CONFIG_PACKAGE_netmodel-radio=y
   CONFIG_PACKAGE_netmodel-ssid=y

.gitlab/tests/cram/mxl25641-hdk-6/015-platform.t

@@ -4,7 +4,7 @@ Create R alias:
 
 Check that there is SFP+ stick present:
 
-  $ R 'ba-cli --less --json SFPs.Cage.1.SFP.Transceiver.?' | jq -r '.[0]."SFPs.Cage.1.SFP.Transceiver." | [.VendorSN, .VendorPN, .TransceiverType, .VendorName] | sort | .[]'
+  $ R 'ba-cli --less --json SFPs.SFPCage.1.SFP.Transceiver.?' | jq -r '.[0]."SFPs.SFPCage.1.SFP.Transceiver." | [.VendorSN, .VendorPN, .TransceiverType, .VendorName] | sort | .[]'
   10G Base-SR
   F\d+$ (re)
   FS

.gitlab/tests/cram/prpl-haze/005-build-config.t

@@ -132,6 +132,7 @@ Assure expected build configuration (PCF-1413):
   CONFIG_PACKAGE_iptables-mod-nfqueue=y
   CONFIG_PACKAGE_iptables-zz-legacy=y
   CONFIG_PACKAGE_iputils-ping=y
+  # CONFIG_PACKAGE_jansson is not set
   # CONFIG_PACKAGE_iw is not set
   CONFIG_PACKAGE_iw-full=y
   CONFIG_PACKAGE_kmod-asn1-decoder=y
@@ -371,6 +372,7 @@ Assure expected build configuration (PCF-1413):
   CONFIG_PACKAGE_netmodel-iprouter=y
   CONFIG_PACKAGE_netmodel-logical=y
   CONFIG_PACKAGE_netmodel-netdev=y
+  CONFIG_PACKAGE_netmodel-optical=y
   CONFIG_PACKAGE_netmodel-ppp=y
   CONFIG_PACKAGE_netmodel-radio=y
   CONFIG_PACKAGE_netmodel-ssid=y

.gitlab/tests/cram/turris-omnia/005-build-config.t

@@ -150,6 +150,7 @@ Assure expected build configuration (PCF-1413):
   CONFIG_PACKAGE_iptables-mod-nfqueue=y
   CONFIG_PACKAGE_iptables-zz-legacy=y
   CONFIG_PACKAGE_iputils-ping=y
+  # CONFIG_PACKAGE_jansson is not set
   # CONFIG_PACKAGE_iw is not set
   CONFIG_PACKAGE_iw-full=y
   CONFIG_PACKAGE_kmod-asn1-decoder=y
@@ -389,6 +390,7 @@ Assure expected build configuration (PCF-1413):
   CONFIG_PACKAGE_netmodel-iprouter=y
   CONFIG_PACKAGE_netmodel-logical=y
   CONFIG_PACKAGE_netmodel-netdev=y
+  CONFIG_PACKAGE_netmodel-optical=y
   CONFIG_PACKAGE_netmodel-ppp=y
   CONFIG_PACKAGE_netmodel-radio=y
   CONFIG_PACKAGE_netmodel-ssid=y

.gitlab/tests/cram/urx851-b0-dk/005-build-config.t

@@ -264,6 +264,7 @@ Assure expected build configuration (PCF-1413):
   CONFIG_PACKAGE_iwlwav-hostap-ng-uci=y
   CONFIG_PACKAGE_iwlwav-iw=y
   CONFIG_PACKAGE_iwlwav-tools-osp=y
+  CONFIG_PACKAGE_jansson=m
   CONFIG_PACKAGE_keyutils=y
   CONFIG_PACKAGE_kmod-asn1-decoder=y
   CONFIG_PACKAGE_kmod-crypto-acompress=y
@@ -609,6 +610,7 @@ Assure expected build configuration (PCF-1413):
   CONFIG_PACKAGE_netmodel-iprouter=y
   CONFIG_PACKAGE_netmodel-logical=y
   CONFIG_PACKAGE_netmodel-netdev=y
+  CONFIG_PACKAGE_netmodel-optical=y
   CONFIG_PACKAGE_netmodel-ppp=y
   CONFIG_PACKAGE_netmodel-radio=y
   CONFIG_PACKAGE_netmodel-ssid=y

.gitlab/tests/cram/wnc-freedom/005-build-config.t

@@ -150,6 +150,7 @@ Assure expected build configuration (PCF-1413):
   CONFIG_PACKAGE_iptables-mod-nfqueue=y
   CONFIG_PACKAGE_iptables-zz-legacy=y
   CONFIG_PACKAGE_iputils-ping=y
+  # CONFIG_PACKAGE_jansson is not set
   CONFIG_PACKAGE_kmod-asn1-decoder=y
   CONFIG_PACKAGE_kmod-crypto-md5=y
   CONFIG_PACKAGE_kmod-ebtables=y
@@ -433,6 +434,7 @@ Assure expected build configuration (PCF-1413):
   CONFIG_PACKAGE_netmodel-iprouter=y
   CONFIG_PACKAGE_netmodel-logical=y
   CONFIG_PACKAGE_netmodel-netdev=y
+  CONFIG_PACKAGE_netmodel-optical=y
   CONFIG_PACKAGE_netmodel-ppp=y
   CONFIG_PACKAGE_netmodel-radio=y
   CONFIG_PACKAGE_netmodel-ssid=y