Skip to content

Commit 32a26f9

Browse files
committed
feat(ommsync): automatically enable subscription on OMM
1 parent ea99db3 commit 32a26f9

3 files changed

Lines changed: 18 additions & 2 deletions

File tree

services/dect-wip-ommsync/dect-wip-ommsync.py

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111
from datetime import datetime
1212
from tools.confighelper import DectWIPConfig
1313

14-
print('Make sure Subscription and Auto-Create are enabled')
15-
1614
lock = Lock()
1715
app = Flask(__name__)
1816
scheduler = APScheduler()
@@ -78,6 +76,20 @@ def makeTemps():
7876
if response.status_code != 200:
7977
raise RuntimeError(f"adding temp extension to db failed: {response.status_code} {response.text}")
8078

79+
@scheduler.task('interval', id='enable_subscription', seconds=15, next_run_time=datetime.now(), max_instances=1)
80+
def enable_subscription():
81+
with lock:
82+
if config.ommsync_enable_subscription:
83+
if client.get_dect_auth_code() != config.ommsync_auth_code:
84+
print(f"setting auth code to {config.ommsync_auth_code}")
85+
client.set_dect_auth_code(config.ommsync_auth_code)
86+
if not client.get_device_auto_create():
87+
print("enabling device auto creation on OMM")
88+
client.set_device_auto_create(True)
89+
if client.get_dect_subscription_mode() != 'Configured':
90+
print("enabling subscription on OMM")
91+
client.set_dect_subscription_mode('Configured')
92+
8193
def init(config_path):
8294

8395
# setup global config

systemfiles/etc/dect-wip.ini.sample

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,3 +50,5 @@ port = 8082
5050
[ommsync]
5151
listen_ip = 0.0.0.0
5252
port = 8081
53+
enable_subscription = true
54+
auth_code = 0000

tools/confighelper.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,8 @@ def __init__(self, config_path = '/etc/dect-wip.ini'):
7272
# [ommsync] --- MicroService
7373
self.ommsync_listen_ip = self.__get_config_with_env_override('ommsync', 'listen_ip')
7474
self.ommsync_port = int(self.__get_config_with_env_override('ommsync', 'port'))
75+
self.ommsync_enable_subscription = str_to_bool(self.__get_config_with_env_override('ommsync', 'enable_subscription'))
76+
self.ommsync_auth_code = self.__get_config_with_env_override('ommsync', 'auth_code')
7577

7678
# [omm]
7779
self.omm_ip = self.__get_config_with_env_override('omm', 'ip')

0 commit comments

Comments
 (0)