diff options
Diffstat (limited to 'cps-ncmp-service/src/test')
4 files changed, 90 insertions, 6 deletions
diff --git a/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/config/HttpClientConfigurationSpec.groovy b/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/config/HttpClientConfigurationSpec.groovy index 91aeb88a54..1d3b22fb73 100644 --- a/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/config/HttpClientConfigurationSpec.groovy +++ b/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/config/HttpClientConfigurationSpec.groovy @@ -25,23 +25,21 @@ import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.context.properties.EnableConfigurationProperties import org.springframework.boot.test.context.SpringBootTest import org.springframework.test.context.ContextConfiguration -import org.springframework.test.context.TestPropertySource import spock.lang.Specification @SpringBootTest @ContextConfiguration(classes = [HttpClientConfiguration]) -@EnableConfigurationProperties(HttpClientConfiguration.class) -@TestPropertySource(properties = ["ncmp.dmi.httpclient.data-services.readTimeoutInSeconds=789", "ncmp.dmi.httpclient.model-services.maximumConnectionsTotal=111"]) +@EnableConfigurationProperties(HttpClientConfiguration) class HttpClientConfigurationSpec extends Specification { @Autowired - private HttpClientConfiguration httpClientConfiguration + HttpClientConfiguration httpClientConfiguration def 'Test http client configuration properties of data with custom and default values'() { expect: 'properties are populated correctly for data' with(httpClientConfiguration.dataServices) { assert connectionTimeoutInSeconds == 123 - assert readTimeoutInSeconds == 789 + assert readTimeoutInSeconds == 33 assert writeTimeoutInSeconds == 30 assert maximumConnectionsTotal == 100 assert pendingAcquireMaxCount == 22 diff --git a/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/impl/data/DmiDataOperationsSpec.groovy b/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/impl/data/DmiDataOperationsSpec.groovy index c2bbfc2edc..970444f643 100644 --- a/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/impl/data/DmiDataOperationsSpec.groovy +++ b/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/impl/data/DmiDataOperationsSpec.groovy @@ -36,6 +36,7 @@ import org.onap.cps.ncmp.utils.TestUtils import org.onap.cps.utils.JsonObjectMapper import org.spockframework.spring.SpringBean import org.springframework.beans.factory.annotation.Autowired +import org.springframework.boot.test.context.SpringBootContextLoader import org.springframework.boot.test.context.SpringBootTest import org.springframework.http.HttpStatus import org.springframework.http.ResponseEntity @@ -53,7 +54,7 @@ import static org.onap.cps.ncmp.impl.models.RequiredDmiService.DATA import static org.onap.cps.ncmp.utils.events.CloudEventMapper.toTargetEvent @SpringBootTest -@ContextConfiguration(classes = [EventsPublisher, CpsApplicationContext, DmiProperties, DmiDataOperations]) +@ContextConfiguration(classes = [EventsPublisher, CpsApplicationContext, DmiProperties, DmiDataOperations, PolicyExecutor]) class DmiDataOperationsSpec extends DmiOperationsBaseSpec { def NO_TOPIC = null @@ -72,6 +73,9 @@ class DmiDataOperationsSpec extends DmiOperationsBaseSpec { @SpringBean EventsPublisher eventsPublisher = Stub() + @SpringBean + PolicyExecutor policyExecutor = Mock() + def 'call get resource data for #expectedDataStore from DMI without topic #scenario.'() { given: 'a cm handle for #cmHandleId' mockYangModelCmHandleRetrieval(dmiProperties) @@ -161,6 +165,8 @@ class DmiDataOperationsSpec extends DmiOperationsBaseSpec { def result = objectUnderTest.writeResourceDataPassThroughRunningFromDmi(cmHandleId, 'parent/child', operation, 'requestData', 'some data type', NO_AUTH_HEADER) then: 'the result is the response from the DMI service' assert result == responseFromDmi + and: 'the permission was checked with the policy executor' + 1 * policyExecutor.checkPermission(_, operation, NO_AUTH_HEADER, resourceIdentifier, 'requestData' ) where: 'the following operation is performed' operation || expectedOperationInUrl CREATE || 'create' diff --git a/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/impl/data/PolicyExecutorSpec.groovy b/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/impl/data/PolicyExecutorSpec.groovy new file mode 100644 index 0000000000..654206776b --- /dev/null +++ b/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/impl/data/PolicyExecutorSpec.groovy @@ -0,0 +1,73 @@ +package org.onap.cps.ncmp.impl.data + +import ch.qos.logback.classic.Level +import ch.qos.logback.classic.Logger +import ch.qos.logback.classic.spi.ILoggingEvent +import ch.qos.logback.core.read.ListAppender +import org.onap.cps.ncmp.impl.inventory.models.YangModelCmHandle +import org.slf4j.LoggerFactory +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.boot.test.context.SpringBootTest +import org.springframework.test.context.ContextConfiguration +import spock.lang.Specification + +import static org.onap.cps.ncmp.api.data.models.OperationType.PATCH + +@SpringBootTest +@ContextConfiguration(classes = [PolicyExecutor]) +class PolicyExecutorSpec extends Specification { + + @Autowired + PolicyExecutor objectUnderTest + + def logAppender = Spy(ListAppender<ILoggingEvent>) + + def setup() { + setupLogger() + } + + def cleanup() { + ((Logger) LoggerFactory.getLogger(PolicyExecutor)).detachAndStopAllAppenders() + } + + def 'Configuration properties.'() { + expect: 'properties used from application.yml' + assert objectUnderTest.enabled + assert objectUnderTest.serverAddress == 'http://localhost' + assert objectUnderTest.serverPort == '8785' + } + + def 'Permission check logging.'() { + when: 'permission is checked for an operation' + def yangModelCmHandle = new YangModelCmHandle(id:'ch-1', alternateId:'fdn1') + objectUnderTest.checkPermission(yangModelCmHandle, PATCH, 'my credentials','my resource','my change') + then: 'correct details are logged ' + assert getLogEntry(0) == 'Policy Executor Enabled' + assert getLogEntry(3).contains('my credentials') + assert getLogEntry(4).contains('cm_patch') + assert getLogEntry(5).contains('fdn1') + assert getLogEntry(6).contains('ch-1') + assert getLogEntry(7).contains('my resource') + assert getLogEntry(8).contains('my change') + } + + def 'Permission check with feature disabled.'() { + given: 'feature is disabled' + objectUnderTest.enabled = false + when: 'permission is checked for an operation' + objectUnderTest.checkPermission(new YangModelCmHandle(), PATCH, 'my credentials','my resource','my change') + then: 'nothing is logged' + assert logAppender.list.isEmpty() + } + + def setupLogger() { + def logger = LoggerFactory.getLogger(PolicyExecutor) + logger.setLevel(Level.DEBUG) + logger.addAppender(logAppender) + logAppender.start() + } + + def getLogEntry(index) { + logAppender.list[index].formattedMessage + } +} diff --git a/cps-ncmp-service/src/test/resources/application.yml b/cps-ncmp-service/src/test/resources/application.yml index 5b10e7376b..f0790dda4b 100644 --- a/cps-ncmp-service/src/test/resources/application.yml +++ b/cps-ncmp-service/src/test/resources/application.yml @@ -41,10 +41,12 @@ ncmp: pendingAcquireMaxCount: 22 connectionTimeoutInSeconds: 123 maximumInMemorySizeInMegabytes: 7 + readTimeoutInSeconds: 33 model-services: pendingAcquireMaxCount: 44 connectionTimeoutInSeconds: 456 maximumInMemorySizeInMegabytes: 8 + maximumConnectionsTotal: 111 auth: username: some-user password: some-password @@ -59,6 +61,11 @@ ncmp: async-executor: parallelism-level: 3 + policy-executor: + enabled: true + server: + address: "http://localhost" + port: "8785" # Custom Hazelcast Config. hazelcast: |