Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SONiC Management Framework Release 1.0 #3488

Merged
merged 108 commits into from
Dec 24, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
108 commits
Select commit Hold shift + click to select a range
159e69f
Added sonic-mgmt-framework as submodule / docker
Jun 19, 2019
3a8ef73
fix build issues
Jun 19, 2019
3b3ded5
Merge pull request #1 from project-arlo/brcm_poc
jghalam Jun 19, 2019
477f233
update sonic-mgmt-framework submodule branch to master
Jun 19, 2019
a1e885f
Merge pull request #2 from project-arlo/brcm_poc
jghalam Jun 19, 2019
3d804a4
Merged changes 70007e6d2ba3a4c0b371cd693ccc63e0a8906e77..00d4fcfed6a7…
dutta-partha Jun 22, 2019
23c4b77
Merge pull request #3 from project-arlo/brcm_poc
PrabhuSreenivasan Jun 22, 2019
6b7d777
Merge pull request #4 from Azure/master
srideepDell Jun 25, 2019
efd773f
Changes to build sonic-mgmt-framework docker
srideepDell Jun 26, 2019
5334b91
Merge pull request #5 from project-arlo/dell_dev_changes1
jghalam Jun 26, 2019
b4d36e7
bumped up sonic-mgmt-framework commit-id
Jun 26, 2019
757bf99
Merge pull request #6 from project-arlo/brcm_poc
nirenjan Jun 26, 2019
e292c98
version bump for sonic-mgmt-framework commit-it
srideepDell Jun 27, 2019
1260d46
Merge pull request #7 from Azure/master
srideepDell Jun 27, 2019
387b8b0
bumped up sonic-mgmt-framework commit-id
srideepDell Jun 28, 2019
a825f7e
Add python packages to docker
srideepDell Jun 28, 2019
8e4b212
Build fix for docker with python packages
srideepDell Jun 28, 2019
82acec7
Merge pull request #8 from project-arlo/dell_dev_changes1
jghalam Jun 28, 2019
335b387
Merge pull request #9 from project-arlo/master
PrabhuSreenivasan Jul 9, 2019
bc95cef
added libyang as dependent package
Jul 9, 2019
5fc3cb0
Merge pull request #10 from project-arlo/brcm_poc
jghalam Jul 9, 2019
de36781
Allow building images on NFS-mounted clones
nirenjan Jul 9, 2019
c7ecb4f
bumped up sonc-mgmt-framework commit to include PR #18
Jul 10, 2019
31ea940
Merge pull request #12 from project-arlo/brcm_poc
srideepDell Jul 10, 2019
ef7d06b
REST Server startup script is enahnced to read the settings from
Jul 10, 2019
f17c27f
Merge pull request #11 from project-arlo/build-sonic-on-nfs
PrabhuSreenivasan Jul 10, 2019
12e8ed2
Merge pull request #13 from project-arlo/brcm_poc
sachinholla Jul 10, 2019
11c3192
Replace src/telemetry as submodule to sonic-telemetry
nirenjan Jul 10, 2019
4c5b824
Update telemetry commit HEAD
nirenjan Jul 10, 2019
9d96e56
Merge pull request #14 from project-arlo/sonic-telemetry-submodule
srideepDell Jul 10, 2019
ff0e23a
Update sonic-telemetry commit HEAD
nirenjan Jul 10, 2019
ec0d35d
Merge pull request #15 from project-arlo/sonic-telemetry-submodule
srideepDell Jul 10, 2019
7597470
libyang env path update
Jul 11, 2019
98abbd4
Merge pull request #16 from project-arlo/brcm_poc
sachinholla Jul 11, 2019
9385bc4
Add libyang dependency to telemetry
seiferteric Jul 12, 2019
66ea5b5
Merge pull request #17 from project-arlo/telemetry-refactor
srideepDell Jul 12, 2019
1430d49
Add scripts to create JSON files for CLI backend
hpersh-dell Jul 12, 2019
c45e80c
Merge remote-tracking branch 'upstream/master'
nirenjan Jul 16, 2019
e86f0a2
In startup script, create directory where CLI back-end files live
hpersh-dell Jul 17, 2019
7a7e456
Merge branch 'master' into dell_platform_dev
srideepDell Jul 17, 2019
4125d6a
build dependency pkgs added to docker for build failure fix
srideepDell Jul 17, 2019
c8cd633
Changes to fix build issue for mgmt framework
srideepDell Jul 17, 2019
03ae04b
Merge pull request #18 from project-arlo/build-sonic-on-nfs
jeff-yin Jul 17, 2019
be243fd
Fix exec path issue with telemetry
seiferteric Jul 17, 2019
83e398c
Merge pull request #19 from project-arlo/telemetry-refactor
jeff-yin Jul 17, 2019
53dc75e
s5232[device] PSU detecttion and default led state support
srideepDell Jul 19, 2019
1b7738c
Merge pull request #20 from project-arlo/build-sonic-on-nfs
jeff-yin Jul 19, 2019
e99a91f
Processing of first boot in rc.local should not have premature exit
hpersh-dell Jul 19, 2019
a11958a
Merge branch 'master' into dell_platform_dev
arunsundark Jul 22, 2019
1ba3305
Merge branch 'dell_platform_dev' of https://github.com/project-arlo/s…
arunsundark Jul 22, 2019
05c8a1d
docker mount options added for platform, system features
arunsundark Jul 22, 2019
ff19fd6
bumped up sonic-mgmt-framework commit id to pick 23rd July 2019 changes
Jul 24, 2019
e67219a
Merge pull request #23 from project-arlo/brcm_poc
dutta-partha Jul 24, 2019
7c32c02
Merge branch 'master' into dell_platform_dev
Jul 25, 2019
46570d1
Merge pull request #21 from Azure/master
nirenjan Jul 25, 2019
4c39486
Added mount options for telemetry docker to get access for system and…
Jul 25, 2019
7427a86
Merge branch 'master' into dell_platform_dev
Jul 26, 2019
e9d022d
Merge pull request #22 from project-arlo/dell_platform_dev
jeff-yin Jul 26, 2019
2bf2381
Update commit for sonic-utilities
nirenjan Jul 26, 2019
a7c13e2
Merge pull request #24 from project-arlo/fix-sonic-utilities-submodul…
nirenjan Jul 26, 2019
b0d7f96
[dell]: Corrected dport map and renamed config files for S5232F
AshokDaparthi Jul 29, 2019
ad4137b
Merge pull request #25 from project-arlo/build-sonic-on-nfs
jeff-yin Jul 29, 2019
03a71be
Merge branch 'master' into upstream-2019-08-06
nirenjan Aug 6, 2019
dfc2b5f
Merge pull request #26 from project-arlo/upstream-2019-08-06
nirenjan Aug 6, 2019
8c832bc
Fix telemetry submodule commit
nirenjan Aug 6, 2019
bf5f365
added support for sonic-cli console
Aug 9, 2019
429f643
Merge branch 'master' into brcm_poc
PrabhuSreenivasan Aug 9, 2019
1969e2c
Merge pull request #27 from project-arlo/brcm_poc
sachinholla Aug 12, 2019
1e45d9f
Merge pull request #28 from Azure/master
jeff-yin Aug 13, 2019
bdba462
[Dell S5232F, Z9264F] Harden FPGA driver kernel module
hpersh-dell Aug 16, 2019
30dcbe3
Merge pull request #29 from project-arlo/master
PrabhuSreenivasan Aug 27, 2019
3d260ad
update mgmt-framework submodule to 27th Aug commit.
Aug 27, 2019
a49a76f
Merge pull request #30 from project-arlo/brcm_poc
PrabhuSreenivasan Aug 27, 2019
2101176
remove changes not related to mgmt-framework and sonic-telemetry
Sep 19, 2019
14015f5
Revert "Replace src/telemetry as submodule to sonic-telemetry"
Sep 19, 2019
cace6d1
Revert "Replace src/telemetry as submodule to sonic-telemetry"
Sep 19, 2019
f568879
Merge branch 'cleanup_for_pr' of https://github.com/project-arlo/soni…
Sep 19, 2019
b19c2d1
make submodule changes and remove a change not related to PR
Sep 19, 2019
042bee7
more changes
Sep 19, 2019
29ef6c2
Merge pull request #32 from project-arlo/cleanup_for_pr
PrabhuSreenivasan Sep 19, 2019
0922838
Update .gitmodules
PrabhuSreenivasan Nov 21, 2019
d79a067
Update Dockerfile.j2
PrabhuSreenivasan Nov 21, 2019
5adb829
Update .gitmodules
PrabhuSreenivasan Nov 21, 2019
cbc502b
Update .gitmodules
PrabhuSreenivasan Nov 21, 2019
4912a0e
Update .gitmodules
PrabhuSreenivasan Nov 21, 2019
2cfcd3d
Removed syspoll for release_1.0
jeff-yin Nov 21, 2019
14694c4
Update docker-sonic-mgmt-framework.mk
PrabhuSreenivasan Nov 22, 2019
f3eb8b0
Update sonic-mgmt-framework.mk
PrabhuSreenivasan Nov 22, 2019
75e17e0
Update sonic-mgmt-framework.mk
PrabhuSreenivasan Nov 22, 2019
14f28c4
Update docker-sonic-mgmt-framework.mk
PrabhuSreenivasan Nov 22, 2019
c6e2aa8
Update docker-sonic-mgmt-framework.mk
PrabhuSreenivasan Nov 22, 2019
f3f07ba
Revert "Processing of first boot in rc.local should not have prematur…
hpersh Nov 22, 2019
07cc6ef
Remove old telemetry directory
seiferteric Nov 22, 2019
5348c91
Update docker-sonic-mgmt-framework.mk
PrabhuSreenivasan Nov 22, 2019
6550e08
Merge branch 'remove_old_telemetry' into release_1.0
seiferteric Nov 22, 2019
de94601
Merge from upstream & resolve conflicts
Nov 26, 2019
ce4dd34
Resolving merge conflict with Azure
anand-kumar-subramanian Nov 26, 2019
9c908b7
Reverting the wrong merge
anand-kumar-subramanian Nov 26, 2019
54b6eb1
Use CVL_SCHEMA_PATH instead of changing directory for telemetry startup
seiferteric Nov 26, 2019
a4e924a
Add missing export
seiferteric Nov 26, 2019
f046a0e
Add python mmh3 to slave dockerfile
sachinholla Nov 28, 2019
0006d00
Remove sonic-mgmt-framework build dep for telemetry, fix dialout star…
seiferteric Dec 4, 2019
52faab4
Provided flag to disable compiling mgmt-framework
anand-kumar-subramanian Dec 12, 2019
edfa330
Update sonic-utilites point latest commit id
Dec 20, 2019
0204c17
Point sonic-utilities to Azure accepted SHA
Dec 20, 2019
960c91d
Updating mgmt framework to right sha
dell-engops Dec 20, 2019
5262e22
Add sonic-telemetry submodule
Dec 24, 2019
4a0fe27
Update the mgmt-framework commit id
Dec 24, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,12 @@
[submodule "platform/mellanox/mlnx-sai/SAI-Implementation"]
path = platform/mellanox/mlnx-sai/SAI-Implementation
url = https://github.com/Mellanox/SAI-Implementation
[submodule "src/sonic-mgmt-framework"]
path = src/sonic-mgmt-framework
url = https://github.com/Azure/sonic-mgmt-framework
[submodule "src/sonic-telemetry"]
path = src/sonic-telemetry
url = https://github.com/Azure/sonic-telemetry
[submodule "Switch-SDK-drivers"]
path = platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
url = https://github.com/Mellanox/Switch-SDK-drivers
42 changes: 42 additions & 0 deletions dockers/docker-sonic-mgmt-framework/Dockerfile.j2
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
FROM docker-config-engine-stretch

ARG docker_container_name
RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf

## Make apt-get non-interactive
ENV DEBIAN_FRONTEND=noninteractive

RUN apt-get update
RUN pip install connexion==1.1.15 \
setuptools==21.0.0 \
grpcio-tools==1.20.0 \
pyangbind==0.6.0 \
certifi==2017.4.17 \
python-dateutil==2.6.0 \
renukamanavalan marked this conversation as resolved.
Show resolved Hide resolved
six==1.11.0 \
urllib3==1.21.1



## Install redis-tools dependencies
## TODO: implicitly install dependencies
RUN apt-get -y install libjemalloc1 libatomic1 liblua5.1-0 lua-bitop lua-cjson

COPY \
{% for deb in docker_sonic_mgmt_framework_debs.split(' ') -%}
debs/{{ deb }}{{' '}}
{%- endfor -%}
debs/

RUN dpkg -i \
{% for deb in docker_sonic_mgmt_framework_debs.split(' ') -%}
renukamanavalan marked this conversation as resolved.
Show resolved Hide resolved
debs/{{ deb }}{{' '}}
{%- endfor %}

COPY ["start.sh", "rest-server.sh", "/usr/bin/"]
COPY ["supervisord.conf", "/etc/supervisor/conf.d/"]

RUN apt-get clean -y; apt-get autoclean -y; apt-get autoremove -y
RUN rm -rf /debs

ENTRYPOINT ["/usr/bin/supervisord"]
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/bash

docker exec -it mgmt-framework /usr/sbin/cli/clish_start "$@"

52 changes: 52 additions & 0 deletions dockers/docker-sonic-mgmt-framework/rest-server.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
#!/usr/bin/env bash

# Startup script for SONiC Management REST Server

SERVER_PORT=
LOG_LEVEL=
CLIENT_AUTH=
SERVER_CRT=
SERVER_KEY=
CA_CERT=

# Read basic server settings from REST_SERVER|default entry
HAS_REST_CONFIG=$(sonic-cfggen -d -v "1 if REST_SERVER and REST_SERVER['default']")
if [ "$HAS_REST_CONFIG" == "1" ]; then
SERVER_PORT=$(sonic-cfggen -d -v "REST_SERVER['default']['port']")
CLIENT_AUTH=$(sonic-cfggen -d -v "REST_SERVER['default']['client_auth']")
LOG_LEVEL=$(sonic-cfggen -d -v "REST_SERVER['default']['log_level']")
fi

# Read certificate file paths from DEVICE_METADATA|x509 entry.
HAS_X509_CONFIG=$(sonic-cfggen -d -v "1 if DEVICE_METADATA and DEVICE_METADATA['x509']")
if [ "$HAS_X509_CONFIG" == "1" ]; then
SERVER_CRT=$(sonic-cfggen -d -v "DEVICE_METADATA['x509']['server_crt']")
SERVER_KEY=$(sonic-cfggen -d -v "DEVICE_METADATA['x509']['server_key']")
CA_CRT=$(sonic-cfggen -d -v "DEVICE_METADATA['x509']['ca_crt']")
fi

# Create temporary server certificate if they not configured in ConfigDB
if [ -z $SERVER_CRT ] && [ -z $SERVER_KEY ]; then
echo "Generating temporary TLS server certificate ..."
(cd /tmp && /usr/sbin/generate_cert --host="localhost,127.0.0.1")
SERVER_CRT=/tmp/cert.pem
SERVER_KEY=/tmp/key.pem
fi


REST_SERVER_ARGS="-ui /rest_ui -logtostderr"
[ ! -z $SERVER_PORT ] && REST_SERVER_ARGS+=" -port $SERVER_PORT"
[ ! -z $LOG_LEVEL ] && REST_SERVER_ARGS+=" -v $LOG_LEVEL"
[ ! -z $CLIENT_AUTH ] && REST_SERVER_ARGS+=" -client_auth $CLIENT_AUTH"
[ ! -z $SERVER_CRT ] && REST_SERVER_ARGS+=" -cert $SERVER_CRT"
[ ! -z $SERVER_KEY ] && REST_SERVER_ARGS+=" -key $SERVER_KEY"
[ ! -z $CA_CRT ] && REST_SERVER_ARGS+=" -cacert $CA_CRT"

echo "REST_SERVER_ARGS = $REST_SERVER_ARGS"


export CVL_SCHEMA_PATH=/usr/sbin/schema
export LIBYANG_EXTENSIONS_PLUGINS_DIR=/usr/lib/x86_64-linux-gnu/libyang/extensions
export LIBYANG_USER_TYPES_PLUGINS_DIR=/usr/lib/x86_64-linux-gnu/libyang/user_types

exec /usr/sbin/rest_server ${REST_SERVER_ARGS}
10 changes: 10 additions & 0 deletions dockers/docker-sonic-mgmt-framework/start.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#!/usr/bin/env bash

mkdir -p /var/sonic
echo "# Config files managed by sonic-config-engine" > /var/sonic/config_status

rm -f /var/run/rsyslogd.pid

supervisorctl start rsyslogd

supervisorctl start rest-server
28 changes: 28 additions & 0 deletions dockers/docker-sonic-mgmt-framework/supervisord.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
[supervisord]
logfile_maxbytes=1MB
logfile_backups=2
nodaemon=true

[program:start.sh]
command=/usr/bin/start.sh
priority=1
autostart=true
autorestart=false
stdout_logfile=syslog
stderr_logfile=syslog

[program:rsyslogd]
command=/usr/sbin/rsyslogd -n
priority=2
autostart=false
autorestart=false
stdout_logfile=syslog
stderr_logfile=syslog

[program:rest-server]
command=/usr/bin/rest-server.sh
priority=3
autostart=false
autorestart=true
stdout_logfile=syslog
stderr_logfile=syslog
2 changes: 1 addition & 1 deletion dockers/docker-sonic-telemetry/dialout.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash

# Start with default config

export CVL_SCHEMA_PATH=/usr/sbin/schema
exec /usr/sbin/dialout_client_cli -insecure -logtostderr -v 2

4 changes: 2 additions & 2 deletions dockers/docker-sonic-telemetry/supervisord.conf
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ nodaemon=true
[eventlistener:supervisor-proc-exit-listener]
command=/usr/bin/supervisor-proc-exit-listener
events=PROCESS_STATE_EXITED
autostart=always
autorestart=unexpected
autostart=true
autorestart=false

[program:start.sh]
command=/usr/bin/start.sh
Expand Down
1 change: 1 addition & 0 deletions dockers/docker-sonic-telemetry/telemetry.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ X509=`sonic-cfggen -d -v "DEVICE_METADATA['x509']"`
TELEMETRY=`sonic-cfggen -d -v 'TELEMETRY.keys() | join(" ") if TELEMETRY'`

TELEMETRY_ARGS=" -logtostderr"
export CVL_SCHEMA_PATH=/usr/sbin/schema

if [ -n "$X509" ]; then
SERVER_CRT=`sonic-cfggen -d -v "DEVICE_METADATA['x509']['server_crt']"`
Expand Down
14 changes: 14 additions & 0 deletions files/build_templates/mgmt-framework.service.j2
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
[Unit]
Description=Management Framework container
Requires=swss.service
After=swss.service
Before=ntp-config.service

[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

[Install]
WantedBy=multi-user.target
3 changes: 3 additions & 0 deletions files/image_config/platform/rc.local
Original file line number Diff line number Diff line change
Expand Up @@ -331,4 +331,7 @@ if [ -f $FIRST_BOOT_FILE ]; then
firsttime_exit
fi

# Create dir where following scripts put their output files
mkdir -p /var/platform

exit 0
3 changes: 3 additions & 0 deletions rules/config
Original file line number Diff line number Diff line change
Expand Up @@ -98,3 +98,6 @@ DEFAULT_VS_PREPARE_MEM = yes

# ENABLE_SYSTEM_SFLOW - build docker-sonic-sflow for sFlow support
ENABLE_SFLOW = y

# ENABLE_MGMT_FRAMEWORK - build docker-sonic-mgt-framework for CLI and REST server support
ENABLE_MGMT_FRAMEWORK = y
34 changes: 34 additions & 0 deletions rules/docker-sonic-mgmt-framework.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
# docker image for mgmt-framework

DOCKER_MGMT_FRAMEWORK_STEM = docker-sonic-mgmt-framework
DOCKER_MGMT_FRAMEWORK = $(DOCKER_MGMT_FRAMEWORK_STEM).gz
DOCKER_MGMT_FRAMEWORK_DBG = $(DOCKER_MGMT_FRAMEWORK_STEM)-$(DBG_IMAGE_MARK).gz

$(DOCKER_MGMT_FRAMEWORK)_PATH = $(DOCKERS_PATH)/$(DOCKER_MGMT_FRAMEWORK_STEM)

$(DOCKER_MGMT_FRAMEWORK)_DEPENDS += $(REDIS_TOOLS) $(SONIC_MGMT_FRAMEWORK)
$(DOCKER_MGMT_FRAMEWORK)_DBG_DEPENDS = $($(DOCKER_CONFIG_ENGINE_STRETCH)_DBG_DEPENDS)
$(DOCKER_MGMT_FRAMEWORK)_DBG_DEPENDS += $(REDIS_TOOLS) $(SONIC_MGMT_FRAMEWORK_DBG)

renukamanavalan marked this conversation as resolved.
Show resolved Hide resolved
SONIC_DOCKER_IMAGES += $(DOCKER_MGMT_FRAMEWORK)
$(DOCKER_MGMT_FRAMEWORK)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_STRETCH)
$(DOCKER_MGMT_FRAMEWORK)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_STRETCH)_DBG_IMAGE_PACKAGES)

ifeq ($(ENABLE_MGMT_FRAMEWORK), y)
SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_MGMT_FRAMEWORK)
SONIC_STRETCH_DOCKERS += $(DOCKER_MGMT_FRAMEWORK)
endif

renukamanavalan marked this conversation as resolved.
Show resolved Hide resolved
SONIC_DOCKER_DBG_IMAGES += $(DOCKER_MGMT_FRAMEWORK_DBG)
ifeq ($(ENABLE_MGMT_FRAMEWORK), y)
SONIC_INSTALL_DOCKER_DBG_IMAGES += $(DOCKER_MGMT_FRAMEWORK_DBG)
SONIC_STRETCH_DBG_DOCKERS += $(DOCKER_MGMT_FRAMEWORK_DBG)
endif

$(DOCKER_MGMT_FRAMEWORK)_CONTAINER_NAME = mgmt-framework
$(DOCKER_MGMT_FRAMEWORK)_RUN_OPT += --net=host --privileged -t
$(DOCKER_MGMT_FRAMEWORK)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
$(DOCKER_MGMT_FRAMEWORK)_RUN_OPT += -v /etc:/host_etc:ro
$(DOCKER_MGMT_FRAMEWORK)_RUN_OPT += --mount type=bind,source="/var/platform/",target="/mnt/platform/"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why do we need to mount platform in mgmt framework. it suppose to be platform independent, right?


$(DOCKER_MGMT_FRAMEWORK)_BASE_IMAGE_FILES += sonic-cli:/usr/bin/sonic-cli
1 change: 1 addition & 0 deletions rules/docker-telemetry.mk
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,6 @@ endif
$(DOCKER_TELEMETRY)_CONTAINER_NAME = telemetry
$(DOCKER_TELEMETRY)_RUN_OPT += --net=host --privileged -t
$(DOCKER_TELEMETRY)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
$(DOCKER_TELEMETRY)_RUN_OPT += --mount type=bind,source="/var/platform/",target="/mnt/platform/"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why do we need to mount platform in mgmt framework. it suppose to be platform independent, right?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is used in two places. 1. Get system information 2. If needed override the default validation(if it is deemed insufficient) and do platform specific validation

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what system information, we have put sys eeprom information in state db.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Following link has the information that we get for the openConfig System module. This is the first module in the link below.

https://github.com/project-arlo/sonic-mgmt-framework/wiki/YANG-Object-Reference


$(DOCKER_TELEMETRY)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT)
16 changes: 16 additions & 0 deletions rules/sonic-mgmt-framework.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# SONiC mgmt-framework package

ifeq ($(ENABLE_MGMT_FRAMEWORK), y)

SONIC_MGMT_FRAMEWORK = sonic-mgmt-framework_1.0-01_amd64.deb
$(SONIC_MGMT_FRAMEWORK)_SRC_PATH = $(SRC_PATH)/sonic-mgmt-framework
$(SONIC_MGMT_FRAMEWORK)_DEPENDS = $(LIBYANG_DEV) $(LIBYANG)
$(SONIC_MGMT_FRAMEWORK)_RDEPENDS = $(LIBYANG)
SONIC_DPKG_DEBS += $(SONIC_MGMT_FRAMEWORK)

SONIC_MGMT_FRAMEWORK_DBG = sonic-mgmt-framework-dbg_1.0-01_amd64.deb
$(SONIC_MGMT_FRAMEWORK_DBG)_DEPENDS += $(SONIC_MGMT_FRAMEWORK)
$(SONIC_MGMT_FRAMEWORK_DBG)_RDEPENDS += $(SONIC_MGMT_FRAMEWORK)
$(eval $(call add_derived_package,$(SONIC_MGMT_FRAMEWORK),$(SONIC_MGMT_FRAMEWORK_DBG)))

endif
4 changes: 3 additions & 1 deletion rules/telemetry.mk
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# SONiC telemetry package

SONIC_TELEMETRY = sonic-telemetry_0.1_$(CONFIGURED_ARCH).deb
$(SONIC_TELEMETRY)_SRC_PATH = $(SRC_PATH)/telemetry
$(SONIC_TELEMETRY)_SRC_PATH = $(SRC_PATH)/sonic-telemetry
$(SONIC_TELEMETRY)_DEPENDS = $(LIBYANG_DEV) $(LIBYANG)
$(SONIC_TELEMETRY)_RDEPENDS = $(LIBYANG)
SONIC_DPKG_DEBS += $(SONIC_TELEMETRY)
3 changes: 3 additions & 0 deletions sonic-slave-stretch/Dockerfile.j2
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,9 @@ RUN pip install mockredispy==2.9.3
RUN pip install pytest-runner==4.4
RUN pip install setuptools==40.8.0

# For mgmt-framework build
RUN pip install mmh3

# Install dependencies for isc-dhcp-relay build
RUN apt-get -y build-dep isc-dhcp

Expand Down
1 change: 1 addition & 0 deletions src/sonic-mgmt-framework
Submodule sonic-mgmt-framework added at 8b199a
1 change: 1 addition & 0 deletions src/sonic-telemetry
Submodule sonic-telemetry added at aaa918
20 changes: 0 additions & 20 deletions src/telemetry/Makefile

This file was deleted.

5 changes: 0 additions & 5 deletions src/telemetry/debian/changelog

This file was deleted.

1 change: 0 additions & 1 deletion src/telemetry/debian/compat

This file was deleted.

17 changes: 0 additions & 17 deletions src/telemetry/debian/control

This file was deleted.

3 changes: 0 additions & 3 deletions src/telemetry/debian/rules

This file was deleted.

14 changes: 0 additions & 14 deletions src/telemetry/debian/telemetry.init.d

This file was deleted.