diff options
author | grabinsk <maciej.grabinski@nokia.com> | 2019-07-09 09:56:58 +0200 |
---|---|---|
committer | grabinsk <maciej.grabinski@nokia.com> | 2019-07-11 11:06:13 +0200 |
commit | 48589757cdb485d5d320395e47a06d0e2afc3b78 (patch) | |
tree | ee8f7f9c2a6be8d6bd097bdda136aa37d7d74aef /prh-app-server/src/test/resources | |
parent | ac77e0be3acc65b898d6310eaf09b3ee1a0d1725 (diff) |
Replace dummy prh workflow scheduling test generating fake code coverage with a prh workflow integration test with aai and dmaap mocked using wiremock and simple prh workflow scheduling test
Change-Id: Id6cfbcf62e865e1527cce2e006b1d85ea499f3f3
Issue-ID: DCAEGEN2-1544
Signed-off-by: grabinsk <maciej.grabinski@nokia.com>
Diffstat (limited to 'prh-app-server/src/test/resources')
5 files changed, 55 insertions, 37 deletions
diff --git a/prh-app-server/src/test/resources/application.yaml b/prh-app-server/src/test/resources/application.yaml index 90385b2b..fa7f11cf 100644 --- a/prh-app-server/src/test/resources/application.yaml +++ b/prh-app-server/src/test/resources/application.yaml @@ -1,3 +1,8 @@ spring: profiles: - active: prod
\ No newline at end of file + active: prod + +logging: + level: + org.onap.dcaegen2.services.prh: debug + org.onap.dcaegen2.services.sdk: debug
\ No newline at end of file diff --git a/prh-app-server/src/test/resources/bootstrap.yaml b/prh-app-server/src/test/resources/bootstrap.yaml index bbb2dcf9..46796cdc 100644 --- a/prh-app-server/src/test/resources/bootstrap.yaml +++ b/prh-app-server/src/test/resources/bootstrap.yaml @@ -1,2 +1,6 @@ cbs: - enabled: false
\ No newline at end of file + enabled: false +spring: + cloud: + config: + enabled: false
\ No newline at end of file diff --git a/prh-app-server/src/test/resources/integration/event.json b/prh-app-server/src/test/resources/integration/event.json new file mode 100644 index 00000000..3a768df2 --- /dev/null +++ b/prh-app-server/src/test/resources/integration/event.json @@ -0,0 +1,37 @@ +{ + "event": { + "commonEventHeader": { + "startEpochMicrosec": 1540212137393, + "sourceId": "val13", + "eventId": "registration_40212137", + "nfcNamingCode": "oam", + "internalHeaderFields": { + "collectorTimeStamp": "Mon, 10 22 2018 12:42:18 UTC" + }, + "eventType": "pnfRegistration", + "priority": "Normal", + "version": "4.0.1", + "reportingEntityName": "NOK6061ZW8", + "sequence": 0, + "domain": "pnfRegistration", + "lastEpochMicrosec": 1540212137393, + "eventName": "pnfRegistration_Nokia_5gDu", + "vesEventListenerVersion": "7.0.1", + "sourceName": "NOK6061ZW8", + "nfNamingCode": "gNB" + }, + "pnfRegistrationFields": { + "unitType": "val8", + "serialNumber": "6061ZW9", + "pnfRegistrationFieldsVersion": "2.0", + "manufactureDate": "1540212137393", + "modelNumber": "val6", + "lastServiceDate": "1540212137393", + "unitFamily": "BBU", + "vendorName": "Nokia", + "oamV4IpAddress": "val3", + "oamV6IpAddress": "val4", + "softwareVersion": "val7" + } + } +}
\ No newline at end of file diff --git a/prh-app-server/src/test/resources/logback-test.xml b/prh-app-server/src/test/resources/logback-test.xml index c1f00665..c8db899a 100644 --- a/prh-app-server/src/test/resources/logback-test.xml +++ b/prh-app-server/src/test/resources/logback-test.xml @@ -1,21 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- - ~ ===============================LICENSE_START====================================== - ~ Copyright © 2017 AT&T Intellectual Property. All rights reserved. - ~ ================================================================================ - ~ Licensed under the Apache License, Version 2.0 (the "License"); - ~ you may not use this file except in compliance with the License. - ~ You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, software - ~ distributed under the License is distributed on an "AS IS" BASIS, - ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ~ See the License for the specific language governing permissions and - ~ limitations under the License. - ~ ============================LICENSE_END=========================================== - --> <configuration> - <root level="OFF"/> -</configuration> + <include resource="org/springframework/boot/logging/logback/defaults.xml" /> + <include resource="org/springframework/boot/logging/logback/console-appender.xml" /> + + <logger name="ROOT" level="WARN"> + <appender-ref ref="CONSOLE"/> + </logger> +</configuration>
\ No newline at end of file diff --git a/prh-app-server/src/test/resources/scheduled-context.xml b/prh-app-server/src/test/resources/scheduled-context.xml deleted file mode 100644 index 91919aa2..00000000 --- a/prh-app-server/src/test/resources/scheduled-context.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:task="http://www.springframework.org/schema/task" - xmlns:context="http://www.springframework.org/schema/context" - xsi:schemaLocation="http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-4.0.xsd - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.0.xsd"> - - <context:component-scan - base-package="org.onap.dcaegen2.services.prh"/> - <task:scheduled-tasks> - <task:scheduled ref="scheduleController" method="startTasks" - fixed-rate="1000"/> - </task:scheduled-tasks> -</beans> |