diff options
| author |   pramod.jamkhedkar <pramod@research.att.com> | 2019-11-13 13:21:16 -0500 |
|---|---|---|
| committer | pramod.jamkhedkar <pramod@research.att.com> | 2019-11-13 15:41:00 -0500 |
| commit | 6de5a0c9e2acf3a799f53c9fedf8a40861b6ddbe (patch) | |
| tree | 8acb76dd6de88cef955ce0914046d072c3a6d1a0 /models-interactions/model-yaml/src/main/java/org/onap | |
| parent | c34a4b6b2e111462cde7f5663b8fbbc4ad86fc7e (diff) | |
Removing Named Query.
Removing all the related files and necessary modifications for removing named query. The code now only supports Custom Query
Issue-ID: POLICY-2125
Change-Id: Ifa5ccb74142aa424359c0dea85b90bbcf70147cb
Signed-off-by: pramod.jamkhedkar <pramod@research.att.com>
Diffstat (limited to 'models-interactions/model-yaml/src/main/java/org/onap')
3 files changed, 4 insertions, 4 deletions
diff --git a/models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/policy/ControlLoop.java b/models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/policy/ControlLoop.java index 69f62b28e..95494d8e9 100644 --- a/models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/policy/ControlLoop.java +++ b/models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/policy/ControlLoop.java @@ -25,7 +25,7 @@ import java.io.Serializable; import java.util.LinkedList; import java.util.List; -import org.onap.policy.aai.Pnf; +import org.onap.aai.domain.yang.Pnf; import org.onap.policy.sdc.Resource; import org.onap.policy.sdc.Service; diff --git a/models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/policy/builder/ControlLoopPolicyBuilder.java b/models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/policy/builder/ControlLoopPolicyBuilder.java index 280c13ec1..1c96b2b90 100644 --- a/models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/policy/builder/ControlLoopPolicyBuilder.java +++ b/models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/policy/builder/ControlLoopPolicyBuilder.java @@ -21,7 +21,7 @@ package org.onap.policy.controlloop.policy.builder; -import org.onap.policy.aai.Pnf; +import org.onap.aai.domain.yang.Pnf; import org.onap.policy.controlloop.policy.ControlLoop; import org.onap.policy.controlloop.policy.OperationsAccumulateParams; import org.onap.policy.controlloop.policy.Policy; diff --git a/models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/policy/builder/impl/ControlLoopPolicyBuilderImpl.java b/models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/policy/builder/impl/ControlLoopPolicyBuilderImpl.java index 30eaf1bf2..779e3096f 100644 --- a/models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/policy/builder/impl/ControlLoopPolicyBuilderImpl.java +++ b/models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/policy/builder/impl/ControlLoopPolicyBuilderImpl.java @@ -25,7 +25,7 @@ import com.google.common.base.Strings; import java.util.LinkedList; import java.util.UUID; -import org.onap.policy.aai.Pnf; +import org.onap.aai.domain.yang.Pnf; import org.onap.policy.controlloop.compiler.CompilerException; import org.onap.policy.controlloop.compiler.ControlLoopCompiler; import org.onap.policy.controlloop.compiler.ControlLoopCompilerCallback; @@ -176,7 +176,7 @@ public class ControlLoopPolicyBuilderImpl implements ControlLoopPolicyBuilder { if (pnf == null) { throw new BuilderException("PNF must not be null"); } - if (pnf.getPnfName() == null && pnf.getPnfType() == null) { + if (pnf.getPnfName() == null && pnf.getEquipType() == null) { throw new BuilderException("Invalid PNF - need either pnfName or pnfType"); } controlLoopPolicy.getControlLoop().setPnf(pnf); |