You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2021/08/06 15:52:33 UTC
[airavata] branch develop updated (35bbf10 -> 8878d9c)
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git.
from 35bbf10 Merge branch 'airavata-3420' into develop
add 404b054 Deploying a gateway for UNG
add c76154c Deploying a gateway for UNG
add edacc61 Deploying a gateway for UNG
add ad3ce1c Deploying a gateway for UNG
new 107f91e AIRAVATA-3496 Accept the given domainId instead of using domain name
new 8878d9c Merge branch 'airavata-3496' into develop
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../host_vars/{ultrascan => unggateway}/vars.yml | 23 +++++++++++-----------
.../production/host_vars/unggateway/vault.yml | 15 ++++++++++++++
.../ansible/inventories/scigap/production/hosts | 1 +
.../server/SharingRegistryServerHandler.java | 1 -
4 files changed, 27 insertions(+), 13 deletions(-)
copy dev-tools/ansible/inventories/scigap/production/host_vars/{ultrascan => unggateway}/vars.yml (59%)
create mode 100644 dev-tools/ansible/inventories/scigap/production/host_vars/unggateway/vault.yml
[airavata] 02/02: Merge branch 'airavata-3496' into develop
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit 8878d9c79d7b7ace92077cb41b3787974cdaf4ff
Merge: 35bbf10 107f91e
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Fri Aug 6 11:52:07 2021 -0400
Merge branch 'airavata-3496' into develop
.../production/host_vars/unggateway/vars.yml | 53 ++++++++++++++++++++++
.../production/host_vars/unggateway/vault.yml | 15 ++++++
.../ansible/inventories/scigap/production/hosts | 1 +
.../server/SharingRegistryServerHandler.java | 1 -
4 files changed, 69 insertions(+), 1 deletion(-)
[airavata] 01/02: AIRAVATA-3496 Accept the given domainId instead
of using domain name
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit 107f91ee40fb11f31e10872f2a83e2f2cd2d9ea4
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Fri Aug 6 11:51:58 2021 -0400
AIRAVATA-3496 Accept the given domainId instead of using domain name
Fixes an issue when a gateway is created with an id
that is different than the gateway name, as can happen
because the id is a sanitized version
of the gateway name.
---
.../airavata/sharing/registry/server/SharingRegistryServerHandler.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java
index b138272..8ef6530 100644
--- a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java
+++ b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java
@@ -62,7 +62,6 @@ public class SharingRegistryServerHandler implements SharingRegistryService.Ifac
@Override
public String createDomain(Domain domain) throws SharingRegistryException, DuplicateEntryException, TException {
try{
- domain.setDomainId(domain.getName());
if((new DomainRepository()).get(domain.getDomainId()) != null)
throw new DuplicateEntryException("There exist domain with given domain id");