From 3b96cf3bb427f259601af590e77fdf41fb0ba25e Mon Sep 17 00:00:00 2001 From: Daniel Willmann Date: Fri, 7 Jun 2019 14:54:38 +0200 Subject: [PATCH] Add script to regenerate VTY and counter documentation This script needs access to the VTY interface, so I changed some remaining config files to bind the VTY interface to 0.0.0.0. There are a couple of services that do that already. Related: OS#1700 Change-Id: Ic5cf7f59de0c18d4c5568b89433c2b11db2a72a5 --- osmo-bsc-master/osmo-bsc.cfg | 1 + osmo-hlr-master/osmo-hlr.cfg | 1 + osmo-hnbgw-master/osmo-hnbgw.cfg | 3 ++ osmo-mgw-master/osmo-mgw.cfg | 1 + osmo-msc-master/osmo-msc.cfg | 1 + osmo-sip-master/osmo-sip-connector.cfg | 3 ++ scripts/regen_doc.sh | 43 ++++++++++++++++++++++++++ 7 files changed, 53 insertions(+) create mode 100755 scripts/regen_doc.sh diff --git a/osmo-bsc-master/osmo-bsc.cfg b/osmo-bsc-master/osmo-bsc.cfg index cb0059d3..7ce91739 100644 --- a/osmo-bsc-master/osmo-bsc.cfg +++ b/osmo-bsc-master/osmo-bsc.cfg @@ -46,6 +46,7 @@ stats interval 5 ! line vty no login + bind 0.0.0.0 ! e1_input e1_line 0 driver ipa diff --git a/osmo-hlr-master/osmo-hlr.cfg b/osmo-hlr-master/osmo-hlr.cfg index f3be5187..9d8b125e 100644 --- a/osmo-hlr-master/osmo-hlr.cfg +++ b/osmo-hlr-master/osmo-hlr.cfg @@ -11,6 +11,7 @@ log stderr logging level linp error ! line vty + no login bind 0.0.0.0 ctrl bind 0.0.0.0 diff --git a/osmo-hnbgw-master/osmo-hnbgw.cfg b/osmo-hnbgw-master/osmo-hnbgw.cfg index 8bffd760..4c7e75bb 100644 --- a/osmo-hnbgw-master/osmo-hnbgw.cfg +++ b/osmo-hnbgw-master/osmo-hnbgw.cfg @@ -19,6 +19,9 @@ log stderr logging level lctrl notice logging level lgtp notice logging level lstats notice +line vty + no login + bind 0.0.0.0 cs7 instance 0 point-code 0.23.5 asp asp-clnt-OsmoHNBGW 2905 0 m3ua diff --git a/osmo-mgw-master/osmo-mgw.cfg b/osmo-mgw-master/osmo-mgw.cfg index 44653e3b..682c4ed6 100644 --- a/osmo-mgw-master/osmo-mgw.cfg +++ b/osmo-mgw-master/osmo-mgw.cfg @@ -31,6 +31,7 @@ stats interval 5 ! line vty no login + bind 0.0.0.0 ! mgcp bind ip 172.18.0.180 diff --git a/osmo-msc-master/osmo-msc.cfg b/osmo-msc-master/osmo-msc.cfg index 91c9eeed..929e88c7 100644 --- a/osmo-msc-master/osmo-msc.cfg +++ b/osmo-msc-master/osmo-msc.cfg @@ -3,6 +3,7 @@ ! line vty no login + bind 0.0.0.0 ! network network country code 1 diff --git a/osmo-sip-master/osmo-sip-connector.cfg b/osmo-sip-master/osmo-sip-connector.cfg index ad429696..5a0b4f5f 100644 --- a/osmo-sip-master/osmo-sip-connector.cfg +++ b/osmo-sip-master/osmo-sip-connector.cfg @@ -1,3 +1,6 @@ +line vty + no login + bind 0.0.0.0 app mncc socket-path /tmp/bsc_mncc diff --git a/scripts/regen_doc.sh b/scripts/regen_doc.sh new file mode 100755 index 00000000..7c7529fe --- /dev/null +++ b/scripts/regen_doc.sh @@ -0,0 +1,43 @@ +#!/bin/sh +x + +. ../jenkins-common.sh + +NAME="$1" +PORT="$2" +COUNTERFILE="$3" +VTYFILE="$4" + +IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" +if [ -z "$OSMO_INTERACT_VTY" ]; then + OSMO_INTERACT_VTY="osmo-interact-vty.py" +fi + +docker_images_require \ + "$NAME-$IMAGE_SUFFIX" + +network_create 172.18.12.0/24 + +container_create() { + CONTAINERNAME=$1 + IP_ADDR=$2 + + docker run --rm --network ${NET_NAME} --ip ${IP_ADDR} \ + --name ${BUILD_TAG}-${CONTAINERNAME} -d \ + ${REPO_USER}/${CONTAINERNAME} + + +} + +container_create "$NAME-$IMAGE_SUFFIX" 172.18.12.23 + +# Get asciidoc counter info +${OSMO_INTERACT_VTY} \ + -c "enable;show asciidoc counters" -p "$PORT" -H 172.18.12.23 -O "$COUNTERFILE" + +# Get vty reference +${OSMO_INTERACT_VTY} \ + -X -p "$PORT" -H 172.18.12.23 -O "$VTYFILE" + +docker container kill "${BUILD_TAG}-$NAME-$IMAGE_SUFFIX" + +network_remove