Merge "Fix pdp group info not there for legacy policy"

3 files changed, 7 insertions, 5 deletions

diff --git a/src/main/java/org/onap/clamp/clds/config/LegacyOperationalPolicy.java b/src/main/java/org/onap/clamp/clds/config/LegacyOperationalPolicyController.java
index 7d4b5f8f..69e94a35 100644
--- a/src/main/java/org/onap/clamp/clds/config/LegacyOperationalPolicy.java
+++ b/src/main/java/org/onap/clamp/clds/config/LegacyOperationalPolicyController.java
@@ -32,12 +32,12 @@ import org.springframework.context.annotation.Profile;
 
 @Configuration
 @Profile("legacy-operational-policy")
-public class LegacyOperationalPolicy {
+public class LegacyOperationalPolicyController {
 
     @Autowired
     PolicyModelsService policyModelService;
 
-    public static final String OPERATIONAL_POLICY_LEGACY = "onap.policies.operational.legacy";
+    public static final String OPERATIONAL_POLICY_LEGACY = "onap.policies.controlloop.Operational";
 
     @PostConstruct
     public void init() {
diff --git a/src/main/java/org/onap/clamp/policy/operational/OperationalPolicy.java b/src/main/java/org/onap/clamp/policy/operational/OperationalPolicy.java
index 18ee84f7..1e721ce2 100644
--- a/src/main/java/org/onap/clamp/policy/operational/OperationalPolicy.java
+++ b/src/main/java/org/onap/clamp/policy/operational/OperationalPolicy.java
@@ -50,6 +50,7 @@ import javax.persistence.Transient;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.hibernate.annotations.TypeDef;
 import org.hibernate.annotations.TypeDefs;
+import org.onap.clamp.clds.config.LegacyOperationalPolicyController;
 import org.onap.clamp.clds.tosca.update.ToscaConverterWithDictionarySupport;
 import org.onap.clamp.dao.model.jsontype.StringJsonUserType;
 import org.onap.clamp.loop.Loop;
@@ -228,7 +229,8 @@ public class OperationalPolicy extends Policy implements Serializable {
     }
 
     public Boolean isLegacy() {
-        return (this.getPolicyModel() != null) && this.getPolicyModel().getPolicyModelType().contains("legacy");
+        return (this.getPolicyModel() != null) && this.getPolicyModel().getPolicyModelType().contains(
+                LegacyOperationalPolicyController.OPERATIONAL_POLICY_LEGACY);
     }
 
     /**
diff --git a/src/test/java/org/onap/clamp/loop/CsarInstallerItCase.java b/src/test/java/org/onap/clamp/loop/CsarInstallerItCase.java
index d0669554..ac7b236e 100644
--- a/src/test/java/org/onap/clamp/loop/CsarInstallerItCase.java
+++ b/src/test/java/org/onap/clamp/loop/CsarInstallerItCase.java
@@ -42,7 +42,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mockito;
 import org.onap.clamp.clds.Application;
-import org.onap.clamp.clds.config.LegacyOperationalPolicy;
+import org.onap.clamp.clds.config.LegacyOperationalPolicyController;
 import org.onap.clamp.clds.exception.sdc.controller.BlueprintParserException;
 import org.onap.clamp.clds.exception.sdc.controller.CsarHandlerException;
 import org.onap.clamp.clds.exception.sdc.controller.SdcArtifactInstallerException;
@@ -164,7 +164,7 @@ public class CsarInstallerItCase {
     @Transactional
     public void testPolicyModelAddedAtStartup() {
         assertThat(policyModelsRepository.findByPolicyModelType(
-                LegacyOperationalPolicy.OPERATIONAL_POLICY_LEGACY).get(0)).isNotNull();
+                LegacyOperationalPolicyController.OPERATIONAL_POLICY_LEGACY).get(0)).isNotNull();
     }
 
     @Test