Merge "Do not use RpcService in TPCE networkmodel module"

Merge "Turn NetworkUtilsImpl into a Component"

Fix new pylint-3.0.0 detected issues

Refactor wait_until_log_contains method of test_utils taking advantage
of the with block in order to remove the finally block. That simplifies
the return flow.

JIRA: TRNSPRTPCE-764
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I8b3fa004eddc9e8688640205490c385645f4d6e3

Do not use RpcService in TPCE networkmodel module

Migrate usage of RpcService to the new style yang.binding.Rpc-based
implementation for networkmodel module.

JIRA: TRNSPRTPCE-752
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: Ia0e3e31b59b9b319b7431ff9d739274a2dfaccf5

Turn NetworkUtilsImpl into a Component

Instead of instanciating this implementation from NetworkModelProvider,
convert it into a simple component.

Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: Ie051ab82455d5d17864bfde5049f6f2b5c6f8e5a

Add DS op netconf connector support to test_utils

- update netconf edit-config transaction
- use updated version of lightynode 18.1.0.8
- activate lightynode for tapi functional tests

JIRA: TRNSPRTPCE-754
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I21433eafbf1c32181078f8d4606e41605d43a6e8

Bump project version

Start Calcium development iteration

Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I03d9a651094c277934a3e8adb0aae0c5138b3a5b

Bump transportpce-models version

Adopt transportpce-models-19.0.0

Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: Id0816d59768e3dd99adcb68699db78b0aeda59cc

Reactivate disabled functional tests

Reactivate few functional tests disabled due to the restconf bug
(https://jira.opendaylight.org/browse/AAA-265)

Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I2963cf8084faba60d0199dd9f681698d9be1c18b

Bump upstream K dependencies

Adopt:
- yangtools-11.0.2
- mdsal-12.0.2
- netconf-6.0.4

Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: Ib5ffe41b1f5bd0720db41c7a925eb81372697e2a

Merge "Fix bug for temp-service-delete"

Fix bug for temp-service-delete

- Currently, temp-service-delete does not work and creates a
  null-pointer exception, when used. The code uses service-list
  instead of temp-service-list to retrieve data for the delete
  operations.
- Add additional code to retrieve the data from the temp-service-list
- Update transport-pce-service-list after the temp-service is deleted
- Update temp-service-list after the temp-service-delete

JIRA: TRNSPRTPCE-750
Signed-off-by: Balagangadhar (Bala) Bathula <bb4341@att.com>
Change-Id: Ia12d67c8bfdc81b934ae2fa292d941e1ce775e3a

Leverage urllib in test_utils sims REST connector

Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Iaa2e53f0dce17da7f9a1dc9dca253560ac2d525f

Outsource sims DS direct op on CP to test_utils

JIRA: TRNSPRTPCE-754
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I3217e2a1481c2437e5bb33b71711329c7f0ee735

Fix some typos in functional tests naming

Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Ie6528fa73b07af9a9514dab9dfb4a2f6c9e487a3

Revert "Skip TAPI feature and functional tests"

This reverts commit 9b938fff9a4a1ef07a2df445ad3dd3f81dad2228.

Change-Id: I5885c2c856ed9f10b4dcfd8d0ddc1bd52fd94379
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>

Bump upstream dependencies to latest version

Adopt:
- odlparent-13.0.4
- yangtools-11.0.1
- mdsal-12.0.1
- netconf-6.0.3

Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: Ibee6a917e4749447ed6ebfa9de890eef0ad54a17

Skip tests in failure before deps version bump

The URL with attributes that contains slashes cause troubles
and ends up with a response status code 400 (invalid request).

- ignore related unittest in functional tests
- adapt test_utils to handle invalid request in these cases

JIRA: NETCONF-1154
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: If03a720fea6b2fcbd2a2089ad88e9580daf5d411

Merge "Declare as final private classes"

Merge changes If1d8e649,I6c3cf5f5,I167b40dd

* changes:
  Switch tests sims to lightynode by default
  Proxify sims install shell scripts
  Add lightynode support to testutils.py

Declare as final private classes

Latest checkstyle version (10.12.3) reports bug when private class
without constructor is not declared final. Fix it up.

Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: Ifdc824a9d5c5ac4aaba38b222a8240b8a9235a52

Merge "Fix some compilation warnings"

Merge "Refactor SH ServiceDataStoreOperationsImpl"

Switch tests sims to lightynode by default

- use lightynode as default sims
- adapt ROADM devices 1.2.1 sample configs
- in tox.ini force honeynode for tests with:
  - device notifications support
    The netconf client connector is ready for lightynode sims.
    But, some tests are still failing and are under investigation.
  - 7.1 devices
    Only 7.1 devices portmapping function tests pass.

JIRA: TRNSPRTPCE-754
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Change-Id: If1d8e649e82df7b4c17b4c91fa2e13f77cf3e911

Merge "Refactor Networkmodel test utils"

Merge "Refactor SH ServiceDataUtils tests"

Proxify sims install shell scripts

JIRA: TRNSPRTPCE-754
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I6c3cf5f50f4a23ab0ecda5652b184502dabf3606

Add lightynode support to testutils.py

- add netconf_client dependency necessary for several tests
- add an installation shell script for lighty_node
- use sed in lightynode and hondenynoe install scripts to deal
  with 1.2.1 sample configs typo issue
- add an environment variable to configure a choice
  among lighty / honeycomb / no simulator
- update tox.ini consequently

JIRA: TRNSPRTPCE-754
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Change-Id: I167b40dd3a1d9bd89cc472fa80899ba730f99c6a

Refactor SH ServiceDataUtils tests

Change-Id: Ie8aaa8db58c867c160477b98538b76ee7ac393fe

Refactor SH ServiceDataStoreOperationsImpl

Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Ic2753f63bb74923d5c423764d51bce8a4a69fafb

Refactor Networkmodel test utils

Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: If87ddbf2ddcf1ba7681368a015e69ee4d292a187

Refactor OLM OlmTransactionUtils tests

Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I02a873200a0b46954f8670f0131bafa027d81fee

Fix some compilation warnings

Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I8653092c5ac236887d79dc38a2e573b011c4e5cf

Clean some functional tests comments & logs

Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I5ad8ab534f21244b7331358ee2e8f4b1b64f3302

Skip TAPI feature and functional tests

There is currently an issue with TAPI feature installation
preventing the CI to run correctly

Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Ia6b1da265a6319ba5804c58d06fba8a90ef1de1d

Refactor tox.ini

- use one variable per line for tox3 support

One variable is the only syntax supported by both tox3 and tox4.

https: //tox.wiki/en/4.0.3/faq.html#tox-4-changed-ini-rules
https://github.com/tox-dev/tox/issues/2658

Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I7db5c9492ea28b4265fd0a126efe9137417d9a35

Use version 13.1.0 of openroadm-network models

- upgrade openroadm-network models from version 10.1.0 to version 13.1.0
- update import revision
- reactivate tapi UT

JIRA: TRNSPRTPCE-746
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: Iec1fd9efb1c2ca67337d36cc2e10b74314905ba9

Use version 13.1.0 of openroadm-service models

- upgrade openroadm-service models from version 10.1.0 to version 13.1.0
- update import revision
- adapt few methods to manage both 10.1 and 13.1 objects (flexgrid,
ifcaptype)
- use latest version of catalog specification
- temporarily disable a few tapi UT while also migrating network models

JIRA: TRNSPRTPCE-746
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I8bf7726e4c8802560d84cb10790d4c67ad54a11a

Improve Xtesting installation procedure

- use a requirements.yml file to install ansible roles and collections

https://github.com/collivier/ansible-role-xtesting/pull/19 has been
fixed in the master branch
cf commit 1a5794a34beada2a2e69b9d46f933f2a286774e9

- remove related workaround notes from INSTALL.txt
- force to use collivier.xtesting master branch repo in requirements.yml
  until the fix is published in ansible official catalog

Change-Id: Ia4e33d5ea327bffef7ed214907823e2ee77e87b7

Bump lighty build to 19.0.0-SNAPSHOT for K

Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I641485f05a92a4d70e92edaece60b9b9d8057bee

Bump upstream dependencies to Potassium GA

Adopt:
- odlparent-13.0.3
- yangtools-11.0.0
- mdsal-12.0.0
- netconf-6.0.1
- transportpce-models-19.0.0-SNAPSHOT

Also, adapt the expected serialized result for JsonStringConverterTest

Change-Id: Ic0c7f6de5fa16e778c0d3104ed27be76bb56378e
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

Declare SuppressFBWarnings in imports

Improve code readability

JIRA: TRNSPRTPCE-755
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: Ic2ff74f5b9948126a2be87764652f757871112cc

Skip the temp-service-create if already exists

- If a temp-service with a commonId already exists in the
  data-store (temp-service-list), and if the temp-service-create
  is issued, then the controller should fail with an error
  message, indicating it already exists.
- Add code to check if the same commonId exists in the datastore
  and add a failed response.
- Add a new Junit test to check it

JIRA: TRNSPRTPCE-753
Signed-off-by: Balagangadhar (Bala) Bathula <bb4341@att.com>
Co-authored-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I9f425e9febd8820f3053ecd5dfdd14f8a66279c4

Merge "Add if-cap-support for If-OTU4-ODU4 ports (7.1)"

Merge "Update temp-service-list"

Merge "Bug in freq-map topology update"

Add a Xtesting entry to combine all tests cases

Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Ifca5a721416ccfb3d8d8ef424698d15300702a5f

Improve TPCE Xtesting tests cases

Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Iaaa07f1b64be3250db56e0ed632229f6be2d73e3

Update temp-service-list

- If a service is implemented using service-create RPC and
  there exists an assoicated temp-service, then the temp-service-list
  needs to updated.
- Using commonId as the key, update the temp-service-list after the
  service is implmented (succeeds and becomes operational).

JIRA: TRNSPRTPCE-749
Signed-off-by: Balagangadhar (Bala) Bathula <bb4341@att.com>
Change-Id: I04b0652779dd620e4e86bcb3ccdd75743f90b177

Add a workaround note to Xtesting INSTALL.txt

Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I6f919c33dd3c4aeb6a5009299082472cd3ab02b0

Bug in freq-map topology update

- When a service-create is initiated after the temp-service-create
  the temp-service boolean in Renderer Listener will still be true
  and it would not update the freq-map in the topology.
- During the service-create operation, we need to make sure this
  boolean is initialized to false.

JIRA: TRNSPRTPCE-748
Signed-off-by: Balagangadhar (Bala) Bathula <bb4341@att.com>
Change-Id: I301f820aa4f81696f262e211523e9e629a468aa0

Add if-cap-support for If-OTU4-ODU4 ports (7.1)

- Currently the if-capability support is missing for IfOTU4ODU4
  type ports for 7.1 devices.
- Port-mapping fails to mount the NE with a null pointer expection when
  the supporting-interface-capabilities are not present in MappingUtilImpl.
- Add code to avoid null-pointer expection, even when the MappingUtilImpl
  does not contain required supported-if-cap.

JIRA: TRNSPRTPCE-747

Change-Id: I0270f99a93a02107a7c9a66f49e9825c65b06242
Signed-off-by: Balagangadhar (Bala) Bathula <bb4341@att.com>

Merge changes from topic "xtesting"

* changes:
  Add INSTALL.txt and ansible playbook for Xtesting
  Xtesting Dockerfile init

Optimize Binding->NormalizedNode transforms

We are running serialization twice. Store the result in a local variable
and check against that.

Change-Id: Ifeb3fd35f2c0f066015c1f262deefb2667459372
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

Migrate nullness annotations

Do not depend on javax.annotation, use JDT annotations instead.

Change-Id: Ie0e30b6ab0e1f7314f55aa40a0a667f6d7739ae7
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

Add INSTALL.txt and ansible playbook for Xtesting

Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: If010fb9444392de5e51a0e0119217a73fcd24d44

Xtesting Dockerfile init

- create a Dockerfile sample
  to retrieve transportPCE master branch content
  and install required dependencies to run tox and build the project
- create a YAML configuration w/ a sample shell testcase
  to run pre-commit via tox

Change-Id: I96d1ab3c9439c13dbb8bd4877c314fb14ac2188c
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>

Add OLM support for 7.1 model TPDR with 100G ports

- A 7.1 OpenROADM transponder can contain ports that support
  both 100G and 400G.
- The current OLM transponder power setting only supports 400G.
- Using the supported-interface capability, enable the support for
  100G rates (if-OCH-OTU4-ODU4 and if-OCH types)

JIRA: TRNSPRTPCE-745
Change-Id: If53e401c4fed9fb87bea1fe88180217846cc1220
Signed-off-by: Balagangadhar (Bala) Bathula <bb4341@att.com>

Refactor SH Renderer Listener notification support

JIRA: TRNSPRTPCE-743
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: If374613970639bdf15af2b55d334cc38bd3e5670

Add notification support for service-rpc-result

- This RPC allows to notify the results of the path-computation
  such as assigned frequency, width, operational-mode-id,
  power range, GSNR and OSNR
- Applicable only for temp-service-create RPC
- Use-cases include IP-over-WDM and alien wavelength
- For IP-over-WDM or alien wavlength use case

JIRA: TRNSPRTPCE-743
Change-Id: I80258fad0b7ff3fc484203c9000a825e3565ea26
Signed-off-by: Balagangadhar (Bala) Bathula <bb4341@att.com>

Disable optical control mode for temp service

- Currently, when a temp-service is created, all
  the interfaces are pushed to the NE.
- If roadm-connections (crossconnets) are created without
  the ingress power-power, it would create alarms.
- For temp-service create, we keep the optical-control-mode
  in "off" state

Signed-off-by: Balagangadhar (Bala) Bathula <bb4341@att.com>
Change-Id: I9ccf6a9da74ff040a988ed86d3089e5b5a38060c

Update path-description data for temp service list

- When a temp-service is created, the temp-service list should
  indicate the transport assigment details.
- Using path description data of the temp-service, update
  transport assignment details such as min-freq, max-freq,
  spectral-width and central-frquency.

Change-Id: If59a863eee3cd5419ee97490fee8fbfde6ab18cd
Signed-off-by: Balagangadhar (Bala) Bathula <bb4341@att.com>

Path description YANG update

- Currently path-description container does not include
  central-frequency and spectral width for a given service.
- Add central-frequency and spectral-width leafs to the
  A-Z direction and Z-A direction containers.
- Add received GNSR, OSNR, min/max power and operational-mode-id
  details.
- Update the revision date and necessary imports.

Signed-off-by: Balagangadhar (Bala) Bathula <bb4341@att.com>
Change-Id: I52fe413276ccedf8390123e22bc46f3c76e9e810
Signed-off-by: Balagangadhar (Bala) Bathula <bb4341@att.com>

Bump upstream dependencies to Ar-SR1

Adopt:
- odlparent-12.0.5
- yangtools-10.0.6
- mdsal-11.0.9
- netconf-5.0.6
- transportpce-models-18.1.0

Change-Id: I16272888d4c136157ab12b2065e837663faf9321
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

Migrate Optional.get() callers

Use Optional.orElseThrow() instead.

Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I65031d77602d1c66bcdc1d33c3852ad117670e63

Refactor Lighty.io build TransportPCEImpl step 2

JIRA: TRNSPRTPCE-736
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Id6eef88803e341249a75ab516afc2d7ec6a446a6

Enforce checkstyle warnings in Lighty.io build

Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Icc332585bc20d21614adab4c6d618ce39a80867a

Clean Lighty.io build warnings

JIRA: TRNSPRTPCE-736
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I9fcec2279896092ab85a0a01194170e3e6a4e776

Refactor Lighty.io build TransportPCEImpl

JIRA: TRNSPRTPCE-736
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Iec7cee56849a9aaf1a7127e259d7f49bf59143bf

Merge "Add functional tests for regenerator type"

Merge "Enable 400G rate for OC service-format"

Update Lighty baseUrl to RFC8040

JIRA: TRNSPRTPCE-742
Signed-off-by: Christophe Betoule <christophe.betoule@orange.com>
Change-Id: Ifb90c3e200ed205e77459146a66d331601f95f3c

Add functional tests for regenerator type

- Verify the port-mapping data
- Verify renderer for creating regenerator interfaces
- Verify renderer for deleting regnerator interfaces

JIRA: TRNSPRTPCE-740
Change-Id: I6051cc4b30d46f1e6b7baf8624ee88aea0a9d4f1
Signed-off-by: Balagangadhar (Bala) Bathula <bb4341@att.com>

Merge "Refactor SH ServicehandlerImplTest"

Enable 400G rate for OC service-format

- Currently only 100G is supported for OC service-format

JIRA: TRNSPRTPCE-741
Change-Id: I92d0305610892828573a73373473c196b89b8868
Signed-off-by: Balagangadhar (Bala) Bathula <bb4341@att.com>

Remove import-error checks from tox pylint profile

New Gerrit-tox JJB configuration breaks pylint request import,
what causes false positives in the CI

Issue-ID: https://jira.linuxfoundation.org/browse/RELENG-4539
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I1e04d41e84d88e048ed00832ab494ca84d2bd7e1

CI: Prepare tox.ini for new tox version

whitelist_externals is now deprecated in favor of allowlist_externals
https://tox.wiki/en/latest/changelog.html#v4-0-0rc4-2022-12-06

space separator is no longer valid for passenv variable lists
https://tox.wiki/en/latest/changelog.html#v4-0-3-2022-12-08

Issue-ID: https://jira.linuxfoundation.org/browse/RELENG-4539
Co-authored-by: Guillaume Lambert <guillaume.lambert@orange.com>
Change-Id: If9322889b1d4625f0ddc58966adda92f614887c7
Signed-off-by: Matthew Watkins <mwatkins@linuxfoundation.org>
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>

Refactor SH ServicehandlerImplTest

JIRA: TRNSPRTPCE-714
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Ic9ffc2aba18a3260a77790e579ed0b6e6da414ce

Refactor SH ServicehandlerComplianceCheck

JIRA: TRNSPRTPCE-714
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Ib051079c2a7d5010c56011e6fdee3d8c0abeec12

Refactor SH CatalogValidation

JIRA: TRNSPRTPCE-714
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Ie33cf0a24959580a3b62cac66534d27ab02c784b

Refactor SH CatalogDataUtil

JIRA: TRNSPRTPCE-714
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I36cc525ff9f632dad23fb9fc6a107e133b0b9c0f

Refactor SH CatalogMapper

JIRA: TRNSPRTPCE-714
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I850b255388618eb5e074942329fd1aea59da3957

Bump project version to 8.0.0-SNAPSHOT

Start K development iteration.

Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: Ie4f22373e1b5f1867ec4b0d429ca34390a964c86

Bump lighty to 18.0.0 released version

Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I6e584618f0d25bc34f4c2364bb2c3d39454bc765

Merge "Catalog RPC Implementation"

Catalog RPC Implementation

Also, declare CatalogDataStoreOperations as a Component

JIRA: TRNSPRTPCE-714
Signed-off-by: Roshan Joyce <roshan.joyce@fujitsu.com>
Co-authored-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I9fe5b5c00d0145ceabd2edb7961f1f3e46065fee
(cherry picked from commit 30a7633eb11290b9fc0da5116fb9f6bec50710cc)

Merge "Activate Swagger for Lighty"

Unregister DataTreeChangeListeners

- use a list of listeners of DataTreeChangeListeners when serveral are
registered.
- unregister all listeners when the bundle stop.
- add a check in few provider UT

Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: Ib564b7b74e2b499c129c4c76c0e5a38012853dd7
(cherry picked from commit 3f8fa9fb8da822fbc6579bbaaf49a95b499e9a27)

Remove inventory-blueprint.xml file

- convert ListenerProvider into a Component
- remove some useless properties
- manage all object instantiation from ListenerProvider

JIRA: TRNSPRTPCE-736
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I7cffbbeaf5e31e909454645fb29ad7791f03e5d6
(cherry picked from commit ea63bb039f35ba876bf8f6ee915ea626ef65e4cd)

Remove dmaap-blueprint.xml file

Convert DmaapClientProvider into a Component.

JIRA: TRNSPRTPCE-736
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I7dd15f32a597dfee0e2ee77e90fe17f17a40c627
(cherry picked from commit 8cde36c2ece92e26e0ebee020525ba5ab08d18f3)

Remove nobinotifications-blueprint.xml file

- convert NbiNotificationsProvider into a Component
- adapt NbiNotificationsProviderTest accordingly

JIRA: TRNSPRTPCE-736
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I298b7d1bf6f18f06a0bb3687f4df2363311629cf
(cherry picked from commit 0e5a378adbacbe904865e220a01fded2f597ff07)

Remove tapi-blueprint.xml file

- Convert TapiProvider to OSGI DS.
- Adapt TapiProviderTest accordingly.

JIRA: TRNSPRTPCE-736
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I1e4ece95c9604d56d8eb00300866d1d5f5359fbe
(cherry picked from commit 40f7b65724bf8057eb16cd544b5135c9fdb36606)

Turn TapiNetworkModelListenerImpl into a Component

JIRA: TRNSPRTPCE-736
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I1ce5ae37fae9ea0f887fa5a580e5c0fad593d1b7
(cherry picked from commit 7138d52b04b59ac8d6c73f28808bd4ac6d2f59d7)

Convert TapiNetworkUtilsImpl into a Component

JIRA: TRNSPRTPCE-736
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I97ec3379b01f2988d08ba2c923eb53dece67bb9e
(cherry picked from commit eeadba530158493c810870bd2083f3918b6d3d76)

Convert TapiNetworkModelServiceImpl to a Component

JIRA: TRNSPRTPCE-736
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I07d791a46372b17725faa440c093a4419290908b
(cherry picked from commit 6b42803ee32ed5f8f75a8edd51b73e80e0db830c)

Fix small bug in TapiTopologyImplExceptionTest

Use mock of TapiLink instead of its real implementation

JIRA: TRNSPRTPCE-736
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I7a91c74bebd35fd246cc79dfac17b43ccdadbdaa
(cherry picked from commit cba68fdd3184519f1689344e559f2ea2e969094d)

Convert TapiLinkImpl into a Component

- Rename TapiLink into TapiLinkImpl and create its associated interface.
- Turn TapiLinkImpl into a Component.
- Adapt blueprint file removing TapiLink bean.

JIRA: TRNSPRTPCE-736
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: Ied0c259a1e6186e0eb3d4fd2993ce150736111ab
(cherry picked from commit 3f83898ef90e47a1c85722caff67ee8243dc51fd)

Remove static instantiations from RendererProvider

Convert DeviceRendererRPCImpl and TransportPCEServicePathRPCImpl
into Components.

JIRA: TRNSPRTPCE-736
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I678a717ac1ffdbadc181bc789c8066700c51b56c
(cherry picked from commit 807b93874f23be2f81da25b066204a827a05368a)

Migrate servicehandler module to OSGI DS

- convert ServicehandlerImpl into a Component
- remove unused parameter in ServicehandlerImpl
- convert ServicehandlerProvider into a Component
- replace the implementation type of listener parameters by their
respective interface one in ServicehandlerProvider
- convert NetworkModelListenerImpl into a Component
- convert PceListenerImpl into a Component
- convert RendererListenerImpl into a Component
- convert ServiceListener into a Component
- create interfaces for pce, renderer and network listeners
- remove the servicehandler-blueprint.xml file
- adapt ServicehandlerProviderTest, ServicehandlerImplTest and
TapiConnectivityImplTest UT consequently

JIRA: TRNSPRTPCE-736
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I7440863e9ae4df0bc209bab6674e7531b9521e53
(cherry picked from commit 3eaaac5f8c8bd69d6505053c00a014509b8ece6c)

Turn ServiceDataStoreOperationsImpl into Component

JIRA: TRNSPRTPCE-736
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I70cf38993e3e20445b398078f7a4c46b1afedba5
(cherry picked from commit 1bb411b2d1b153a9d3be27081daf3e624c507c68)