diff --git a/.gitignore b/.gitignore index e0e9b8b..3e19d06 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ __pycache__/ .nox/ + +**/.gradle diff --git a/exn-middleware-core/.gradle/7.5.1/checksums/checksums.lock b/exn-middleware-core/.gradle/7.5.1/checksums/checksums.lock deleted file mode 100644 index 0a427a0..0000000 Binary files a/exn-middleware-core/.gradle/7.5.1/checksums/checksums.lock and /dev/null differ diff --git a/exn-middleware-core/.gradle/7.5.1/checksums/md5-checksums.bin b/exn-middleware-core/.gradle/7.5.1/checksums/md5-checksums.bin deleted file mode 100644 index a1ef689..0000000 Binary files a/exn-middleware-core/.gradle/7.5.1/checksums/md5-checksums.bin and /dev/null differ diff --git a/exn-middleware-core/.gradle/7.5.1/checksums/sha1-checksums.bin b/exn-middleware-core/.gradle/7.5.1/checksums/sha1-checksums.bin deleted file mode 100644 index e3d5896..0000000 Binary files a/exn-middleware-core/.gradle/7.5.1/checksums/sha1-checksums.bin and /dev/null differ diff --git a/exn-middleware-core/.gradle/7.5.1/dependencies-accessors/dependencies-accessors.lock b/exn-middleware-core/.gradle/7.5.1/dependencies-accessors/dependencies-accessors.lock deleted file mode 100644 index 9ebd27c..0000000 Binary files a/exn-middleware-core/.gradle/7.5.1/dependencies-accessors/dependencies-accessors.lock and /dev/null differ diff --git a/exn-middleware-core/.gradle/7.5.1/dependencies-accessors/gc.properties b/exn-middleware-core/.gradle/7.5.1/dependencies-accessors/gc.properties deleted file mode 100644 index e69de29..0000000 diff --git a/exn-middleware-core/.gradle/7.5.1/executionHistory/executionHistory.bin b/exn-middleware-core/.gradle/7.5.1/executionHistory/executionHistory.bin deleted file mode 100644 index ce32461..0000000 Binary files a/exn-middleware-core/.gradle/7.5.1/executionHistory/executionHistory.bin and /dev/null differ diff --git a/exn-middleware-core/.gradle/7.5.1/executionHistory/executionHistory.lock b/exn-middleware-core/.gradle/7.5.1/executionHistory/executionHistory.lock deleted file mode 100644 index 6ab1827..0000000 Binary files a/exn-middleware-core/.gradle/7.5.1/executionHistory/executionHistory.lock and /dev/null differ diff --git a/exn-middleware-core/.gradle/7.5.1/fileChanges/last-build.bin b/exn-middleware-core/.gradle/7.5.1/fileChanges/last-build.bin deleted file mode 100644 index f76dd23..0000000 Binary files a/exn-middleware-core/.gradle/7.5.1/fileChanges/last-build.bin and /dev/null differ diff --git a/exn-middleware-core/.gradle/7.5.1/fileHashes/fileHashes.bin b/exn-middleware-core/.gradle/7.5.1/fileHashes/fileHashes.bin deleted file mode 100644 index f4440d7..0000000 Binary files a/exn-middleware-core/.gradle/7.5.1/fileHashes/fileHashes.bin and /dev/null differ diff --git a/exn-middleware-core/.gradle/7.5.1/fileHashes/fileHashes.lock b/exn-middleware-core/.gradle/7.5.1/fileHashes/fileHashes.lock deleted file mode 100644 index 6a12c3c..0000000 Binary files a/exn-middleware-core/.gradle/7.5.1/fileHashes/fileHashes.lock and /dev/null differ diff --git a/exn-middleware-core/.gradle/7.5.1/gc.properties b/exn-middleware-core/.gradle/7.5.1/gc.properties deleted file mode 100644 index e69de29..0000000 diff --git a/exn-middleware-core/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/exn-middleware-core/.gradle/buildOutputCleanup/buildOutputCleanup.lock deleted file mode 100644 index 84f1007..0000000 Binary files a/exn-middleware-core/.gradle/buildOutputCleanup/buildOutputCleanup.lock and /dev/null differ diff --git a/exn-middleware-core/.gradle/buildOutputCleanup/cache.properties b/exn-middleware-core/.gradle/buildOutputCleanup/cache.properties deleted file mode 100644 index 1adacfd..0000000 --- a/exn-middleware-core/.gradle/buildOutputCleanup/cache.properties +++ /dev/null @@ -1,2 +0,0 @@ -#Mon Feb 05 14:24:01 EET 2024 -gradle.version=7.5.1 diff --git a/exn-middleware-core/.gradle/buildOutputCleanup/outputFiles.bin b/exn-middleware-core/.gradle/buildOutputCleanup/outputFiles.bin deleted file mode 100644 index 382ecb2..0000000 Binary files a/exn-middleware-core/.gradle/buildOutputCleanup/outputFiles.bin and /dev/null differ diff --git a/exn-middleware-core/.gradle/file-system.probe b/exn-middleware-core/.gradle/file-system.probe deleted file mode 100644 index 0fb3ac0..0000000 Binary files a/exn-middleware-core/.gradle/file-system.probe and /dev/null differ diff --git a/exn-middleware-core/.gradle/vcs-1/gc.properties b/exn-middleware-core/.gradle/vcs-1/gc.properties deleted file mode 100644 index e69de29..0000000 diff --git a/exn-middleware-core/build/classes/groovy/main/eu/nebulouscloud/exn/modules/sal/middleware/handlers/consumer/AMQPSalMessageHandler.class b/exn-middleware-core/build/classes/groovy/main/eu/nebulouscloud/exn/modules/sal/middleware/handlers/consumer/AMQPSalMessageHandler.class index 5fd6dba..f00b3d3 100644 Binary files a/exn-middleware-core/build/classes/groovy/main/eu/nebulouscloud/exn/modules/sal/middleware/handlers/consumer/AMQPSalMessageHandler.class and b/exn-middleware-core/build/classes/groovy/main/eu/nebulouscloud/exn/modules/sal/middleware/handlers/consumer/AMQPSalMessageHandler.class differ diff --git a/exn-middleware-core/build/classes/groovy/main/eu/nebulouscloud/exn/modules/sal/processors/AbstractProcessor.class b/exn-middleware-core/build/classes/groovy/main/eu/nebulouscloud/exn/modules/sal/processors/AbstractProcessor.class index 845b08d..01ad6f3 100644 Binary files a/exn-middleware-core/build/classes/groovy/main/eu/nebulouscloud/exn/modules/sal/processors/AbstractProcessor.class and b/exn-middleware-core/build/classes/groovy/main/eu/nebulouscloud/exn/modules/sal/processors/AbstractProcessor.class differ diff --git a/exn-middleware-core/build/classes/groovy/main/eu/nebulouscloud/exn/modules/sal/processors/impl/CloudProcessor.class b/exn-middleware-core/build/classes/groovy/main/eu/nebulouscloud/exn/modules/sal/processors/impl/CloudProcessor.class index b1f7241..c0ddc40 100644 Binary files a/exn-middleware-core/build/classes/groovy/main/eu/nebulouscloud/exn/modules/sal/processors/impl/CloudProcessor.class and b/exn-middleware-core/build/classes/groovy/main/eu/nebulouscloud/exn/modules/sal/processors/impl/CloudProcessor.class differ diff --git a/exn-middleware-core/build/classes/groovy/main/eu/nebulouscloud/exn/modules/sal/processors/impl/JobProcessor.class b/exn-middleware-core/build/classes/groovy/main/eu/nebulouscloud/exn/modules/sal/processors/impl/JobProcessor.class index 24d1a46..7d45463 100644 Binary files a/exn-middleware-core/build/classes/groovy/main/eu/nebulouscloud/exn/modules/sal/processors/impl/JobProcessor.class and b/exn-middleware-core/build/classes/groovy/main/eu/nebulouscloud/exn/modules/sal/processors/impl/JobProcessor.class differ diff --git a/exn-middleware-core/build/classes/groovy/main/eu/nebulouscloud/exn/modules/sal/processors/impl/NodeCandidateProcessor.class b/exn-middleware-core/build/classes/groovy/main/eu/nebulouscloud/exn/modules/sal/processors/impl/NodeCandidateProcessor.class index b9e72d8..686d79f 100644 Binary files a/exn-middleware-core/build/classes/groovy/main/eu/nebulouscloud/exn/modules/sal/processors/impl/NodeCandidateProcessor.class and b/exn-middleware-core/build/classes/groovy/main/eu/nebulouscloud/exn/modules/sal/processors/impl/NodeCandidateProcessor.class differ diff --git a/exn-middleware-core/build/classes/groovy/main/eu/nebulouscloud/exn/modules/sal/processors/impl/NodeProcessor.class b/exn-middleware-core/build/classes/groovy/main/eu/nebulouscloud/exn/modules/sal/processors/impl/NodeProcessor.class index eb0c83f..f7093de 100644 Binary files a/exn-middleware-core/build/classes/groovy/main/eu/nebulouscloud/exn/modules/sal/processors/impl/NodeProcessor.class and b/exn-middleware-core/build/classes/groovy/main/eu/nebulouscloud/exn/modules/sal/processors/impl/NodeProcessor.class differ diff --git a/exn-middleware-core/build/classes/groovy/main/eu/nebulouscloud/exn/modules/sal/repository/AbstractSalRepository.class b/exn-middleware-core/build/classes/groovy/main/eu/nebulouscloud/exn/modules/sal/repository/AbstractSalRepository.class index 86708b9..88754d8 100644 Binary files a/exn-middleware-core/build/classes/groovy/main/eu/nebulouscloud/exn/modules/sal/repository/AbstractSalRepository.class and b/exn-middleware-core/build/classes/groovy/main/eu/nebulouscloud/exn/modules/sal/repository/AbstractSalRepository.class differ diff --git a/exn-middleware-core/build/classes/groovy/main/eu/nebulouscloud/exn/modules/sal/repository/GatewayRepository.class b/exn-middleware-core/build/classes/groovy/main/eu/nebulouscloud/exn/modules/sal/repository/GatewayRepository.class index b17bd35..9aedffc 100644 Binary files a/exn-middleware-core/build/classes/groovy/main/eu/nebulouscloud/exn/modules/sal/repository/GatewayRepository.class and b/exn-middleware-core/build/classes/groovy/main/eu/nebulouscloud/exn/modules/sal/repository/GatewayRepository.class differ diff --git a/exn-middleware-core/build/classes/groovy/main/eu/nebulouscloud/exn/modules/sal/repository/nodecandidate/NodeCandidateRepository.class b/exn-middleware-core/build/classes/groovy/main/eu/nebulouscloud/exn/modules/sal/repository/nodecandidate/NodeCandidateRepository.class index f452956..576f1a1 100644 Binary files a/exn-middleware-core/build/classes/groovy/main/eu/nebulouscloud/exn/modules/sal/repository/nodecandidate/NodeCandidateRepository.class and b/exn-middleware-core/build/classes/groovy/main/eu/nebulouscloud/exn/modules/sal/repository/nodecandidate/NodeCandidateRepository.class differ diff --git a/exn-middleware-core/config/application.yml b/exn-middleware-core/config/application.yml index f222ff6..5fd1af6 100644 --- a/exn-middleware-core/config/application.yml +++ b/exn-middleware-core/config/application.yml @@ -1,6 +1,6 @@ logging: level: - eu.nebulouscloud.exn.modules: TRACE + eu.nebulouscloud.exn: TRACE spring: profiles: default @@ -12,13 +12,12 @@ spring: application: exn: config: - url: 'nebulous-nebulous-activemq' - port: 5672 + url: 'nebulous-activemq' + port: '5672' username: 'admin' password: 'admin' sal: protocol: 'http' -# host: 'fa84-194-219-170-2.ngrok-free.app/' host: 'sal' port: '8080' api: 'sal' diff --git a/exn-middleware-core/src/main/groovy/eu/nebulouscloud/exn/modules/sal/middleware/handlers/consumer/AMQPSalMessageHandler.groovy b/exn-middleware-core/src/main/groovy/eu/nebulouscloud/exn/modules/sal/middleware/handlers/consumer/AMQPSalMessageHandler.groovy index db1fa5c..0e97353 100644 --- a/exn-middleware-core/src/main/groovy/eu/nebulouscloud/exn/modules/sal/middleware/handlers/consumer/AMQPSalMessageHandler.groovy +++ b/exn-middleware-core/src/main/groovy/eu/nebulouscloud/exn/modules/sal/middleware/handlers/consumer/AMQPSalMessageHandler.groovy @@ -50,6 +50,7 @@ public class AMQPSalMessageHandler extends Handler { Map response = p.process(destination, message) + log.info('REPLYING {}',response) Map amqpProperties = ['correlation-id': message.correlationId()?.toString(), 'reply-to' : message.replyTo()] diff --git a/exn-middleware-core/src/main/groovy/eu/nebulouscloud/exn/modules/sal/processors/AbstractProcessor.groovy b/exn-middleware-core/src/main/groovy/eu/nebulouscloud/exn/modules/sal/processors/AbstractProcessor.groovy index 9d6106f..7786cda 100644 --- a/exn-middleware-core/src/main/groovy/eu/nebulouscloud/exn/modules/sal/processors/AbstractProcessor.groovy +++ b/exn-middleware-core/src/main/groovy/eu/nebulouscloud/exn/modules/sal/processors/AbstractProcessor.groovy @@ -7,6 +7,7 @@ import org.slf4j.Logger import org.slf4j.LoggerFactory import org.springframework.beans.factory.annotation.Autowired import org.springframework.http.HttpStatus +import org.springframework.web.client.HttpClientErrorException import org.springframework.web.client.HttpServerErrorException /** @@ -25,9 +26,11 @@ abstract class AbstractProcessor implements Processor { @Override Map process(String destination, ClientMessage message) { - //Maybe move it to message property(?) and don't blend with application's payload Map payload = message.body() as Map Map metaData = payload.metaData as Map + if(!metaData){ + metaData =[:] + } String o = payload.body Map ret = [:] @@ -53,19 +56,26 @@ abstract class AbstractProcessor implements Processor { ret = post(metaData,o) } - } catch (HttpServerErrorException e) { - logger.error("[{} -> {}] Exception during gateway request for {}", metaData.user, method, o, e) - ret.status = HttpStatus.BAD_GATEWAY.value() - ret.body = ["key": "gateway-exception-error", "message": 'Gateway exception while handling request with reason' + StringUtils.substring(e.getMessage(),0,50)] + } catch (HttpClientErrorException e) { + logger.error("[{} -> {}] Client Exception during gateway request for {}", metaData?.user, method, o, e) + logger.error('RAW HTTP CLIENT ERROR:\n {}', e.getMessage()) + ret.status = e.getStatusCode().value() + ret.body = ["key": "gateway-client-exception-error", "message": StringUtils.substring(e.getMessage(), 0, 50)] + } + catch (HttpServerErrorException e) { + logger.error("[{} -> {}] Server Exception during gateway request for {}", metaData?.user, method, o, e) + logger.error('RAW HTTP SERVER ERROR:\n {}',e.getMessage()) + ret.status = e.getStatusCode().value() + ret.body = ["key": "gateway-server-exception-error", "message": StringUtils.substring(e.getMessage(),0,50)] } catch (Exception e) { - logger.error("[{} -> {}] Exception for {}", metaData.user, method, o, e) + logger.error("[{} -> {}] Exception for {}", metaData?.user, method, o, e) + logger.error('RAW EXCEPTION ERROR:\n {}',e.getMessage()) ret.status = HttpStatus.INTERNAL_SERVER_ERROR.value() -// ret.body = ["key": "generic-exception-error", "message": 'Generic exception while handling request for user ' + metaData.user + ' and reason:\n' + StringUtils.left(e.getMessage(),100)] ret.body = ["key": "generic-exception-error", "message": 'Generic exception while handling request for user ' + StringUtils.substring(e.getMessage(),0,50)] } metaData.status = ret.status -// metaData.protocol = 'HTTP' + metaData.protocol = 'HTTP' ret.remove('status') ret.metaData = metaData ret.body = mapper.writeValueAsString(ret.body) @@ -85,7 +95,7 @@ abstract class AbstractProcessor implements Processor { Map delete(Map metaData, String body) { return noop(metaData, body) } Map noop(Map metaData, String body) { - return ["status": HttpStatus.ACCEPTED.value(), "body": metaData.user + " { " + body + "}"] + return ["status": HttpStatus.ACCEPTED.value(), "body": metaData?.user + " { " + body + "}"] } } diff --git a/exn-middleware-core/src/main/groovy/eu/nebulouscloud/exn/modules/sal/processors/impl/CloudProcessor.groovy b/exn-middleware-core/src/main/groovy/eu/nebulouscloud/exn/modules/sal/processors/impl/CloudProcessor.groovy index 0d835c3..59fad02 100644 --- a/exn-middleware-core/src/main/groovy/eu/nebulouscloud/exn/modules/sal/processors/impl/CloudProcessor.groovy +++ b/exn-middleware-core/src/main/groovy/eu/nebulouscloud/exn/modules/sal/processors/impl/CloudProcessor.groovy @@ -31,7 +31,7 @@ class CloudProcessor extends AbstractProcessor{ "body": {} ] - logger.info('{} - Registering cloud {}',metaData.user, o) + logger.info('{} - Registering cloud {}',metaData?.user, o) // User Credentials for connecting to ProActive Server. // SAL is a REST interface to PWS. Get it from UI or store in middleware db? @@ -61,7 +61,7 @@ class CloudProcessor extends AbstractProcessor{ "body": {} ] - logger.info('{} - Getting clouds {}',metaData.user, o) + logger.info('{} - Getting clouds {}',metaData?.user, o) //User Credentials for connecting to ProActive Server. //SAL is a REST interface to PWS. Get it from UI or store behind the scenes ? @@ -88,7 +88,7 @@ class CloudProcessor extends AbstractProcessor{ "body": {} ] - logger.info('{} - Deleting clouds {}',metaData.user, o) + logger.info('{} - Deleting clouds {}',metaData?.user, o) //User Credentials for connecting to ProActive Server. //SAL is a REST interface to PWS. Get it from UI or store behind the scenes ? diff --git a/exn-middleware-core/src/main/groovy/eu/nebulouscloud/exn/modules/sal/processors/impl/JobProcessor.groovy b/exn-middleware-core/src/main/groovy/eu/nebulouscloud/exn/modules/sal/processors/impl/JobProcessor.groovy index 2b086ac..38b816d 100644 --- a/exn-middleware-core/src/main/groovy/eu/nebulouscloud/exn/modules/sal/processors/impl/JobProcessor.groovy +++ b/exn-middleware-core/src/main/groovy/eu/nebulouscloud/exn/modules/sal/processors/impl/JobProcessor.groovy @@ -35,7 +35,7 @@ class JobProcessor extends AbstractProcessor{ "body": {} ] - logger.info('{} - Creating job {}',metaData.user, o) + logger.info('{} - Creating job {}',metaData?.user, o) // User Credentials for connecting to ProActive Server. // SAL is a REST interface to PWS. Get it from UI or store in middleware db? @@ -48,11 +48,11 @@ class JobProcessor extends AbstractProcessor{ headers.add('sessionid',sessionId) headers.setContentType(MediaType.APPLICATION_JSON) - def response = jobRepository.save(o,headers,Object.class) + Boolean response = jobRepository.save(o,headers,Boolean.class) return [ "status": HttpStatus.OK.value(), - "body": response + "body": ["success":response] ] } @@ -65,7 +65,7 @@ class JobProcessor extends AbstractProcessor{ "body": {} ] - logger.info('{} - Getting clouds {}',metaData.user, o) + logger.info('{} - Getting clouds {}',metaData?.user, o) //User Credentials for connecting to ProActive Server. //SAL is a REST interface to PWS. Get it from UI or store behind the scenes ? @@ -101,7 +101,7 @@ class JobProcessor extends AbstractProcessor{ String jobId = metaData.jobId String action = metaData.action - logger.info('{} - [{}] job {} and payload {}',metaData.user, action, jobId, o) + logger.info('{} - [{}] job {} and payload {}',metaData?.user, action, jobId, o) //User Credentials for connecting to ProActive Server. //SAL is a REST interface to PWS. Get it from UI or store behind the scenes ? @@ -140,7 +140,7 @@ class JobProcessor extends AbstractProcessor{ "body": {} ] - logger.info('{} - Submitting job {} with body {}',metaData.user, metaData.jobId, o) + logger.info('{} - Submitting job {} with body {}',metaData?.user, metaData.jobId, o) //User Credentials for connecting to ProActive Server. //SAL is a REST interface to PWS. Get it from UI or store behind the scenes ? diff --git a/exn-middleware-core/src/main/groovy/eu/nebulouscloud/exn/modules/sal/processors/impl/NodeCandidateProcessor.groovy b/exn-middleware-core/src/main/groovy/eu/nebulouscloud/exn/modules/sal/processors/impl/NodeCandidateProcessor.groovy index 51d5c4a..7617f6b 100644 --- a/exn-middleware-core/src/main/groovy/eu/nebulouscloud/exn/modules/sal/processors/impl/NodeCandidateProcessor.groovy +++ b/exn-middleware-core/src/main/groovy/eu/nebulouscloud/exn/modules/sal/processors/impl/NodeCandidateProcessor.groovy @@ -30,7 +30,7 @@ class NodeCandidateProcessor extends AbstractProcessor{ @Override Map get(Map metaData, String o) { - logger.info('{} - Getting node candidates {}',metaData.user, o) + logger.info('{} - Getting node candidates {}',metaData?.user, o) //User Credentials for connecting to ProActive Server. //SAL is a REST interface to PWS. Get it from UI or store behind the scenes ? @@ -50,5 +50,25 @@ class NodeCandidateProcessor extends AbstractProcessor{ } + @Override + Map post(Map metaData, String o) { + + logger.info('{} - Ranking node candidates {}',metaData?.user, o) + + String sessionId = gatewayRepository.login(salConfiguration.username,salConfiguration.password) + + HttpHeaders headers = new HttpHeaders() + headers.add('sessionid',sessionId) + headers.setContentType(MediaType.APPLICATION_JSON) + + //Check jobId mentioned above + List response = nodeCandidateRepository.rankCandidates(o,headers,Object.class) + + return [ + "status": HttpStatus.OK.value(), + "body": response + ] + + } } diff --git a/exn-middleware-core/src/main/groovy/eu/nebulouscloud/exn/modules/sal/processors/impl/NodeProcessor.groovy b/exn-middleware-core/src/main/groovy/eu/nebulouscloud/exn/modules/sal/processors/impl/NodeProcessor.groovy index 2b9f006..61b9336 100644 --- a/exn-middleware-core/src/main/groovy/eu/nebulouscloud/exn/modules/sal/processors/impl/NodeProcessor.groovy +++ b/exn-middleware-core/src/main/groovy/eu/nebulouscloud/exn/modules/sal/processors/impl/NodeProcessor.groovy @@ -30,7 +30,7 @@ class NodeProcessor extends AbstractProcessor{ "body": {} ] - logger.info('{} - Registering node {}',metaData.user, o) + logger.info('{} - Registering node {}',metaData?.user, o) //User Credentials for connecting to ProActive Server. //SAL is a REST interface to PWS. Get it from UI or store in middleware db? @@ -66,7 +66,7 @@ class NodeProcessor extends AbstractProcessor{ "body": {} ] - logger.info('{} - Getting node for Job {}',metaData.user, metaData.jobId) + logger.info('{} - Getting node for Job {}',metaData?.user, metaData.jobId) //User Credentials for connecting to ProActive Server. //SAL is a REST interface to PWS. Get it from UI or store behind the scenes ? @@ -103,7 +103,7 @@ class NodeProcessor extends AbstractProcessor{ "body": {} ] - logger.info('{} - Deleting nodes for Job {}',metaData.user, metaData.jobId) + logger.info('{} - Deleting nodes for Job {}',metaData?.user, metaData.jobId) //User Credentials for connecting to ProActive Server. //SAL is a REST interface to PWS. Get it from UI or store behind the scenes ? @@ -140,7 +140,7 @@ class NodeProcessor extends AbstractProcessor{ "body": {} ] - logger.info('{} - Assigning node {} to job with payload: {}',metaData.user, metaData.jobId, o) + logger.info('{} - Assigning node {} to job with payload: {}',metaData?.user, metaData.jobId, o) //User Credentials for connecting to ProActive Server. //SAL is a REST interface to PWS. Get it from UI or store in middleware db? diff --git a/exn-middleware-core/src/main/groovy/eu/nebulouscloud/exn/modules/sal/repository/GatewayRepository.groovy b/exn-middleware-core/src/main/groovy/eu/nebulouscloud/exn/modules/sal/repository/GatewayRepository.groovy index dbb2fd3..cb25842 100644 --- a/exn-middleware-core/src/main/groovy/eu/nebulouscloud/exn/modules/sal/repository/GatewayRepository.groovy +++ b/exn-middleware-core/src/main/groovy/eu/nebulouscloud/exn/modules/sal/repository/GatewayRepository.groovy @@ -1,5 +1,6 @@ package eu.nebulouscloud.exn.modules.sal.repository +import groovy.util.logging.Slf4j import org.springframework.http.HttpHeaders import org.springframework.http.MediaType import org.springframework.stereotype.Repository @@ -8,6 +9,7 @@ import org.springframework.util.MultiValueMap import org.springframework.web.client.HttpClientErrorException @Repository +@Slf4j class GatewayRepository extends AbstractSalRepository{ GatewayRepository() { @@ -23,7 +25,9 @@ class GatewayRepository extends AbstractSalRepository{ HttpHeaders headers = new HttpHeaders() headers.setContentType(MediaType.MULTIPART_FORM_DATA) - String sessionId = post('connect', credentials, headers) + log.trace('Logging in with username: {} and password {}',username,password) + String sessionId = post('connect', credentials, headers) + log.trace('Logged in with sessionId {}',sessionId) return sessionId diff --git a/exn-middleware-core/src/main/groovy/eu/nebulouscloud/exn/modules/sal/repository/nodecandidate/NodeCandidateRepository.groovy b/exn-middleware-core/src/main/groovy/eu/nebulouscloud/exn/modules/sal/repository/nodecandidate/NodeCandidateRepository.groovy index a689b6f..622a5c5 100644 --- a/exn-middleware-core/src/main/groovy/eu/nebulouscloud/exn/modules/sal/repository/nodecandidate/NodeCandidateRepository.groovy +++ b/exn-middleware-core/src/main/groovy/eu/nebulouscloud/exn/modules/sal/repository/nodecandidate/NodeCandidateRepository.groovy @@ -15,5 +15,8 @@ class NodeCandidateRepository extends AbstractSalRepository{ post('filter',body,headers,responseType) } + List rankCandidates(String body, HttpHeaders headers, Class responseType){ + post('orderfiltered',body,headers,responseType) + } }