From 636a1b2fcafa5249cf2bf380dfb6e20f6fe98691 Mon Sep 17 00:00:00 2001 From: Bruno Sakoto Date: Fri, 27 Sep 2019 16:15:49 -0400 Subject: Integrate cds actor service provider * Add request enrichment with aai service instance id and vnf id * Implement cds grpc request * Implement VfwControlLoopCdsTest Issue-ID: POLICY-2088 Signed-off-by: Bruno Sakoto Change-Id: Ib44d447d6a3a70ff800a5760032b676fdfa32d9c --- .../common/feature-controlloop-management/pom.xml | 16 ++++++++++++++++ .../feature/config/controlloop.properties.environment | 7 +++++++ 2 files changed, 23 insertions(+) (limited to 'controlloop/common/feature-controlloop-management') diff --git a/controlloop/common/feature-controlloop-management/pom.xml b/controlloop/common/feature-controlloop-management/pom.xml index bf43f20dc..24f7a1792 100644 --- a/controlloop/common/feature-controlloop-management/pom.xml +++ b/controlloop/common/feature-controlloop-management/pom.xml @@ -244,6 +244,17 @@ + + org.onap.policy.models.policy-models-interactions.model-actors + actor.cds + ${policy.models.version} + + + guava + com.google.guava + + + org.onap.policy.models.policy-models-interactions model-yaml @@ -265,6 +276,11 @@ ${version.policy.drools-pdp} provided + + org.onap.policy.models.policy-models-interactions.model-impl + cds + ${policy.models.version} + junit junit diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/controlloop.properties.environment b/controlloop/common/feature-controlloop-management/src/main/feature/config/controlloop.properties.environment index 84bef12f9..4a0916895 100644 --- a/controlloop/common/feature-controlloop-management/src/main/feature/config/controlloop.properties.environment +++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/controlloop.properties.environment @@ -3,6 +3,7 @@ # ONAP # ================================================================================ # Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved. +# Modifications Copyright (C) 2019 Bell Canada. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -51,3 +52,9 @@ sdnc.username=${env:SDNC_USERNAME} sdnc.password=${env:SDNC_PASSWORD} aai.customQuery=true + +cds.grpcHost=${env:CDS_GRPC_HOST} +cds.grpcPort=${env:CDS_GRPC_PORT} +cds.grpcUsername=${env:CDS_GRPC_USERNAME} +cds.grpcPassword=${env:CDS_GRPC_PASSWORD} +cds.grpcTimeout=10 -- cgit 1.2.3-korg