Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CADC-12563 generic PackageRunner classes for cavern and vault #208

Merged
merged 28 commits into from
Jan 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
d703aa3
CADC-12563 new PackageJobManager and PackageTest classes
jburke-cadc Oct 27, 2023
1b0a11f
CADC-12563 update cavern capabilities and web.xml for pkg endpoint
jburke-cadc Oct 27, 2023
6e09d7e
CADC-12563 add VospacePackageRunner to cadc-vos-server-alt
jburke-cadc Oct 27, 2023
477da4f
Initial PackageRunner int tests
jburke-cadc Oct 27, 2023
7af9bb5
CADC-12563 better int-test logging
jburke-cadc Nov 3, 2023
360b25e
Merge branch 'master' into CADC-12563
jburke-cadc Nov 3, 2023
aa8212e
CADC-12563 pkg int-test updates
jburke-cadc Nov 8, 2023
9500bec
Merge branch 'master' into CADC-12563-2
jburke-cadc Nov 8, 2023
ae31b9f
Merge branch 'master' into CADC-12563-2
jburke-cadc Nov 24, 2023
57b7e7e
CADC-12563 updates for cadc-pkg-server api change
jburke-cadc Dec 8, 2023
64a36f6
Merge branch 'master' into CADC-12563-2
jburke-cadc Dec 8, 2023
c8f7c0b
CADC-12563 protected method in VospacePackageRunner to get the URL fo…
jburke-cadc Dec 11, 2023
0b30a0b
CADC-12563 use an iterator to stream the PackageItem's for the target…
jburke-cadc Dec 19, 2023
9f3fdd1
CADC-12563 updated code comments
jburke-cadc Dec 19, 2023
d9ef587
CADC-12563 README for PackageRunner call sequence
jburke-cadc Dec 19, 2023
be09026
CADC-12563 rework, simplify advance() logic
jburke-cadc Dec 20, 2023
8f30fe1
Merge branch 'CADC-12563-2' of https://github.com/jburke-cadc/vos int…
jburke-cadc Dec 20, 2023
a9462b0
Merge branch 'master' into CADC-12563-2
jburke-cadc Dec 20, 2023
c1ab2a1
CADC-12563 increment build and VERSION for latest release
jburke-cadc Dec 20, 2023
e054197
CADC-12563 update cadc-vos-server DEVREADME
jburke-cadc Jan 16, 2024
91daf69
CADC-12563 update TransferRunner to use SUSPENDED phase for package t…
jburke-cadc Jan 16, 2024
e8a5523
CADC-12563 remove POST support from pkg endpoint
jburke-cadc Jan 16, 2024
d5ec2e4
Merge branch 'master' into CADC-12563-2
jburke-cadc Jan 16, 2024
600b06f
CADC-12563 update PackageTest to use synctrans endpoint
jburke-cadc Jan 18, 2024
ca6dc29
CADC-12563 VospacePackageRunner bug fix, additional debug
jburke-cadc Jan 18, 2024
fb4442b
CADC-12563 update cavern build for newer jars
jburke-cadc Jan 18, 2024
9d9dd05
CADC-12563 code review rework
jburke-cadc Jan 20, 2024
e3f38bd
CADC-12563 override the initial Job phase for the VospacePackageRunner
jburke-cadc Jan 20, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion cadc-test-vos/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ sourceCompatibility = 1.8

group = 'org.opencadc'

version = '2.1.4'
version = '2.1.5'

description = 'OpenCADC VOSpace test library'
def git_url = 'https://github.com/opencadc/vos'
Expand All @@ -29,4 +29,5 @@ dependencies {
implementation 'org.opencadc:cadc-registry:[1.7.4,2.0)'

implementation 'junit:junit:[4.0,)'
implementation 'org.apache.commons:commons-compress:[1.12,)'
}
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,13 @@

package org.opencadc.conformance.vos;

import ca.nrc.cadc.auth.AuthMethod;
import ca.nrc.cadc.auth.RunnableAction;
import ca.nrc.cadc.net.FileContent;
import ca.nrc.cadc.net.HttpGet;
import ca.nrc.cadc.net.HttpPost;
import ca.nrc.cadc.reg.Standards;
import ca.nrc.cadc.reg.client.RegistryClient;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
Expand All @@ -95,8 +97,14 @@
public class FilesTest extends VOSTest {
private static final Logger log = Logger.getLogger(FilesTest.class);

protected final URL filesServiceURL;

protected FilesTest(URI resourceID, File testCert) {
super(resourceID, testCert);

RegistryClient regClient = new RegistryClient();
this.filesServiceURL = regClient.getServiceURL(resourceID, Standards.VOSPACE_FILES_20, AuthMethod.ANON);
log.info(String.format("%s: %s", Standards.VOSPACE_FILES_20, filesServiceURL));
}

@Test
Expand Down
Loading
Loading