experiments/clixon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Docker: enable ssh tests

Browse source 
Test: restore tty after restconf start
This commit is contained in:
Olof hagsand 2023-11-19 12:16:23 +01:00
parent 8601690c91
commit cafbe7d200
10 changed files with 41 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
docker/test/Dockerfile
View file

@ -45,6 +45,9 @@ RUN apk add --update net-snmp net-snmp-dev
# For groupadd/groupdel
RUN apk add --update shadow
# Test-specific (for test scripts)
RUN apk add --update openssh
# Checkout standard YANG models for tests (note >1G for full repo)
RUN mkdir -p /usr/local/share/yang
WORKDIR /usr/local/share/yang
@ -129,7 +132,7 @@ RUN echo "agentXSocket unix:/var/run/snmp.sock" >> /etc/snmp/snmpd.conf
RUN echo "agentxperms 777 777" >> /etc/snmp/snmpd.conf
# Test-specific (for test scripts)
RUN apk add --update sudo curl procps grep make bash expect
RUN apk add --update sudo curl procps grep make bash expect openssh
# Create clicon user and group
RUN adduser -D -H clicon

5
docker/test/Dockerfile.fcgi
View file

@ -48,6 +48,9 @@ RUN apk add --update net-snmp net-snmp-dev
# For groupadd/groupdel
RUN apk add --update shadow
# Test-specific (for test scripts)
RUN apk add --update openssh
# Checkout standard YANG models for tests (note >1G for full repo)
RUN mkdir -p /usr/local/share/yang
WORKDIR /usr/local/share/yang
@ -142,7 +145,7 @@ RUN adduser -D -H -G www-data www-data
RUN apk add --update nginx
# Test-specific (for test scripts)
RUN apk add --update sudo curl procps grep make bash expect
RUN apk add --update sudo curl procps grep make bash expect openssh
# Expose nginx port for restconf
EXPOSE 80

9
docker/test/Dockerfile.native
View file

@ -47,6 +47,9 @@ RUN apk add --update net-snmp net-snmp-dev
# For groupadd/groupdel
RUN apk add --update shadow
# Test-specific (for test scripts)
RUN apk add --update openssh
# Checkout standard YANG models for tests (note >1G for full repo)
RUN mkdir -p /usr/local/share/yang
WORKDIR /usr/local/share/yang
@ -122,18 +125,16 @@ FROM alpine
MAINTAINER Olof Hagsand <olof@hagsand.se>
# For clixon and cligen
RUN apk add --update flex bison
RUN apk add --update flex bison openssl
# need to add www user manually
RUN adduser -D -H -G www-data www-data
RUN apk add --update openssl
# nghttp2 dependencies
RUN apk add --update nghttp2
# Test-specific (for test scripts)
RUN apk add --update sudo curl procps grep make bash expect
RUN apk add --update sudo curl procps grep make bash expect openssh
# For SNMP
RUN apk add --update net-snmp net-snmp-tools

3
docker/test/startsystem.sh
View file

@ -73,6 +73,9 @@ EOF
# Patch yang syntax errors
sed -i s/=\ olt\'/=\ \'olt\'/g /usr/local/share/yang/standard/ieee/published/802.3/ieee802-ethernet-pon.yang
# Generate ssh host keys
ssh-keygen -A
# Workaround for this error output:
# sudo: setrlimit(RLIMIT_CORE): Operation not permitted
echo "Set disable_coredump false" > /etc/sudo.conf

3
docker/test/startsystem_fcgi.sh
View file

@ -103,6 +103,9 @@ EOF
# Patch yang syntax errors
sed -i s/=\ olt\'/=\ \'olt\'/g /usr/local/share/yang/standard/ieee/published/802.3/ieee802-ethernet-pon.yang
# Generate ssh host keys
ssh-keygen -A
# Workaround for this error output:
# sudo: setrlimit(RLIMIT_CORE): Operation not permitted
echo "Set disable_coredump false" > /etc/sudo.conf

3
docker/test/startsystem_native.sh
View file

@ -70,6 +70,9 @@ EOF
# Patch yang syntax errors
sed -i s/=\ olt\'/=\ \'olt\'/g /usr/local/share/yang/standard/ieee/published/802.3/ieee802-ethernet-pon.yang
# Generate ssh host keys
ssh-keygen -A
# Workaround for this error output:
# sudo: setrlimit(RLIMIT_CORE): Operation not permitted
echo "Set disable_coredump false" > /etc/sudo.conf

7
test/README.md
View file

@ -36,6 +36,13 @@ To download the openconfig and yang models required for the tests:
git pull origin main
```
## SSH and SSHD
Some tests require ssh and even sshd (eg test_netconf_ssh_callhome.sh), and requires generated host-keys:
```
# ssh-keygen -a
```
## Continuous Integration
CI is done via github actions.

1
test/lib.sh
View file

@ -637,6 +637,7 @@ function wait_restconf(){
fi
# echo "curl $CURLOPTS -X GET $myproto://localhost/restconf"
hdr=$(curl $CURLOPTS -X GET $myproto://localhost/restconf 2> /dev/null)
stty $STTYSETTINGS >/dev/null
# echo "hdr:\"$hdr\""
let i=0;
while [[ "$hdr" != *"200"* ]]; do

8
test/test_netconf_ssh_callhome.sh
View file

@ -1,5 +1,6 @@
#!/usr/bin/env bash
# Netconf callhome RFC 8071
# Requires an openssh + opensshd install + ssh-keygen -A
# Magic line must be first in script (see README.md)
s="$_" ; . ./lib.sh || if [ "$s" = $0 ]; then exit 0; else return 0; fi
@ -13,6 +14,13 @@ if ! [ -x "$ssh_bin" ]; then
if [ "$s" = $0 ]; then exit 0; else return 0; fi # skip
fi
if ! [ -x "/usr/sbin/sshd" ]; then
echo "...sshd not installed"
rm -rf $dir
if [ "$s" = $0 ]; then exit 0; else return 0; fi # skip
fi
# Dont run this test with valgrind
if [ $valgrindtest -ne 0 ]; then
echo "...skipped "