@Component
public class PolicyClient {
- protected static final String POLICY_PREFIX_BASE = "Config_";
protected static final String LOG_POLICY_PREFIX = "Response is ";
protected static final EELFLogger logger = EELFManager.getInstance().getLogger(PolicyClient.class);
protected static final EELFLogger metricsLogger = EELFManager.getInstance().getMetricsLogger();
- protected static final String POLICY_MSTYPE_PROPERTY_NAME = "policy.ms.type";
- protected static final String POLICY_ONAPNAME_PROPERTY_NAME = "policy.onap.name";
+ public static final String POLICY_MSTYPE_PROPERTY_NAME = "policy.ms.type";
+ public static final String POLICY_ONAPNAME_PROPERTY_NAME = "policy.onap.name";
+ public static final String POLICY_BASENAME_PREFIX_PROPERTY_NAME = "policy.base.policyNamePrefix";
+ public static final String POLICY_OP_NAME_PREFIX_PROPERTY_NAME = "policy.op.policyNamePrefix";
+ public static final String POLICY_MS_NAME_PREFIX_PROPERTY_NAME = "policy.ms.policyNamePrefix";
+ public static final String POLICY_OP_TYPE_PROPERTY_NAME = "policy.op.type";
@Autowired
protected ApplicationContext appContext;
@Autowired
policyParameters.setAttributes(attributes);
// Set a random UUID(Mandatory)
policyParameters.setRequestID(UUID.fromString(policyRequestUuid));
- String policyNamePrefix = refProp.getStringValue("policy.op.policyNamePrefix");
+ String policyNamePrefix = refProp.getStringValue(POLICY_OP_NAME_PREFIX_PROPERTY_NAME);
String rtnMsg = send(policyParameters, prop, policyNamePrefix);
- String policyType = refProp.getStringValue("policy.op.type");
+ String policyType = refProp.getStringValue(POLICY_OP_TYPE_PROPERTY_NAME);
push(policyType, prop);
return rtnMsg;
}
policyParameters.setConfigBody(policyJson);
policyParameters.setConfigBodyType(PolicyType.JSON);
policyParameters.setRequestID(UUID.fromString(policyRequestUuid));
- String policyNamePrefix = refProp.getStringValue("policy.ms.policyNamePrefix");
+ String policyNamePrefix = refProp.getStringValue(POLICY_MS_NAME_PREFIX_PROPERTY_NAME);
// Adding this line to clear the policy id from policy name while
// pushing to policy engine
prop.setPolicyUniqueId("");
// Adding this line to clear the policy id from policy name while
// pushing to policy engine
prop.setPolicyUniqueId("");
- String rtnMsg = send(policyParameters, prop, POLICY_PREFIX_BASE);
+ String rtnMsg = send(policyParameters, prop, refProp.getStringValue(POLICY_BASENAME_PREFIX_PROPERTY_NAME));
push(PolicyConfigType.Base.toString(), prop);
return rtnMsg;
}
policyParameters.setOnapName(refProp.getStringValue(POLICY_ONAPNAME_PROPERTY_NAME));
policyParameters.setPolicyName(prop.getCurrentPolicyScopeAndPolicyName());
policyParameters.setConfigBody(configBody);
- String policyNamePrefix = refProp.getStringValue("policy.ms.policyNamePrefix");
+ String policyNamePrefix = refProp.getStringValue(POLICY_MS_NAME_PREFIX_PROPERTY_NAME);
// Adding this line to clear the policy id from policy name while
// pushing to policy engine
prop.setPolicyUniqueId("");
* @return The response message from policy
*/
public String deleteBrms(ModelProperties prop) {
- String policyType = refProp.getStringValue("policy.op.type");
+ String policyType = refProp.getStringValue(POLICY_OP_TYPE_PROPERTY_NAME);
return deletePolicy(prop, policyType);
}
private static final EELFLogger logger = EELFManager.getInstance().getLogger(CsarInstallerImpl.class);
private Map<String, BlueprintParserFilesConfiguration> bpmnMapping = new HashMap<>();
public static final String TEMPLATE_NAME_PREFIX = "DCAE-Designer-ClosedLoopTemplate-";
- public static final String MODEL_NAME_PREFIX = "ClosedLoop-";
+ public static final String CONTROL_NAME_PREFIX = "ClosedLoop-";
public static final String GET_INPUT_BLUEPRINT_PARAM = "get_input";
+ // This will be used later as the policy scope
+ public static final String MODEL_NAME_PREFIX = "CLAMP";
/**
* The file name that will be loaded by Spring.
*/
}
public static String buildModelName(CsarHandler csar) {
- return csar.getSdcCsarHelper().getServiceMetadata().getValue("name") + " v"
- + csar.getSdcNotification().getServiceVersion();
+ return MODEL_NAME_PREFIX + csar.getSdcCsarHelper().getServiceMetadata().getValue("name") + "_v"
+ + csar.getSdcNotification().getServiceVersion().replace('.', '_');
}
@Override
// It's a filter must add a specific prefix
cldsModel.setControlNamePrefix(policyName);
} else {
- cldsModel.setControlNamePrefix(MODEL_NAME_PREFIX);
+ cldsModel.setControlNamePrefix(CONTROL_NAME_PREFIX);
}
cldsModel.setName(buildModelName(csar));
cldsModel.setBlueprintText(blueprintArtifact.getDcaeBlueprint());
#\r
#\r
# Configuration Settings for Policy Engine Components\r
-clamp.config.policy.pdpUrl1=http://vm1.policy.simpledemo.onap.org:8081/pdp/ , testpdp, alpha123\r
-clamp.config.policy.pdpUrl2=http://vm1.policy.simpledemo.onap.org:8081/pdp/ , testpdp, alpha123\r
-clamp.config.policy.papUrl=http://vm1.policy.simpledemo.onap.org:8081/pap/ , testpap, alpha123\r
+clamp.config.policy.pdpUrl1=http://localhost:8085/pdp/ , testpdp, alpha123\r
+clamp.config.policy.pdpUrl2=http://vlocalhost:8085/pdp/ , testpdp, alpha123\r
+clamp.config.policy.papUrl=http://localhost:8085/pap/ , testpap, alpha123\r
clamp.config.policy.notificationType=websocket\r
clamp.config.policy.notificationUebServers=localhost\r
clamp.config.policy.notificationTopic=\r
clamp.config.policy.pdp.group=default\r
clamp.config.policy.ms.type=MicroService\r
clamp.config.policy.ms.policyNamePrefix=Config_MS_\r
-clamp.config.policy.op.type=BRMS_Param\r
clamp.config.policy.op.policyNamePrefix=Config_BRMS_Param_\r
+clamp.config.policy.base.policyNamePrefix=Config_\r
+clamp.config.policy.op.type=BRMS_Param\r
+\r
\r
# TCA MicroService Policy request build properties\r
#\r
clamp.config.op.eNodeB.period=10s\r
#\r
# Sdc service properties\r
-clamp.config.sdc.catalog.url=http://sdc.api.simpledemo.onap.org:8080/sdc/v1/catalog/\r
-clamp.config.sdc.hostUrl=http://sdc.api.simpledemo.onap.org:8080\r
-clamp.config.sdc.serviceUrl=http://sdc.api.simpledemo.onap.org:8080/sdc/v1/catalog/services\r
+clamp.config.sdc.catalog.url=http://localhost:8085/sdc/v1/catalog/\r
+clamp.config.sdc.hostUrl=http://localhost:8085\r
+clamp.config.sdc.serviceUrl=http://localhost:8085/sdc/v1/catalog/services\r
clamp.config.sdc.serviceUsername=clamp\r
clamp.config.sdc.servicePassword=b7acccda32b98c5bb7acccda32b98c5b05D511BD6D93626E90D18E9D24D9B78CD34C7EE8012F0A189A28763E82271E50A5D4EC10C7D93E06E0A2D27CAE66B981\r
clamp.config.sdc.artifactLabel=blueprintclampcockpit\r
clamp.config.clds.service.cache.invalidate.after.seconds=120\r
\r
#DCAE Inventory Url Properties\r
-clamp.config.dcae.inventory.url=http://dcae.api.simpledemo.onap.org:8080\r
+clamp.config.dcae.inventory.url=http://localhost:8085\r
clamp.config.dcae.intentory.retry.interval=10000\r
clamp.config.dcae.intentory.retry.limit=3\r
\r
#DCAE Dispatcher Url Properties\r
-clamp.config.dcae.dispatcher.url=http://dcae.api.simpledemo.onap.org:8080\r
+clamp.config.dcae.dispatcher.url=http://localhost:8085\r
clamp.config.dcae.header.requestId = X-ECOMP-RequestID\r
\r
#Define user permission related parameters, the permission type can be changed but MUST be redefined in clds-users.properties in that case !\r
clamp.config.policy.pdp.group=default\r
clamp.config.policy.ms.type=MicroService\r
clamp.config.policy.ms.policyNamePrefix=Config_MS_\r
-clamp.config.policy.op.type=BRMS_Param\r
clamp.config.policy.op.policyNamePrefix=Config_BRMS_Param_\r
+clamp.config.policy.base.policyNamePrefix=Config_\r
+clamp.config.policy.op.type=BRMS_Param\r
\r
# TCA MicroService Policy request build properties\r
#\r