Ticket #8581 (closed: fixed)

Opened 7 years ago

Last modified 5 years ago

[ICAT] Fix endpoint issue

Reported by: Jay Rainey Owned by: Jay Rainey
Priority: major Milestone: Release 3.1
Component: Framework Keywords: ICAT
Cc: Blocked By:
Blocking: #7636 Tester: Martyn Gigg

Description (last modified by Jay Rainey) (diff)

Although the end-point is set in Facilities.xml it is in fact not used in ICat4Catalog or other catalogs. As it is not used, the gSoap generated files see the related soap_endpoint as being empty, and use the endpoint the files were generated against. As such, we want to set this end-point accordingly.

To do this we need to:

  1. Update catalogLogin to contain a list of all available facilities.
  1. Update catalogLogin to obtain the soap-endpoint based on the facility selected, and then pass it to the related catalog login method.
  1. Update all catalogs (ICat4Catalog & ICat3Catalog) to set the end-point for the session in the login method, and then use the session class to "get" the end-point & use it throughout.

Change History

comment:1 Changed 7 years ago by Jay Rainey

  • Summary changed from [ICAT] to [ICAT] Fix endpoint issue

comment:2 Changed 7 years ago by Jay Rainey

  • Description modified (diff)

comment:3 Changed 7 years ago by Jay Rainey

  • Description modified (diff)

comment:4 Changed 7 years ago by Jay Rainey

  • Status changed from new to inprogress

List available facility in login algorithm. Refs #8581.

Changeset: 2ebcec5aaeff7e9a9172f083939c5d8dba37eb65

comment:5 Changed 7 years ago by Jay Rainey

Obtain the soapEndPoint based on facility on login. Refs #8581.

  • Use username/password properties directly in the login algorithm.

Changeset: 5551c1b2827287bf6fb2e1408c1e6e3f4d64c6dd

comment:6 Changed 7 years ago by Jay Rainey

Added soapEndPoint methods to session. Refs #8581.

  • Removed a "zero width space" from soapendpoint in Facilities.xml.

Changeset: 1d0dfef7615062c88bd5f2a4fa23b88508951e85

comment:7 Changed 7 years ago by Jay Rainey

Created convenience method to set endpoint & SSLContext. Refs #8581.

Changeset: bc5750bae36c334c755af7725da1634697772068

comment:8 Changed 7 years ago by Jay Rainey

Merge branch 'feature/8581_icat_use_specified_endpoint' into develop. Refs #8581.

Conflicts:

  • Code/Mantid/Framework/ICat/inc/MantidICat/ICat4/ICat4Catalog.h

Changeset: e9dc22560218f46415b47e6a9d72b1bc8f4b699b

comment:9 Changed 7 years ago by Jay Rainey

Last edited 7 years ago by Jay Rainey (previous) (diff)

comment:10 Changed 7 years ago by Jay Rainey

Last edited 7 years ago by Jay Rainey (previous) (diff)

comment:11 Changed 7 years ago by Jay Rainey

Last edited 7 years ago by Jay Rainey (previous) (diff)

comment:12 Changed 7 years ago by Jay Rainey

Last edited 7 years ago by Jay Rainey (previous) (diff)

comment:13 Changed 7 years ago by Jay Rainey

Last edited 7 years ago by Jay Rainey (previous) (diff)

comment:14 Changed 7 years ago by Jay Rainey

Fix broken tests. Refs #8581.

Changeset: b8a1ee38f0d1497d71d910aa01e172c0223e8e36

comment:15 Changed 7 years ago by Jay Rainey

Merge branch 'feature/8581_icat_use_specified_endpoint' into develop. Refs #8581.

Conflicts:

  • Code/Mantid/Framework/ICat/inc/MantidICat/ICat4/ICat4Catalog.h

Changeset: 706b6032ffc01c5d1a939afe9c8be9e7c14f2068

Last edited 7 years ago by Jay Rainey (previous) (diff)

comment:16 Changed 7 years ago by Jay Rainey

Added debugging info. Refs #8581.

Changeset: 99132a78432112b18c5add0a30fbecfcfff708fc

comment:17 Changed 7 years ago by Jay Rainey

Add support for ICAT3. Refs #8581.

  • Added two new helper methods to reduce duplication & bloat within ICat3Catalog.

Changeset: ec911726ac7e1a0a32cf3bb9f20401a20de4addb

comment:18 Changed 7 years ago by Jay Rainey

  • Status changed from inprogress to verify
  • Resolution set to fixed

To test

  1. Open Mantid and enable debugging in the console.
  2. Click Catalog -> Login. There should now be a third option, which is a list of all available facilities. Select ISIS. Note: You may select another facility, but an error will be thrown as these facilities do not currently have catalog information in Facilities.xml.
  3. You should now see a debug message that shows you the soap end-point that you are currently using for the catalog.
  4. Change soapendpoint in Facilities.xml to: https://icatdev.isis.cclrc.ac.uk/ICATService/ICAT
  5. Log into the catalog again to verify that the end-point has changed.
  6. Perform searches and use ICAT to ensure no functionality is broken.

comment:19 Changed 7 years ago by Jay Rainey

  • Status changed from verify to reopened
  • Resolution fixed deleted

comment:20 Changed 7 years ago by Jay Rainey

  • Status changed from reopened to inprogress

Select default facility. Refs #8581.

Changeset: a73f524bf138dfa52130417b20c7a99d83a8ab7d

comment:21 Changed 7 years ago by Jay Rainey

  • Status changed from inprogress to verify
  • Resolution set to fixed

comment:22 Changed 7 years ago by Martyn Gigg

  • Status changed from verify to verifying
  • Tester set to Martyn Gigg

comment:23 Changed 7 years ago by Martyn Gigg

  • Status changed from verifying to closed

Merge remote-tracking branch 'origin/feature/8581_icat_use_specified_endpoint'

Full changeset: 6ca4eceb8db09abc2f94a799ccc21cd243b319c7

comment:24 Changed 7 years ago by Jay Rainey

Merge branch 'feature/8581_icat_use_specified_endpoint' into develop. Refs #8581.

Conflicts:

Code/Mantid/Framework/ICat/inc/MantidICat/ICat4/ICat4Catalog.h

Changeset: 706b6032ffc01c5d1a939afe9c8be9e7c14f2068

comment:25 Changed 5 years ago by Stuart Campbell

This ticket has been transferred to github issue 9425

Note: See TracTickets for help on using tickets.