diff options
author | a.sreekumar <ajith.sreekumar@est.tech> | 2020-04-17 10:25:23 +0100 |
---|---|---|
committer | a.sreekumar <ajith.sreekumar@est.tech> | 2020-04-17 10:25:37 +0100 |
commit | f6690ccc2786278659bb1f85b89a219e5018cb9a (patch) | |
tree | faf239d3bfd4f6006c1e563f974190f5cbc72474 /models-sim/policy-models-sim-pdp/src/main | |
parent | bed21af59885a954e3facf7226c4678f4b69b153 (diff) |
Updating pdp-simulator as per recent changes to send PdpGroup in status
Change-Id: Ic2ad6bd7f65633eef73d6432f244be77d7c760f9
Issue-ID: POLICY-2499
Signed-off-by: a.sreekumar <ajith.sreekumar@est.tech>
Diffstat (limited to 'models-sim/policy-models-sim-pdp/src/main')
3 files changed, 5 insertions, 5 deletions
diff --git a/models-sim/policy-models-sim-pdp/src/main/java/org/onap/policy/models/sim/pdp/handler/PdpMessageHandler.java b/models-sim/policy-models-sim-pdp/src/main/java/org/onap/policy/models/sim/pdp/handler/PdpMessageHandler.java index de0edef0c..d77ece054 100644 --- a/models-sim/policy-models-sim-pdp/src/main/java/org/onap/policy/models/sim/pdp/handler/PdpMessageHandler.java +++ b/models-sim/policy-models-sim-pdp/src/main/java/org/onap/policy/models/sim/pdp/handler/PdpMessageHandler.java @@ -23,7 +23,6 @@ package org.onap.policy.models.sim.pdp.handler; import java.util.ArrayList; import java.util.List; - import org.onap.policy.common.utils.services.Registry; import org.onap.policy.models.pdp.concepts.PdpResponseDetails; import org.onap.policy.models.pdp.concepts.PdpStatus; @@ -53,6 +52,7 @@ public class PdpMessageHandler { public PdpStatus createPdpStatusFromParameters(final String instanceId, final PdpStatusParameters pdpStatusParameters) { final PdpStatus pdpStatus = new PdpStatus(); + pdpStatus.setPdpGroup(pdpStatusParameters.getPdpGroup()); pdpStatus.setPdpType(pdpStatusParameters.getPdpType()); pdpStatus.setState(PdpState.PASSIVE); pdpStatus.setHealthy(PdpHealthStatus.HEALTHY); diff --git a/models-sim/policy-models-sim-pdp/src/main/java/org/onap/policy/models/sim/pdp/parameters/PdpStatusParameters.java b/models-sim/policy-models-sim-pdp/src/main/java/org/onap/policy/models/sim/pdp/parameters/PdpStatusParameters.java index e59ec52b7..c8160373c 100644 --- a/models-sim/policy-models-sim-pdp/src/main/java/org/onap/policy/models/sim/pdp/parameters/PdpStatusParameters.java +++ b/models-sim/policy-models-sim-pdp/src/main/java/org/onap/policy/models/sim/pdp/parameters/PdpStatusParameters.java @@ -1,6 +1,6 @@ /*- * ============LICENSE_START======================================================= - * Copyright (C) 2019 Nordix Foundation. + * Copyright (C) 2019-2020 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,9 +21,7 @@ package org.onap.policy.models.sim.pdp.parameters; import java.util.List; - import lombok.Getter; - import org.onap.policy.common.parameters.ParameterGroupImpl; import org.onap.policy.common.parameters.annotations.Min; import org.onap.policy.common.parameters.annotations.NotBlank; @@ -45,6 +43,7 @@ public class PdpStatusParameters extends ParameterGroupImpl { private String pdpType; private String description; private List<ToscaPolicyTypeIdentifierParameters> supportedPolicyTypes; + private String pdpGroup; public PdpStatusParameters() { super(PdpStatusParameters.class.getSimpleName()); diff --git a/models-sim/policy-models-sim-pdp/src/main/resources/config/OnapPfConfig.json b/models-sim/policy-models-sim-pdp/src/main/resources/config/OnapPfConfig.json index cb8c4dd0f..4b05fd985 100644 --- a/models-sim/policy-models-sim-pdp/src/main/resources/config/OnapPfConfig.json +++ b/models-sim/policy-models-sim-pdp/src/main/resources/config/OnapPfConfig.json @@ -1,6 +1,7 @@ { "name":"OnapPfParameterGroup", - "pdpStatusParameters":{ + "pdpStatusParameters": { + "pdpGroup": "defaultGroup", "timeIntervalMs": 120000, "pdpType":"apex", "description":"Pdp Heartbeat", |