aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java
diff options
context:
space:
mode:
authorSébastien Determe <sd378r@intl.att.com>2017-08-04 12:04:26 +0000
committerGerrit Code Review <gerrit@onap.org>2017-08-04 12:04:26 +0000
commit8fab8020f0bb45c8bf048c929fba13db638b9fc1 (patch)
tree7ed3781aaf0be89b6d2b76b2631a4028c7e90108 /src/main/java
parent392f318df4d58d9c6245e2e094877f6d7803f327 (diff)
parent1736336840125ff2c1aef00c7d55b1471e380cb7 (diff)
Merge "[CLAMP-26] upgrade org.onap.policy"
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/org/onap/clamp/clds/client/OperationalPolicyDelegate.java2
-rw-r--r--src/main/java/org/onap/clamp/clds/client/PolicyClient.java6
-rw-r--r--src/main/java/org/onap/clamp/clds/client/req/OperationalPolicyReq.java30
3 files changed, 19 insertions, 19 deletions
diff --git a/src/main/java/org/onap/clamp/clds/client/OperationalPolicyDelegate.java b/src/main/java/org/onap/clamp/clds/client/OperationalPolicyDelegate.java
index fc3ea2ab2..2b7b06697 100644
--- a/src/main/java/org/onap/clamp/clds/client/OperationalPolicyDelegate.java
+++ b/src/main/java/org/onap/clamp/clds/client/OperationalPolicyDelegate.java
@@ -26,7 +26,7 @@ package org.onap.clamp.clds.client;
import org.onap.clamp.clds.client.req.OperationalPolicyReq;
import org.onap.clamp.clds.model.prop.ModelProperties;
import org.onap.clamp.clds.model.refprop.RefProp;
-import org.openecomp.policy.api.AttributeType;
+import org.onap.policy.api.AttributeType;
import org.camunda.bpm.engine.delegate.DelegateExecution;
import org.camunda.bpm.engine.delegate.JavaDelegate;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/org/onap/clamp/clds/client/PolicyClient.java b/src/main/java/org/onap/clamp/clds/client/PolicyClient.java
index 95e60ea2e..d19c2167e 100644
--- a/src/main/java/org/onap/clamp/clds/client/PolicyClient.java
+++ b/src/main/java/org/onap/clamp/clds/client/PolicyClient.java
@@ -25,7 +25,7 @@ package org.onap.clamp.clds.client;
import org.onap.clamp.clds.model.prop.ModelProperties;
import org.onap.clamp.clds.model.refprop.RefProp;
-import org.openecomp.policy.api.*;
+import org.onap.policy.api.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.ApplicationContext;
@@ -106,7 +106,7 @@ public class PolicyClient {
// Set Policy Type
policyParameters.setPolicyConfigType(PolicyConfigType.MicroService);
- policyParameters.setEcompName(refProp.getStringValue("policy.ecomp.name"));
+ policyParameters.setOnapName(refProp.getStringValue("policy.onap.name"));
policyParameters.setPolicyName(prop.getCurrentPolicyScopeAndPolicyName());
policyParameters.setConfigBody(policyJson);
@@ -339,4 +339,4 @@ public class PolicyClient {
return responseMessage;
}
-} \ No newline at end of file
+}
diff --git a/src/main/java/org/onap/clamp/clds/client/req/OperationalPolicyReq.java b/src/main/java/org/onap/clamp/clds/client/req/OperationalPolicyReq.java
index 90b9ff8ad..17e606133 100644
--- a/src/main/java/org/onap/clamp/clds/client/req/OperationalPolicyReq.java
+++ b/src/main/java/org/onap/clamp/clds/client/req/OperationalPolicyReq.java
@@ -27,17 +27,17 @@ import org.onap.clamp.clds.model.prop.Global;
import org.onap.clamp.clds.model.prop.ModelProperties;
import org.onap.clamp.clds.model.prop.Policy;
import org.onap.clamp.clds.model.prop.PolicyItem;
-import org.openecomp.policy.controlloop.policy.TargetType;
-import org.openecomp.policy.controlloop.policy.PolicyResult;
-import org.openecomp.policy.controlloop.policy.Target;
-import org.openecomp.policy.controlloop.policy.builder.BuilderException;
-import org.openecomp.policy.controlloop.policy.builder.ControlLoopPolicyBuilder;
-import org.openecomp.policy.controlloop.policy.builder.Message;
-import org.openecomp.policy.controlloop.policy.builder.Results;
-import org.openecomp.policy.api.AttributeType;
-import org.openecomp.policy.asdc.Resource;
-import org.openecomp.policy.asdc.ResourceType;
-import org.openecomp.policy.asdc.Service;
+import org.onap.policy.controlloop.policy.TargetType;
+import org.onap.policy.controlloop.policy.PolicyResult;
+import org.onap.policy.controlloop.policy.Target;
+import org.onap.policy.controlloop.policy.builder.BuilderException;
+import org.onap.policy.controlloop.policy.builder.ControlLoopPolicyBuilder;
+import org.onap.policy.controlloop.policy.builder.Message;
+import org.onap.policy.controlloop.policy.builder.Results;
+import org.onap.policy.api.AttributeType;
+import org.onap.policy.asdc.Resource;
+import org.onap.policy.asdc.ResourceType;
+import org.onap.policy.asdc.Service;
import org.onap.clamp.clds.model.refprop.RefProp;
import org.jboss.resteasy.spi.BadRequestException;
@@ -155,10 +155,10 @@ public class OperationalPolicyReq {
builder.addResource(vfcResources);
// process each policy
- HashMap<String, org.openecomp.policy.controlloop.policy.Policy> policyObjMap = new HashMap<>();
+ HashMap<String, org.onap.policy.controlloop.policy.Policy> policyObjMap = new HashMap<>();
List<PolicyItem> policyItemList = orderParentFirst(policy.getPolicyItems());
for (int i = 0; i < policyItemList.size(); i++) {
- org.openecomp.policy.controlloop.policy.Policy policyObj;
+ org.onap.policy.controlloop.policy.Policy policyObj;
PolicyItem policyItem = policyItemList.get(i);
String policyName = policyItem.getRecipe() + " Policy";
if (i == 0) {
@@ -173,7 +173,7 @@ public class OperationalPolicyReq {
policyItem.getMaxRetries(),
policyItem.getRetryTimeLimit());
} else {
- org.openecomp.policy.controlloop.policy.Policy parentPolicyObj = policyObjMap.get(policyItem.getParentPolicy());
+ org.onap.policy.controlloop.policy.Policy parentPolicyObj = policyObjMap.get(policyItem.getParentPolicy());
String policyDescription = policyItem.getRecipe() + " Policy - triggered conditionally by " + parentPolicyObj.getName() + " - created by CLDS";
policyObj = builder.setPolicyForPolicyResult(
policyName,
@@ -296,4 +296,4 @@ public class OperationalPolicyReq {
return prArray;
}
-} \ No newline at end of file
+}