From bed38c4422699fb7457d2fbab65bf5501e132b33 Mon Sep 17 00:00:00 2001
From: Markus Scheidgen <markus.scheidgen@gmail.com>
Date: Thu, 21 Oct 2021 18:31:38 +0200
Subject: [PATCH] Fixed regression ins integration tests.
---
gui/src/components/uploads/UploadPage.js | 2 +-
nomad/cli/client/integrationtests.py | 2 +-
nomad/config.py | 8 ++++----
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/gui/src/components/uploads/UploadPage.js b/gui/src/components/uploads/UploadPage.js
index 8382ba57c5..b6056f3166 100644
--- a/gui/src/components/uploads/UploadPage.js
+++ b/gui/src/components/uploads/UploadPage.js
@@ -340,7 +340,7 @@ function UploadPage() {
const formData = new FormData() // eslint-disable-line no-undef
formData.append('file', files[0])
setUploading(0)
- api.put(`/uploads/${uploadId}/raw`, formData, {
+ api.put(`/uploads/${uploadId}/raw/`, formData, {
onUploadProgress: (progressEvent) => {
const percentCompleted = Math.round((progressEvent.loaded * 100) / progressEvent.total)
setUploading(percentCompleted)
diff --git a/nomad/cli/client/integrationtests.py b/nomad/cli/client/integrationtests.py
index a62dfcf2c5..03e5c79130 100644
--- a/nomad/cli/client/integrationtests.py
+++ b/nomad/cli/client/integrationtests.py
@@ -37,7 +37,7 @@ def integrationtests(auth: api.Auth, skip_parsers: bool, skip_publish: bool, ski
print('get the upload command')
response = api.get('uploads/command-examples', auth=auth)
assert response.status_code == 200, response.text
- command = response.json()['upload_command']
+ command = response.json()['upload_command_with_name']
def get_upload(upload):
first = True
diff --git a/nomad/config.py b/nomad/config.py
index 856abb7c27..6927f74c42 100644
--- a/nomad/config.py
+++ b/nomad/config.py
@@ -179,8 +179,8 @@ services = NomadConfig(
)
oasis = NomadConfig(
- central_nomad_api_url='https://nomad-lab.eu/prod/rae/api',
- central_nomad_deployment_id='nomad-lab.eu/prod/rae',
+ central_nomad_api_url='https://nomad-lab.eu/prod/v1/api',
+ central_nomad_deployment_id='nomad-lab.eu/prod/v1',
allowed_users=None # a list of usernames or user account emails
)
@@ -291,7 +291,7 @@ paths = NomadConfig(
client = NomadConfig(
user='leonard.hofstadter@nomad-fairdi.tests.de',
password='password',
- url='http://nomad-lab.eu/prod/rae/api'
+ url='http://nomad-lab.eu/prod/v1/api'
)
datacite = NomadConfig(
@@ -314,7 +314,7 @@ meta = NomadConfig(
homepage='https://nomad-lab.eu',
source_url='https://gitlab.mpcdf.mpg.de/nomad-lab/nomad-FAIR',
maintainer_email='markus.scheidgen@physik.hu-berlin.de',
- deployment_id='nomad-lab.eu/prod/rae'
+ deployment_id='nomad-lab.eu/prod/v1'
)
gitlab = NomadConfig(
--
GitLab