RDKEMW-19653 : Deprecated DataModel Removal for XRE and XCaliber code from RDKE

conf/mgrlist.conf

@@ -2,7 +2,7 @@ Device.DeviceInfo deviceMgr
 Device.Services.STBService dsMgr
 Device.Services.StorageService storageSrvcMgr
 Device.MoCA mocaMgr
-Device.X_COMCAST-COM_Xcalibur xreMgr
+Device.X_COMCAST-COM_Xcalibur.Client xreMgr
 Device.Ethernet ethernetMgr
 Device.IP ipMgr
 Device.Time timeMgr

conf/tr69hostIf.conf

@@ -3,8 +3,7 @@ Device.DeviceInfo=deviceMgr
 Device.Services.STBService=dsMgr
 Device.Services.StorageService=storageSrvcMgr
 Device.MoCA=mocaMgr
-Device.X_COMCAST-COM_Xcalibur.Client.XRE=xreMgr
-Device.X_COMCAST-COM_Xcalibur.TRM=xreMgr
+Device.X_COMCAST-COM_Xcalibur.Client=xreMgr
 Device.Ethernet=ethernetMgr
 Device.IP=ipMgr
 Device.Time=timeMgr

configure.ac

@@ -30,7 +30,6 @@ AC_CONFIG_HEADERS([cfg/config.h])
 
 LT_INIT
 
-XREMGR_FLAGS=" "
 MOCAMGR_FLAGS=" "
 SUBDIRS_MOCA=" "
 MOCA2_FLAG=" "
@@ -58,21 +57,6 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])],
 [AM_DEFAULT_VERBOSITY=1
 AC_SUBST(AM_DEFAULT_VERBOSITY)]) 
 
-AC_ARG_ENABLE([xre],
-	[ AS_HELP_STRING([--enable-xre], [enable xre profile (default is no)])],
-        [
-        case "${enableval}" in
-	yes) XREMGR_FLAGS="-DUSE_XRESRC"
-	     xre=true;;
-	no)  AC_MSG_ERROR([xre profile is disabled])
-             xre=false;;
-	*) AC_MSG_ERROR([bad value ${enableval} for --enable-xre])
-           xre=false;;
-	esac
-	],
-        [xre=false; echo "xre profile is disabled"])
-AM_CONDITIONAL([XRELIB_FLAG], [test "x$xre" = xtrue])
-
 # This adds the option of compiling with/without using the  profile source code
 AC_ARG_ENABLE([moca],
 	[AS_HELP_STRING([--enable-moca],[enable moca profile (default is yes)])],
@@ -424,7 +408,6 @@ AM_CONDITIONAL([ENABLE_RDK_STMGR_V2], [test "x$HAVE_RDK_STMGR_V2_H" = "xyes" -a
 AC_FUNC_MALLOC
 
 AC_SUBST(PROFILE_SRC)
-AC_SUBST(XREMGR_FLAGS)
 AC_SUBST(MOCAMGR_FLAGS)
 AC_SUBST(SUBDIRS_MOCA)
 AC_SUBST(SUBDIRS_STORAGESERVICE)

docs/api/dml_parameter_list.md

@@ -4,9 +4,9 @@
 
 | Access | Count | Test Action |
 |--------|-------|-------------|
-| readOnly  | 356 | GET only - assert non-empty or expected value |
-| readWrite | 548 | GET + SET - verify set/get round-trip |
-| **Total** | **904** | |
+| readOnly  | 254 | GET only - assert non-empty or expected value |
+| readWrite | 493 | GET + SET - verify set/get round-trip |
+| **Total** | **747** | |
 
 ---
 
@@ -753,64 +753,9 @@
 | 739 | `Device.Time.NTPServer5Directive` | readWrite | string | Chrony directive used for the numbered NTP server slot. |
 | 740 | `Device.Time.Status` | readWrite | string | Current status of the system time service. |
 | 741 | `Device.Time.X_RDK_CurrentUTCTime` | readOnly | string | Current UTC time reported by the device. |
-| 742 | `Device.X_COMCAST-COM_Xcalibur.Client.SecuritySystem.ssDeviceId` | readOnly | string | Security system device identifier. |
-| 743 | `Device.X_COMCAST-COM_Xcalibur.Client.SecuritySystem.ssDeviceReg` | readOnly | dateTime | Security system device registration time. |
-| 744 | `Device.X_COMCAST-COM_Xcalibur.Client.SecuritySystem.ssErrorCnt` | readOnly | unsignedInt | Security system error count. |
-| 745 | `Device.X_COMCAST-COM_Xcalibur.Client.SecuritySystem.ssRegTs` | readOnly | boolean | Indicates whether a security system registration timestamp is available. |
-| 746 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.ConnectionTable.xreAppId` | readOnly | string | Application identifier for this XRE connection entry. |
-| 747 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.ConnectionTable.xreConnEstTs` | readOnly | string | Connection establishment timestamp for this XRE connection entry. |
-| 748 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.ConnectionTable.xreConnIfName` | readOnly | string | Interface name used by this XRE connection entry. |
-| 749 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.ConnectionTable.xreConnRetryAttempts` | readOnly | unsignedInt | Retry attempts recorded for this XRE connection entry. |
-| 750 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.ConnectionTable.xreConnStatus` | readOnly | string | Current status of this XRE connection entry. |
-| 751 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.ConnectionTable.xreConnURL` | readOnly | string | Connection URL used by this XRE connection entry. |
-| 752 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreAvgCmdProcTime` | readOnly | int | Command processing time statistic reported by XRE. |
-| 753 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreChannelMapId` | readOnly | string | Channel map identifier currently used by the XRE client. |
-| 754 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreCommandCnt` | readOnly | unsignedInt | Count metric reported by the XRE client. |
-| 755 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreControllerId` | readOnly | string | Controller identifier reported by the XRE client. |
-| 756 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreEnable` | readWrite | boolean | Enables or disables the XRE client. |
-| 757 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreErrorCnt` | readOnly | unsignedInt | Count metric reported by the XRE client. |
-| 758 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreFlushLocalCache` | readWrite | boolean | Triggers an XRE local cache flush when set. |
-| 759 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreGatewaySTBMAC` | readOnly | string | Gateway STB MAC address reported by the XRE client. |
-| 760 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreGetTWPDiags` | readOnly | string | Diagnostic payload returned by XRE TWP diagnostics. |
-| 761 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreLastURLAccessed` | readOnly | string | Last URL accessed by the XRE client. |
-| 762 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreLastVideoUrl` | readOnly | string | Last video URL accessed by the XRE client. |
-| 763 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreLogLevel` | readWrite | string | Logging level used by the XRE client. |
-| 764 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreMaxCmdProcTime` | readOnly | int | Command processing time statistic reported by XRE. |
-| 765 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreMinCmdProcTime` | readOnly | int | Command processing time statistic reported by XRE. |
-| 766 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.xrePlantId` | readOnly | string | Plant identifier reported by the XRE client. |
-| 767 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreReceiverId` | readOnly | string | Receiver identifier reported by the XRE client. |
-| 768 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreRefreshXreSession` | readWrite | boolean | Triggers XRE session refresh behavior. |
-| 769 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreRefreshXreSessionWithRR` | readWrite | int | Controls refresh-with-RR behavior for the XRE session. |
-| 770 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreSessionId` | readOnly | string | Active XRE session identifier reported by the client. |
-| 771 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreSessionLastModTs` | readOnly | string | Timestamp of the last XRE session update. |
-| 772 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreSessionUptime` | readOnly | string | Uptime of the current XRE session. |
-| 773 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreStatus` | readOnly | string | Configuration or status value for the XRE client. |
-| 774 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreTotAnimCnt` | readOnly | unsignedInt | Count metric reported by the XRE client. |
-| 775 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreTotAppCnt` | readOnly | unsignedInt | Count metric reported by the XRE client. |
-| 776 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreTotFlashCnt` | readOnly | unsignedInt | Count metric reported by the XRE client. |
-| 777 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreTotFontCnt` | readOnly | unsignedInt | Count metric reported by the XRE client. |
-| 778 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreTotHtmlTxtCnt` | readOnly | unsignedInt | Count metric reported by the XRE client. |
-| 779 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreTotImgCnt` | readOnly | unsignedInt | Count metric reported by the XRE client. |
-| 780 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreTotNineSliceImgCnt` | readOnly | unsignedInt | Count metric reported by the XRE client. |
-| 781 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreTotRectCnt` | readOnly | unsignedInt | Count metric reported by the XRE client. |
-| 782 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreTotSoundCnt` | readOnly | unsignedInt | Count metric reported by the XRE client. |
-| 783 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreTotStyleshtCnt` | readOnly | unsignedInt | Count metric reported by the XRE client. |
-| 784 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreTotTxtCnt` | readOnly | unsignedInt | Count metric reported by the XRE client. |
-| 785 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreTotTxtIpCnt` | readOnly | unsignedInt | Count metric reported by the XRE client. |
-| 786 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreTotVideoCnt` | readOnly | unsignedInt | Count metric reported by the XRE client. |
-| 787 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreTotViewCnt` | readOnly | unsignedInt | Count metric reported by the XRE client. |
-| 788 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreVersion` | readOnly | string | Version string reported by the XRE client. |
-| 789 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreVodId` | readOnly | string | VOD identifier reported by the XRE client. |
-| 790 | `Device.X_COMCAST-COM_Xcalibur.Client.xconfCheckNow` | readWrite | string | Triggers an immediate Xconf check for the Xcalibur client. |
-| 791 | `Device.X_COMCAST-COM_Xcalibur.DevApp.devAppNumAps` | readOnly | unsignedInt | Number of DevApp application entries reported by the platform. |
-| 792 | `Device.X_COMCAST-COM_Xcalibur.DevApp.devAppTable.{i}.devAppId` | readOnly | string | Application identifier for this DevApp entry. |
-| 793 | `Device.X_COMCAST-COM_Xcalibur.DevApp.devAppTable.{i}.devAppRestartCapability` | readOnly | string | Restart capability reported for this DevApp entry. |
-| 794 | `Device.X_COMCAST-COM_Xcalibur.TRM.trmGatewayDeviceFriendlyName` | readOnly | string | Gateway identification value reported by TRM. |
-| 795 | `Device.X_COMCAST-COM_Xcalibur.TRM.trmGatewayMoCAIP` | readOnly | string | Gateway identification value reported by TRM. |
-| 796 | `Device.X_COMCAST-COM_Xcalibur.TRM.trmGatewayMoCAMAC` | readOnly | string | Gateway identification value reported by TRM. |
-| 797 | `Device.X_COMCAST-COM_Xcalibur.TRM.trmGatewaySTBMAC` | readOnly | string | Gateway identification value reported by TRM. |
-| 798 | `Device.X_RDKCENTRAL-COM_T2.ReportProfiles` | readWrite | string | Telemetry 2.0 report profiles payload. |
-| 799 | `Device.X_RDKCENTRAL-COM_T2.ReportProfilesMsgPack` | readWrite | string | Telemetry 2.0 report profiles payload. |
-| 800 | `Device.X_RDK_WebPA_DNSText.URL` | readWrite | string | Bootstrap URL used to retrieve WebPA DNS text records. |
-| 801 | `Device.X_RDK_WebPA_Server.URL` | readOnly | string | Current WebPA server URL from the bootstrap store. |
-| 802 | `Device.X_RDK_WebPA_TokenServer.URL` | readOnly | string | Current WebPA token server URL from the bootstrap store. |
+| 742 | `Device.X_COMCAST-COM_Xcalibur.Client.xconfCheckNow` | readWrite | string | Triggers an immediate Xconf check for the Xcalibur client. |
+| 743 | `Device.X_RDKCENTRAL-COM_T2.ReportProfiles` | readWrite | string | Telemetry 2.0 report profiles payload. |
+| 744 | `Device.X_RDKCENTRAL-COM_T2.ReportProfilesMsgPack` | readWrite | string | Telemetry 2.0 report profiles payload. |
+| 745 | `Device.X_RDK_WebPA_DNSText.URL` | readWrite | string | Bootstrap URL used to retrieve WebPA DNS text records. |
+| 746 | `Device.X_RDK_WebPA_Server.URL` | readOnly | string | Current WebPA server URL from the bootstrap store. |
+| 747 | `Device.X_RDK_WebPA_TokenServer.URL` | readOnly | string | Current WebPA token server URL from the bootstrap store. |

docs/integration/build-setup.md

@@ -26,7 +26,6 @@ The top-level `configure.ac` currently exposes feature toggles including:
 
 | Flag | Effect |
 |------|--------|
-| `--enable-xre` | Enable XRE-related profile support |
 | `--enable-moca` / `--enable-moca2` | Enable MoCA profile support |
 | `--enable-DHCPv4` | Enable DHCPv4 profile support |
 | `--enable-StorageService` | Enable StorageService profile support |

run_ut.sh

@@ -81,7 +81,7 @@ touch /tmp/timeReceivedNTP
 touch /tmp/webpa/start_time 
 touch /opt/persistent/firstNtpTime
 touch /etc/rfcdefaults/rfcdefaults.ini
-touch /opt/XRE_container_enable /opt/dab-enable
+touch /opt/dab-enable
 touch /opt/.ntpEnabled
 touch /var/tmp/rssh.pid
 cat /version.txt

src/Makefile.am

@@ -71,18 +71,10 @@ if WITH_WEBPA_RFC
 AM_CXXFLAGS += -DWEBPA_RFC_ENABLED
 endif
 
-if XRELIB_FLAG
-AM_LDFLAGS = $(GLIB_LDFLAGS) $(GLIB_LIBS) \
-	$(G_THREAD_LIBS) -lyajl $(SOUP_LIBS) \
-	$(NEXUS_LIB) -ldbus-1 \
-	-lIARMBus -lrdkloggers \
-	-ltr69ProfileXcaliber -lrbus
-else
 AM_LDFLAGS = $(GLIB_LDFLAGS) $(GLIB_LIBS) \
 	$(G_THREAD_LIBS) -lyajl $(SOUP_LIBS) \
 	$(NEXUS_LIB) -ldbus-1 \
 	-lIARMBus -lrdkloggers -lrbus
-endif
 
 if WITH_THUNDER_CLIENT
 else
@@ -143,10 +135,6 @@ if WITH_MOCA_PROFILE
 tr69hostif_LDADD += $(top_builddir)/src/hostif/profiles/moca/libhostIfMoCA.la
 endif
 
-if XRELIB_FLAG
-tr69hostif_LDADD += -ltr69ProfileXcaliber
-endif
-
 AM_CXXFLAGS += -I$(top_srcdir)/src/hostif/parodusClient/pal 
 AM_CXXFLAGS += -I$(top_srcdir)/src/hostif/parodusClient/waldb
 tr69hostif_LDADD += $(top_builddir)/src/hostif/parodusClient/waldb/libwaldb.la

src/hostif/handlers/Makefile.am

@@ -22,7 +22,6 @@ DIST_SUBDIRS =
 
 AM_CXXFLAGS = -I$(top_srcdir)/src/hostif/include \
 	-I$(top_srcdir)/src/hostif/profiles/STBService \
-	-I$(top_srcdir)/src/hostif/profiles/X_COMCAST-COM/X_COMCAST-COM_Xcalibur/include \
 	-I$(top_srcdir)/src/hostif/profiles/moca \
 	-I$(top_srcdir)/src/hostif/profiles/Ethernet \
 	-I$(top_srcdir)/src/hostif/profiles/Device \
@@ -34,9 +33,8 @@ AM_CXXFLAGS = -I$(top_srcdir)/src/hostif/include \
 	-I$(top_srcdir)/src/hostif/profiles/InterfaceStack \
 	-I$(top_srcdir)/src/hostif/profiles/StorageService \
 	-I$(PKG_CONFIG_SYSROOT_DIR)$(includedir)/rdk/iarmmgrs/sysmgr \
-	-I$(top_srcdir)/src/hostif/profiles/moca \
 	-I./include $(GLIB_CFLAGS) $(G_THREAD_CFLAGS) \
-	$(XREMGR_FLAGS) $(MOCAMGR_FLAGS) $(SOUP_CFLAGS) $(MOCA2_FLAG) \
+	$(MOCAMGR_FLAGS) $(SOUP_CFLAGS) $(MOCA2_FLAG) \
 	$(XRDK_SDCARD_PROFILE_FLAG) $(XRDK_EMMC_PROFILE_FLAG) \
         -I=/usr/include/rdk/iarmbus/ \
         -I=/usr/include/rdk/iarmmgrs/sysmgr/ \

src/hostif/handlers/docs/README.md

@@ -193,7 +193,7 @@ These classes own specific TR-181 areas or integration namespaces and are the ob
 | `DHCPv4ClientReqHandler` | `Device.DHCPv4.Client.*` | Read-only handler in practice for the current code path; returns client interface references, routers, and DNS servers, and reports the client entry count |
 | `InterfaceStackClientReqHandler` | `Device.InterfaceStack.*` | Read-only handler that exposes higher-layer and lower-layer relationships between interfaces and reports `InterfaceStackNumberOfEntries` |
 | `StorageSrvcReqHandler` | `Device.services.StorageService.*` | Delegates storage-service GET requests to `hostIf_StorageSrvc`; the current implementation exposes reads and leaves SET and attribute support effectively unimplemented |
-| `XREClientReqHandler` | `Device.X_COMCAST-COM_Xcalibur.Client.*`, `...Client.XRE.*`, and related XRE/DevApp control parameters | Handles XRE operational controls such as xconf check-now, session refresh, XRE restart, cache flush, log level changes, and receiver/dev-app restart flows when the XRE profile is enabled |
+| `XREClientReqHandler` | `Device.X_COMCAST-COM_Xcalibur.Client.xconfCheckNow` | Handles the xconf check-now parameter only; triggers the rdkvfwupgrader script when set to `TRUE` or `CANARY`, and persists the value to `/tmp/xconfchecknow_val` |
 | `XRdkCentralT2` | `Device.X_RDKCENTRAL-COM_T2.ReportProfiles` and `...ReportProfilesMsgPack` | Pass-through handler that forwards Telemetry 2 profile payloads to RBUS, supports long-string transfer using `paramValueLong`, and cross-checks written report profile data |
 | `X_rdk_req_hdlr` | Parameters under the internal `X_RDK_PREFIX_STR` namespace | Thin mutex-protected wrapper around `X_rdk_profile`, used for RDK-specific parameters that are not part of the main standard object handlers |
 

src/hostif/handlers/include/hostIf_XREClient_ReqHandler.h

@@ -18,12 +18,13 @@
 */
 /**
  * @file hostIf_XREClient_ReqHandler.h
- * @brief The header file provides HostIf XRE Client request handler information APIs.
+ * @brief Minimal handler for Device.X_COMCAST-COM_Xcalibur.Client.xconfCheckNow parameter.
+ * @note All XRE/Xcalibur profile features except xconfCheckNow have been removed.
  */
 
 /**
  * @defgroup TR-069HOSTIF_XRECLIENT_REQHANDLER_CLASSES XREClient RequestHandler Public Classes
- * Describe the details about classes used in TR-069 XREClient request handler.
+ * Describe the minimal classes used in TR-069 xconfCheckNow request handler.
  * @ingroup TR-069HOSTIF_DEVICECLIENT_HANDLER
  */
 
@@ -48,23 +49,20 @@
 #define HOSTIF_XRECLIENT_REQHANDLER_H_
 
 #include "hostIf_msgHandler.h"
-#include "hostIf_updateHandler.h"
 #include "hostIf_main.h"
 #include "secure_wrapper.h"
 
 /**
- * @brief This class provides the interface for getting XRE request handler information.
+ * @brief Minimal handler for xconfCheckNow parameter only.
  * @ingroup TR-069HOSTIF_XRECLIENT_REQHANDLER_CLASSES
  */
 class XREClientReqHandler : public msgHandler
 {
     XREClientReqHandler() {};
     ~XREClientReqHandler() {};
     static class XREClientReqHandler *pInstance;
-    static updateCallback mUpdateCallback;
     static GMutex m_mutex;
     static void getLock();
-    static int numOfEntries;
 public:
     virtual bool init();
     virtual bool unInit();
@@ -75,7 +73,6 @@ class XREClientReqHandler : public msgHandler
     static void releaseLock();
     static void checkForUpdates();
     static void reset();
-    static void registerUpdateCallback(updateCallback cb);
     static msgHandler* getInstance();
 };