* * org.onap.dcae
* * ================================================================================
* * Copyright (c) 2020 AT&T Intellectual Property. All rights reserved.
+ * * Copyright (c) 2021 Nokia. All rights reserved.
* * ================================================================================
* * Modifications Copyright (c) 2021 Nokia
* * ================================================================================
package org.onap.blueprintgenerator.service.common;
-import org.onap.blueprintgenerator.constants.Constants;
import org.onap.blueprintgenerator.model.common.Appconfig;
import org.onap.blueprintgenerator.model.common.Dmaap;
import org.onap.blueprintgenerator.model.common.GetInput;
import org.onap.blueprintgenerator.model.componentspec.OnapComponentSpec;
import org.onap.blueprintgenerator.model.componentspec.common.Calls;
import org.onap.blueprintgenerator.model.componentspec.common.Parameters;
-import org.onap.blueprintgenerator.model.componentspec.common.Publishes;
-import org.onap.blueprintgenerator.model.componentspec.common.Subscribes;
import org.onap.blueprintgenerator.service.base.BlueprintHelperService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
*
* @param inputs Inputs
* @param onapComponentSpec Onap Component Specification
- * @param override Parameter to Service Component Override
* @param isDmaap Dmaap Argument
* @return
*/
public Map<String, Object> createAppconfig(
Map<String, LinkedHashMap<String, Object>> inputs,
OnapComponentSpec onapComponentSpec,
- String override,
boolean isDmaap) {
Map<String, Object> response = new HashMap<>();
}
}
}
- if (override != null) {
- GetInput ov = new GetInput();
- ov.setBpInputName(Constants.SERVICE_COMPONENT_NAME_OVERRIDE);
- parameters.put(Constants.SERVICE_COMPONENT_NAME_OVERRIDE, ov);
- LinkedHashMap<String, Object> over = blueprintHelperService.createStringInput(override);
- inputs.put(Constants.SERVICE_COMPONENT_NAME_OVERRIDE, over);
- }
+
appconfig.setParams(parameters);
response.put("appconfig", appconfig);
* * org.onap.dcae
* * ================================================================================
* * Copyright (c) 2020 AT&T Intellectual Property. All rights reserved.
+ * * Copyright (c) 2021 Nokia. All rights reserved.
* * ================================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
package org.onap.blueprintgenerator.service.common;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
import org.onap.blueprintgenerator.constants.Constants;
import org.onap.blueprintgenerator.model.common.Appconfig;
import org.onap.blueprintgenerator.model.common.GetInput;
+import org.onap.blueprintgenerator.model.common.Properties;
import org.onap.blueprintgenerator.model.common.ResourceConfig;
import org.onap.blueprintgenerator.model.componentspec.OnapAuxilary;
import org.onap.blueprintgenerator.model.componentspec.OnapComponentSpec;
import org.onap.blueprintgenerator.model.dmaap.TlsInfo;
import org.onap.blueprintgenerator.service.base.BlueprintHelperService;
import org.onap.blueprintgenerator.service.dmaap.StreamsService;
-import org.onap.blueprintgenerator.model.common.Properties;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.ArrayList;
-import java.util.List;
-
/**
* @author : Ravi Mantena
- * @date 10/16/2020 Application: ONAP - Blueprint Generator Common ONAP Service to create Properties
- * Node
+ * @date 10/16/2020 Application: ONAP - Blueprint Generator Common ONAP Service to create Properties Node
*/
@Service("onapPropertiesService")
public class PropertiesService {
/**
* Creates ONAP properties
*
- * @param inputs Inputs
+ * @param inputs Inputs
* @param onapComponentSpec OnapComponentSpec
- * @param override Override
+ * @param override Override
* @return
*/
public Map<String, Object> createOnapProperties(
properties.setDocker_config(onapAuxilary);
Map<String, Object> appConfigResponse =
- appConfigService.createAppconfig(inputs, onapComponentSpec, override, false);
+ appConfigService.createAppconfig(inputs, onapComponentSpec, false);
inputs = (Map<String, LinkedHashMap<String, Object>>) appConfigResponse.get("inputs");
properties.setApplication_config((Appconfig) appConfigResponse.get("appconfig"));
sType = sType.replace('.', '-');
properties.setService_component_type(sType);
+ inputs.put(Constants.SERVICE_COMPONENT_NAME_OVERRIDE,
+ addServiceComponentNameOverride(override, properties));
+
Map<String, Object> tls_info = onapComponentSpec.getAuxilary().getTls_info();
if (tls_info != null) {
addTlsInfo(onapComponentSpec, inputs, properties);
/**
* Creates Dmaap properties
*
- * @param inputs Inputs
+ * @param inputs Inputs
* @param onapComponentSpec OnapComponentSpec
- * @param override Override
+ * @param override Override
* @return
*/
public Map<String, Object> createDmaapProperties(
sType = sType.replace('.', '-');
properties.setService_component_type(sType);
+ inputs.put(Constants.SERVICE_COMPONENT_NAME_OVERRIDE,
+ addServiceComponentNameOverride(override, properties));
+
Map<String, Object> tls_info = onapComponentSpec.getAuxilary().getTls_info();
if (tls_info != null) {
addTlsInfo(onapComponentSpec, inputs, properties);
properties.setDocker_config(onapAuxilary);
Map<String, Object> appConfigResponse =
- appConfigService.createAppconfig(inputs, onapComponentSpec, override, true);
+ appConfigService.createAppconfig(inputs, onapComponentSpec, true);
inputs = (Map<String, LinkedHashMap<String, Object>>) appConfigResponse.get("inputs");
properties.setApplication_config((Appconfig) appConfigResponse.get("appconfig"));
return response;
}
+ private LinkedHashMap<String, Object> addServiceComponentNameOverride(String override, Properties properties) {
+ GetInput overrideGetInput = new GetInput();
+ overrideGetInput.setBpInputName(Constants.SERVICE_COMPONENT_NAME_OVERRIDE);
+ properties.setService_component_name_override(overrideGetInput);
+ return blueprintHelperService.createStringInput(override != null ? override : "");
+ }
+
private void addTlsInfo(
OnapComponentSpec onapComponentSpec,
Map<String, LinkedHashMap<String, Object>> inputs,