From fea2cbff3cb6c9cce52f05019676b49ed53f63ef Mon Sep 17 00:00:00 2001
From: Keith Whyte <keith@rhizomatica.org>
Date: Tue, 28 Mar 2023 08:45:36 +0200
Subject: [PATCH] BTS: update provision and scripts

---
 modules/rhizo_base/files/SysmoBTS/bts          |  5 +----
 modules/rhizo_base/files/SysmoBTS/pcu          | 18 ++++++++++--------
 modules/rhizo_base/files/SysmoBTS/provision.sh |  6 +++---
 modules/rhizo_base/templates/osmo-pcu.cfg.erb  |  2 +-
 4 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/modules/rhizo_base/files/SysmoBTS/bts b/modules/rhizo_base/files/SysmoBTS/bts
index fc6f878..9f09b81 100644
--- a/modules/rhizo_base/files/SysmoBTS/bts
+++ b/modules/rhizo_base/files/SysmoBTS/bts
@@ -15,8 +15,6 @@ expect "#"
 send "logging level set-all error\r"
 expect "#"
 
-
-
 send "logging level linp info\r"
 expect "#"
 send "logging level lmi info\r"
@@ -29,10 +27,9 @@ send "logging level rll info\r"
 expect "#"
 send "logging level meas fatal\r"
 expect "#"
-send "logging level rtp fatal\r"
+send "logging level pcu notice\r"
 expect "#"
 
 send "logging filter all 1\r"
 expect "#"
 interact
-
diff --git a/modules/rhizo_base/files/SysmoBTS/pcu b/modules/rhizo_base/files/SysmoBTS/pcu
index 5d3df01..9cc9b88 100644
--- a/modules/rhizo_base/files/SysmoBTS/pcu
+++ b/modules/rhizo_base/files/SysmoBTS/pcu
@@ -6,24 +6,26 @@ send "enable\r"
 expect "#"
 send "logging enable\r"
 expect "#"
-send "logging level all everything\r"
+send "logging level set-all fatal\r"
+expect "#"
+send "logging print level 1\r"
 expect "#"
 send "logging print category 1\r"
 expect "#"
 
-send "logging level l1if info\r"
+send "logging level l1if error\r"
 expect "#"
-send "logging level rlcmac info\r"
+send "logging level rlcmac error\r"
 expect "#"
-send "logging level rlcmacmeas notice\r"
+send "logging level rlcmacmeas error\r"
 expect "#"
-send "logging level tbf info\r"
+send "logging level tbf notice\r"
 expect "#"
-send "logging level tbful info\r"
+send "logging level tbful notice\r"
 expect "#"
-send "logging level tbfdl info\r"
+send "logging level tbfdl notice\r"
 expect "#"
-send "logging level rlcmacsched info\r"
+send "logging level rlcmacsched notice\r"
 expect "#"
 
 send "logging level set-all error\r"
diff --git a/modules/rhizo_base/files/SysmoBTS/provision.sh b/modules/rhizo_base/files/SysmoBTS/provision.sh
index 8b9cfc9..69047e2 100644
--- a/modules/rhizo_base/files/SysmoBTS/provision.sh
+++ b/modules/rhizo_base/files/SysmoBTS/provision.sh
@@ -24,10 +24,10 @@ for bts in "${!BTS[@]}" ; do
   ssh $SSH_OPTS root@${BTS[$bts]} "echo nameserver 1.1.1.1 > /etc/resolv.conf; echo nameserver 9.9.9.9 >> /etc/resolv.conf"
   ssh $SSH_OPTS root@${BTS[$bts]} "mkdir -p /etc/profile.d"
   scp $SSH_OPTS alias.sh root@${BTS[$bts]}:/etc/profile.d/alias.sh
-  scp $SSH_OPTS osmo-pcu.cfg root@${BTS[$bts]}:/etc/osmocom/osmo-pcu.cfg
+  scp $SSH_OPTS osmo-pcu_$bts.cfg root@${BTS[$bts]}:/etc/osmocom/osmo-pcu.cfg
   scp $SSH_OPTS osmo-bts_$bts.cfg root@${BTS[$bts]}:/etc/osmocom/osmo-bts-sysmo.cfg
-  scp $SSH_OPTS pcu bts mgr txp root@${BTS[$bts]}:/bin/
-  ssh $SSH_OPTS root@${BTS[$bts]} "chmod 750 /bin/pcu /bin/bts /bin/mgr /bin/txp"
+  scp $SSH_OPTS pcu bts mgr txp /usr/local/bin/vty root@${BTS[$bts]}:/bin/
+  ssh $SSH_OPTS root@${BTS[$bts]} "chmod 750 /bin/pcu /bin/bts /bin/mgr /bin/txp /bin/vty"
   ssh $SSH_OPTS root@${BTS[$bts]} "expect -v 2>/dev/null"
 
   if [ "$?" != "0" ]; then
diff --git a/modules/rhizo_base/templates/osmo-pcu.cfg.erb b/modules/rhizo_base/templates/osmo-pcu.cfg.erb
index b9ec781..361a57a 100644
--- a/modules/rhizo_base/templates/osmo-pcu.cfg.erb
+++ b/modules/rhizo_base/templates/osmo-pcu.cfg.erb
@@ -5,7 +5,7 @@ stats reporter statsd
   remote-ip 172.16.0.1
   remote-port 8125
   level global
-  no prefix
+  prefix PCU-<%= @bts[@i]["name"].gsub(' ','-') %>
   enable
 !
 pcu