pespin has uploaded this change for review.
Document future removal of unneeded osmo-stp.cfg AS dynamic routing-key routes
With recent libosmo-sigtran improvements, those routes are added
automatically in a dynamic way, and there's no need to set them
explicitly, which simplifies config quite a lot.
Mark the places for future removal once we release libosmo-sigtran so we
can use the same config files in both master and latest.
Related: libosmo-sigtran.git Change-Id Icd9e43736ea9240060244cebcacba1f8119043a5
Related: OS#7070
Change-Id: I1ef20c7762a67d34461cd03b0390ace4358ca286
---
M bsc/osmo-stp.cfg
M hnbgw/osmo-stp.cfg
M msc/osmo-stp.cfg
M sgsn/osmo-stp.cfg
M smlc/osmo-stp.cfg
M stp/osmo-stp-ipa-m3ua.confmerge
M stp/osmo-stp-ipa.confmerge
M stp/osmo-stp-m3ua-tcp.confmerge
M stp/osmo-stp-m3ua.confmerge
M stp/osmo-stp-tcap.confmerge
10 files changed, 14 insertions(+), 5 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/32/43832/1
diff --git a/bsc/osmo-stp.cfg b/bsc/osmo-stp.cfg
index 0ec559c..63791d0 100644
--- a/bsc/osmo-stp.cfg
+++ b/bsc/osmo-stp.cfg
@@ -73,6 +73,7 @@
routing-key 6 0.23.6
route-table system
+ ! These 'update route' below are no longer needed and can be dropped with libosmo-sigtran >2.3.0:
update route 0.23.3 7.255.7 linkset bsc0
update route 0.23.1 7.255.7 linkset virt-msc0
update route 0.0.2 7.255.7 linkset virt-msc1
diff --git a/hnbgw/osmo-stp.cfg b/hnbgw/osmo-stp.cfg
index fe01f7f..4dc8e71 100644
--- a/hnbgw/osmo-stp.cfg
+++ b/hnbgw/osmo-stp.cfg
@@ -101,6 +101,7 @@
routing-key 6 0.1.3
route-table system
+ ! These 'update route' below are no longer needed and can be dropped with libosmo-sigtran >2.3.0:
update route 0.23.5 7.255.7 linkset hnbgw0
update route 0.23.1 7.255.7 linkset virt-msc0
update route 0.0.2 7.255.7 linkset virt-msc1
diff --git a/msc/osmo-stp.cfg b/msc/osmo-stp.cfg
index ad43ba2..5da1f41 100644
--- a/msc/osmo-stp.cfg
+++ b/msc/osmo-stp.cfg
@@ -60,6 +60,7 @@
asp virt-rnc0-0
routing-key 2 0.24.3
route-table system
+ ! These 'update route' below are no longer needed and can be dropped with libosmo-sigtran >2.3.0:
update route 0.23.1 7.255.7 linkset msc0
update route 0.24.1 7.255.7 linkset virt-bsc0
update route 0.24.2 7.255.7 linkset virt-bsc1
diff --git a/sgsn/osmo-stp.cfg b/sgsn/osmo-stp.cfg
index 93e35db..08d5809 100644
--- a/sgsn/osmo-stp.cfg
+++ b/sgsn/osmo-stp.cfg
@@ -55,6 +55,7 @@
asp virt-rnc0-0
routing-key 2 0.24.3
route-table system
+ ! These 'update route' below are no longer needed and can be dropped with libosmo-sigtran >2.3.0:
update route 0.23.4 7.255.7 linkset sgsn0
update route 0.24.3 7.255.7 linkset virt-rnc0
listen m3ua 2905
diff --git a/smlc/osmo-stp.cfg b/smlc/osmo-stp.cfg
index 654ddfc..f8589da 100644
--- a/smlc/osmo-stp.cfg
+++ b/smlc/osmo-stp.cfg
@@ -44,6 +44,7 @@
routing-key 1 0.23.3
route-table system
+ ! These 'update route' below are no longer needed and can be dropped with libosmo-sigtran >2.3.0:
update route 0.23.3 7.255.7 linkset virt-bsc0
update route 0.23.6 7.255.7 linkset smlc0
listen m3ua 2905
diff --git a/stp/osmo-stp-ipa-m3ua.confmerge b/stp/osmo-stp-ipa-m3ua.confmerge
index ce3123b..cfe005e 100644
--- a/stp/osmo-stp-ipa-m3ua.confmerge
+++ b/stp/osmo-stp-ipa-m3ua.confmerge
@@ -22,8 +22,8 @@
! ROUTING TABLE:
!
route-table system
+ ! These 'update route' below are no longer needed and can be dropped with libosmo-sigtran >2.3.0:
update route 23 16777215 linkset as-sender
- route-table system
update route 5 16777215 linkset ipa-as-dynamic-asp
!
!SERVERS:
diff --git a/stp/osmo-stp-ipa.confmerge b/stp/osmo-stp-ipa.confmerge
index 9ef997d..76db4a3 100644
--- a/stp/osmo-stp-ipa.confmerge
+++ b/stp/osmo-stp-ipa.confmerge
@@ -87,11 +87,12 @@
! ROUTING TABLE:
!
route-table system
+ ! These 2 below are no longer needed and can be dropped with libosmo-sigtran >2.3.0:
update route 31 16777215 linkset ipa-as-loadshare-receiver
+ update route 33 16777215 linkset ipa-as-override-receiver
! These 2 below are used in TC_combinedlset_loadshare to route traffic from ipa-as-loadshare-receiver towards:
update route 32 16777215 linkset ipa-as-LS0-0 priority 6
update route 32 16777215 linkset ipa-as-LS0-1 priority 6
- update route 33 16777215 linkset ipa-as-override-receiver
!
!SERVERS:
!
diff --git a/stp/osmo-stp-m3ua-tcp.confmerge b/stp/osmo-stp-m3ua-tcp.confmerge
index 7c77b05..cb5d007 100644
--- a/stp/osmo-stp-m3ua-tcp.confmerge
+++ b/stp/osmo-stp-m3ua-tcp.confmerge
@@ -49,9 +49,9 @@
! ROUTING TABLE:
!
route-table system
+ ! These 'update route' below are no longer needed and can be dropped with libosmo-sigtran >2.3.0:
update route 123 16777215 linkset as-sender-tcp
update route 155 16777215 linkset as-client-tcp
- route-table system
update route 23 16777215 linkset as-sender
update route 55 16777215 linkset as-client
!
diff --git a/stp/osmo-stp-m3ua.confmerge b/stp/osmo-stp-m3ua.confmerge
index c69714c..34b9ba5 100644
--- a/stp/osmo-stp-m3ua.confmerge
+++ b/stp/osmo-stp-m3ua.confmerge
@@ -115,10 +115,12 @@
! ROUTING TABLE:
!
route-table system
- update route 23 16777215 linkset as-sender
- update route 42 16777215 linkset as-receiver
+ ! PC 99 used as combined-linkset loadsharing between as-LS0-0 and as-LS0-1
update route 99 16777215 linkset as-LS0-0 priority 3
update route 99 16777215 linkset as-LS0-1 priority 3
+ ! These 'update route' below are no longer needed and can be dropped with libosmo-sigtran >2.3.0:
+ update route 23 16777215 linkset as-sender
+ update route 42 16777215 linkset as-receive
update route 55 16777215 linkset as-client
update route 60 16777215 linkset as-client60-norctx
update route 61 16777215 linkset as-client61-norctx
diff --git a/stp/osmo-stp-tcap.confmerge b/stp/osmo-stp-tcap.confmerge
index da607a5..f0afa33 100644
--- a/stp/osmo-stp-tcap.confmerge
+++ b/stp/osmo-stp-tcap.confmerge
@@ -130,6 +130,7 @@
! ROUTING TABLE:
!
route-table system
+ ! These 'update route' below are no longer needed and can be dropped with libosmo-sigtran >2.3.0:
update route 23 16777215 linkset as-m3ua-loadshare-0
update route 24 16777215 linkset as-m3ua-loadshare-1
update route 25 16777215 linkset as-m3ua-loadshare-2
To view, visit change 43832. To unsubscribe, or for help writing mail filters, visit settings.