Skip to content

Fix: Bump API version for enrollment token API move to resource API. #297

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
mharista merged 1 commit into from
Oct 16, 2025
Merged

Fix: Bump API version for enrollment token API move to resource API. #297

Show file tree
Hide file tree
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: 3 additions & 3 deletions cvprac/cvp_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3169,8 +3169,8 @@ def create_enroll_token(self, duration, devices=None):
if self.clnt.apiversion is None:
self.get_cvp_info()
response = None
if self.clnt.apiversion >= 13.0:
# Use resource API for CVP 2024.2.0+
if self.clnt.apiversion >= 14.0:
# Use resource API for CVP 2024.3.0+
data = {
"enrollmentToken": {"reenrollDevices": devices,
"validFor": duration}
Expand All @@ -3179,7 +3179,7 @@ def create_enroll_token(self, duration, devices=None):
'/api/resources/admin.Enrollment/AddEnrollmentToken',
data=data, timeout=self.request_timeout)
elif self.clnt.apiversion >= 6.0:
# User service API for CVP 2021.2.0 - 2024.1.X
# User service API for CVP 2021.2.0 - 2024.2.X
self.log.debug('v6 /cvpservice/enroll/createToken')
data = {"reenrollDevices": devices, "duration": duration}
response = self.clnt.post(
Expand Down
6 changes: 3 additions & 3 deletions test/system/test_cvp_client_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2438,8 +2438,8 @@ def test_api_create_enroll_token(self):
# Set client apiversion if it is not already set
if self.clnt.apiversion is None:
self.api.get_cvp_info()
if self.clnt.apiversion >= 13.0:
# If CVaaS is used or CVP 2024.2.0+ check if the returned list has an
if self.clnt.apiversion >= 14.0:
# If CVaaS is used or CVP 2024.3.0+ check if the returned list has an
# "enrollmentToken" key
# The format of enroll token returned by CVaaS should be:
# [{'enrollmentToken':{'token': <token>, 'groups': [],
Expand All @@ -2453,7 +2453,7 @@ def test_api_create_enroll_token(self):
token_obj = gen_token
self.assertIn("enrollmentToken", token_obj)
elif self.clnt.apiversion >= 6.0:
# If CVP is between 2021.2.0 - 2024.1.0+
# If CVP is between 2021.2.0 - 2024.2.0+
# Test if the returned value has a "data" key for on-prem
# Format of enroll token returned by on-prem should be:
# {'data': <token>}
Expand Down
Loading