Skip to content

Add manufacturer name to configuration #673

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jboddey merged 2 commits into from
Aug 22, 2024
Merged

Add manufacturer name to configuration #673

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aacf6f0
Add org name to config
jboddey Aug 9, 2024
67a4128
Merge branch 'release/v1.5' into feature/manufacturer_name
jboddey Aug 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion framework/python/src/common/session.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
API_URL_KEY = 'api_url'
API_PORT_KEY = 'api_port'
MAX_DEVICE_REPORTS_KEY = 'max_device_reports'
ORG_NAME_KEY = 'org_name'
CERTS_PATH = 'local/root_certs'
CONFIG_FILE_PATH = 'local/system.json'
STATUS_TOPIC = 'status'
Expand Down Expand Up @@ -184,7 +185,8 @@ def _get_default_config(self):
'monitor_period': 30,
'max_device_reports': 0,
'api_url': 'http://localhost',
'api_port': 8000
'api_port': 8000,
'org_name': ''
}

def get_config(self):
Expand Down Expand Up @@ -231,6 +233,11 @@ def _load_config(self):
self._config[MAX_DEVICE_REPORTS_KEY] = config_file_json.get(
MAX_DEVICE_REPORTS_KEY)

if ORG_NAME_KEY in config_file_json:
self._config[ORG_NAME_KEY] = config_file_json.get(
ORG_NAME_KEY
)

LOGGER.debug(self._config)

def _load_version(self):
Expand Down