Skip to content

Improves group creation for both local and AD #770

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
shinchris merged 2 commits into from
Jan 7, 2021
Merged

Improves group creation for both local and AD #770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e3751a0
Fixes local and ad group creation
Jan 4, 2021
7b0de49
Adds tests for validating group field values
Jan 5, 2021
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
14 changes: 9 additions & 5 deletions tableauserverclient/models/group_item.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,17 @@ class GroupItem(object):

tag_name = 'group'

def __init__(self, name=None):
self._domain_name = None
class LicenseMode:
onLogin = 'onLogin'
onSync = 'onSync'

def __init__(self, name=None, domain_name=None):
self._id = None
self._users = None
self.name = name
self._license_mode = None
self._minimum_site_role = None
self._users = None
self.name = name
self.domain_name = domain_name

@property
def domain_name(self):
Expand Down Expand Up @@ -43,8 +47,8 @@ def license_mode(self):
return self._license_mode

@license_mode.setter
@property_is_enum(LicenseMode)
def license_mode(self, value):
# valid values = onSync, onLogin
self._license_mode = value

@property
Expand Down
8 changes: 3 additions & 5 deletions tableauserverclient/server/request_factory.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,10 +277,8 @@ def create_local_req(self, group_item):
xml_request = ET.Element('tsRequest')
group_element = ET.SubElement(xml_request, 'group')
group_element.attrib['name'] = group_item.name
if group_item.license_mode is not None:
group_element.attrib['grantLicenseMode'] = group_item.license_mode
if group_item.minimum_site_role is not None:
group_element.attrib['SiteRole'] = group_item.minimum_site_role
group_element.attrib['minimumSiteRole'] = group_item.minimum_site_role
return ET.tostring(xml_request)

def create_ad_req(self, group_item):
Expand All @@ -295,9 +293,9 @@ def create_ad_req(self, group_item):

import_element.attrib['domainName'] = group_item.domain_name
if group_item.license_mode is not None:
import_element.attrib['grantLicenseMode'] = group_item.license
import_element.attrib['grantLicenseMode'] = group_item.license_mode
if group_item.minimum_site_role is not None:
import_element.attrib['SiteRole'] = group_item.minimum_site_role
import_element.attrib['siteRole'] = group_item.minimum_site_role
return ET.tostring(xml_request)

def update_req(self, group_item, default_site_role=None):
Expand Down
10 changes: 10 additions & 0 deletions test/test_group_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,13 @@ def test_invalid_name(self):

with self.assertRaises(ValueError):
group.name = ""

def test_invalid_minimum_site_role(self):
group = TSC.GroupItem("grp")
with self.assertRaises(ValueError):
group.minimum_site_role = "Captain"

def test_invalid_license_mode(self):
group = TSC.GroupItem("grp")
with self.assertRaises(ValueError):
group.license_mode = "off"