From a871bf21392e490186acb54c151de0da334b074b Mon Sep 17 00:00:00 2001
From: Monocots <gitmaster@rhizomatica.org>
Date: Fri, 5 Apr 2024 02:31:37 +0000
Subject: [PATCH] update osmocom versions

---
 modules/rhizo_base/manifests/osmocom.pp | 50 ++++++++++++++++++-------
 1 file changed, 36 insertions(+), 14 deletions(-)

diff --git a/modules/rhizo_base/manifests/osmocom.pp b/modules/rhizo_base/manifests/osmocom.pp
index 961f54c..3a05745 100644
--- a/modules/rhizo_base/manifests/osmocom.pp
+++ b/modules/rhizo_base/manifests/osmocom.pp
@@ -20,25 +20,44 @@ class rhizo_base::osmocom::buster inherits rhizo_base::osmocom::common {
       ensure   => 'installed'
    }
 
-  package { [ 'libosmoabis10' ]:
-      ensure   => '1.4.1'
+  package { [ 'libosmoabis13', 'libosmotrau2' ]:
+      ensure   => '1.5.2'
+   }
+
+  package { [ 'libosmonetif11' ]:
+      ensure   => '1.4.0'
+   }
+
+  package { [ 'libosmo-ranap7' ]:
+      ensure   => '1.5.1'
    }
 
   package { [ 'libosmocore' ]:
-      ensure   => '1.8.0'
+      ensure   => '1.9.2'
    }
 
   package { [ 'osmo-bsc', 'osmo-bsc-meas-utils' ]:
-      ensure   => '1.9.0+rhizo3b',
+      schedule => 'offpeak',
+      ensure   => '1.11.0.2.6c6ca~rhizomatica.production',
       require  => Class['rhizo_base::apt'],
       notify   => Exec['notify-osmo-restart'],
    }
   package { [ 'osmo-msc' ]:
+      schedule => 'offpeak',
       require  => Class['rhizo_base::apt'],
-      ensure   => '1.10.0.77.11e4b~rhizomatica.production',
+      ensure   => '1.9.0.92.a021a~rhizomatica.production',
    }
-  package { [ 'osmo-sgsn', 'libgtp6' ]:
-      ensure   => "$repo" ? { "latest" => '1.10.1', "nightly" => "installed" },
+  package { [ 'osmo-mgw', 'libosmo-mgcp-client12' ]:
+      schedule => 'offpeak',
+      require  => Class['rhizo_base::apt'],
+      ensure   => '1.12.2.8.78a93~rhizomatica.production',
+   }
+  package { [ 'osmo-sgsn' ]:
+      ensure   => "$repo" ? { "latest" => '1.11.1.2.01c5~rhizomatica.production', "nightly" => "installed" },
+      require  => Class['rhizo_base::apt'],
+   }
+  package { [ 'libgtp6' ]:
+      ensure   => "$repo" ? { "latest" => '1.11.0', "nightly" => "installed" },
       require  => Class['rhizo_base::apt'],
    }
   package { [ 'osmo-sip-connector' ]:
@@ -47,9 +66,15 @@ class rhizo_base::osmocom::buster inherits rhizo_base::osmocom::common {
     }
   package { [ 'osmo-hlr', 'libosmo-mslookup1', 'osmo-mslookup-utils',
                'libosmo-gsup-client0' ]:
-      ensure   => '1.6.0.19.80b2~rhizomatica.production',
+      schedule => 'offpeak',
+      ensure   => '1.7.0.10.6784~rhizomatica.production',
       require  => Class['rhizo_base::apt'],
     }
+  package { [ 'osmo-stp' ]:
+      ensure   => '1.8.1',
+      require  => Class['rhizo_base::apt'],
+    }
+
 }
 
 class rhizo_base::osmocom::common {
@@ -82,7 +107,8 @@ class rhizo_base::osmocom::common {
   $mgw_num_ep     =  hiera('rhizo::mgw_num_ep', $bts.size * 24)
   $osmo_local_bin  = hiera('rhizo::osmo_local_bin', [])
 
-  package { "osmocom-nitb":
+  package { [ "osmocom-nitb", 'libosmo-sigtran7',
+              'libosmo-mgcp-client9', 'libosmonetif8' ]:
      ensure   => 'absent'
     }
 
@@ -91,15 +117,11 @@ class rhizo_base::osmocom::common {
       ensure   => 'installed',
     }
 
-  package {  [ 'libsmpp1', 'libosmo-sigtran7',
-               'libosmo-mgcp-client9',
-               'libosmonetif8', 'libosmotrau2',
-               'osmo-stp', 'osmo-mgw' ]:
+  package {  [ 'libsmpp1', 'libosmo-sigtran9' ]:
       ensure   => 'installed',
       require  => Class['rhizo_base::apt']
     }
 
-
   $ts0_phys_chan = { "unknown"  => "CCCH",
                      "1002"     => "CCCH+SDCCH4",
                      "1020"     => "CCCH+SDCCH4",