osmith submitted this change.

View Change

Approvals: fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified
{hlr,hss}/pyhss/config: remove unused options

PyHSS had several unused config options. They have been removed
upstream, remove them from the osmo-ttcn3-hacks configs as well.

Related: https://github.com/nickvsnetworking/pyhss/pull/284
Change-Id: I87cf01e00fe0a3b32be9eaa4cf4c1ddf02cddc0b
---
M hlr/pyhss/config.yaml
M hss/pyhss/config.yaml
2 files changed, 0 insertions(+), 52 deletions(-)

diff --git a/hlr/pyhss/config.yaml b/hlr/pyhss/config.yaml
index 87e6c53..61b819e 100644
--- a/hlr/pyhss/config.yaml
+++ b/hlr/pyhss/config.yaml
@@ -8,12 +8,6 @@
site_name: "TTCN3"
MCC: "001"
MNC: "01"
- SLh_enabled: False
- #IMSI of Test Subscriber for Unit Checks (Optional)
- test_sub_imsi: '001021234567890'
-
- #The maximum time to wait, in seconds, before disconnecting a client when no data is received.
- client_socket_timeout: 120

#The maximum time to wait, in seconds, before disconnecting a client when no data is received.
client_socket_timeout: 300
@@ -39,13 +33,6 @@
#If enabled sends CLRs to old MME when new MME attaches active sub
CancelLocationRequest_Enabled: False

- #Workaround for some MMEs to force an Insert Subscriber Data request to be sent immediately after ULA
- Insert_Subscriber_Data_Force: False
-
- #Default Initial Filter Criteria for IMS Subscribers
- #Jinja Formatted Template, see the example for variables passed to it.
- Default_iFC: 'default_ifc.xml'
-
#Default Sh User Data
Default_Sh_UserData: 'default_sh_user_data.xml'

@@ -124,11 +111,7 @@
database:
db_type: sqlite
server: 127.0.0.1
- username: dbeaver
- password: password
database: pyhss.db
- readCacheEnabled: True
- readCacheInterval: 60

## External Webhook Notifications
webhooks:
@@ -160,18 +143,6 @@
unixSocketPath: '/var/run/redis/redis-server.sock'
host: localhost
port: 6379
- sentinel:
- masterName: exampleMaster
- hosts:
- - exampleSentinel.mnc001.mcc001.3gppnetwork.org:
- port: 6379
- password: ''
-
-
-prometheus:
- enabled: False
- port: 8081 #If the API is run the API runs on the next port number up from this
- async_subscriber_count: False #If enabled the subscriber count will be updated asynchronously for Prometheus

influxdb:
enabled: False
diff --git a/hss/pyhss/config.yaml b/hss/pyhss/config.yaml
index 3114820..c951beb 100644
--- a/hss/pyhss/config.yaml
+++ b/hss/pyhss/config.yaml
@@ -8,12 +8,6 @@
site_name: "TTCN3"
MCC: "001"
MNC: "01"
- SLh_enabled: False
- #IMSI of Test Subscriber for Unit Checks (Optional)
- test_sub_imsi: '001021234567890'
-
- #The maximum time to wait, in seconds, before disconnecting a client when no data is received.
- client_socket_timeout: 120

#The maximum time to wait, in seconds, before disconnecting a client when no data is received.
client_socket_timeout: 300
@@ -39,13 +33,6 @@
#If enabled sends CLRs to old MME when new MME attaches active sub
CancelLocationRequest_Enabled: False

- #Workaround for some MMEs to force an Insert Subscriber Data request to be sent immediately after ULA
- Insert_Subscriber_Data_Force: False
-
- #Default Initial Filter Criteria for IMS Subscribers
- #Jinja Formatted Template, see the example for variables passed to it.
- Default_iFC: 'default_ifc.xml'
-
#Default Sh User Data
Default_Sh_UserData: 'default_sh_user_data.xml'

@@ -121,11 +108,7 @@
database:
db_type: sqlite
server: 127.0.0.1
- username: dbeaver
- password: password
database: pyhss.db
- readCacheEnabled: True
- readCacheInterval: 60

## External Webhook Notifications
webhooks:
@@ -157,12 +140,6 @@
unixSocketPath: '/var/run/redis/redis-server.sock'
host: localhost
port: 6379
- sentinel:
- masterName: exampleMaster
- hosts:
- - exampleSentinel.mnc001.mcc001.3gppnetwork.org:
- port: 6379
- password: ''

influxdb:
enabled: False

To view, visit change 42286. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-MessageType: merged
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I87cf01e00fe0a3b32be9eaa4cf4c1ddf02cddc0b
Gerrit-Change-Number: 42286
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de>
Gerrit-Reviewer: laforge <laforge@osmocom.org>
Gerrit-Reviewer: osmith <osmith@sysmocom.de>