From b49dc8f14dbe1c0d4208f177084a22e5d6a1f63e Mon Sep 17 00:00:00 2001 From: Vidyashree Rama Date: Fri, 14 Dec 2018 16:31:56 +0530 Subject: Add sdnc simulator in controlloop-utils Add sdnc simulator in controlloop-utils Issue-ID: POLICY-1356 Change-Id: I999a402370c2ebeeff75d647bd1d72c42dd598f7 Signed-off-by: Vidyashree Rama --- controlloop/common/feature-controlloop-utils/pom.xml | 5 +++++ .../src/main/feature/config/simulators.properties.environment | 5 +++++ .../apps/controlloop/feature/utils/ControlLoopUtilsFeature.java | 5 +++-- .../apps/controlloop/feature/utils/ControlLoopUtilsFeatureTest.java | 1 + 4 files changed, 14 insertions(+), 2 deletions(-) (limited to 'controlloop') diff --git a/controlloop/common/feature-controlloop-utils/pom.xml b/controlloop/common/feature-controlloop-utils/pom.xml index 671f1d183..92b783885 100644 --- a/controlloop/common/feature-controlloop-utils/pom.xml +++ b/controlloop/common/feature-controlloop-utils/pom.xml @@ -119,6 +119,11 @@ so ${project.version} + + org.onap.policy.drools-applications.controlloop.common.model-impl + sdnc + ${project.version} + org.onap.policy.drools-applications.controlloop.common.model-impl rest diff --git a/controlloop/common/feature-controlloop-utils/src/main/feature/config/simulators.properties.environment b/controlloop/common/feature-controlloop-utils/src/main/feature/config/simulators.properties.environment index cfe957b4c..c51e8cfb3 100644 --- a/controlloop/common/feature-controlloop-utils/src/main/feature/config/simulators.properties.environment +++ b/controlloop/common/feature-controlloop-utils/src/main/feature/config/simulators.properties.environment @@ -3,6 +3,7 @@ # ONAP # ================================================================================ # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# Modifications Copyright (C) 2018 Huawei 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. @@ -35,3 +36,7 @@ vfc.password=policy guard.url=http://localhost:6669/pdp/api/getDecision guard.disabled=true +sdnc.url=http://localhost:6670 +sdnc.username=policy +sdnc.password=policy + diff --git a/controlloop/common/feature-controlloop-utils/src/main/java/org/onap/policy/drools/apps/controlloop/feature/utils/ControlLoopUtilsFeature.java b/controlloop/common/feature-controlloop-utils/src/main/java/org/onap/policy/drools/apps/controlloop/feature/utils/ControlLoopUtilsFeature.java index 99597f52d..824956930 100644 --- a/controlloop/common/feature-controlloop-utils/src/main/java/org/onap/policy/drools/apps/controlloop/feature/utils/ControlLoopUtilsFeature.java +++ b/controlloop/common/feature-controlloop-utils/src/main/java/org/onap/policy/drools/apps/controlloop/feature/utils/ControlLoopUtilsFeature.java @@ -29,8 +29,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * PDP-D feature for lab environments that provides Server simulation capabilities for AAI, SO, and - * VFC. + * PDP-D feature for lab environments that provides Server simulation capabilities for AAI, SO, SDNC + * and VFC. * */ public class ControlLoopUtilsFeature implements PolicyEngineFeatureAPI { @@ -44,6 +44,7 @@ public class ControlLoopUtilsFeature implements PolicyEngineFeatureAPI { Util.buildSoSim(); Util.buildVfcSim(); Util.buildGuardSim(); + Util.buildSdncSim(); } catch (final InterruptedException e) { logger.error("{}: initialization aborted", ControlLoopUtilsFeature.class.getName(), e); Thread.currentThread().interrupt(); diff --git a/controlloop/common/feature-controlloop-utils/src/test/java/org/onap/policy/drools/apps/controlloop/feature/utils/ControlLoopUtilsFeatureTest.java b/controlloop/common/feature-controlloop-utils/src/test/java/org/onap/policy/drools/apps/controlloop/feature/utils/ControlLoopUtilsFeatureTest.java index 07b999e56..fd73b6293 100644 --- a/controlloop/common/feature-controlloop-utils/src/test/java/org/onap/policy/drools/apps/controlloop/feature/utils/ControlLoopUtilsFeatureTest.java +++ b/controlloop/common/feature-controlloop-utils/src/test/java/org/onap/policy/drools/apps/controlloop/feature/utils/ControlLoopUtilsFeatureTest.java @@ -43,6 +43,7 @@ public class ControlLoopUtilsFeatureTest { assertNotNull(HttpServletServer.factory.get(Util.SOSIM_SERVER_PORT)); assertNotNull(HttpServletServer.factory.get(Util.SOSIM_SERVER_PORT)); assertNotNull(HttpServletServer.factory.get(Util.GUARDSIM_SERVER_PORT)); + assertNotNull(HttpServletServer.factory.get(Util.SDNCSIM_SERVER_PORT)); } } -- cgit 1.2.3-korg