From c316f2d6aa29b503a49fd2b7750c465d9db1bbe2 Mon Sep 17 00:00:00 2001
From: Kavitha Ramalingam <ramalingam_k@hcl.com>
Date: Fri, 25 Oct 2024 12:43:33 +0530
Subject: [PATCH] gNOI Cold Reboot - Integrated Docker and Makefile changes

---
 dockers/docker-framework/Dockerfile.j2        |   3 +-
 dockers/docker-framework/framework.sh         |   1 -
 dockers/docker-framework/start.sh             |   1 -
 .../docker-framework/versions-deb-bookworm    | 229 ++++++++++++++++++
 .../dockers/docker-framework/versions-py3     |  26 ++
 .../docker-sonic-vs/versions-deb-bookworm     | 140 +++++++++++
 .../docker-sonic-vs/versions-deb-bullseye     |   1 +
 files/build_templates/framework.service.j2    |  22 ++
 files/build_templates/init_cfg.json.j2        |   3 +-
 platform/vs/docker-sonic-vs.mk                |   6 +-
 platform/vs/docker-sonic-vs/start.sh          |   2 +
 rules/docker-framework.dep                    |  10 +
 rules/docker-framework.mk                     |  35 +++
 rules/framework.dep                           |  13 +
 rules/framework.mk                            |  19 ++
 sonic-slave-bookworm/Dockerfile.j2            |   2 +
 sonic-slave-bullseye/Dockerfile.j2            |   2 +
 src/sonic-framework/Makefile.am               |  19 ++
 src/sonic-framework/autogen.sh                |   5 +
 src/sonic-framework/configure.ac              |  84 +++++++
 src/sonic-framework/debian/changelog          |   6 +
 src/sonic-framework/debian/compat             |   1 +
 src/sonic-framework/debian/control            |  18 ++
 src/sonic-framework/debian/rules              |  38 +++
 src/sonic-framework/package.cfg               |  15 ++
 src/sonic-framework/rebootbackend/Makefile.am |  19 ++
 .../rebootbackend/interfaces.cpp              |   4 +-
 .../rebootbackend/interfaces.h                |  10 +
 .../rebootbackend/reboot_common.cpp           |  14 ++
 .../rebootbackend/reboot_common.h             |   4 +-
 .../rebootbackend/reboot_thread.cpp           |   6 +-
 .../rebootbackend/reboot_thread.h             |   1 -
 .../rebootbackend/rebootbackend.cpp           |   5 +-
 .../rebootbackend/rebootbe.cpp                |  14 +-
 src/sonic-framework/rebootbackend/rebootbe.h  |  12 +-
 src/sonic-framework/tests/Makefile.am         |  56 +++++
 .../tests/reboot_thread_test.cpp              |   1 -
 src/sonic-framework/tests/rebootbe_test.cpp   |  21 +-
 .../tests/test_utils_common.cpp               |   1 -
 39 files changed, 815 insertions(+), 54 deletions(-)
 create mode 100644 files/build/versions/dockers/docker-framework/versions-deb-bookworm
 create mode 100644 files/build/versions/dockers/docker-framework/versions-py3
 create mode 100644 files/build/versions/dockers/docker-sonic-vs/versions-deb-bookworm
 create mode 100644 files/build_templates/framework.service.j2
 create mode 100644 rules/docker-framework.dep
 create mode 100644 rules/docker-framework.mk
 create mode 100644 rules/framework.dep
 create mode 100644 rules/framework.mk
 create mode 100644 src/sonic-framework/Makefile.am
 create mode 100755 src/sonic-framework/autogen.sh
 create mode 100644 src/sonic-framework/configure.ac
 create mode 100644 src/sonic-framework/debian/changelog
 create mode 100644 src/sonic-framework/debian/compat
 create mode 100644 src/sonic-framework/debian/control
 create mode 100755 src/sonic-framework/debian/rules
 create mode 100644 src/sonic-framework/package.cfg
 create mode 100644 src/sonic-framework/rebootbackend/Makefile.am
 create mode 100644 src/sonic-framework/rebootbackend/reboot_common.cpp
 create mode 100644 src/sonic-framework/tests/Makefile.am

diff --git a/dockers/docker-framework/Dockerfile.j2 b/dockers/docker-framework/Dockerfile.j2
index c9c71d402e84..44ff3c1d2816 100644
--- a/dockers/docker-framework/Dockerfile.j2
+++ b/dockers/docker-framework/Dockerfile.j2
@@ -1,5 +1,5 @@
 {% from "dockers/dockerfile-macros.j2" import install_debian_packages, install_python_wheels, copy_files %}
-FROM docker-config-engine-bullseye-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
+FROM docker-config-engine-bookworm-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
 
 ARG docker_container_name
 RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf
@@ -30,5 +30,4 @@ COPY ["supervisord.conf", "/etc/supervisor/conf.d/"]
 COPY ["files/supervisor-proc-exit-listener", "/usr/bin"]
 # COPY ["git_commits", "/usr"]
 
-
 ENTRYPOINT ["/usr/local/bin/supervisord"]
diff --git a/dockers/docker-framework/framework.sh b/dockers/docker-framework/framework.sh
index 68e72417fd2a..2d2e4c2c6fa5 100755
--- a/dockers/docker-framework/framework.sh
+++ b/dockers/docker-framework/framework.sh
@@ -1,4 +1,3 @@
 #!/usr/bin/env bash
 
-
 exec /usr/local/bin/framework --logtostderr
diff --git a/dockers/docker-framework/start.sh b/dockers/docker-framework/start.sh
index 1235a4e5a671..d6722a27fc77 100755
--- a/dockers/docker-framework/start.sh
+++ b/dockers/docker-framework/start.sh
@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
 
-
 mkdir -p /var/sonic
 echo "# Config files managed by sonic-config-engine" > /var/sonic/config_status
diff --git a/files/build/versions/dockers/docker-framework/versions-deb-bookworm b/files/build/versions/dockers/docker-framework/versions-deb-bookworm
new file mode 100644
index 000000000000..d3c4068c849f
--- /dev/null
+++ b/files/build/versions/dockers/docker-framework/versions-deb-bookworm
@@ -0,0 +1,229 @@
+adduser==4.118+deb11u1
+apt==2.2.4
+apt-utils==2.2.4
+base-files==11.1+deb11u9
+base-passwd==3.5.51
+bash==5.1-2+deb11u1
+bsdutils==1:2.36.1-8+deb11u2
+ca-certificates==20210119
+coreutils==8.32-4+b1
+curl==7.74.0-1.3+deb11u11
+dash==0.5.11+git20200708+dd9ef66-5
+debconf==1.5.77
+debian-archive-keyring==2021.1.1+deb11u1
+debianutils==4.11.2
+diffutils==1:3.7-5
+dpkg==1.20.13
+dpkg-dev==1.20.13
+e2fsprogs==1.46.2-2
+findutils==4.8.0-1
+framework==1.0.0
+framework-dbg==1.0.0
+gcc-10-base==10.2.1-6
+gcc-9-base==9.3.0-22
+gdb==10.1-1.7
+gdbserver==10.1-1.7
+gpgv==2.2.27-2+deb11u2
+grep==3.6-1+deb11u1
+gzip==1.10-4+deb11u1
+hostname==3.23
+init-system-helpers==1.60
+iproute2==5.10.0-4
+jq==1.6-2.1
+less==551-2+deb11u2
+libabsl20200923==0~20200923.3-2
+libacl1==2.2.53-10
+libapt-pkg6.0==2.2.4
+libatomic1==10.2.1-6
+libattr1==1:2.4.48-6
+libaudit-common==1:3.0-2
+libaudit1==1:3.0-2
+libbabeltrace1==1.5.8-1+b3
+libblkid1==2.36.1-8+deb11u2
+libboost-regex1.74.0==1.74.0-9
+libboost-serialization1.74.0==1.74.0-9
+libbpf0==1:0.3-3
+libbrotli1==1.0.9-2+b2
+libbsd0==0.11.3-1+deb11u1
+libbz2-1.0==1.0.8-4
+libc-ares2==1.17.1-1+deb11u3
+libc-bin==2.31-13+deb11u10
+libc6==2.31-13+deb11u10
+libcap-ng0==0.7.9-2.2+b1
+libcap2==1:2.44-1
+libcap2-bin==1:2.44-1
+libcbor0==0.5.0+dfsg-2
+libcom-err2==1.46.2-2
+libcrypt1==1:4.4.18-4
+libcurl3-gnutls==7.74.0-1.3+deb11u11
+libcurl4==7.74.0-1.3+deb11u11
+libdaemon0==0.14-7.1
+libdb5.3==5.3.28+dfsg1-0.8
+libdbus-1-3==1.12.28-0+deb11u1
+libdbus-c++-1-0v5==0.9.0-8.2
+libdebconfclient0==0.260
+libdebuginfod1==0.183-1
+libdw1==0.183-1
+libecore1==1.25.1-1
+libedit2==3.1-20191231-2+b1
+libeina1a==1.25.1-1
+libelf1==0.183-1
+libestr0==0.1.10-2.1+b1
+libexpat1==2.2.10-2+deb11u5
+libext2fs2==1.46.2-2
+libfastjson4==0.99.9-1
+libffi7==3.3-6
+libfido2-1==1.6.0-2
+libgcc-s1==10.2.1-6
+libgcrypt20==1.8.7-6
+libgdbm-compat4==1.19-2
+libgdbm6==1.19-2
+libglib2.0-0==2.66.8-1+deb11u3
+libgmp10==2:6.2.1+dfsg-1+deb11u1
+libgnutls30==3.7.1-5+deb11u4
+libgpg-error0==1.38-2
+libgpm2==1.20.7-8
+libgrpc++1==1.30.2-3
+libgrpc10==1.30.2-3
+libgssapi-krb5-2==1.18.3-6+deb11u4
+libhiredis0.14==0.14.1-1
+libhiredis0.14-dbgsym==0.14.1-1
+libhogweed6==3.7.3-1
+libicu67==67.1-7
+libidn2-0==2.3.0-5
+libipt2==2.0.3-1
+libjansson4==2.13.1-1.1
+libjemalloc2==5.2.1-3
+libjq1==1.6-2.1
+libjs-jquery==3.5.1+dfsg+~3.5.5-7
+libk5crypto3==1.18.3-6+deb11u4
+libkeyutils1==1.6.1-2
+libkrb5-3==1.18.3-6+deb11u4
+libkrb5support0==1.18.3-6+deb11u4
+libldap-2.4-2==2.4.57+dfsg-3+deb11u1
+liblognorm5==2.0.5-1.1
+liblua5.1-0==5.1.5-8.1+b3
+liblz4-1==1.9.3-2
+liblzf1==3.6-3
+liblzma5==5.2.5-2.1~deb11u1
+libmd0==1.0.3-3
+libmnl0==1.0.4-3
+libmount1==2.36.1-8+deb11u2
+libmpdec3==2.5.1-1
+libmpfr6==4.1.0-3
+libncurses6==6.2+20201114-2+deb11u2
+libncursesw6==6.2+20201114-2+deb11u2
+libnettle8==3.7.3-1
+libnghttp2-14==1.43.0-1+deb11u1
+libnl-3-200==3.5.0-1
+libnl-cli-3-200==3.5.0-1
+libnl-genl-3-200==3.5.0-1
+libnl-nf-3-200==3.5.0-1
+libnl-route-3-200==3.5.0-1
+libnorm1==1.5.9+dfsg-2
+libnsl2==1.3.0-2
+libonig5==6.9.6-1.1
+libp11-kit0==0.23.22-1
+libpam-modules==1.4.0-9+deb11u1
+libpam-modules-bin==1.4.0-9+deb11u1
+libpam-runtime==1.4.0-9+deb11u1
+libpam0g==1.4.0-9+deb11u1
+libpcre2-8-0==10.36-2+deb11u1
+libpcre3==2:8.39-13
+libperl5.32==5.32.1-4+deb11u3
+libpgm-5.3-0==5.3.128~dfsg-2
+libprocps8==2:3.3.17-5
+libprotobuf-dev==3.21.12-3
+libprotobuf-lite32==3.21.12-3
+libprotobuf32==3.21.12-3
+libprotoc32==3.21.12-3
+libpsl5==0.21.0-1.2
+libpython3-stdlib==3.9.2-3
+libpython3.9==3.9.2-1
+libpython3.9-minimal==3.9.2-1
+libpython3.9-stdlib==3.9.2-1
+libreadline8==8.1-1
+librtmp1==2.4+20151223.gitfa8646d.1-2+b2
+libsasl2-2==2.1.27+dfsg-2.1+deb11u1
+libsasl2-modules-db==2.1.27+dfsg-2.1+deb11u1
+libseccomp2==2.5.1-1+deb11u1
+libselinux1==3.1-3
+libsemanage-common==3.1-1
+libsemanage1==3.1-1+b2
+libsepol1==3.1-1
+libsmartcols1==2.36.1-8+deb11u2
+libsodium23==1.0.18-1
+libsource-highlight-common==3.1.9-3
+libsource-highlight4v5==3.1.9-3+b1
+libsqlite3-0==3.34.1-3
+libss2==1.46.2-2
+libssh2-1==1.9.0-2
+libssl1.1==1.1.1w-0+deb11u1
+libstdc++6==10.2.1-6
+libswsscommon==1.0.0
+libswsscommon-dbgsym==1.0.0
+libsystemd0==247.3-7+deb11u4
+libtasn1-6==4.16.0-2+deb11u1
+libtinfo6==6.2+20201114-2+deb11u2
+libtirpc-common==1.3.1-1+deb11u1
+libtirpc3==1.3.1-1+deb11u1
+libudev1==247.3-7+deb11u4
+libunistring2==0.9.10-4
+libunwind8==1.3.2-2
+libuuid1==2.36.1-8+deb11u2
+libwrap0==7.6.q-31
+libxtables12==1.8.7-1
+libxxhash0==0.8.0-2
+libyang==1.0.73
+libyang-cpp==1.0.73
+libzmq5==4.3.4-1+deb11u1
+libzstd1==1.4.8+dfsg-2.1
+login==1:4.8.1-1
+logsave==1.46.2-2
+lsb-base==11.1.0
+lua-bitop==1.0.2-5
+lua-cjson==2.1.0+dfsg-2.1
+mawk==1.3.4.20200120-2
+media-types==4.0.0
+mount==2.36.1-8+deb11u2
+ncurses-base==6.2+20201114-2+deb11u2
+ncurses-bin==6.2+20201114-2+deb11u2
+net-tools==1.60+git20181103.0eebece-1
+netbase==6.3
+openssh-client==1:8.4p1-5+deb11u3
+openssl==1.1.1w-0+deb11u1
+passwd==1:4.8.1-1
+perl==5.32.1-4+deb11u3
+perl-base==5.32.1-4+deb11u3
+perl-modules-5.32==5.32.1-4+deb11u3
+procps==2:3.3.17-5
+protobuf-compiler==3.21.12-3
+python-is-python3==3.9.2-1
+python3==3.9.2-3
+python3-distutils==3.9.2-1
+python3-lib2to3==3.9.2-1
+python3-minimal==3.9.2-3
+python3-swsscommon==1.0.0
+python3-yang==1.0.73
+python3.9==3.9.2-1
+python3.9-minimal==3.9.2-1
+readline-common==8.1-1
+redis-tools==5:6.0.16-1+deb11u2
+rsyslog==8.2302.0-1~bpo11+1
+sed==4.7-1
+socat==1.7.4.1-3
+sonic-build-hooks==1.0
+sonic-db-cli==1.0.0
+sonic-eventd==1.0.0-0
+sshpass==1.09-1+b1
+strace==5.10-1
+sysvinit-utils==2.96-7+deb11u1
+tar==1.34+dfsg-1+deb11u1
+tzdata==2024a-0+deb11u1
+util-linux==2.36.1-8+deb11u2
+vim==2:8.2.2434-3+deb11u1
+vim-common==2:8.2.2434-3+deb11u1
+vim-runtime==2:8.2.2434-3+deb11u1
+vim-tiny==2:8.2.2434-3+deb11u1
+xxd==2:8.2.2434-3+deb11u1
+zlib1g==1:1.2.11.dfsg-2+deb11u2 
diff --git a/files/build/versions/dockers/docker-framework/versions-py3 b/files/build/versions/dockers/docker-framework/versions-py3
new file mode 100644
index 000000000000..d326d329b6ef
--- /dev/null
+++ b/files/build/versions/dockers/docker-framework/versions-py3
@@ -0,0 +1,26 @@
+async-timeout==4.0.3
+bitarray==1.5.3
+ijson==2.6.1
+ipaddress==1.0.23
+j2cli==0.3.10
+jinja2==3.1.4
+jsondiff==2.0.0
+lxml==4.9.1
+markupsafe==2.1.5
+natsort==6.2.1
+netaddr==0.8.0
+pip==24.0
+pyang==2.6.0
+pyangbind==0.8.1
+pyyaml==5.4.1
+redis==4.5.4
+redis-dump-load==1.1
+regex==2024.5.10
+setuptools==58.1.0
+six==1.16.0
+supervisor==4.2.1
+supervisord-dependent-startup==1.4.0
+tabulate==0.8.2
+toposort==1.10
+wheel==0.40.0
+xmltodict==0.12.0 
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-deb-bookworm b/files/build/versions/dockers/docker-sonic-vs/versions-deb-bookworm
new file mode 100644
index 000000000000..3567db934fff
--- /dev/null
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-deb-bookworm
@@ -0,0 +1,140 @@
+arping==2.21-2
+bash-completion==1:2.11-2
+bridge-utils==1.7-1
+bzip2==1.0.8-4
+comerr-dev==2.1-1.46.2-2
+conntrack==1:1.4.6-2
+cron==3.0pl1-137
+dbus==1.12.28-0+deb11u1
+dirmngr==2.2.27-2+deb11u2
+dmsetup==2:1.02.175-2.1
+ethtool==1:5.9-1
+fontconfig-config==2.13.1-4.2
+fonts-dejavu-core==2.37-2
+fonts-font-awesome==5.0.10+really4.7.0~dfsg-4.1
+fonts-lato==2.0-2.1
+framework==1.0.0
+frr==8.5.4-sonic-0
+gettext-base==0.21-4
+gir1.2-glib-2.0==1.66.1-1+b1
+gnupg==2.2.27-2+deb11u2
+gnupg-l10n==2.2.27-2+deb11u2
+gnupg-utils==2.2.27-2+deb11u2
+gpg==2.2.27-2+deb11u2
+gpg-agent==2.2.27-2+deb11u2
+gpg-wks-client==2.2.27-2+deb11u2
+gpg-wks-server==2.2.27-2+deb11u2
+gpgconf==2.2.27-2+deb11u2
+gpgsm==2.2.27-2+deb11u2
+grub-common==2.06-3~deb11u6
+grub2-common==2.06-3~deb11u6
+icu-devtools==67.1-7
+ifupdown==0.8.36
+iproute2==6.1.0-3~bpo11+1
+iptables==1.8.7-1
+krb5-multidev==1.18.3-6+deb11u5+fips
+libapparmor1==2.13.6-10
+libassuan0==2.5.3-7.1
+libblkid-dev==2.36.1-8+deb11u2
+libblkid1==2.36.1-8+deb11u2
+libbsd-dev==0.11.3-1+deb11u1
+libc-ares2==1.17.1-1+deb11u3
+libc-dev-bin==2.31-13+deb11u10
+libc6-dev==2.31-13+deb11u10
+libcbor0==0.5.0+dfsg-2
+libcrypt-dev==1:4.4.18-4
+libdevmapper1.02.1==2:1.02.175-2.1
+libdouble-conversion3==3.1.5-6.1
+libedit2==3.1-20191231-2+b1
+libefiboot1==37-6
+libefivar1==37-6
+libfido2-1==1.6.0-2
+libfreetype6==2.10.4+dfsg-1+deb11u1
+libfreetype6-dev==2.10.4+dfsg-1+deb11u1
+libfuse2==2.9.9-5
+libgirepository-1.0-1==1.66.1-1+b1
+libglib2.0-0==2.66.8-1+deb11u4
+libglib2.0-data==2.66.8-1+deb11u4
+libgssapi-krb5-2==1.18.3-6+deb11u5+fips
+libgssrpc4==1.18.3-6+deb11u5+fips
+libicu-dev==67.1-7
+libicu67==67.1-7
+libip4tc2==1.8.7-1
+libip6tc2==1.8.7-1
+libjs-sphinxdoc==3.4.3-2
+libjs-underscore==1.9.1~dfsg-3
+libjson-c5==0.15-2+deb11u1
+libjudydebian1==1.0.5-5+b2
+libk5crypto3==1.18.3-6+deb11u4
+libkadm5clnt-mit12==1.18.3-6+deb11u5+fips
+libkadm5srv-mit12==1.18.3-6+deb11u5+fips
+libkdb5-10==1.18.3-6+deb11u5
+libkrb5-3==1.18.3-6+deb11u5+fips
+libkrb5-dev==1.18.3-6+deb11u5+fips
+libkrb5support0==1.18.3-6+deb11u5+fips
+libksba8==1.5.0-3+deb11u2
+libmd-dev==1.0.3-3
+libmount1==2.36.1-8+deb11u2
+libnet1==1.1.6+dfsg-3.1
+libnetfilter-conntrack3==1.0.8-3
+libnfnetlink0==1.0.1-3+b1
+libnftnl11==1.1.9-1
+libnorm-dev==1.5.9+dfsg-2
+libnpth0==1.6-3
+libnsl-dev==1.3.0-2
+libpcap0.8==1.10.0-2
+libpcre2-16-0==10.36-2+deb11u1
+libpgm-dev==5.3.128~dfsg-2
+libpng16-16==1.6.37-3
+libpopt0==1.18-2
+libpython2-stdlib==2.7.18-3
+libpython2.7-minimal==2.7.18-8+deb11u1
+libpython2.7-stdlib==2.7.18-8+deb11u1
+libqt5core5a==5.15.2+dfsg-9+deb11u1
+libqt5dbus5==5.15.2+dfsg-9+deb11u1
+libqt5network5==5.15.2+dfsg-9+deb11u1
+libsaivs==1.0.0
+libsodium-dev==1.0.18-1
+libssl1.1==1.1.1w-0+deb11u1
+libsystemd0==247.3-7+deb11u2
+libteam-utils==1.31-1
+libtirpc-dev==1.3.1-1+deb11u1
+libunwind8==1.3.2-2
+libuuid1==2.36.1-8+deb11u2
+libxml2==2.9.10+dfsg-6.7+deb11u4
+libxml2-dev==2.9.10+dfsg-6.7+deb11u4
+libyang2==2.0.112-6
+libzmq3-dev==4.3.4-1+deb11u1
+linux-libc-dev==5.10.221-1
+logrotate==3.18.0-2+deb11u2
+lsof==4.93.2+dfsg-1.1
+mailcap==3.69
+mime-support==3.66
+ndisc6==1.0.4-2
+netbase==6.3
+openssh-client==1:8.4p1-5+deb11u3
+openssh-server==1:8.4p1-5+deb11u3
+openssh-sftp-server==1:8.4p1-5+deb11u3
+openssl==1.1.1w-0+deb11u1
+pinentry-curses==1.1.0-4
+psmisc==23.4-2
+python-ply==3.11-4
+python2==2.7.18-3
+python2-minimal==2.7.18-3
+python2.7==2.7.18-8+deb11u1
+python2.7-minimal==2.7.18-8+deb11u1
+python3-scapy==2.4.4-4
+redis-server==5:6.0.16-1+deb11u2
+runit-helper==2.10.3
+sensible-utils==0.0.14
+shared-mime-info==2.0-1
+sonic-device-data==1.0-1
+sonic-host-services-data==1.0-1
+sonic-utilities-data==1.0-1
+sphinx-rtd-theme-common==0.5.1+dfsg-1
+syncd-vs==1.0.0
+tcpdump==4.99.0-2+deb11u1
+ucf==3.0043
+uuid-dev==2.36.1-8+deb11u2
+x11-common==1:7.7+22
+xz-utils==5.2.5-2.1~deb11u1
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-deb-bullseye b/files/build/versions/dockers/docker-sonic-vs/versions-deb-bullseye
index 9086a97ef363..3567db934fff 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-deb-bullseye
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-deb-bullseye
@@ -13,6 +13,7 @@ fontconfig-config==2.13.1-4.2
 fonts-dejavu-core==2.37-2
 fonts-font-awesome==5.0.10+really4.7.0~dfsg-4.1
 fonts-lato==2.0-2.1
+framework==1.0.0
 frr==8.5.4-sonic-0
 gettext-base==0.21-4
 gir1.2-glib-2.0==1.66.1-1+b1
diff --git a/files/build_templates/framework.service.j2 b/files/build_templates/framework.service.j2
new file mode 100644
index 000000000000..eb2bf3225e16
--- /dev/null
+++ b/files/build_templates/framework.service.j2
@@ -0,0 +1,22 @@
+[Unit]
+Description=Framework Container
+Requires=database.service
+After=database.service swss.service
+BindsTo=sonic.target
+After=sonic.target
+Before=ntp-config.service
+StartLimitIntervalSec=1200
+StartLimitBurst=3
+
+
+[Service]
+User={{ sonicadmin_user }}
+ExecStartPre=/usr/bin/{{docker_container_name}}.sh start
+ExecStart=/usr/bin/{{docker_container_name}}.sh wait
+ExecStop=/usr/bin/{{docker_container_name}}.sh stop
+Restart=always
+RestartSec=30
+
+
+[Install]
+WantedBy=sonic.target
diff --git a/files/build_templates/init_cfg.json.j2 b/files/build_templates/init_cfg.json.j2
index 622087a5521d..fb610bc78cf8 100644
--- a/files/build_templates/init_cfg.json.j2
+++ b/files/build_templates/init_cfg.json.j2
@@ -64,6 +64,7 @@
     },
 {%- set features = [("bgp", "{% if not DEVICE_RUNTIME_METADATA['ETHERNET_PORTS_PRESENT'] or ('CHASSIS_METADATA' in DEVICE_RUNTIME_METADATA and DEVICE_RUNTIME_METADATA['CHASSIS_METADATA']['module_type'] in ['supervisor']) %}disabled{% else %}enabled{% endif %}", false, "enabled"),
                    ("database", "always_enabled", false, "always_enabled"),
+                   ("framework", "enabled", false, "enabled"),
                    ("lldp", "enabled", true, "enabled"),
                    ("pmon", "enabled", "{% if 'type' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['type'] == 'SpineRouter' %}False{% else %}True{% endif %}", "enabled"),
                    ("snmp", "enabled", true, "enabled"),
@@ -93,7 +94,7 @@
 {%- elif include_system_eventd == "y" %}
     {% do features.append(("eventd", "enabled", false, "enabled")) %}
 {%- endif %}
-    "FEATURE": {
+    "FEATURE": { 
 {# delayed field if set, will start the feature systemd .timer unit instead of .service unit #}
 {%- for feature, state, delayed, autorestart in features %}
         "{{feature}}": {
diff --git a/platform/vs/docker-sonic-vs.mk b/platform/vs/docker-sonic-vs.mk
index 53735eb980cf..6daf146da77a 100644
--- a/platform/vs/docker-sonic-vs.mk
+++ b/platform/vs/docker-sonic-vs.mk
@@ -11,7 +11,8 @@ $(DOCKER_SONIC_VS)_DEPENDS += $(SYNCD_VS) \
                               $(LIBYANG_CPP) \
                               $(LIBYANG_PY3) \
                               $(SONIC_UTILITIES_DATA) \
-                              $(SONIC_HOST_SERVICES_DATA)
+                              $(SONIC_HOST_SERVICES_DATA) \
+                              $(FRAMEWORK)
 
 $(DOCKER_SONIC_VS)_PYTHON_WHEELS += $(SONIC_PY_COMMON_PY3) \
                                     $(SONIC_PLATFORM_COMMON_PY3) \
@@ -24,7 +25,8 @@ ifeq ($(INSTALL_DEBUG_TOOLS), y)
 $(DOCKER_SONIC_VS)_DEPENDS += $(LIBSWSSCOMMON_DBG) \
                               $(LIBSAIREDIS_DBG) \
                               $(LIBSAIVS_DBG) \
-                              $(SYNCD_VS_DBG)
+                              $(SYNCD_VS_DBG) \
+                              $(FRAMEWORK_DBG)
 endif
 
 ifeq ($(SONIC_ROUTING_STACK), frr)
diff --git a/platform/vs/docker-sonic-vs/start.sh b/platform/vs/docker-sonic-vs/start.sh
index f28f05f3707d..50402011de4d 100755
--- a/platform/vs/docker-sonic-vs/start.sh
+++ b/platform/vs/docker-sonic-vs/start.sh
@@ -178,6 +178,8 @@ supervisorctl start tunnelmgrd
 
 supervisorctl start fabricmgrd
 
+supervisorctl start rebootbackend
+
 # Start arp_update when VLAN exists
 VLAN=`sonic-cfggen -d -v 'VLAN.keys() | join(" ") if VLAN'`
 if [ "$VLAN" != "" ]; then
diff --git a/rules/docker-framework.dep b/rules/docker-framework.dep
new file mode 100644
index 000000000000..238e16db8b09
--- /dev/null
+++ b/rules/docker-framework.dep
@@ -0,0 +1,10 @@
+DPATH       := $($(DOCKER_FRAMEWORK)_PATH)
+DEP_FILES   := $(SONIC_COMMON_FILES_LIST) rules/docker-framework.mk rules/docker-framework.dep
+DEP_FILES   += $(SONIC_COMMON_BASE_FILES_LIST)
+DEP_FILES   += $(shell git ls-files $(DPATH))
+
+$(DOCKER_FRAMEWORK)_CACHE_MODE  := GIT_CONTENT_SHA
+$(DOCKER_FRAMEWORK)_DEP_FLAGS   := $(SONIC_COMMON_FLAGS_LIST)
+$(DOCKER_FRAMEWORK)_DEP_FILES   := $(DEP_FILES)
+
+$(eval $(call add_dbg_docker,$(DOCKER_FRAMEWORK),$(DOCKER_FRAMEWORK_DBG)))
diff --git a/rules/docker-framework.mk b/rules/docker-framework.mk
new file mode 100644
index 000000000000..9da73a1bb118
--- /dev/null
+++ b/rules/docker-framework.mk
@@ -0,0 +1,35 @@
+# docker image for framework
+
+DOCKER_FRAMEWORK_STEM = docker-framework
+DOCKER_FRAMEWORK = $(DOCKER_FRAMEWORK_STEM).gz
+DOCKER_FRAMEWORK_DBG = $(DOCKER_FRAMEWORK_STEM)-$(DBG_IMAGE_MARK).gz
+
+$(DOCKER_FRAMEWORK)_PATH = $(DOCKERS_PATH)/$(DOCKER_FRAMEWORK_STEM)
+
+$(DOCKER_FRAMEWORK)_DEPENDS += $(FRAMEWORK)
+$(DOCKER_FRAMEWORK)_DBG_DEPENDS = $($(DOCKER_CONFIG_ENGINE_BOOKWORM)_DBG_DEPENDS)
+$(DOCKER_FRAMEWORK)_DBG_DEPENDS += $(FRAMEWORK_DBG) $(LIBSWSSCOMMON_DBG)
+$(DOCKER_FRAMEWORK)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_BOOKWORM)_DBG_IMAGE_PACKAGES)
+
+$(DOCKER_FRAMEWORK)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_BOOKWORM)
+$(DOCKER_FRAMEWORK)_LOAD_DOCKERS += $($(DOCKER_CONFIG_ENGINE_BOOKWORM)_LOAD_DOCKERS)
+
+$(DOCKER_FRAMEWORK)_VERSION = 1.0.0
+$(DOCKER_FRAMEWORK)_PACKAGE_NAME = framework
+
+SONIC_DOCKER_IMAGES += $(DOCKER_FRAMEWORK)
+SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_FRAMEWORK)
+
+SONIC_DOCKER_DBG_IMAGES += $(DOCKER_FRAMEWORK_DBG)
+SONIC_INSTALL_DOCKER_DBG_IMAGES += $(DOCKER_FRAMEWORK_DBG)
+
+$(DOCKER_FRAMEWORK)_CONTAINER_NAME = framework
+$(DOCKER_FRAMEWORK)_RUN_OPT += -v /var/run/dbus:/var/run/dbus:rw  
+$(DOCKER_FRAMEWORK)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro  
+$(DOCKER_FRAMEWORK)_GIT_REPOSITORIES += "sonic-swss"
+$(DOCKER_FRAMEWORK)_GIT_REPOSITORIES += "sonic-swss-common"
+
+$(DOCKER_FRAMEWORK)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT)
+
+SONIC_BOOKWORM_DOCKERS += $(DOCKER_FRAMEWORK)
+SONIC_BOOKWORM_DBG_DOCKERS += $(DOCKER_FRAMEWORK_DBG)
diff --git a/rules/framework.dep b/rules/framework.dep
new file mode 100644
index 000000000000..76aa6d2aff2b
--- /dev/null
+++ b/rules/framework.dep
@@ -0,0 +1,13 @@
+
+SPATH       := $($(FRAMEWORK)_SRC_PATH)
+DEP_FILES   := $(SONIC_COMMON_FILES_LIST) rules/framework.mk rules/framework.dep
+DEP_FILES   += $(SONIC_COMMON_BASE_FILES_LIST)
+SMDEP_PATHS := $(SPATH) $(SPATH)/gnoi
+$(foreach path, $(SMDEP_PATHS), $(eval $(path) :=$(filter-out $(SMDEP_PATHS),$(addprefix $(path)/, \
+                                $(shell cd $(path)  && git ls-files | grep -v " ")))))
+
+$(FRAMEWORK)_CACHE_MODE  := GIT_CONTENT_SHA
+$(FRAMEWORK)_DEP_FLAGS   := $(SONIC_COMMON_FLAGS_LIST) $(ENABLE_ASAN)
+$(FRAMEWORK)_DEP_FILES   := $(DEP_FILES)
+$(FRAMEWORK)_SMDEP_FILES := $(foreach path, $(SMDEP_PATHS), $($(path)))
+$(FRAMEWORK)_SMDEP_PATHS := $(SPATH) 
diff --git a/rules/framework.mk b/rules/framework.mk
new file mode 100644
index 000000000000..8c9bb19826f0
--- /dev/null
+++ b/rules/framework.mk
@@ -0,0 +1,19 @@
+# framework package
+
+FRAMEWORK = framework_1.0.0_$(CONFIGURED_ARCH).deb
+$(FRAMEWORK)_SRC_PATH = $(SRC_PATH)/sonic-framework
+$(FRAMEWORK)_DEPENDS += $(LIBSWSSCOMMON_DEV) \
+ 			$(PROTOBUF) $(PROTOBUF_LITE) $(PROTOBUF_DEV) $(PROTOBUF_COMPILER)
+
+$(FRAMEWORK)_RDEPENDS += $(LIBSWSSCOMMON) $(PROTOBUF)
+SONIC_DPKG_DEBS += $(FRAMEWORK)
+
+FRAMEWORK_DBG = framework-dbg_1.0.0_$(CONFIGURED_ARCH).deb
+$(FRAMEWORK_DBG)_DEPENDS += $(FRAMEWORK)
+$(FRAMEWORK_DBG)_RDEPENDS += $(FRAMEWORK)
+$(eval $(call add_derived_package,$(FRAMEWORK),$(FRAMEWORK_DBG)))
+
+# The .c, .cpp, .h & .hpp files under src/{$DBG_SRC_ARCHIVE list}
+# are archived into debug one image to facilitate debugging.
+#
+DBG_SRC_ARCHIVE += sonic-framework
diff --git a/sonic-slave-bookworm/Dockerfile.j2 b/sonic-slave-bookworm/Dockerfile.j2
index 8416c3166fe0..b10ff4393329 100644
--- a/sonic-slave-bookworm/Dockerfile.j2
+++ b/sonic-slave-bookworm/Dockerfile.j2
@@ -428,6 +428,8 @@ RUN apt-get update && apt-get install -y eatmydata && eatmydata apt-get install
 # For audisp-tacplus
         libauparse-dev \
         auditd \
+# For framework container build
+        libdbus-c++-dev \
 # For protobuf
         protobuf-compiler \
         libprotobuf-dev \
diff --git a/sonic-slave-bullseye/Dockerfile.j2 b/sonic-slave-bullseye/Dockerfile.j2
index 1aca2a0ba5e3..323ecf186400 100644
--- a/sonic-slave-bullseye/Dockerfile.j2
+++ b/sonic-slave-bullseye/Dockerfile.j2
@@ -420,6 +420,8 @@ RUN apt-get update && apt-get install -y eatmydata && eatmydata apt-get install
 # For audisp-tacplus
         libauparse-dev \
         auditd \
+# For framework container build 
+        libdbus-c++-dev \
 # For protobuf
         dh-elpa \
         xmlto \
diff --git a/src/sonic-framework/Makefile.am b/src/sonic-framework/Makefile.am
new file mode 100644
index 000000000000..23051da40f3c
--- /dev/null
+++ b/src/sonic-framework/Makefile.am
@@ -0,0 +1,19 @@
+.PHONY: compile_protobufs
+AUTOMAKE_OPTIONS = subdir-objects
+INCLUDES = -I ../sonic-swss-common/common
+BUILT_SOURCES = rebootbackend_protobuf_compilation rebootbackend_dbus_compilation
+
+compile_protobufs: rebootbackend_protobuf_compilation rebootbackend_dbus_compilation
+
+rebootbackend_protobuf_compilation: 
+	/usr/bin/protoc --cpp_out=rebootbackend \
+		--proto_path=gnoi \
+		gnoi/types/types.proto \
+		gnoi/common/common.proto \
+		gnoi/system/system.proto
+
+rebootbackend_dbus_compilation:
+	/usr/bin/dbusxx-xml2cpp rebootbackend/gnoi_reboot.xml \
+		--proxy=rebootbackend/gnoi_reboot_dbus.h
+
+SUBDIRS = rebootbackend
diff --git a/src/sonic-framework/autogen.sh b/src/sonic-framework/autogen.sh
new file mode 100755
index 000000000000..4a5ffda82dde
--- /dev/null
+++ b/src/sonic-framework/autogen.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+ 
+libtoolize --force --copy &&
+autoreconf --force --install -I m4
+rm -Rf autom4te.cache
diff --git a/src/sonic-framework/configure.ac b/src/sonic-framework/configure.ac
new file mode 100644
index 000000000000..3a315230495f
--- /dev/null
+++ b/src/sonic-framework/configure.ac
@@ -0,0 +1,84 @@
+AC_INIT([sonic-swss],[1.0])
+AC_CONFIG_SRCDIR([])
+AC_CONFIG_AUX_DIR(config)
+AM_CONFIG_HEADER(config.h)
+AM_INIT_AUTOMAKE([foreign])
+AC_LANG_C
+AC_LANG([C++])
+AC_PROG_CC
+AC_PROG_CXX
+AC_PROG_LIBTOOL
+AC_HEADER_STDC
+
+AC_CHECK_LIB([hiredis], [redisConnect],,
+    AC_MSG_ERROR([libhiredis is not installed.]))
+
+PKG_CHECK_MODULES([JANSSON], [jansson])
+
+AC_ARG_ENABLE(debug,
+[  --enable-debug      Compile with debugging flags],
+[case "${enableval}" in
+	yes) debug=true ;;
+	no)  debug=false ;;
+	*) AC_MSG_ERROR(bad value ${enableval} for --enable-debug) ;;
+esac],[debug=false])
+AM_CONDITIONAL(DEBUG, test x$debug = xtrue)
+
+AC_ARG_WITH(extra-inc,
+[  --with-extra-inc=DIR
+                          prefix where extra includes are installed],
+[AC_SUBST(CPPFLAGS, "$CPPFLAGS -I${withval} -I${withval}/swss")])
+
+AC_ARG_WITH(extra-lib,
+[  --with-extra-lib=DIR
+                          prefix where extra libraries are installed],
+[AC_SUBST(LDFLAGS, "$LDFLAGS -L${withval}")])
+
+CFLAGS_COMMON="-std=c++14 -Wall -fPIC -Wno-write-strings -I/usr/include/swss"
+
+CFLAGS_COMMON+=" -Werror"
+CFLAGS_COMMON+=" -Wno-reorder"
+CFLAGS_COMMON+=" -Wcast-align"
+CFLAGS_COMMON+=" -Wcast-qual"
+#TODO (b/314850353): Re-enable conversion errors with updated protoc compiler.
+#CFLAGS_COMMON+=" -Wconversion"
+CFLAGS_COMMON+=" -Wdisabled-optimization"
+CFLAGS_COMMON+=" -Wextra"
+CFLAGS_COMMON+=" -Wfloat-equal"
+CFLAGS_COMMON+=" -Wformat=2"
+CFLAGS_COMMON+=" -Wformat-nonliteral"
+CFLAGS_COMMON+=" -Wformat-security"
+CFLAGS_COMMON+=" -Wformat-y2k"
+CFLAGS_COMMON+=" -Wimport"
+CFLAGS_COMMON+=" -Winit-self"
+CFLAGS_COMMON+=" -Winvalid-pch"
+CFLAGS_COMMON+=" -Wlong-long"
+CFLAGS_COMMON+=" -Wmissing-field-initializers"
+CFLAGS_COMMON+=" -Wmissing-format-attribute"
+CFLAGS_COMMON+=" -Wno-aggregate-return"
+CFLAGS_COMMON+=" -Wno-padded"
+CFLAGS_COMMON+=" -Wno-switch-enum"
+CFLAGS_COMMON+=" -Wno-unused-parameter"
+CFLAGS_COMMON+=" -Wpacked"
+CFLAGS_COMMON+=" -Wpointer-arith"
+CFLAGS_COMMON+=" -Wredundant-decls"
+CFLAGS_COMMON+=" -Wstack-protector"
+CFLAGS_COMMON+=" -Wstrict-aliasing=3"
+CFLAGS_COMMON+=" -Wswitch"
+CFLAGS_COMMON+=" -Wswitch-default"
+CFLAGS_COMMON+=" -Wunreachable-code"
+CFLAGS_COMMON+=" -Wunused"
+CFLAGS_COMMON+=" -Wvariadic-macros"
+CFLAGS_COMMON+=" -Wno-switch-default"
+CFLAGS_COMMON+=" -Wno-long-long"
+CFLAGS_COMMON+=" -Wno-redundant-decls"
+
+AC_SUBST(CFLAGS_COMMON)
+
+AC_CONFIG_FILES([
+    Makefile
+    rebootbackend/Makefile
+    tests/Makefile
+])
+
+AC_OUTPUT
diff --git a/src/sonic-framework/debian/changelog b/src/sonic-framework/debian/changelog
new file mode 100644
index 000000000000..93dae9ae8a70
--- /dev/null
+++ b/src/sonic-framework/debian/changelog
@@ -0,0 +1,6 @@
+sonic (1.0.0) stable; urgency=medium
+
+  * Initial release.
+
+ -- Runming Wu <runmingwu@google.com>  Wed, 20 Sep 2023 12:00:00 -0800 
+
diff --git a/src/sonic-framework/debian/compat b/src/sonic-framework/debian/compat
new file mode 100644
index 000000000000..52a8c6d10ce8
--- /dev/null
+++ b/src/sonic-framework/debian/compat
@@ -0,0 +1 @@
+10 
diff --git a/src/sonic-framework/debian/control b/src/sonic-framework/debian/control
new file mode 100644
index 000000000000..cb588a8ce73c
--- /dev/null
+++ b/src/sonic-framework/debian/control
@@ -0,0 +1,18 @@
+Source: sonic
+Maintainer: Runming Wu <runmingwu@google.com>
+Section: net
+Priority: optional
+Build-Depends: dh-exec (>=0.3), debhelper (>= 9), autotools-dev
+Standards-Version: 1.0.0
+
+Package: framework
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: This package contains framework service.
+
+Package: framework-dbg
+Architecture: any
+Section: debug
+Priority: extra
+Depends: framework (=${binary:Version})
+Description: debugging symbols for framework
diff --git a/src/sonic-framework/debian/rules b/src/sonic-framework/debian/rules
new file mode 100755
index 000000000000..5d0fe39d9c98
--- /dev/null
+++ b/src/sonic-framework/debian/rules
@@ -0,0 +1,38 @@
+#!/usr/bin/make -f
+# See debhelper(7) (uncomment to enable)
+# output every command that modifies files on the build system.
+#export DH_VERBOSE = 1
+
+# see EXAMPLES in dpkg-buildflags(1) and read /usr/share/dpkg/*
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/default.mk
+
+# see FEATURE AREAS in dpkg-buildflags(1)
+#export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
+# see ENVIRONMENT in dpkg-buildflags(1)
+# package maintainers to append CFLAGS
+#export DEB_CFLAGS_MAINT_APPEND  = -Wall -pedantic
+# package maintainers to append LDFLAGS
+#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+
+
+# main packaging script based on dh7 syntax
+%:
+	dh $@  --with autotools-dev
+
+# dh_make generated override targets
+# This is example for Cmake (See https://bugs.debian.org/641051 )
+#override_dh_auto_configure:
+#	dh_auto_configure -- \
+#	-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
+
+override_dh_auto_configure:
+	dh_auto_configure -- $(configure_opts)
+
+override_dh_auto_install:
+	dh_auto_install --destdir=debian/framework
+
+override_dh_strip: 
+	dh_strip -pframework --dbg-package=framework-dbg
+
diff --git a/src/sonic-framework/package.cfg b/src/sonic-framework/package.cfg
new file mode 100644
index 000000000000..e80d873ab346
--- /dev/null
+++ b/src/sonic-framework/package.cfg
@@ -0,0 +1,15 @@
+{
+    "description": "This package contains SONiC framework.",
+    "version": "1.0.0",
+    "maintainer": "Runming Wu <runmingwu@google.com>",
+    "build_depends": [ ],
+    "packages": [
+        {
+            "name": "sonic-framework",
+            "dependencies": [
+            ],
+            "files": [
+            ]
+        }
+    ]
+}
diff --git a/src/sonic-framework/rebootbackend/Makefile.am b/src/sonic-framework/rebootbackend/Makefile.am
new file mode 100644
index 000000000000..7d6faf283c02
--- /dev/null
+++ b/src/sonic-framework/rebootbackend/Makefile.am
@@ -0,0 +1,19 @@
+AUTOMAKE_OPTIONS = subdir-objects
+INCLUDES = -I $(top_srcdir) -I/usr/include/dbus-c++-1/ -I $(top_srcdir)/system  -I ../../sonic-swss-common/common
+
+bin_PROGRAMS = rebootbackend
+
+if DEBUG
+DBGFLAGS = -ggdb -DDEBUG
+else
+DBGFLAGS = -g
+endif
+
+rebootbackend_SOURCES = rebootbackend.cpp rebootbe.cpp interfaces.cpp \
+                        reboot_thread.cpp  \
+                        system/system.pb.cc types/types.pb.cc \
+                        common/common.pb.cc 
+
+rebootbackend_CFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_ASAN)
+rebootbackend_CPPFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_ASAN)
+rebootbackend_LDADD = $(LDFLAGS_ASAN) -lswsscommon -ldbus-c++-1 -lpthread -lprotobuf
diff --git a/src/sonic-framework/rebootbackend/interfaces.cpp b/src/sonic-framework/rebootbackend/interfaces.cpp
index 3a54d5d42ea8..2b61542a2dd9 100644
--- a/src/sonic-framework/rebootbackend/interfaces.cpp
+++ b/src/sonic-framework/rebootbackend/interfaces.cpp
@@ -13,8 +13,8 @@ constexpr char kContainerShutdownPath[] = "/org/SONiC/HostService/gnoi_container
 
 // DBus::BusDispatcher dispatcher;
 DBus::Connection& HostServiceDbus::getConnection(void) {
-  static DBus::Connection* ConnPtr = nullptr;
-  if (ConnPtr == nullptr) {
+  static DBus::Connection* connPtr = nullptr;
+  if (connPtr == nullptr) {
     static DBus::BusDispatcher dispatcher;
     DBus::default_dispatcher = &dispatcher;
 
diff --git a/src/sonic-framework/rebootbackend/interfaces.h b/src/sonic-framework/rebootbackend/interfaces.h
index 977d3518ead0..aa0081dd8080 100644
--- a/src/sonic-framework/rebootbackend/interfaces.h
+++ b/src/sonic-framework/rebootbackend/interfaces.h
@@ -6,6 +6,10 @@
 #include "gnoi_reboot_dbus.h"              // auto generated gnoi_reboot_proxy
 #include "reboot_interfaces.h"
 
+/* Reboot is a request to the reboot sonic host service to request a reboot 
+from the platform. This takes as an argument a string based json formatted 
+Reboot request from system.proto.’https://github.com/openconfig/gnoi/blob/73a1e7675c5f963e7810bd3828203f2758eb47e8/system/system.proto#L107 */
+
 class GnoiDbusReboot : public org::SONiC::HostService::gnoi_reboot_proxy,
                        public DBus::IntrospectableProxy,
                        public DBus::ObjectProxy {
@@ -15,6 +19,12 @@ class GnoiDbusReboot : public org::SONiC::HostService::gnoi_reboot_proxy,
       : DBus::ObjectProxy(connection, dbus_obj_name_p, dbus_bus_name_p) {}
 };
 
+/* DbusResponse consists of STATUS: success/fail: i.e. was the dbus request 
+successful DbusResponse.json_string: string based json formatted  RebootResponse
+defined here:
+https://github.com/openconfig/gnoi/blob/73a1e7675c5f963e7810bd3828203f2758eb47e8/system/system.proto#L119 */
+
+
 class HostServiceDbus : public DbusInterface {
  public:
   DbusInterface::DbusResponse Reboot(
diff --git a/src/sonic-framework/rebootbackend/reboot_common.cpp b/src/sonic-framework/rebootbackend/reboot_common.cpp
new file mode 100644
index 000000000000..65672ae67841
--- /dev/null
+++ b/src/sonic-framework/rebootbackend/reboot_common.cpp
@@ -0,0 +1,14 @@
+#include "reboot_common.h"
+
+#include <time.h>
+
+namespace rebootbackend {
+
+timespec milliseconds_to_timespec(uint64_t time_ms) {
+  timespec l_timespec;
+  l_timespec.tv_sec = time_ms / ONE_THOUSAND;
+  l_timespec.tv_nsec = (time_ms % ONE_THOUSAND) * ONE_THOUSAND * ONE_THOUSAND;
+  return l_timespec; 
+}
+
+}  // namespace rebootbackend
diff --git a/src/sonic-framework/rebootbackend/reboot_common.h b/src/sonic-framework/rebootbackend/reboot_common.h
index 3c9b55be767c..a67b92cad6a3 100644
--- a/src/sonic-framework/rebootbackend/reboot_common.h
+++ b/src/sonic-framework/rebootbackend/reboot_common.h
@@ -6,9 +6,7 @@
 
 namespace rebootbackend {
 
-//extern bool sigterm_requested;
-bool sigterm_requested = false;
-
+extern bool sigterm_requested;
 struct NotificationResponse {
   swss::StatusCode status;
   std::string json_string;
diff --git a/src/sonic-framework/rebootbackend/reboot_thread.cpp b/src/sonic-framework/rebootbackend/reboot_thread.cpp
index a57a241e302f..efd8f9e451cc 100644
--- a/src/sonic-framework/rebootbackend/reboot_thread.cpp
+++ b/src/sonic-framework/rebootbackend/reboot_thread.cpp
@@ -6,7 +6,6 @@
 #include "notificationproducer.h"
 #include "reboot_common.h"
 #include "reboot_interfaces.h"
-#include "redis_utils.h"
 #include "select.h"
 #include "selectableevent.h"
 #include "selectabletimer.h"
@@ -19,7 +18,10 @@ namespace rebootbackend {
 using namespace ::gnoi::system;
 using steady_clock = std::chrono::steady_clock;
 using Progress = ::rebootbackend::RebootThread::Progress;
-//using WarmBootStage = ::swss::WarmStart::WarmBootStage;
+namespace gpu = ::google::protobuf::util;
+
+bool sigterm_requested = false;
+
 using WarmStartState = ::swss::WarmStart::WarmStartState;
 namespace gpu = ::google::protobuf::util;
 
diff --git a/src/sonic-framework/rebootbackend/reboot_thread.h b/src/sonic-framework/rebootbackend/reboot_thread.h
index 6655069a61c7..8ca3b7c73805 100644
--- a/src/sonic-framework/rebootbackend/reboot_thread.h
+++ b/src/sonic-framework/rebootbackend/reboot_thread.h
@@ -8,7 +8,6 @@
 #include "notificationproducer.h"
 #include "reboot_common.h"
 #include "reboot_interfaces.h"
-#include "redis_utils.h"
 #include "select.h"
 #include "selectableevent.h"
 #include "selectabletimer.h"
diff --git a/src/sonic-framework/rebootbackend/rebootbackend.cpp b/src/sonic-framework/rebootbackend/rebootbackend.cpp
index 3864eea3e37c..d0962f63869b 100644
--- a/src/sonic-framework/rebootbackend/rebootbackend.cpp
+++ b/src/sonic-framework/rebootbackend/rebootbackend.cpp
@@ -2,12 +2,9 @@
 #include "reboot_interfaces.h"
 #include "rebootbe.h"
 
-using namespace ::rebootbackend::HostServiceDbus;
-using namespace ::rebootbackend::RebootBE;
-
 int main(int argc, char** argv) {
   HostServiceDbus dbus_interface;
-  RebootBE rebootbe(dbus_interface);
+  ::rebootbackend::RebootBE rebootbe(dbus_interface);
   rebootbe.Start();
   return 0;
 }
diff --git a/src/sonic-framework/rebootbackend/rebootbe.cpp b/src/sonic-framework/rebootbackend/rebootbe.cpp
index bdb113c47c48..1c3b1c2fe014 100644
--- a/src/sonic-framework/rebootbackend/rebootbe.cpp
+++ b/src/sonic-framework/rebootbackend/rebootbe.cpp
@@ -30,7 +30,6 @@ RebootBE::RebootBE(DbusInterface &dbus_interface)
 }
 
 RebootBE::RebManagerStatus RebootBE::GetCurrentStatus() {
-  const std::lock_guard<std::mutex> lock(m_StatusMutex);
   return m_CurrentStatus;
 }
 
@@ -43,10 +42,6 @@ void RebootBE::Start() {
   SWSS_LOG_ENTER();
   SWSS_LOG_NOTICE("--- Starting rebootbackend ---");
 
-  swss::WarmStart::initialize("rebootbackend", "sonic-framework");
-  swss::WarmStart::checkWarmStart("rebootbackend", "sonic-framework",
-                                  /*incr_restore_cnt=*/false);
-
   swss::Select s;
   s.addSelectable(&m_NotificationConsumer);
   s.addSelectable(&m_Done);
@@ -85,12 +80,12 @@ bool RebootBE::RetrieveNotificationData(
     RebootBE::NotificationRequest &request) {
   SWSS_LOG_ENTER();
 
-  Request.op = "";
-  Request.retString = "";
+  request.op = "";
+  request.retString = "";
 
   std::string data;
   std::vector<swss::FieldValueTuple> values;
-  consumer.pop(Request.op, data, values);
+  consumer.pop(request.op, data, values);
 
   for (auto &fv : values) {
     if (DATA_TUPLE_KEY == fvField(fv)) {
@@ -119,8 +114,7 @@ void RebootBE::SendNotificationResponse(const std::string key,
 
 NotificationResponse RebootBE::HandleRebootRequest(
     const std::string &jsonRebootRequest) {
-//  using namespace google::protobuf::util;
-  using namespace gpu::;
+    using namespace gpu;
 
   SWSS_LOG_ENTER();
 
diff --git a/src/sonic-framework/rebootbackend/rebootbe.h b/src/sonic-framework/rebootbackend/rebootbe.h
index 97a6c227e45a..59f8734026f7 100644
--- a/src/sonic-framework/rebootbackend/rebootbe.h
+++ b/src/sonic-framework/rebootbackend/rebootbe.h
@@ -10,12 +10,12 @@
 
 namespace rebootbackend {
 
-#define REBOOT_REQUEST_NOTIFICATION_CHANNEL "Reboot_Request_Channel"
-#define REBOOT_RESPONSE_NOTIFICATION_CHANNEL "Reboot_Response_Channel"
-#define REBOOT_KEY "Reboot"
-#define REBOOT_STATUS_KEY "RebootStatus"
-#define CANCEL_REBOOT_KEY "CancelReboot"
-#define DATA_TUPLE_KEY "MESSAGE" 
+constexpr char REBOOT_REQUEST_NOTIFICATION_CHANNEL[] = "Reboot_Request_Channel";
+constexpr char REBOOT_RESPONSE_NOTIFICATION_CHANNEL[] = "Reboot_Response_Channel";
+constexpr char REBOOT_KEY[] = "Reboot";
+constexpr char REBOOT_STATUS_KEY[] = "RebootStatus";
+constexpr char CANCEL_REBOOT_KEY[] = "CancelReboot";
+constexpr char DATA_TUPLE_KEY[] = "MESSAGE";
 
 class RebootBE {
  public:
diff --git a/src/sonic-framework/tests/Makefile.am b/src/sonic-framework/tests/Makefile.am
new file mode 100644
index 000000000000..f26c7a7191f3
--- /dev/null
+++ b/src/sonic-framework/tests/Makefile.am
@@ -0,0 +1,56 @@
+AUTOMAKE_OPTIONS = subdir-objects
+INCLUDES = -I $(top_srcdir) -I $(top_srcdir)/rebootbackend -I $(top_srcdir)/rebootbackend/system -I ../../sonic-swss-common/common
+
+TESTS = tests tests_asan tests_tsan tests_usan
+
+noinst_PROGRAMS = tests tests_asan tests_tsan tests_usan
+
+if DEBUG
+DBGFLAGS = -ggdb -DDEBUG
+else
+DBGFLAGS = -g -DNDEBUG
+endif
+
+CFLAGS_GTEST =
+LDADD_GTEST = -lgtest -lgtest_main -lgmock -lgmock_main
+CFLAGS_COVERAGE = --coverage -fprofile-arcs -ftest-coverage
+LDADD_COVERAGE = -lgcov
+CFLAGS_ASAN = -fsanitize=address
+CFLAGS_TSAN = -fsanitize=thread
+CFLAGS_USAN = -fsanitize=undefined
+
+testsdir = /usr/include
+
+tests_HEADERS = /usr/include/gmock/gmock.h
+
+tests_SOURCES = test_utils_common.cpp \
+		rebootbe_test.cpp \
+                $(top_srcdir)/rebootbackend/rebootbe.cpp \
+                reboot_thread_test.cpp \
+                $(top_srcdir)/rebootbackend/reboot_thread.cpp \
+                $(top_srcdir)/rebootbackend/system/system.pb.cc \
+                $(top_srcdir)/rebootbackend/types/types.pb.cc \
+                $(top_srcdir)/rebootbackend/common/common.pb.cc \
+                test_main.cpp
+
+tests_CFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_GTEST) $(CFLAGS_COVERAGE) $(CFLAGS_SAI)
+tests_CPPFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_GTEST) $(CFLAGS_COVERAGE) $(CFLAGS_SAI)
+tests_LDADD = $(LDADD_GTEST) $(LDADD_COVERAGE) -lswsscommon -lpthread -lprotobuf
+
+tests_asan_SOURCES = $(tests_SOURCES)
+tests_asan_CFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_GTEST) $(CFLAGS_ASAN) $(CFLAGS_SAI)
+tests_asan_CPPFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_GTEST) $(CFLAGS_ASAN) $(CFLAGS_SAI)
+tests_asan_LDFLAGS = $(CFLAGS_ASAN)
+tests_asan_LDADD = $(LDADD_GTEST) -lswsscommon -lpthread -lprotobuf
+
+tests_tsan_SOURCES = $(tests_SOURCES)
+tests_tsan_CFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_GTEST) $(CFLAGS_TSAN) $(CFLAGS_SAI)
+tests_tsan_CPPFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_GTEST) $(CFLAGS_TSAN) $(CFLAGS_SAI)
+tests_tsan_LDFLAGS = $(CFLAGS_TSAN)
+tests_tsan_LDADD = $(LDADD_GTEST) -lswsscommon -lpthread -lprotobuf
+
+tests_usan_SOURCES = $(tests_SOURCES)
+tests_usan_CFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_GTEST) $(CFLAGS_USAN) $(CFLAGS_SAI)
+tests_usan_CPPFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_GTEST) $(CFLAGS_USAN) $(CFLAGS_SAI)
+tests_usan_LDFLAGS = $(CFLAGS_USAN)
+tests_usan_LDADD = $(LDADD_GTEST) -lswsscommon -lpthread -lprotobuf
diff --git a/src/sonic-framework/tests/reboot_thread_test.cpp b/src/sonic-framework/tests/reboot_thread_test.cpp
index 35778ff864a1..dcf1e17ea205 100644
--- a/src/sonic-framework/tests/reboot_thread_test.cpp
+++ b/src/sonic-framework/tests/reboot_thread_test.cpp
@@ -12,7 +12,6 @@
 #include "mock_reboot_interfaces.h"
 #include "reboot_common.h"
 #include "reboot_interfaces.h"
-#include "redis_utils.h"
 #include "select.h"
 #include "selectableevent.h"
 #include "status_code_util.h"
diff --git a/src/sonic-framework/tests/rebootbe_test.cpp b/src/sonic-framework/tests/rebootbe_test.cpp
index 7c23f996bad3..b786c919bcab 100644
--- a/src/sonic-framework/tests/rebootbe_test.cpp
+++ b/src/sonic-framework/tests/rebootbe_test.cpp
@@ -27,6 +27,7 @@ namespace rebootbackend {
 #define ONE_SECOND_MS (1000)
 #define FIFTEEN_HUNDRED_MS (1500)
 #define TWO_SECONDS_MS (2000)
+#define SELECT_TIMEOUT_250_MS (250)
 
 namespace gpu = ::google::protobuf::util;
 using namespace gnoi::system;
@@ -75,20 +76,6 @@ class RebootBETestWithoutStop : public ::testing::Test {
   }
   virtual ~RebootBETestWithoutStop() = default;
 
-  gnoi::system::RebootStatusResponse default_not_started_status() {
-    InitThreadStatus status;
-    return status.get_response();
-  }
-
-  gnoi::system::RebootStatusResponse default_done_status() {
-    InitThreadStatus status;
-    // We can't edit the status without it being active.
-    status.set_start_status();
-    status.set_success();
-    status.set_inactive();
-    return status.get_response();
-  }
-
 
   void start_rebootbe() {
     m_rebootbe_thread =
@@ -102,11 +89,11 @@ class RebootBETestWithoutStop : public ::testing::Test {
   }
 
   void overwrite_reboot_timeout(uint32_t timeout_seconds) {
-    m_rebootbe.m_reboot_thread.m_reboot_timeout = timeout_seconds;
+    m_rebootbe.m_RebootThread.m_reboot_timeout = timeout_seconds;
   }
 
 
-  void send_stop_reboot_thread() { m_rebootbe.m_reboot_thread.Stop(); }
+  void send_stop_reboot_thread() { m_rebootbe.m_RebootThread.Stop(); }
 
   void SendRebootRequest(const std::string &op, const std::string &data,
                          const std::string &field, const std::string &value) {
@@ -188,7 +175,7 @@ class RebootBETestWithoutStop : public ::testing::Test {
   }
 
   NotificationResponse handle_reboot_request(std::string &json_request) {
-    return m_rebootbe.handle_reboot_request(json_request);
+    return m_rebootbe.HandleRebootRequest(json_request);
   }
 
 
diff --git a/src/sonic-framework/tests/test_utils_common.cpp b/src/sonic-framework/tests/test_utils_common.cpp
index ef0088b7bf05..ff7c93aee928 100644
--- a/src/sonic-framework/tests/test_utils_common.cpp
+++ b/src/sonic-framework/tests/test_utils_common.cpp
@@ -8,7 +8,6 @@
 
 #include "dbconnector.h"
 #include "notificationconsumer.h"
-#include "redis_utils.h"
 #include "select.h"
 #include "selectableevent.h"
 #include "table.h"