Skip to content

provided client type for PCL to have proper telemetry #169

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
xorrkaz merged 4 commits into from
Mar 12, 2026
Merged

provided client type for PCL to have proper telemetry #169

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
04a70af
provided client type for PCL to have proper telemetry
vprysiaz Mar 6, 2026
8dcabd0
tag added only when pcl 2.9 or above is used
vprysiaz Mar 11, 2026
b6fa098
updated Version import in helpers
vprysiaz Mar 11, 2026
068c2fd
updated tag. applied linters
vprysiaz Mar 11, 2026
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
31 changes: 22 additions & 9 deletions virl/helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import click
from requests.exceptions import HTTPError
from virl2_client import ClientLibrary
from virl2_client.virl2_client import Version


# http://code.activestate.com/recipes/578035-disable-file-system-redirector/
Expand Down Expand Up @@ -279,7 +280,25 @@ def get_cml_client(server, ignore=False):
os.environ.pop("VIRL2_PASS", None)
os.environ.pop("VIRL2_URL", None)

client = ClientLibrary(server.host, server.user, server.passwd, raise_for_auth_failure=True, ssl_verify=ssl_verify)
version = getattr(ClientLibrary, "VERSION", None)
if version is not None and version >= Version("2.9.0"):
client = ClientLibrary(
server.host,
server.user,
server.passwd,
raise_for_auth_failure=True,
ssl_verify=ssl_verify,
client_type="CmlUtils",
)
else:
client = ClientLibrary(
server.host,
server.user,
server.passwd,
raise_for_auth_failure=True,
ssl_verify=ssl_verify,
)

logger.setLevel(level)

return client
Expand All @@ -302,15 +321,9 @@ def get_group_member_ids(all_users, members, add_all_users):
def get_group_associations(client, labs, add_all_labs):
"""Build target lab associations for group create/update payloads."""
if add_all_labs is not None:
return [
{"id": lab_id, "permissions": convert_permissions(add_all_labs)}
for lab_id in client.get_lab_list()
]
return [{"id": lab_id, "permissions": convert_permissions(add_all_labs)} for lab_id in client.get_lab_list()]
if labs:
return [
{"id": lab_id, "permissions": convert_permissions(permission)}
for lab_id, permission in labs
]
return [{"id": lab_id, "permissions": convert_permissions(permission)} for lab_id, permission in labs]
return []


Expand Down
Loading