Skip to content

Resolve "Upload data collection to ICAT when LIMS is ICAT"

Alejandro De Maria Antolinos requested to merge 682-upload-data-collection-to-icat-when-lims-is-icat into gitlab-develop-sso

Closes #682

Currently, ISPyBClient uses the class ICATClient. This is configured in lims.xml:

<object role="ldapServer" href="/ldapconnection"/>
  <object role="icat_client" href="/icat-client"/>
  <ws_root>
    https://ispyb.esrf.fr/ispyb/ispyb-ws/ispybWS/
  </ws_root>
  <ws_username>ispybws1</ws_username>
  <ws_password>I$pybws1</ws_password>
  <object role="session" href="/session"/>
  <authServerType>ldap</authServerType>
</object>

ICATClient has no configuration and implements two methods: create_mx_collection and create_ssx_collection

The idea is to move these two methods into ICATLimsClient so methods depending on ICAT are grouped together in the same class. I think this simplifies a little bit the code (even if it's still far from optimal)

Edited by Alejandro De Maria Antolinos

Merge request reports