summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PdpStatus.java12
-rw-r--r--models-pdp/src/test/java/org/onap/policy/models/pdp/concepts/PdpStatusTest.java13
-rw-r--r--models-sim/policy-models-sim-pdp/src/main/java/org/onap/policy/models/sim/pdp/handler/PdpMessageHandler.java5
3 files changed, 13 insertions, 17 deletions
diff --git a/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PdpStatus.java b/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PdpStatus.java
index e50694b93..5b1566d8b 100644
--- a/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PdpStatus.java
+++ b/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PdpStatus.java
@@ -1,6 +1,6 @@
/*-
* ============LICENSE_START=======================================================
- * Copyright (C) 2019 Nordix Foundation.
+ * Copyright (C) 2019-2020 Nordix Foundation.
* Modifications Copyright (C) 2019 AT&T Intellectual Property.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -23,15 +23,16 @@ package org.onap.policy.models.pdp.concepts;
import java.util.ArrayList;
import java.util.List;
+
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
+
import org.onap.policy.models.base.PfUtils;
import org.onap.policy.models.pdp.enums.PdpHealthStatus;
import org.onap.policy.models.pdp.enums.PdpMessageType;
import org.onap.policy.models.pdp.enums.PdpState;
import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicyIdentifier;
-import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicyTypeIdentifier;
/**
* Class to represent the PDP_STATUS message that all the PDP's will send to PAP.
@@ -48,11 +49,10 @@ public class PdpStatus extends PdpMessage {
private PdpHealthStatus healthy;
/**
- * Description of the PDP or the PDP type. May be left {@code null}.
+ * Description of the PDP or the PDP type. May be left {@code null}.
*/
private String description;
- private List<ToscaPolicyTypeIdentifier> supportedPolicyTypes;
private List<ToscaPolicyIdentifier> policies;
private String deploymentInstanceInfo;
private String properties;
@@ -72,15 +72,13 @@ public class PdpStatus extends PdpMessage {
*
* @param source source from which to copy
*/
- public PdpStatus(PdpStatus source) {
+ public PdpStatus(final PdpStatus source) {
super(source);
this.pdpType = source.pdpType;
this.state = source.state;
this.healthy = source.healthy;
this.description = source.description;
- this.supportedPolicyTypes = PfUtils.mapList(source.supportedPolicyTypes, ToscaPolicyTypeIdentifier::new,
- new ArrayList<>(0));
this.policies = PfUtils.mapList(source.policies, ToscaPolicyIdentifier::new, new ArrayList<>(0));
this.deploymentInstanceInfo = source.deploymentInstanceInfo;
this.properties = source.properties;
diff --git a/models-pdp/src/test/java/org/onap/policy/models/pdp/concepts/PdpStatusTest.java b/models-pdp/src/test/java/org/onap/policy/models/pdp/concepts/PdpStatusTest.java
index 3284d95ff..68af3d3b7 100644
--- a/models-pdp/src/test/java/org/onap/policy/models/pdp/concepts/PdpStatusTest.java
+++ b/models-pdp/src/test/java/org/onap/policy/models/pdp/concepts/PdpStatusTest.java
@@ -1,8 +1,9 @@
-/*
+/*-
* ============LICENSE_START=======================================================
* ONAP Policy Models
* ================================================================================
* Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 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.
@@ -26,11 +27,11 @@ import static org.onap.policy.models.pdp.concepts.PdpMessageUtils.removeVariable
import java.util.Arrays;
import java.util.Collections;
+
import org.junit.Test;
import org.onap.policy.models.pdp.enums.PdpHealthStatus;
import org.onap.policy.models.pdp.enums.PdpState;
import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicyIdentifier;
-import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicyTypeIdentifier;
public class PdpStatusTest {
@@ -38,10 +39,9 @@ public class PdpStatusTest {
public void testCopyConstructor() {
assertThatThrownBy(() -> new PdpStatus(null)).isInstanceOf(NullPointerException.class);
- PdpStatus orig = new PdpStatus();
+ final PdpStatus orig = new PdpStatus();
// verify with null values
- orig.setSupportedPolicyTypes(Collections.emptyList());
orig.setPolicies(Collections.emptyList());
assertEquals(removeVariableFields(orig.toString()), removeVariableFields(new PdpStatus(orig).toString()));
@@ -56,17 +56,16 @@ public class PdpStatusTest {
orig.setPolicies(Arrays.asList(new ToscaPolicyIdentifier("policy-A", "1.0.0")));
orig.setProperties("my-properties");
- PdpResponseDetails resp = new PdpResponseDetails();
+ final PdpResponseDetails resp = new PdpResponseDetails();
resp.setResponseMessage("my-response");
orig.setResponse(resp);
orig.setState(PdpState.SAFE);
- PdpStatistics stats = new PdpStatistics();
+ final PdpStatistics stats = new PdpStatistics();
stats.setPdpInstanceId("my-pdp-id");
orig.setStatistics(stats);
- orig.setSupportedPolicyTypes(Arrays.asList(new ToscaPolicyTypeIdentifier("type-A", "2.0.0")));
assertEquals(removeVariableFields(orig.toString()), removeVariableFields(new PdpStatus(orig).toString()));
}
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 7b8f29c4b..855919e71 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
@@ -1,6 +1,6 @@
/*-
* ============LICENSE_START=======================================================
- * Copyright (C) 2019 Nordix Foundation.
+ * Copyright (C) 2019-2020 Nordix Foundation.
* Modifications Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -23,6 +23,7 @@ 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;
@@ -59,7 +60,6 @@ public class PdpMessageHandler {
pdpStatus.setHealthy(PdpHealthStatus.HEALTHY);
pdpStatus.setDescription(pdpStatusParameters.getDescription());
pdpStatus.setName(instanceId);
- pdpStatus.setSupportedPolicyTypes(getSupportedPolicyTypesFromParameters(pdpStatusParameters));
return pdpStatus;
}
@@ -94,7 +94,6 @@ public class PdpMessageHandler {
pdpStatus.setState(pdpStatusContext.getState());
pdpStatus.setHealthy(pdpStatusContext.getHealthy());
pdpStatus.setDescription(pdpStatusContext.getDescription());
- pdpStatus.setSupportedPolicyTypes(pdpStatusContext.getSupportedPolicyTypes());
pdpStatus.setPolicies(pdpStatusContext.getPolicies());
pdpStatus.setPdpGroup(pdpStatusContext.getPdpGroup());
pdpStatus.setPdpSubgroup(pdpStatusContext.getPdpSubgroup());