Merge "Removing Named Query."

5 files changed, 8 insertions, 9 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);
diff --git a/models-interactions/model-yaml/src/test/java/org/onap/policy/controlloop/policy/ControlLoopPolicyBuilderTest.java b/models-interactions/model-yaml/src/test/java/org/onap/policy/controlloop/policy/ControlLoopPolicyBuilderTest.java
index 3236bca3f..b6b5c7acb 100644
--- a/models-interactions/model-yaml/src/test/java/org/onap/policy/controlloop/policy/ControlLoopPolicyBuilderTest.java
+++ b/models-interactions/model-yaml/src/test/java/org/onap/policy/controlloop/policy/ControlLoopPolicyBuilderTest.java
@@ -36,8 +36,7 @@ import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
-import org.onap.policy.aai.Pnf;
-import org.onap.policy.aai.PnfType;
+import org.onap.aai.domain.yang.Pnf;
 import org.onap.policy.controlloop.policy.builder.BuilderException;
 import org.onap.policy.controlloop.policy.builder.ControlLoopPolicyBuilder;
 import org.onap.policy.controlloop.policy.builder.Message;
@@ -239,7 +238,7 @@ public class ControlLoopPolicyBuilderTest {
     // PLEASE ADVISE IF THE BEHAVIOUR IS INCORRECT OR THE TEST CASE IS INVALID
     public void testControlLoopForPnf() throws BuilderException {
         Pnf pnf = new Pnf();
-        pnf.setPnfType(PnfType.ENODEB);
+        //pnf.setPnfType(PnfType.ENODEB);
         ControlLoopPolicyBuilder builder =
                 ControlLoopPolicyBuilder.Factory.buildControlLoop(UUID.randomUUID().toString(), 2400, pnf);
         assertEquals(pnf, builder.getControlLoop().getPnf());
@@ -257,7 +256,7 @@ public class ControlLoopPolicyBuilderTest {
         assertNull(builder.getControlLoop().getPnf());
 
         Pnf pnf = new Pnf();
-        pnf.setPnfType(PnfType.ENODEB);
+        //pnf.setPnfType(PnfType.ENODEB);
         builder.setPnf(pnf);
         assertEquals(pnf, builder.getControlLoop().getPnf());
 
diff --git a/models-interactions/model-yaml/src/test/java/org/onap/policy/controlloop/policy/ControlLoopTest.java b/models-interactions/model-yaml/src/test/java/org/onap/policy/controlloop/policy/ControlLoopTest.java
index 23287da68..c0131f506 100644
--- a/models-interactions/model-yaml/src/test/java/org/onap/policy/controlloop/policy/ControlLoopTest.java
+++ b/models-interactions/model-yaml/src/test/java/org/onap/policy/controlloop/policy/ControlLoopTest.java
@@ -31,7 +31,7 @@ import java.util.List;
 import org.junit.Ignore;
 import org.junit.Test;
 
-import org.onap.policy.aai.Pnf;
+import org.onap.aai.domain.yang.Pnf;
 import org.onap.policy.common.utils.io.Serializer;
 import org.onap.policy.sdc.Resource;
 import org.onap.policy.sdc.ResourceType;