diff options
Diffstat (limited to 'src/main')
4 files changed, 20 insertions, 11 deletions
diff --git a/src/main/java/org/onap/clamp/clds/client/DcaeDispatcherServices.java b/src/main/java/org/onap/clamp/clds/client/DcaeDispatcherServices.java index 1ea4c4b93..f7aff0eff 100644 --- a/src/main/java/org/onap/clamp/clds/client/DcaeDispatcherServices.java +++ b/src/main/java/org/onap/clamp/clds/client/DcaeDispatcherServices.java @@ -5,6 +5,8 @@ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights
* reserved.
* ================================================================================
+ * Modifications Copyright (c) 2019 Samsung
+ * ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@@ -54,7 +56,6 @@ public class DcaeDispatcherServices { private static final String STATUS_URL_LOG = "Status URL extracted: ";
private static final String DCAE_URL_PREFIX = "/dcae-deployments/";
private static final String DCAE_URL_PROPERTY_NAME = "dcae.dispatcher.url";
- public static final String DCAE_REQUESTID_PROPERTY_NAME = "dcae.header.requestId";
private static final String DCAE_LINK_FIELD = "links";
private static final String DCAE_STATUS_FIELD = "status";
diff --git a/src/main/java/org/onap/clamp/clds/client/req/policy/GuardPolicyAttributesConstructor.java b/src/main/java/org/onap/clamp/clds/client/req/policy/GuardPolicyAttributesConstructor.java index bc82cb3da..e996ae822 100644 --- a/src/main/java/org/onap/clamp/clds/client/req/policy/GuardPolicyAttributesConstructor.java +++ b/src/main/java/org/onap/clamp/clds/client/req/policy/GuardPolicyAttributesConstructor.java @@ -5,6 +5,8 @@ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights * reserved. * ================================================================================ + * Modifications Copyright (c) 2019 Samsung + * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -30,6 +32,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.EnumMap; import org.onap.clamp.clds.model.properties.ModelProperties; import org.onap.clamp.clds.model.properties.PolicyChain; @@ -99,7 +102,7 @@ public class GuardPolicyAttributesConstructor { } private static Map<AttributeType, Map<String, String>> createAttributesMap(Map<String, String> matchingAttributes) { - Map<AttributeType, Map<String, String>> attributes = new HashMap<>(); + Map<AttributeType, Map<String, String>> attributes = new EnumMap<>(AttributeType.class); attributes.put(AttributeType.MATCHING, matchingAttributes); return attributes; } diff --git a/src/main/java/org/onap/clamp/clds/client/req/policy/PolicyClient.java b/src/main/java/org/onap/clamp/clds/client/req/policy/PolicyClient.java index c88489190..43209b299 100644 --- a/src/main/java/org/onap/clamp/clds/client/req/policy/PolicyClient.java +++ b/src/main/java/org/onap/clamp/clds/client/req/policy/PolicyClient.java @@ -5,6 +5,8 @@ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights * reserved. * ================================================================================ + * Modifications Copyright (c) 2019 Samsung + * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -84,7 +86,6 @@ public class PolicyClient { 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"; - public static final String POLICY_GUARD_SUFFIX = "_Guard"; public static final String TOSCA_FILE_TEMP_PATH = "tosca.filePath"; @Autowired @@ -382,10 +383,12 @@ public class PolicyClient { * Use list Policy API to retrieve the policy. Return true if policy exists * otherwise return false. * - * @param policyNamePrefix - * The Policy Name Prefix * @param prop * The ModelProperties + * @param policyPrefix + * The Policy Name Prefix + * @param policyNameWithPrefix + * The Policy Full Name * @return The response message from policy * @throws PolicyConfigException * In case of issues with policy engine diff --git a/src/main/java/org/onap/clamp/clds/client/req/tca/TcaRequestFormatter.java b/src/main/java/org/onap/clamp/clds/client/req/tca/TcaRequestFormatter.java index 6b8f04397..ae0de074a 100644 --- a/src/main/java/org/onap/clamp/clds/client/req/tca/TcaRequestFormatter.java +++ b/src/main/java/org/onap/clamp/clds/client/req/tca/TcaRequestFormatter.java @@ -5,6 +5,8 @@ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights * reserved. * ================================================================================ + * Modifications Copyright (c) 2019 Samsung + * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -173,7 +175,7 @@ public class TcaRequestFormatter { /** * This method updates the blueprint that is received in the UI with the TCA * Json. - * + * * @param refProp * * The refProp generally created by Spring, it's an access on * the clds-references.properties file @@ -188,11 +190,11 @@ public class TcaRequestFormatter { String jsonPolicy = JsonUtils.GSON.toJson(createPolicyContent(refProp, modelProperties, null, null, null)); logger.info("Yaml that will be updated:" + yamlValue); Yaml yaml = new Yaml(); - Map<String, Object> loadedYaml = (Map<String, Object>) yaml.load(yamlValue); - Map<String, Object> nodeTemplates = (Map<String, Object>) loadedYaml.get("node_templates"); - Map<String, Object> tcaObject = (Map<String, Object>) nodeTemplates.get("tca_tca"); - Map<String, Object> propsObject = (Map<String, Object>) tcaObject.get("properties"); - Map<String, Object> appPreferences = (Map<String, Object>) propsObject.get("app_preferences"); + Map<String, Map> loadedYaml = yaml.load(yamlValue); + Map<String, Map> nodeTemplates = loadedYaml.get("node_templates"); + Map<String, Map> tcaObject = nodeTemplates.get("tca_tca"); + Map<String, Map> propsObject = tcaObject.get("properties"); + Map<String, String> appPreferences = propsObject.get("app_preferences"); appPreferences.put("tca_policy", jsonPolicy); String blueprint = yaml.dump(loadedYaml); logger.info("Yaml updated:" + blueprint); |