Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 18 additions & 0 deletions tableauserverclient/models/datasource_item.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ def __init__(self, project_id, name=None):
self._content_url = None
self._created_at = None
self._datasource_type = None
self._description = None
self._encrypt_extracts = None
self._has_extracts = None
self._id = None
Expand Down Expand Up @@ -131,6 +132,14 @@ def project_name(self):
def datasource_type(self):
return self._datasource_type

@property
def description(self):
return self._description

@description.setter
def description(self, value):
self._description = value

@property
def updated_at(self):
return self._updated_at
Expand Down Expand Up @@ -314,6 +323,15 @@ def from_response(cls, resp, ns):

@staticmethod
def _parse_element(datasource_xml, ns):
id_ = datasource_xml.get('id', None)
name = datasource_xml.get('name', None)
datasource_type = datasource_xml.get('type', None)
description = datasource_xml.get('description', None)
content_url = datasource_xml.get('contentUrl', None)
created_at = parse_datetime(datasource_xml.get('createdAt', None))
updated_at = parse_datetime(datasource_xml.get('updatedAt', None))
certification_note = datasource_xml.get('certificationNote', None)
certified = str(datasource_xml.get('isCertified', None)).lower() == 'true'
certification_note = datasource_xml.get("certificationNote", None)
certified = str(datasource_xml.get("isCertified", None)).lower() == "true"
content_url = datasource_xml.get("contentUrl", None)
Expand Down
4 changes: 2 additions & 2 deletions test/assets/datasource_get.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
<tsResponse xmlns="http://tableau.com/api" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://tableau.com/api http://tableau.com/api/ts-api-2.3.xsd">
<pagination pageNumber="1" pageSize="100" totalAvailable="2" />
<datasources>
<datasource id="e76a1461-3b1d-4588-bf1b-17551a879ad9" name="SampleDS" contentUrl="SampleDS" type="dataengine" createdAt="2016-08-11T21:22:40Z" updatedAt="2016-08-11T21:34:17Z" encryptExtracts="false" hasExtracts="true" useRemoteQueryAgent="false" webpageUrl="https://web.com">
<datasource id="e76a1461-3b1d-4588-bf1b-17551a879ad9" name="SampleDS" contentUrl="SampleDS" description="SampleDsDescription" type="dataengine" createdAt="2016-08-11T21:22:40Z" updatedAt="2016-08-11T21:34:17Z" encryptExtracts="false" hasExtracts="true" useRemoteQueryAgent="false" webpageUrl="https://web.com">
<project id="ee8c6e70-43b6-11e6-af4f-f7b0d8e20760" name="default" />
<owner id="5de011f8-5aa9-4d5b-b991-f462c8dd6bb7" />
<tags />
</datasource>
<datasource id="9dbd2263-16b5-46e1-9c43-a76bb8ab65fb" name="Sample datasource" contentUrl="Sampledatasource" type="dataengine" createdAt="2016-08-04T21:31:55Z" updatedAt="2016-08-04T21:31:55Z" encryptExtracts="true" hasExtracts="false" useRemoteQueryAgent="true" webpageUrl="https://page.com">
<datasource id="9dbd2263-16b5-46e1-9c43-a76bb8ab65fb" name="Sample datasource" description="description Sample" contentUrl="Sampledatasource" type="dataengine" createdAt="2016-08-04T21:31:55Z" updatedAt="2016-08-04T21:31:55Z" encryptExtracts="true" hasExtracts="false" useRemoteQueryAgent="true" webpageUrl="https://page.com">
<project id="ee8c6e70-43b6-11e6-af4f-f7b0d8e20760" name="default" />
<owner id="5de011f8-5aa9-4d5b-b991-f462c8dd6bb7" />
<tags>
Expand Down
2 changes: 1 addition & 1 deletion test/assets/datasource_get_by_id.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<tsResponse xmlns="http://tableau.com/api" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://tableau.com/api http://tableau.com/api/ts-api-2.3.xsd">
<datasource id="9dbd2263-16b5-46e1-9c43-a76bb8ab65fb" name="Sample datasource" contentUrl="Sampledatasource" type="dataengine" createdAt="2016-08-04T21:31:55Z" updatedAt="2016-08-04T21:31:55Z" description="test-ds">
<datasource id="9dbd2263-16b5-46e1-9c43-a76bb8ab65fb" name="Sample datasource" contentUrl="Sampledatasource" type="dataengine" createdAt="2016-08-04T21:31:55Z" updatedAt="2016-08-04T21:31:55Z" description="abc description xyz">
<project id="ee8c6e70-43b6-11e6-af4f-f7b0d8e20760" name="default" />
<owner id="5de011f8-5aa9-4d5b-b991-f462c8dd6bb7" />
<tags>
Expand Down
4 changes: 3 additions & 1 deletion test/test_datasource.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ def test_get(self):
self.assertEqual(2, pagination_item.total_available)
self.assertEqual('e76a1461-3b1d-4588-bf1b-17551a879ad9', all_datasources[0].id)
self.assertEqual('dataengine', all_datasources[0].datasource_type)
self.assertEqual('SampleDsDescription', all_datasources[0].description)
self.assertEqual('SampleDS', all_datasources[0].content_url)
self.assertEqual('2016-08-11T21:22:40Z', format_datetime(all_datasources[0].created_at))
self.assertEqual('2016-08-11T21:34:17Z', format_datetime(all_datasources[0].updated_at))
Expand All @@ -60,6 +61,7 @@ def test_get(self):

self.assertEqual('9dbd2263-16b5-46e1-9c43-a76bb8ab65fb', all_datasources[1].id)
self.assertEqual('dataengine', all_datasources[1].datasource_type)
self.assertEqual('description Sample', all_datasources[1].description)
self.assertEqual('Sampledatasource', all_datasources[1].content_url)
self.assertEqual('2016-08-04T21:31:55Z', format_datetime(all_datasources[1].created_at))
self.assertEqual('2016-08-04T21:31:55Z', format_datetime(all_datasources[1].updated_at))
Expand Down Expand Up @@ -94,6 +96,7 @@ def test_get_by_id(self):

self.assertEqual('9dbd2263-16b5-46e1-9c43-a76bb8ab65fb', single_datasource.id)
self.assertEqual('dataengine', single_datasource.datasource_type)
self.assertEqual('abc description xyz', single_datasource.description)
self.assertEqual('Sampledatasource', single_datasource.content_url)
self.assertEqual('2016-08-04T21:31:55Z', format_datetime(single_datasource.created_at))
self.assertEqual('2016-08-04T21:31:55Z', format_datetime(single_datasource.updated_at))
Expand All @@ -102,7 +105,6 @@ def test_get_by_id(self):
self.assertEqual('ee8c6e70-43b6-11e6-af4f-f7b0d8e20760', single_datasource.project_id)
self.assertEqual('5de011f8-5aa9-4d5b-b991-f462c8dd6bb7', single_datasource.owner_id)
self.assertEqual(set(['world', 'indicators', 'sample']), single_datasource.tags)
self.assertEqual("test-ds", single_datasource.description)
self.assertEqual(TSC.DatasourceItem.AskDataEnablement.SiteDefault, single_datasource.ask_data_enablement)

def test_update(self):
Expand Down