nonrtric.git
4 years agoTest env updates for dmaap messages in batch and for running external agent 13/3713/2
BjornMagnussonXA [Mon, 11 May 2020 12:11:30 +0000 (14:11 +0200)]
Test env updates for dmaap messages in batch and for running external agent

Restructured and consolidated testcases

Various minor updates and adjustment to test functions

Change-Id: Ie796b04b7a12bbd410b56db19d718e1c5a0510de
Issue-ID: NONRTRIC-154
Signed-off-by: BjornMagnussonXA <bjorn.magnusson@est.tech>
4 years agoBugfix, GET policy types for OSC A1 Policy REST API 11/3711/1
PatrikBuhr [Fri, 15 May 2020 11:05:23 +0000 (13:05 +0200)]
Bugfix, GET policy types for OSC A1 Policy REST API

The OSC A1 Policy REST API GET Policy types returns an array of integer,
but the agent expected an array of strings.
Now both cases will work.

Change-Id: Iac3d2e0ecbf1427644f50ac678ff2e6a69f12929
Issue-ID: NONRTRIC-195
Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
4 years agoAdded test of validation of trusted peer 08/3708/1
PatrikBuhr [Fri, 15 May 2020 06:49:21 +0000 (08:49 +0200)]
Added test of validation of trusted peer

Also, loading trust store is done only once instead of for each connection.

Change-Id: I673015d8129e5b69d3abbf351d1d4079f7839f41
Issue-ID: NONRTRIC-195
Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
4 years agoAdded upport for trust store when agent acts as web client 95/3695/3
PatrikBuhr [Thu, 7 May 2020 10:30:21 +0000 (12:30 +0200)]
Added upport for trust store when agent acts as web client

Updated Dmaap so it uses http towards the agent NBI instead of https

Change-Id: Ia30ac783683efa478bc8ab56dc4ac8311b03f8f0
Issue-ID: NONRTRIC-195
Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
4 years agoMerge "Update mrstub with nginx"
Henrik Andersson [Thu, 14 May 2020 06:14:19 +0000 (06:14 +0000)]
Merge "Update mrstub with nginx"

4 years agoUpdate mrstub with nginx 65/3665/10
ecaiyanlinux [Mon, 11 May 2020 10:53:23 +0000 (12:53 +0200)]
Update mrstub with nginx

Support http/https for mrstub
http port 3905
https port 3906
Add timeout for mr AGENT_READ_URL

Issue-ID: NONRTRIC-208
Change-Id: I222906b705f273b2e582ad8ce80fa88b2e582824
Signed-off-by: Chengkai Yan <martin.c.yan@est.tech>
4 years agoSupport for transient policies not recreated at synchronization 79/3679/3
PatrikBuhr [Wed, 13 May 2020 08:55:14 +0000 (10:55 +0200)]
Support for transient policies not recreated at synchronization

Decreased the sleep time when waiting for dmaap configuration to 10 seconds instead on 60.

Change-Id: I774c62d665efe84d249c486094de41168233c410
Issue-ID: NONRTRIC-217
Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
4 years agoBugfix, creating only one DmaapProducer 71/3671/2
PatrikBuhr [Tue, 12 May 2020 11:27:37 +0000 (13:27 +0200)]
Bugfix, creating only one DmaapProducer

Each DmaapProducer starts a thread that is never terminated.
This class works around that by only creating one DmaapProducer
and will reuse that.

Change-Id: I3f8f9369a948f1cb5e3ae119c62c03bf4f5d180a
Issue-ID: NONRTRIC-210
Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
4 years agoMerge "Fix Sonar and CheckStyle warnings"
Henrik Andersson [Tue, 12 May 2020 13:48:16 +0000 (13:48 +0000)]
Merge "Fix Sonar and CheckStyle warnings"

4 years agoMerge "Improve code coverage of A1 controller"
Henrik Andersson [Tue, 12 May 2020 13:46:46 +0000 (13:46 +0000)]
Merge "Improve code coverage of A1 controller"

4 years agoImprove code coverage of A1 controller 72/3672/3
RehanRaza [Tue, 12 May 2020 11:54:48 +0000 (13:54 +0200)]
Improve code coverage of A1 controller

Change-Id: Ia9630e0f6d619e2bc7435845ee73e15e1fa06a1e
Issue-ID: NONRTRIC-201
Signed-off-by: RehanRaza <muhammad.rehan.raza@est.tech>
4 years agoFix Sonar and CheckStyle warnings 66/3666/5
elinuxhenrik [Mon, 11 May 2020 12:12:43 +0000 (14:12 +0200)]
Fix Sonar and CheckStyle warnings

Change-Id: Ifbbb999aec5ecbf382c799a3bb733ca272f93da7
Issue-ID: NONRTRIC-209
Signed-off-by: elinuxhenrik <henrik.b.andersson@est.tech>
4 years agoHandling Dmaap messages in a series 61/3661/1
PatrikBuhr [Mon, 11 May 2020 06:47:45 +0000 (08:47 +0200)]
Handling Dmaap messages in  a series

To gurante that messges are handled in the right order they must be
processed in a series instead of in paralell.

Change-Id: I156bade6dc2d5100403681b452aadf473f6b94ed
Issue-ID: NONRTRIC-210
Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
4 years agoMerge "Remove sleep from DmaapMessageConsumer"
John Keeney [Fri, 8 May 2020 15:35:33 +0000 (15:35 +0000)]
Merge "Remove sleep from DmaapMessageConsumer"

4 years agoMerge "Decrease concurrency"
John Keeney [Fri, 8 May 2020 15:32:54 +0000 (15:32 +0000)]
Merge "Decrease concurrency"

4 years agoRemove sleep from DmaapMessageConsumer 32/3632/9
elinuxhenrik [Tue, 5 May 2020 14:38:15 +0000 (16:38 +0200)]
Remove sleep from DmaapMessageConsumer

Now that the timeout parameter is used when polling MR, the consumer
doesn't have to sleep between polls.

Also fixes the MR simulator so it responds correctly to the responses
from the policy agent.

Change-Id: I56d8be6a762013503defcd4f7297daa90a0a293e
Issue-ID: NONRTRIC-209
Signed-off-by: elinuxhenrik <henrik.b.andersson@est.tech>
4 years agoDecrease concurrency 33/3633/2
PatrikBuhr [Thu, 7 May 2020 10:46:52 +0000 (12:46 +0200)]
Decrease concurrency

Decrease concurrency when policies are recreated.

Bugfix, SdncOscA1Client deleteAllPolicies did nohing.

Change-Id: I9db04fd951defb1b033f96c115da18e7bd05ff04
Issue-ID: NONRTRIC-201
Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
4 years agoAdd webserver support for mr simulator 37/3637/1
YongchaoWu [Thu, 7 May 2020 10:21:42 +0000 (12:21 +0200)]
Add webserver support for mr simulator

- build nginx, wsgi, flask mr in one container
- support multi-threading and multi-processing
- support both http and https call
- support both IPv4 and IPv6

Issue-ID: NONRTRIC-208
Signed-off-by: YongchaoWu <yongchao.wu@est.tech>
Change-Id: Idf905923a1419e62ea4ec2d07fdcfccd0f85f12c

4 years agoReturn correct error response code from A1 controller 13/3613/4
RehanRaza [Thu, 7 May 2020 10:18:14 +0000 (12:18 +0200)]
Return correct error response code from A1 controller

Change-Id: I4c886be11dc83b7693ffa56a64295b83abced000
Issue-ID: NONRTRIC-213
Signed-off-by: RehanRaza <muhammad.rehan.raza@est.tech>
4 years agoMerge "Added one typeless Policy in MockPolicyAgent"
John Keeney [Wed, 6 May 2020 16:37:19 +0000 (16:37 +0000)]
Merge "Added one typeless Policy in MockPolicyAgent"

4 years agoMerge "First version of HealtCheck test"
John Keeney [Wed, 6 May 2020 16:34:03 +0000 (16:34 +0000)]
Merge "First version of HealtCheck test"

4 years agoUpdate parent pom versions in A1 controller 93/3593/1
RehanRaza [Wed, 6 May 2020 10:23:27 +0000 (12:23 +0200)]
Update parent pom versions in A1 controller

Also update ccsdk docker version

Change-Id: I69ff800299c0a07cf97eeec1737cb3b974464e6b
Issue-ID: NONRTRIC-201
Signed-off-by: RehanRaza <muhammad.rehan.raza@est.tech>
4 years agoAdded one typeless Policy in MockPolicyAgent 78/3578/3
PatrikBuhr [Tue, 5 May 2020 07:11:52 +0000 (09:11 +0200)]
Added one typeless Policy in MockPolicyAgent

For enabling manual testing of typeless policies in the Controlpanel

Change-Id: I51a7c4cefeb7f621e27879f3ce4b3f4659c56bd4
Issue-ID: NONRTRIC-210
Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
4 years agoMerge "Further updates to the auto-test environment"
Henrik Andersson [Tue, 5 May 2020 07:27:13 +0000 (07:27 +0000)]
Merge "Further updates to the auto-test environment"

4 years agoFixing timeout parameter in MRConsumer 74/3574/1
elinuxhenrik [Mon, 4 May 2020 15:37:59 +0000 (17:37 +0200)]
Fixing timeout parameter in MRConsumer

The properties for the timeout and limit parameters where added as
integers, but should be added as strings to the properties.

Change-Id: I02b84362d1a6c9cc38a4c670f3e4b40ecba235be
Issue-ID: NONRTRIC-209
Signed-off-by: elinuxhenrik <henrik.b.andersson@est.tech>
4 years agoUpdate README files in A1 controller 71/3571/1
RehanRaza [Mon, 4 May 2020 12:38:28 +0000 (14:38 +0200)]
Update README files in A1 controller

Change-Id: I753f79cfe7c2f2bdae13c9bc3e00eba0d55f1e98
Issue-ID: NONRTRIC-201
Signed-off-by: RehanRaza <muhammad.rehan.raza@est.tech>
4 years agoFirst version of HealtCheck test 86/3586/1
elinuxhenrik [Tue, 28 Apr 2020 13:31:33 +0000 (15:31 +0200)]
First version of HealtCheck test

Change-Id: I49c765eaf8ee340c8371c48e2c24cd3427800547
Issue-ID: NONRTRIC-200
Signed-off-by: elinuxhenrik <henrik.b.andersson@est.tech>
4 years agoMerge "Minor changes"
Henrik Andersson [Mon, 4 May 2020 08:52:08 +0000 (08:52 +0000)]
Merge "Minor changes"

4 years agoFurther updates to the auto-test environment 64/3564/1
BjornMagnussonXA [Fri, 24 Apr 2020 07:20:18 +0000 (09:20 +0200)]
Further updates to the auto-test environment

Aligned python to python 3

Added test script of ric re-sync

Preparing for secure port of simulator and agent

Integrated SNDC ONAP adapter to the test environment

MR-stub now support long poll and message limits

Change-Id: I280f173f811a9fd859c4cc5234084a5a20f77a90
Issue-ID: NONRTRIC-154
Signed-off-by: BjornMagnussonXA <bjorn.magnusson@est.tech>
4 years agoMerge "Add https support in A1 controller"
John Keeney [Fri, 1 May 2020 10:33:39 +0000 (10:33 +0000)]
Merge "Add https support in A1 controller"

4 years agoMinor changes 29/3529/4
PatrikBuhr [Wed, 29 Apr 2020 12:31:02 +0000 (14:31 +0200)]
Minor changes

Added a unittest for getting schema through the SDNC
controller.

Increased http READ time out, from 10 to 30 seconds
Added TRACE of all REST bodies and responses

Attempt to fix that loading config from consul stops
when the json is syntaxtically wrong.

Change-Id: I4fc5d43971fd6853737f57aa0900f2e5068cd43c
Issue-ID: NONRTRIC-195
Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
4 years agoAdd https support in A1 controller 44/3544/2
RehanRaza [Thu, 30 Apr 2020 12:04:57 +0000 (14:04 +0200)]
Add https support in A1 controller

Add self-signed cert for NBI and SBI
Remove ONAP signed certs

Change-Id: I733cb48bf37cb124a330f9a2734920fda010de57
Issue-ID: NONRTRIC-196
Signed-off-by: RehanRaza <muhammad.rehan.raza@est.tech>
4 years agoMerge "Fixed so that DMAAP client uses https"
John Keeney [Wed, 29 Apr 2020 11:58:59 +0000 (11:58 +0000)]
Merge "Fixed so that DMAAP client uses https"

4 years agoMerge "Change formatting of API documentation"
Henrik Andersson [Tue, 28 Apr 2020 14:31:34 +0000 (14:31 +0000)]
Merge "Change formatting of API documentation"

4 years agoFixed so that DMAAP client uses https 03/3503/1
PatrikBuhr [Tue, 28 Apr 2020 13:18:39 +0000 (15:18 +0200)]
Fixed so that DMAAP client uses https

Change-Id: I530c70159ef26bb3d3df11f23b3f89715c591efb
Issue-ID: NONRTRIC-195
Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
4 years agoFixed Concurrency test 98/3498/1
PatrikBuhr [Tue, 28 Apr 2020 09:33:32 +0000 (11:33 +0200)]
Fixed Concurrency test

Fixed so that controller adapter SdncOscA1Client extracts the create_schema
in the same was os the OscA1Client.

Change-Id: Ia930aca22242743631ccc26534ede2eed345cbdd
Issue-ID: NONRTRIC-195
Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
4 years agoMerge "Rename artifacts in A1 controller"
Henrik Andersson [Tue, 28 Apr 2020 08:14:49 +0000 (08:14 +0000)]
Merge "Rename artifacts in A1 controller"

4 years agoMerge "Changed the config loading from consul"
Henrik Andersson [Tue, 28 Apr 2020 07:59:20 +0000 (07:59 +0000)]
Merge "Changed the config loading from consul"

4 years agoChanged the config loading from consul 53/3453/5
PatrikBuhr [Fri, 24 Apr 2020 13:45:58 +0000 (15:45 +0200)]
Changed the config loading from consul

Cannot use the updates() function in CBS client.

Forgetting the negitiated protocol when a controller is connected
or disconnected in the configuration.

Temporary disabled trhe concurrency test due
to too much resource consumption.

Change-Id: I760add1c1e1b028763ae5c7c8cc4e542361026ef
Issue-ID: NONRTRIC-204
Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
4 years agoRename artifacts in A1 controller 86/3486/2
RehanRaza [Mon, 27 Apr 2020 14:20:26 +0000 (16:20 +0200)]
Rename artifacts in A1 controller

Change-Id: I0aa592dd98a1f6c9a038aa3415e363d1263772d6
Issue-ID: NONRTRIC-201
Signed-off-by: RehanRaza <muhammad.rehan.raza@est.tech>
4 years agoMerge "Remove unnecessary stuff from northbound directory of A1 controller"
Henrik Andersson [Mon, 27 Apr 2020 05:46:04 +0000 (05:46 +0000)]
Merge "Remove unnecessary stuff from northbound directory of A1 controller"

4 years agoMerge "Loading of configuration"
Henrik Andersson [Fri, 24 Apr 2020 08:33:34 +0000 (08:33 +0000)]
Merge "Loading of configuration"

4 years agoLoading of configuration 45/3445/3
PatrikBuhr [Fri, 24 Apr 2020 07:33:30 +0000 (09:33 +0200)]
Loading of configuration

When an invalid configuartion was entered (from file of from consul)
the periodic polling for updates was stopped. This is fixed.

Improved error messages when an invalid configiration was intered.
Previuosly it often was just a NullPointerException when a mandatory
element was not found. Now, the missing element will be logged.

Change-Id: Id28dd268429c0174a84f490e6fb48ef5614c0966
Issue-ID: NONRTRIC-204
Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
4 years agoMerge "Added support for https"
Henrik Andersson [Fri, 24 Apr 2020 05:32:51 +0000 (05:32 +0000)]
Merge "Added support for https"

4 years agoRemove unnecessary stuff from northbound directory of A1 controller 28/3428/5
RehanRaza [Thu, 23 Apr 2020 09:56:39 +0000 (11:56 +0200)]
Remove unnecessary stuff from northbound directory of A1 controller

Change-Id: I214723fc405bbf6aacb8cf60cc810f87beeeab77
Issue-ID: NONRTRIC-201
Signed-off-by: RehanRaza <muhammad.rehan.raza@est.tech>
4 years agoMerge "Remove unnecessary stuff from oam directory of A1 controller"
John Keeney [Thu, 23 Apr 2020 13:47:34 +0000 (13:47 +0000)]
Merge "Remove unnecessary stuff from oam directory of A1 controller"

4 years agoAdded support for https 24/3424/2
PatrikBuhr [Fri, 17 Apr 2020 06:58:02 +0000 (08:58 +0200)]
Added support for https

The agent listens to two ports:
- 8081 for http
- 8433 for https

The agent can communicate using http or https.

A self signed certificate is used, which built into
the docker container.

Change-Id: Ia54d00ea849bd656678a76dfeab5d10c6e4dc1a2
Issue-ID: NONRTRIC-195
Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
4 years agoChange formatting of API documentation 96/3396/1
elinuxhenrik [Wed, 22 Apr 2020 16:05:07 +0000 (18:05 +0200)]
Change formatting of API documentation

Changed the headings and added a heading level for the definition and
example of use of a function.

Change-Id: Ifab8b13aabb21cd1692a3e700969d8d926b4ccfb
Issue-ID: NONRTRIC-158
Signed-off-by: elinuxhenrik <henrik.b.andersson@est.tech>
4 years agoAdd examples in SDNC A1 Controlle API doc 57/3357/5
elinuxhenrik [Tue, 21 Apr 2020 13:14:04 +0000 (15:14 +0200)]
Add examples in SDNC A1 Controlle API doc

Adding examples where the STD 1.1.3 version of the A1 protocol is used.

Change-Id: I33575900c7c257595e61e33e9385ae7286c51b72
Issue-ID: NONRTRIC-158
Signed-off-by: elinuxhenrik <henrik.b.andersson@est.tech>
4 years agoRemove unnecessary stuff from oam directory of A1 controller 34/3334/13
RehanRaza [Mon, 20 Apr 2020 15:10:39 +0000 (17:10 +0200)]
Remove unnecessary stuff from oam directory of A1 controller

Change-Id: I6f46a93f2109c7495d3c996b407f8fd415ff9d53
Issue-ID: NONRTRIC-201
Signed-off-by: RehanRaza <muhammad.rehan.raza@est.tech>
4 years agoMerge "Clean autotest folder"
Henrik Andersson [Wed, 22 Apr 2020 07:32:54 +0000 (07:32 +0000)]
Merge "Clean autotest folder"

4 years agoClean autotest folder 46/3346/3
YongchaoWu [Tue, 21 Apr 2020 07:03:42 +0000 (09:03 +0200)]
Clean autotest folder

remove unused code directory
rename autotest folder to "test"

Issue-ID: NONRTRIC-148
Signed-off-by: YongchaoWu <yongchao.wu@est.tech>
Change-Id: I484d22d87486d22f9b05a1631812a7f5194d3966

4 years agoFixed formatting of API documentation 33/3333/2
elinuxhenrik [Mon, 20 Apr 2020 14:46:26 +0000 (16:46 +0200)]
Fixed formatting of API documentation

Change-Id: Id76bf5af940ca21d93d282837ffd0d6fbb0077f0
Issue-ID: NONRTRIC-158
Signed-off-by: elinuxhenrik <henrik.b.andersson@est.tech>
4 years agoMerge "Updated function test environment"
Henrik Andersson [Mon, 20 Apr 2020 13:47:47 +0000 (13:47 +0000)]
Merge "Updated function test environment"

4 years agoUpdated function test environment 70/3270/2
BjornMagnussonXA [Thu, 19 Mar 2020 13:31:06 +0000 (14:31 +0100)]
Updated function test environment

Added interface stub for MR

Added simulator monitor

Added function test and test cases

Added a server for catching callbacks from the agent

Added test cases for SNDC A1-Controller NB

README files are generally not updated. Will be made in later commits.

Change-Id: Ibf35f70b3e6f2d3f9c117aaf26ecdb03f80158f8
Issue-ID: NONRTRIC-154
Signed-off-by: BjornMagnussonXA <bjorn.magnusson@est.tech>
4 years agoMerge "Bugfix, only one RIC was synched"
Henrik Andersson [Mon, 20 Apr 2020 11:04:27 +0000 (11:04 +0000)]
Merge "Bugfix, only one RIC was synched"

4 years agoBugfix, only one RIC was synched 07/3307/5
PatrikBuhr [Fri, 17 Apr 2020 07:57:35 +0000 (09:57 +0200)]
Bugfix, only one RIC was synched

In RicSupervision, when recovery was started, cheching of the other ones was
stopped.

Other improvements such as:
Not starting consistency check when it is already started
Improved tracing

Change-Id: I82d1d48a091de8f24ebfa60b7cc1140e81d959f6
Issue-ID: NONRTRIC-164
Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
4 years agoAdd first version of SDNC A1 Controller API docs 96/3296/2
elinuxhenrik [Wed, 8 Apr 2020 15:02:40 +0000 (17:02 +0200)]
Add first version of SDNC A1 Controller API docs

Change-Id: Ie280225822a900d7c022608b01ed4e955465c9f4
Issue-ID: NONRTRIC-192
Signed-off-by: elinuxhenrik <henrik.b.andersson@est.tech>
4 years agoAdd links to new API documentation 90/3290/1
elinuxhenrik [Tue, 14 Apr 2020 08:59:36 +0000 (10:59 +0200)]
Add links to new API documentation

Change-Id: I1b7507a3d9648c22e71f7b5d292305b6bbb3ae1e
Issue-ID: NONRTRIC-152
Signed-off-by: elinuxhenrik <henrik.b.andersson@est.tech>
4 years agoRemoved throwing of runtime exceptions 78/3278/1
PatrikBuhr [Wed, 15 Apr 2020 10:48:16 +0000 (12:48 +0200)]
Removed throwing of runtime exceptions

Change-Id: I74565f457b0d93be7d580f775a48c2589c5a0e25
Issue-ID: NONRTRIC-164
Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
4 years agoMerge "Bugfix"
Henrik Andersson [Wed, 15 Apr 2020 09:04:47 +0000 (09:04 +0000)]
Merge "Bugfix"

4 years agoBugfix 61/3261/5
PatrikBuhr [Tue, 14 Apr 2020 11:50:07 +0000 (13:50 +0200)]
Bugfix

Parsing of controller output.
Renamed the config/application_configuration.json
to application_configuration.json_example so it does not
by default is loaded by the builyt container.

Change-Id: Ie631a3f745a977c7414ed60b2f3d09cd6687360a
Issue-ID: NONRTRIC-164
Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
4 years agoStandardisation of names 30/3230/2
maximesson [Thu, 9 Apr 2020 13:16:04 +0000 (15:16 +0200)]
Standardisation of names

Change-Id: Ib90680a1282aca5c623aa802d5c2c92dc913fff0
Issue-ID: NONRTRIC-158
Signed-off-by: maximesson <maxime.bonneau@est.tech>
4 years agoMerge "Added check in PUT policy"
Henrik Andersson [Thu, 9 Apr 2020 12:59:26 +0000 (12:59 +0000)]
Merge "Added check in PUT policy"

4 years agoAdded check in PUT policy 28/3228/2
PatrikBuhr [Thu, 9 Apr 2020 11:46:21 +0000 (13:46 +0200)]
Added check in PUT policy

For PUT policy, added ad check that the RIC actually supports the given type.
Previously it was only check that the type existed.

Change-Id: I0e4772c46686aab44ed335e9026043f4f5febce6
Issue-ID: NONRTRIC-164
Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
4 years agoMerge "Added check of callback URL in service registration"
John Keeney [Thu, 9 Apr 2020 08:09:15 +0000 (08:09 +0000)]
Merge "Added check of callback URL in service registration"

4 years agoMerge "Update documentation for added RIC state"
Henrik Andersson [Thu, 9 Apr 2020 08:02:51 +0000 (08:02 +0000)]
Merge "Update documentation for added RIC state"

4 years agoMerge "Added RIC state to RicInfo in the agent NBI"
John Keeney [Thu, 9 Apr 2020 07:47:24 +0000 (07:47 +0000)]
Merge "Added RIC state to RicInfo in the agent NBI"

4 years agoUpdate documentation for added RIC state 26/3226/1
elinuxhenrik [Thu, 9 Apr 2020 07:28:07 +0000 (09:28 +0200)]
Update documentation for added RIC state

RIC state has been added to the RicInfo in the policy agent NBI.

Change-Id: I455edda16429fac5408ca7bd68549e5d223e9151
Issue-ID: NONRTRIC-164
Signed-off-by: elinuxhenrik <henrik.b.andersson@est.tech>
4 years agoBugfix controller adaption 24/3224/3
PatrikBuhr [Thu, 9 Apr 2020 05:48:26 +0000 (07:48 +0200)]
Bugfix controller adaption

The input to the controllers is Json, so the follwing
has changed (illustrated by an example):

From:
{"input":"{\"near-rt-ric-url\":\"XXXX/A1-P/v1/policies\"}"}

To:
{"input":{"near-rt-ric-url":"XXXX/A1-P/v1/policies"}}

Change-Id: I668eda2072fff9ce71bdbfed32fcb1a40b0799c8
Issue-ID: NONRTRIC-164
Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
4 years agoAdded RIC state to RicInfo in the agent NBI 15/3215/1
PatrikBuhr [Wed, 8 Apr 2020 10:52:52 +0000 (12:52 +0200)]
Added RIC state to RicInfo in the agent NBI

Change-Id: Ice8d3ee829c38e58d2f2808a8d0453024e250bbc
Issue-ID: NONRTRIC-164
Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
4 years agoAdded check of callback URL in service registration 11/3211/1
PatrikBuhr [Wed, 8 Apr 2020 06:58:03 +0000 (08:58 +0200)]
Added check of callback URL in service registration

Change-Id: Ifdf3cbc11e7ac8e0f7b35261954a75147f7edc57
Issue-ID: NONRTRIC-164
Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
4 years agoAdapt documentation to change in API 10/3210/2
elinuxhenrik [Wed, 8 Apr 2020 06:15:59 +0000 (08:15 +0200)]
Adapt documentation to change in API

The /services/keepalive method is changed to PUT:

Update some descriptions.

Change-Id: I35faa3a47ad8c19f6c0eadf069656626a1ddc428
Issue-ID: NONRTRIC-164
Signed-off-by: elinuxhenrik <henrik.b.andersson@est.tech>
4 years agoChanged service keepAlive from POST to PUT 91/3191/1
PatrikBuhr [Tue, 7 Apr 2020 12:26:26 +0000 (14:26 +0200)]
Changed service keepAlive from POST to PUT

Fixed some very confusing log messages

Change-Id: I48679ba69252a09e610cdc239e2fb56554d665d9
Issue-ID: NONRTRIC-164
Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
4 years agoMerge "Update verions of dependencies"
Henrik Andersson [Tue, 7 Apr 2020 06:44:19 +0000 (06:44 +0000)]
Merge "Update verions of dependencies"

4 years agoMerge "Remove call stack from original exceptions in log"
Henrik Andersson [Tue, 7 Apr 2020 06:44:07 +0000 (06:44 +0000)]
Merge "Remove call stack from original exceptions in log"

4 years agoMerge "Change name of policy ID in API"
Henrik Andersson [Tue, 7 Apr 2020 06:40:13 +0000 (06:40 +0000)]
Merge "Change name of policy ID in API"

4 years agoMerge "Bugfix, RIC configs would disappear after one minute"
Henrik Andersson [Tue, 7 Apr 2020 06:28:09 +0000 (06:28 +0000)]
Merge "Bugfix, RIC configs would disappear after one minute"

4 years agoUpdate verions of dependencies 57/3157/2
elinuxhenrik [Mon, 6 Apr 2020 11:01:00 +0000 (13:01 +0200)]
Update verions of dependencies

Change-Id: Ic7f81743afd27309a10cf01ca7c2ad266c17b0ad
Signed-off-by: elinuxhenrik <henrik.b.andersson@est.tech>
4 years agoRemove call stack from original exceptions in log 35/3135/2
elinuxhenrik [Fri, 3 Apr 2020 14:36:23 +0000 (16:36 +0200)]
Remove call stack from original exceptions in log

Change-Id: Id6201dc6d6d451d9f3ce2b8c5521f5c27d6c47ac
Signed-off-by: elinuxhenrik <henrik.b.andersson@est.tech>
4 years agoChange name of policy ID in API 29/3129/4
elinuxhenrik [Fri, 3 Apr 2020 07:24:52 +0000 (09:24 +0200)]
Change name of policy ID in API

In some methods the policy ID parameter was named "instance". It is
changed to "id".

Change-Id: Id267fba84e62a2e6d3ff52ffb3d728561178b337
Issue-ID: NONRTRIC-152
Signed-off-by: elinuxhenrik <henrik.b.andersson@est.tech>
4 years agoMerge "Minor changes"
John Keeney [Mon, 6 Apr 2020 15:41:15 +0000 (15:41 +0000)]
Merge "Minor changes"

4 years agoMerge "API documentation"
John Keeney [Mon, 6 Apr 2020 15:38:54 +0000 (15:38 +0000)]
Merge "API documentation"

4 years agoMinor changes 63/3163/1
PatrikBuhr [Mon, 6 Apr 2020 14:53:31 +0000 (16:53 +0200)]
Minor changes

Increased the TCP timeouts
Made managedElementId in GET rics mandatory (bugfix)

Change-Id: Ie2683d1fdd7e0abfc15877f4f4039e2f82f62eea
Issue-ID: NONRTRIC-164
Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
4 years agoAPI documentation 18/3118/7
elinuxhenrik [Tue, 31 Mar 2020 15:59:49 +0000 (17:59 +0200)]
API documentation

Change-Id: I1184b3170afd6cbedc455810fb77d18a626f216a
Issue-ID: NONRTRIC-152
Signed-off-by: elinuxhenrik <henrik.b.andersson@est.tech>
4 years agoBugfix, RIC configs would disappear after one minute 46/3146/2
PatrikBuhr [Fri, 3 Apr 2020 13:54:09 +0000 (15:54 +0200)]
Bugfix, RIC configs would disappear after one minute

Bugfix

Also fixed so that keepalive inerval <0 when registerring a servive
is rejected.

Change-Id: Ic9bec3d6e73237d34d9b9208682218c2df381d67
Issue-ID: NONRTRIC-183
Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
4 years agoAdded Controller configuration 20/3120/5
PatrikBuhr [Thu, 2 Apr 2020 12:46:33 +0000 (14:46 +0200)]
Added Controller configuration

The controller configuration is loaded like the rest of the configuration
(from CBS or file).
There can now be several controller instances.

Change-Id: Ifacf619cacd8979622d61720fad647754c9f1615
Issue-ID: NONRTRIC-183
Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
4 years agoConcurrency improvements 97/3097/3
PatrikBuhr [Wed, 1 Apr 2020 13:43:03 +0000 (15:43 +0200)]
Concurrency improvements

The test for concurrency is improved so it involves RIC
synchronizations.

The principles for synchronization is simplified so that
classes in repository always returns copies of collections.

RIC syncronization is taking an exclusive lock during syncronization,
which leads to that a client will not get an HTTP error when accessing
a RIC that is synched. Instead, the client will be kept waiting until
the synch is completed.

Change-Id: I67568e8ef63b4b559a341ed8136e41119c9b7e6b
Issue-ID: NONRTRIC-164
Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
4 years agoBugfix in RIC synchronization 57/3057/3
PatrikBuhr [Mon, 30 Mar 2020 13:45:45 +0000 (15:45 +0200)]
Bugfix in RIC synchronization

Concurrent modification exception when allpolicies for a RIC was deleted.

Fixed MockA1Client so it can simulate network delays

Change-Id: I1883b42a7afac303770084625a1e45acbf89c28f
Issue-ID: NONRTRIC-164
Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
4 years agoFixe .gitignore for top level 55/3055/1
elinuxhenrik [Mon, 30 Mar 2020 12:08:34 +0000 (14:08 +0200)]
Fixe .gitignore for top level

Change-Id: Ic1d60d0a512ff469d0a13f1bb944bccd1a344741
Signed-off-by: elinuxhenrik <henrik.b.andersson@est.tech>
4 years agoMerge "Documentation reorganisation"
Henrik Andersson [Mon, 30 Mar 2020 11:55:50 +0000 (11:55 +0000)]
Merge "Documentation reorganisation"

4 years agoImproved java class documentation 35/3035/2
PatrikBuhr [Fri, 27 Mar 2020 14:44:54 +0000 (15:44 +0100)]
Improved java class documentation

Removed sprinng boot actuator from the generated
open API documentation.

Bugfix, only one Application configuration object can exist.

Change-Id: Iabed9a95995a2e1aadf6f9e3b7188b04e73838ec
Issue-ID: NONRTRIC-164
Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
4 years agoDocumentation reorganisation 24/3024/2
maximesson [Thu, 26 Mar 2020 15:43:27 +0000 (16:43 +0100)]
Documentation reorganisation

Change-Id: I8db9e11ba1f979970c189f81c743f6009dcda8f0
Issue-ID: NONRTRIC-166
Signed-off-by: maximesson <maxime.bonneau@est.tech>
4 years agoMerge "A1 controler access can be both OSC and ORAN versions of A1"
John Keeney [Fri, 27 Mar 2020 09:53:21 +0000 (09:53 +0000)]
Merge "A1 controler access can be both OSC and ORAN versions of A1"

4 years agoMerge "Sonar fix in log aspect"
Henrik Andersson [Fri, 27 Mar 2020 08:58:43 +0000 (08:58 +0000)]
Merge "Sonar fix in log aspect"

4 years agoA1 controler access can be both OSC and ORAN versions of A1 91/2991/1
PatrikBuhr [Thu, 26 Mar 2020 09:58:51 +0000 (10:58 +0100)]
A1 controler access can be both OSC and ORAN versions of A1

Change-Id: I3c77a11f67cad6fceb3346ac13b62929def822a1
Issue-ID: NONRTRIC-164
Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
4 years agoMerge "Generalization of controller"
John Keeney [Thu, 26 Mar 2020 09:32:41 +0000 (09:32 +0000)]
Merge "Generalization of controller"

4 years agoSonar fix in log aspect 72/2972/1
Lathish [Wed, 25 Mar 2020 12:40:34 +0000 (12:40 +0000)]
Sonar fix in log aspect

Issue-ID: NONRTRIC-170
Change-Id: Ie72a3e6c6a9d9c42753fb2404f68dfae86ddd1f0
Signed-off-by: Lathish <lathishbabu.ganesan@est.tech>
4 years agoMerge "Removing release file for nearric simulator"
Henrik Andersson [Wed, 25 Mar 2020 06:55:56 +0000 (06:55 +0000)]
Merge "Removing release file for nearric simulator"

4 years agoRemoving release file for nearric simulator 40/2940/2
maximesson [Tue, 24 Mar 2020 08:43:14 +0000 (09:43 +0100)]
Removing release file for nearric simulator

Since the simulator has been moved to its own repo,
the release file for it should be removed from this repo.

Change-Id: I0cbb68a43662dbbd486ab61bf6e8d42cfc0b733b
Issue-ID: NONRTRIC-88
Signed-off-by: maximesson <maxime.bonneau@est.tech>