diff --git a/src/test/java/org/gcube/accounting/datamodel/validations/validators/TestRules.java b/src/test/java/org/gcube/accounting/datamodel/validations/validators/TestRules.java index e2e77ea..111c4a2 100644 --- a/src/test/java/org/gcube/accounting/datamodel/validations/validators/TestRules.java +++ b/src/test/java/org/gcube/accounting/datamodel/validations/validators/TestRules.java @@ -28,6 +28,7 @@ public class TestRules { "Catalogue-WS-UNKNOWN", "CkanConnector-connect", "CkanConnector-disconnect", + "data-transfer-service-upload", "FullTextIndexNode-delete", "FullTextIndexNode-dropCollection", "FullTextIndexNode-insert", @@ -83,7 +84,7 @@ public class TestRules { @Test public void testSingleRule() throws Exception { - testRule("geoanalytics-main-service-UNKNOWN"); + testRule("data-transfer-service-getCapabilities"); } } diff --git a/src/test/resources/rules/data-transfer-service-getCapabilities-rule.json b/src/test/resources/rules/data-transfer-service-getCapabilities-rule.json new file mode 100644 index 0000000..11b3941 --- /dev/null +++ b/src/test/resources/rules/data-transfer-service-getCapabilities-rule.json @@ -0,0 +1,12 @@ +{ + "match": { + "serviceClassRegex": "DataTransfer", + "serviceNameRegex": "data-transfer-service", + "calledMethodRegex": ".*Capabilities.*" + }, + "replace": { + "serviceClass": "DataTransfer", + "serviceName": "data-transfer-service", + "calledMethod": "getCapabilities" + } +} \ No newline at end of file diff --git a/src/test/resources/rules/data-transfer-service-getCapabilities-values.csv b/src/test/resources/rules/data-transfer-service-getCapabilities-values.csv new file mode 100644 index 0000000..6b361d0 --- /dev/null +++ b/src/test/resources/rules/data-transfer-service-getCapabilities-values.csv @@ -0,0 +1,3 @@ +DataTransfer,data-transfer-service,/gcube/service/Capabilities +DataTransfer,data-transfer-service,gcube/service/Capabilities +DataTransfer,data-transfer-service,Capabilities \ No newline at end of file diff --git a/src/test/resources/rules/data-transfer-service-upload-rule.json b/src/test/resources/rules/data-transfer-service-upload-rule.json new file mode 100644 index 0000000..006c198 --- /dev/null +++ b/src/test/resources/rules/data-transfer-service-upload-rule.json @@ -0,0 +1,12 @@ +{ + "match": { + "serviceClassRegex": "DataTransfer", + "serviceNameRegex": "data-transfer-service", + "calledMethodRegex": ".*FileUpload.*" + }, + "replace": { + "serviceClass": "DataTransfer", + "serviceName": "data-transfer-service", + "calledMethod": "upload" + } +} \ No newline at end of file diff --git a/src/test/resources/rules/data-transfer-service-upload-values.csv b/src/test/resources/rules/data-transfer-service-upload-values.csv new file mode 100644 index 0000000..356ff5f --- /dev/null +++ b/src/test/resources/rules/data-transfer-service-upload-values.csv @@ -0,0 +1,15 @@ +DataTransfer,data-transfer-service,/gcube/service/REST/FileUpload/c81a9e00-a27c-4fc3-8db8-d0c82f6633c5 +DataTransfer,data-transfer-service,/gcube/service/REST/FileUpload/data-transfer-service +DataTransfer,data-transfer-service,/gcube/service/REST/FileUpload/data-transfer-service/testFolder +DataTransfer,data-transfer-service,/gcube/service/REST/FileUpload/thredds/public/netcdf/Oscar +DataTransfer,data-transfer-service,/gcube/service/REST/FileUpload/thredds/public/netcdf/myCatalog +DataTransfer,data-transfer-service,gcube/service/REST/FileUpload/c81a9e00-a27c-4fc3-8db8-d0c82f6633c5 +DataTransfer,data-transfer-service,gcube/service/REST/FileUpload/data-transfer-service +DataTransfer,data-transfer-service,gcube/service/REST/FileUpload/data-transfer-service/testFolder +DataTransfer,data-transfer-service,gcube/service/REST/FileUpload/thredds/public/netcdf/Oscar +DataTransfer,data-transfer-service,gcube/service/REST/FileUpload/thredds/public/netcdf/myCatalog +DataTransfer,data-transfer-service,fdgdgfdgf/FileUpload/c81a9e00-a27c-4fc3-8db8-d0c82f6633c5 +DataTransfer,data-transfer-service,gfdgfgfgff/FileUpload/data-transfer-service +DataTransfer,data-transfer-service,bnvmcfh/FileUpload/data-transfer-service/testFolder +DataTransfer,data-transfer-service,truizdh/FileUpload/thredds/public/netcdf/Oscar +DataTransfer,data-transfer-service,sgfdhhjj/FileUpload/thredds/public/netcdf/myCatalog \ No newline at end of file