Skip to content
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

Jump to bottom

Fix for issue #3099 #3105

Merged
merged 1 commit into from
Aug 18, 2023
Merged

Fix for issue #3099 #3105

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions volttron/platform/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,17 +281,19 @@ def build_vip_address_string(vip_root, serverkey, publickey, secretkey):

:raises ValueError if one of the parameters is None.
"""
from volttron.platform.agent.utils import is_auth_enabled

_log.debug("root: {}, serverkey: {}, publickey: {}, secretkey: {}".format(
vip_root, serverkey, publickey, secretkey))
parsed = urlparse(vip_root)
if parsed.scheme == 'tcp':
if parsed.scheme == 'tcp' and is_auth_enabled():
if not (serverkey and publickey and secretkey and vip_root):
raise ValueError("All parameters must be entered.")

root = "{}?serverkey={}&publickey={}&secretkey={}".format(
vip_root, serverkey, publickey, secretkey)

elif parsed.scheme == 'ipc':
elif parsed.scheme == 'ipc' or not is_auth_enabled():
root = vip_root
else:
raise ValueError('Invalid vip root specified!')
Expand Down
Loading