...

$ cd ~/rdkb/components/opensource/ccsp/CcspEthAgent
$ git fetch https://code.rdkcentral.com/r/rdkb/components/opensource/ccsp/CcspEthAgent refs/changes/98/58898/24 && git cherry-pick FETCH_HEAD

$ cd ~/rdkbrdk/components/generic/json-rpcrdk_logger
$ git fetch https://code.rdkcentral.com/r/rdkbrdk/components/generic/json-rpcrdk_logger refs/changes/9185/5889158885/1 && git cherry-pick FETCH_HEAD 

$ cd ~/rdkrdkb/components/opensource/genericccsp/rdk_loggerCcspPandM
$ git fetch https://code.rdkcentral.com/r/rdkrdkb/components/opensource/genericccsp/rdk_loggerCcspPandM refs/changes/8551/5888558951/13 && git cherry-pick FETCH_HEAD

$ cd ~/rdkb/components/opensource/ccsp/CcspPandMmeta-cmf-raspberrypi
$ git fetch https://code.rdkcentral.com/r/rdkbrdk/components/opensourcegeneric/ccsp/CcspPandMrdk-oe/meta-cmf-raspberrypi refs/changes/5126/5895159026/14 && git cherry-pick FETCH_HEAD

$ cd ~/meta-cmf-broadband
$ git fetch https://code.rdkcentral.com/r/rdk/components/generic/rdk-oe/meta-cmf-broadband refs/changes/65/58865/2 && git cherry-pick FETCH_HEAD

$ cd ~/meta-cmf-raspberrypi
$ git fetch https://code.rdkcentral.com/r/rdk/components/generic/rdk-oe/meta-cmf-raspberrypi refs/changes/26/59026/2 && git cherry-pick FETCH_HEAD

Note : The above bug fixes changes are temporary given as instructions. This is not required once the change is gets merged into the appropriate repo.

Build steps

$ MACHINE=raspberrypi-rdk-broadband source meta-cmf-raspberrypi/setup-environment
$ bitbake rdk-generic-broadband-image

We will get the following rdk-wanmanager compilation errors While bitbaking the target image,

../../../git/source/WanManager/wanmgr_interface_sm.c:720:62: error: macro "LOG_CONSOLE" passed 3 arguments, but takes just 0
         LOG_CONSOLE("%s Wan_init_complete:%d\n",buffer,uptime);
                                                              ^
../../../git/source/WanManager/wanmgr_interface_sm.c:720:9: error: 'LOG_CONSOLE' undeclared (first use in this function)
         LOG_CONSOLE("%s Wan_init_complete:%d\n",buffer,uptime);
         ^~~~~~~~~~~

$ cd ~/build-raspberrypi-rdk-broadband/tmp/work/cortexa7t2hf-neon-vfpv4-rdk-linux-gnueabi/rdk-wanmanager/1.99+gitAUTOINC+b6db33d891-r0/git/source
$ git fetch https://code.rdkcentral.com/r/rdkb/components/opensource/ccsp/RdkWanManager refs/changes/00/58500/2 && git cherry-pick FETCH_HEAD

$ bitbake rdk-wanmanager -c compile -f
$ bitbake  rdk-generic-broadband-image

Note: The above bug fixes changes are temporary given as instructions. This is not required once the change is gets merged into the appropriate repo.

Control Flow

Following diagram depicts the flow of control among the components,

...

Note : The above bug fixes changes are temporary given as instructions. This is not required once the change is gets merged into the appropriate repo.

Image Generation Steps

$ MACHINE=raspberrypi-rdk-broadband source meta-cmf-raspberrypi/setup-environment
$ bitbake rdk-generic-broadband-image

Control Flow

Following diagram depicts the flow of control among the components,

• platform-hal (i.e. hal-ethsw) will send the callbacks(pGWP_act_EthWanLinkUP /pGWP_act_EthWanLinkDOWN) whenever physical link event change to EthAgent.
• CcspEthAgent will pass the link change event to Wan Manager,
                     It will set the value for Wan Manger DM ‘Device.X_RDK_WanManager.CPEInterface.1.Wan.LinkStatus’  

Approach

Integration Approach

Manifest Changes

<project name="rdkb/components/opensource/ccsp/RdkWanManager" revision="rdk-next"/>
<project name="rdkb/components/generic/json-rpc" revision="rdk-next"/>

Global CFLAGS

• FEATURE_RDKB_WANMANAGER is the global CFLAG used in other components to use with WANMANAGER feature.
• All the changes are enclosed inside FEATURE_RDKB_WAN_MANAGER compilation flag, this CFLAG can be used to control whether or not to
  compile the WanManager code changes.

We enabled WanManager CFLAGS in below file in rpi(meta-cmf-raspberrypi) layer,

CFLAGS_append += "${@bb.utils.contains('DISTRO_FEATURES', 'rdkb_wan_manager', ' -DFEATURE_RDKB_WAN_MANAGER ', '', d)}"

Distro Features

We are using the following distro features to enable rdkb wanmanager in RPI machine configuration file,

• rdkb_wan_manager : Used to enable RDK WanManager and json hal

DISTRO_FEATURES_append = "  rdkb_wan_manager"

Also , we need to disable the GwProvapp-EthWan component in ccsp packagegroup . 

GWPROVAPP = ""

Package Group

To enable the RDKB Wanmanager components, added those components into the final build target.  So, We have added those components into the  ccsp packagegroup(58865),

RDEPENDS_packagegroup-rdk-ccsp-broadband_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'rdkb_wan_manager', ' rdk-wanmanager json-hal-lib hal-json-ethsw', '', d)} "

ethsw(platform-hal)

• Developed C HAL API's to support the ETH Agent for WanManager Feature .

Utopia CFLAG

• To disable the utopia service_wan execution , we need to enable the utopia _WAN_MANAGER_ENABLED_ flag would mean that the RdkWanManager controls the Wan Management.   

  
  

  Code Block
  language bash title utopia.bbappend
  CFLAGS_append += "${@bb.utils.contains('DISTRO_FEATURES', 'rdkb_wan_manager', ' -D_WAN_MANAGER_ENABLED_', '', d)}"

                   

...

• Eth Hal will configure interface and monitor the link. CcspEthAgent will subscribe for ‘EthInterfaceStatus’ event so that it can receive the notification form Vendor Software (i.e. Eth Hal)
  whenever physical link event change.
• CcspEthAgent will pass the link change event to Wan Manager,
                     It will set the value for Wan Manger DM ‘Device.X_RDK_WanManager.CPEInterface.1.Wan.LinkStatus’  

Approach

Integration Approach

Manifest Changes

<project name="rdkb/components/opensource/ccsp/RdkWanManager" revision="rdk-next"/>
<project name="rdkb/components/generic/json-rpc" revision="rdk-next"/>

Note :  RdkWanManager Project will be added in RPI Manifest , Once the RdkWanManager Compilation error changes are merged in rdk-next(58500) 

Global CFLAGS

• FEATURE_RDKB_WANMANAGER is the global CFLAG used in other components to use with WANMANAGER feature.
• All the changes are enclosed inside FEATURE_RDKB_WAN_MANAGER compilation flag, this CFLAG can be used to control whether or not to
  compile the WanManager code changes.

We enabled WanManager CFLAGS in below file in rpi(meta-cmf-raspberrypi) layer,

CFLAGS_append += "${@bb.utils.contains('DISTRO_FEATURES', 'rdkb_wan_manager', ' -DFEATURE_RDKB_WAN_MANAGER ', '', d)}"

Distro Features

We are using the following distro features to enable rdkb wanmanager in RPI machine configuration file,

• rdkb_wan_manager : Used to enable RDK WanManager and json hal

DISTRO_FEATURES_append = "  rdkb_wan_manager"

Also , we need to disable the GwProvapp-EthWan component in ccsp packagegroup . 

GWPROVAPP = ""

Package Group

To enable the RDKB Wanmanager components, added those components into the final build target.  So, We have added those components into the  ccsp packagegroup(58865),

RDEPENDS_packagegroup-rdk-ccsp-broadband_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'rdkb_wan_manager', ' rdk-wanmanager json-hal-lib hal-json-ethsw', '', d)} "

hal-json-ethsw(Eth Hal)

...

Persistent (PSM) configuration changes

For wanmanager, the default configurations are stored in PSM. As of now, we have 1 interfaces defined for WAN in wanmanager modules (i,e) wanoe.

For WANOE, by default we are using `eth0 `port for WAN connection. 

Example PSM Configurations

Recipe-path for JSON HAL server(58865)

...

Utopia CFLAG

...

CFLAGS_append += "${@bb.utils.contains('DISTRO_FEATURES', 'rdkb_wan_manager', ' -D_WAN_MANAGER_ENABLED_', '', d)}"

Persistent (PSM) configuration changes

For wanmanager, the default configurations are stored in PSM. As of now, we have 1 interfaces defined for WAN in wanmanager modules (i,e) wanoe.

For WANOE, by default we are using `eth0 `port for WAN connection. 

...

<Record name=""dmsb.wanmanager.if.2.Name"" type=""astr"">eth0</Record>

Example PSM Configurations

Major Errors and Challenges 

Major Errors and Challenges 

...

          Following systemd service file's status needs to be verfiy,

...

1.  utopia
2.  CcspEthAgent
3. CcspPandMSsp

Image Removed

...

Using dmcli commands to verify the LinkStatus(CcspEthAgent will pass the LinkStatus to WanManager )

...