Skip to content
Snippets Groups Projects
Commit ab2f95f5 authored by vkovtun's avatar vkovtun
Browse files

SSDM-8405 Fixing hard-coded data store code. Taking the first datastore found using V3 API.

parent a61bc2a8
No related branches found
No related tags found
No related merge requests found
......@@ -4,7 +4,9 @@ from ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset import DataSetKind
from ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.create import DataSetCreation
from ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.fetchoptions import DataSetFetchOptions
from ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.id import DataSetPermId
from ch.ethz.sis.openbis.generic.asapi.v3.dto.datastore.fetchoptions import DataStoreFetchOptions
from ch.ethz.sis.openbis.generic.asapi.v3.dto.datastore.id import DataStorePermId
from ch.ethz.sis.openbis.generic.asapi.v3.dto.datastore.search import DataStoreSearchCriteria
from ch.ethz.sis.openbis.generic.asapi.v3.dto.entitytype import EntityKind
from ch.ethz.sis.openbis.generic.asapi.v3.dto.entitytype.id import EntityTypePermId
from ch.ethz.sis.openbis.generic.asapi.v3.dto.experiment.id import ExperimentIdentifier
......@@ -63,7 +65,7 @@ def createDataSet(parameters, sessionToken, v3, sampleId):
dataSetIds = v3.getDataSets(sessionToken, identifiers, DataSetFetchOptions()).keys()
operationLog.debug('Found %d data sets.' % len(dataSetIds))
dataStoreCode = parameters.get('dataStoreCode')
dataStoreCode = getDefaultDataStoreCode(v3, sessionToken)
dataSetCreation = DataSetCreation()
dataSetCreation.setAutoGeneratedCode(True)
......@@ -75,6 +77,11 @@ def createDataSet(parameters, sessionToken, v3, sampleId):
v3.createDataSets(sessionToken, [dataSetCreation])
def getDefaultDataStoreCode(v3, sessionToken):
searchResult = v3.searchDataStores(sessionToken, DataStoreSearchCriteria(), DataStoreFetchOptions())
return searchResult.objects.get(0).code
def createPublicationSample(parameters, sessionToken, v3):
publicationOrganization = parameters.get('publicationOrganization')
publicationType = parameters.get('publicationType') # The only valid value for now is "Public Repository"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment