Skip to content

Commit 5c6b86b

Browse files
authored
Add gnoic to PTF container. (#22114)
Why I did it gnoic is a well written gnoic client with good coverage for our need. We should use it for our sonic-mgmt tests (at least) How I did it How to verify it Install to ptf host and run gnoic to a sonic device.
1 parent 469e03c commit 5c6b86b

File tree

2 files changed

+18
-7
lines changed

2 files changed

+18
-7
lines changed

ThirdPartyLicenses.txt

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -978,6 +978,7 @@ Microsoft is offering you a license to use the following components, to the exte
978978
*/
979979

980980
4. apt-clean, apt-gzip-indexes, apt-no-languages imported from docker v1.11.1
981+
5. gnoic imported from https://github.com/karimra/gnoic using Apache License 2.0
981982
/*
982983
* Apache License
983984
* Version 2.0, January 2004
@@ -1171,17 +1172,17 @@ Microsoft is offering you a license to use the following components, to the exte
11711172
* limitations under the License.
11721173
*/
11731174

1174-
5. src/tacacs/bash/bash_tacplus based on https://github.com/daveolson53/tacplus-auth project using GNU GENERAL PUBLIC LICENSE Version 2
1175+
6. src/tacacs/bash/bash_tacplus based on https://github.com/daveolson53/tacplus-auth project using GNU GENERAL PUBLIC LICENSE Version 2
11751176

11761177
/* Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
11771178
* Upstream-Name: tacplus-auth
11781179
* Source: https://github.com/daveolson53/tacplus-auth
1179-
*
1180+
*
11801181
* Files: *
11811182
* Copyright: 2016 Cumulus Networks, Inc. All rights reserved.,
11821183
* 2010 Pawel Krawczyk <[email protected]> and Jeroen Nijhof <[email protected]>.
11831184
* License: GPL-2+
1184-
*
1185+
*
11851186
* License: GPL-2+
11861187
* This program is free software; you can redistribute it and/or modify
11871188
* it under the terms of the GNU General Public License as published by
@@ -1199,4 +1200,5 @@ Microsoft is offering you a license to use the following components, to the exte
11991200
* .
12001201
* On Debian systems, the full copy of the GPL-2 license can be found in
12011202
* /usr/share/common-licenses/GPL-2
1202-
*/
1203+
*/
1204+

dockers/docker-ptf/Dockerfile.j2

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,15 @@ RUN cd gnxi \
302302
&& pip3 install -r /tmp/requirements.txt
303303
{% endif %}
304304

305+
# Install gnoic tool
306+
RUN git clone https://github.com/karimra/gnoic.git \
307+
&& cd gnoic \
308+
&& git checkout 57aac3d \
309+
&& chmod +x install.sh \
310+
&& ./install.sh \
311+
&& cd .. \
312+
&& rm -rf gnoic
313+
305314
COPY \
306315
{% for deb in docker_ptf_debs.split(' ') -%}
307316
debs/{{ deb }}{{' '}}
@@ -315,8 +324,8 @@ debs/{{ deb }}{{' '}}
315324

316325
{% if PTF_ENV_PY_VER == "py3" %}
317326
# Create symlink so that test scripts and ptf_runner invocation path
318-
# is same across python 2 and python 3 envs. Note that for virtual-env
319-
# ptf is under /root/env-python3/bin.
327+
# is same across python 2 and python 3 envs. Note that for virtual-env
328+
# ptf is under /root/env-python3/bin.
320329
# TODO - cleanup when the supported PTF image is py3only across all branches
321330
RUN mkdir -p /root/env-python3/bin \
322331
&& ln -s /usr/local/bin/ptf /usr/bin/ptf \
@@ -328,4 +337,4 @@ RUN mkdir -p /root/env-python3/bin \
328337
COPY ["*.ini", "/etc/ptf/"]
329338
EXPOSE 22 8009
330339

331-
ENTRYPOINT ["/usr/local/bin/supervisord", "-c", "/etc/supervisor/supervisord.conf"]
340+
ENTRYPOINT ["/usr/local/bin/supervisord", "-c", "/etc/supervisor/supervisord.conf"]

0 commit comments

Comments
 (0)