+++ /dev/null
-/*\r
- * Copyright © 2017-2018 AT&T Intellectual Property.\r
- * Modifications Copyright © 2018 IBM.\r
- *\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- * http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-\r
-package org.onap.ccsdk.apps.controllerblueprints.service;\r
-\r
-import com.fasterxml.jackson.databind.JsonNode;\r
-import com.google.common.base.Preconditions;\r
-import org.apache.commons.lang3.StringUtils;\r
-import org.jetbrains.annotations.NotNull;\r
-import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintException;\r
-import org.onap.ccsdk.apps.controllerblueprints.core.data.*;\r
-import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonUtils;\r
-import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceDefinition;\r
-import org.onap.ccsdk.apps.controllerblueprints.resource.dict.service.ResourceDefinitionRepoService;\r
-import org.onap.ccsdk.apps.controllerblueprints.service.domain.ModelType;\r
-import org.onap.ccsdk.apps.controllerblueprints.service.domain.ResourceDictionary;\r
-import org.onap.ccsdk.apps.controllerblueprints.service.repository.ModelTypeRepository;\r
-import org.onap.ccsdk.apps.controllerblueprints.service.repository.ResourceDictionaryRepository;\r
-import org.springframework.stereotype.Service;\r
-\r
-import java.util.Optional;\r
-\r
-/**\r
- * ResourceDefinitionRepoDBService\r
- *\r
- * @author Brinda Santh\r
- */\r
-@Service\r
-@SuppressWarnings("unused")\r
-public class ResourceDefinitionRepoDBService implements ResourceDefinitionRepoService {\r
-\r
- private ModelTypeRepository modelTypeRepository;\r
- private ResourceDictionaryRepository resourceDictionaryRepository;\r
-\r
- @SuppressWarnings("unused")\r
- public ResourceDefinitionRepoDBService(ModelTypeRepository modelTypeRepository,\r
- ResourceDictionaryRepository resourceDictionaryRepository) {\r
- this.modelTypeRepository = modelTypeRepository;\r
- this.resourceDictionaryRepository = resourceDictionaryRepository;\r
- }\r
-\r
- @Override\r
- public NodeType getNodeType(@NotNull String nodeTypeName) throws BluePrintException {\r
- return getModelType(nodeTypeName, NodeType.class);\r
- }\r
-\r
- @Override\r
- public DataType getDataType(@NotNull String dataTypeName) throws BluePrintException {\r
- return getModelType(dataTypeName, DataType.class);\r
- }\r
-\r
- @Override\r
- public ArtifactType getArtifactType(@NotNull String artifactTypeName) throws BluePrintException {\r
- return getModelType(artifactTypeName, ArtifactType.class);\r
- }\r
-\r
- @Override\r
- public RelationshipType getRelationshipType(@NotNull String relationshipTypeName) throws BluePrintException {\r
- return getModelType(relationshipTypeName, RelationshipType.class);\r
- }\r
-\r
- @Override\r
- public CapabilityDefinition getCapabilityDefinition(@NotNull String capabilityDefinitionName) throws BluePrintException {\r
- return getModelType(capabilityDefinitionName, CapabilityDefinition.class);\r
- }\r
-\r
- @NotNull\r
- @Override\r
- public ResourceDefinition getResourceDefinition(@NotNull String resourceDefinitionName) throws BluePrintException {\r
- Optional<ResourceDictionary> dbResourceDictionary = resourceDictionaryRepository.findByName(resourceDefinitionName);\r
- if (dbResourceDictionary.isPresent()) {\r
- return dbResourceDictionary.get().getDefinition();\r
- } else {\r
- throw new BluePrintException(String.format("failed to get resource dictionary (%s) from repo", resourceDefinitionName));\r
- }\r
- }\r
-\r
- private <T> T getModelType(String modelName, Class<T> valueClass) throws BluePrintException {\r
- Preconditions.checkArgument(StringUtils.isNotBlank(modelName),\r
- "Failed to get model from repo, model name is missing");\r
-\r
- JsonNode modelDefinition = getModelDefinition(modelName);\r
- Preconditions.checkNotNull(modelDefinition,\r
- String.format("Failed to get model content for model name (%s)", modelName));\r
-\r
- return JacksonUtils.readValue(modelDefinition, valueClass);\r
- }\r
-\r
- private JsonNode getModelDefinition(String modelName) throws BluePrintException {\r
- JsonNode modelDefinition;\r
- Optional<ModelType> modelTypeDb = modelTypeRepository.findByModelName(modelName);\r
- if (modelTypeDb.isPresent()) {\r
- modelDefinition = modelTypeDb.get().getDefinition();\r
- } else {\r
- throw new BluePrintException(String.format("failed to get model definition (%s) from repo", modelName));\r
- }\r
- return modelDefinition;\r
- }\r
-}\r
package org.onap.ccsdk.apps.controllerblueprints.service;
-import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintRepoService;
+import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.BluePrintRepoService;
import org.onap.ccsdk.apps.controllerblueprints.resource.dict.service.ResourceDefinitionDefaultValidationService;
import org.springframework.stereotype.Service;
--- /dev/null
+/*
+ * Copyright © 2017-2018 AT&T Intellectual Property.
+ *
+ * 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
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.onap.ccsdk.apps.controllerblueprints.service
+
+import com.fasterxml.jackson.databind.JsonNode
+import com.google.common.base.Preconditions
+import org.apache.commons.lang3.StringUtils
+import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintException
+import org.onap.ccsdk.apps.controllerblueprints.core.data.*
+import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.BluePrintRepoService
+import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonUtils
+import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceDefinition
+import org.onap.ccsdk.apps.controllerblueprints.service.repository.ModelTypeRepository
+import org.onap.ccsdk.apps.controllerblueprints.service.repository.ResourceDictionaryRepository
+import org.springframework.stereotype.Service
+
+interface ResourceDefinitionRepoService : BluePrintRepoService {
+
+ @Throws(BluePrintException::class)
+ fun getResourceDefinition(resourceDefinitionName: String): ResourceDefinition
+}
+
+@Service
+open class BluePrintRepoFileService(private val modelTypeRepository: ModelTypeRepository,
+ private val resourceDictionaryRepository: ResourceDictionaryRepository) : ResourceDefinitionRepoService {
+
+ @Throws(BluePrintException::class)
+ override fun getNodeType(nodeTypeName: String): NodeType {
+ return getModelType(nodeTypeName, NodeType::class.java)
+ ?: throw BluePrintException("couldn't get NodeType($nodeTypeName)")
+ }
+
+ @Throws(BluePrintException::class)
+ override fun getDataType(dataTypeName: String): DataType {
+ return getModelType(dataTypeName, DataType::class.java)
+ ?: throw BluePrintException("couldn't get DataType($dataTypeName)")
+ }
+
+ @Throws(BluePrintException::class)
+ override fun getArtifactType(artifactTypeName: String): ArtifactType {
+ return getModelType(artifactTypeName, ArtifactType::class.java)
+ ?: throw BluePrintException("couldn't get ArtifactType($artifactTypeName)")
+ }
+
+ @Throws(BluePrintException::class)
+ override fun getRelationshipType(relationshipTypeName: String): RelationshipType {
+ return getModelType(relationshipTypeName, RelationshipType::class.java)
+ ?: throw BluePrintException("couldn't get RelationshipType($relationshipTypeName)")
+ }
+
+ @Throws(BluePrintException::class)
+ override fun getCapabilityDefinition(capabilityDefinitionName: String): CapabilityDefinition {
+ return getModelType(capabilityDefinitionName, CapabilityDefinition::class.java)
+ ?: throw BluePrintException("couldn't get CapabilityDefinition($capabilityDefinitionName)")
+ }
+
+ @Throws(BluePrintException::class)
+ override fun getResourceDefinition(resourceDefinitionName: String): ResourceDefinition {
+ val dbResourceDictionary = resourceDictionaryRepository.findByName(resourceDefinitionName)
+ return if (dbResourceDictionary.isPresent) {
+ dbResourceDictionary.get().definition
+ } else {
+ throw BluePrintException(String.format("failed to get resource dictionary (%s) from repo", resourceDefinitionName))
+ }
+ }
+
+ @Throws(BluePrintException::class)
+ private fun <T> getModelType(modelName: String, valueClass: Class<T>): T? {
+ Preconditions.checkArgument(StringUtils.isNotBlank(modelName),
+ "Failed to get model from repo, model name is missing")
+
+ val modelDefinition = getModelDefinition(modelName)
+ Preconditions.checkNotNull(modelDefinition,
+ String.format("Failed to get model content for model name (%s)", modelName))
+
+ return JacksonUtils.readValue(modelDefinition, valueClass)
+ }
+
+ @Throws(BluePrintException::class)
+ private fun getModelDefinition(modelName: String): JsonNode {
+ val modelDefinition: JsonNode
+ val modelTypeDb = modelTypeRepository.findByModelName(modelName)
+ if (modelTypeDb.isPresent) {
+ modelDefinition = modelTypeDb.get().definition
+ } else {
+ throw BluePrintException(String.format("failed to get model definition (%s) from repo", modelName))
+ }
+ return modelDefinition
+ }
+}
\ No newline at end of file
import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintError
import org.onap.ccsdk.apps.controllerblueprints.core.data.AttributeDefinition
import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.BluePrintAttributeDefinitionEnhancer
+import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.BluePrintRepoService
import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.BluePrintTypeEnhancerService
import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintContext
-import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintRepoService
class BluePrintAttributeDefinitionEnhancerImpl(private val bluePrintRepoService: BluePrintRepoService,
private val bluePrintTypeEnhancerService: BluePrintTypeEnhancerService)
import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintException\r
import org.onap.ccsdk.apps.controllerblueprints.core.data.ServiceTemplate\r
import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.BluePrintEnhancerService\r
+import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.BluePrintRepoService\r
import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.BluePrintTypeEnhancerService\r
import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintContext\r
-import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintRepoService\r
import org.onap.ccsdk.apps.controllerblueprints.core.utils.BluePrintFileUtils\r
import org.onap.ccsdk.apps.controllerblueprints.core.utils.BluePrintMetadataUtils\r
+import org.springframework.stereotype.Service\r
\r
+@Service\r
open class BluePrintEnhancerServiceImpl(private val bluePrintRepoService: BluePrintRepoService,\r
private val bluePrintTypeEnhancerService: BluePrintTypeEnhancerService) : BluePrintEnhancerService {\r
\r
\r
@Throws(BluePrintException::class)\r
override fun enhance(basePath: String): BluePrintContext {\r
+ log.info("Enhancing blueprint($basePath)")\r
val bluePrintContext = BluePrintMetadataUtils.getBluePrintContext(basePath)\r
val error = BluePrintError()\r
bluePrintTypeEnhancerService.enhanceServiceTemplate(bluePrintContext, error, "service_template",\r
package org.onap.ccsdk.apps.controllerblueprints.service.enhancer
+import com.att.eelf.configuration.EELFLogger
+import com.att.eelf.configuration.EELFManager
import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintError
import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintException
import org.onap.ccsdk.apps.controllerblueprints.core.data.ArtifactType
import org.onap.ccsdk.apps.controllerblueprints.core.data.NodeType
import org.onap.ccsdk.apps.controllerblueprints.core.format
import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.BluePrintNodeTemplateEnhancer
+import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.BluePrintRepoService
import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.BluePrintTypeEnhancerService
import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintContext
-import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintRepoService
import org.springframework.beans.factory.config.ConfigurableBeanFactory
import org.springframework.context.annotation.Scope
import org.springframework.stereotype.Service
private val bluePrintTypeEnhancerService: BluePrintTypeEnhancerService)
: BluePrintNodeTemplateEnhancer {
+ private val log: EELFLogger = EELFManager.getInstance().getLogger(BluePrintNodeTemplateEnhancerImpl::class.toString())
lateinit var bluePrintContext: BluePrintContext
lateinit var error: BluePrintError
override fun enhance(bluePrintContext: BluePrintContext, error: BluePrintError, name: String, nodeTemplate: NodeTemplate) {
+ log.info("Enhancing NodeTemplate($name)")
this.bluePrintContext = bluePrintContext
this.error = error
import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.BluePrintNodeTypeEnhancer
import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.BluePrintTypeEnhancerService
import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintContext
-import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintRepoService
+import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.BluePrintRepoService
import org.springframework.beans.factory.config.ConfigurableBeanFactory
import org.springframework.context.annotation.Scope
import org.springframework.stereotype.Service
import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.BluePrintPolicyTypeEnhancer
import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.BluePrintTypeEnhancerService
import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintContext
-import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintRepoService
+import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.BluePrintRepoService
import org.springframework.beans.factory.config.ConfigurableBeanFactory
import org.springframework.context.annotation.Scope
import org.springframework.stereotype.Service
private val bluePrintTypeEnhancerService: BluePrintTypeEnhancerService)
: BluePrintPolicyTypeEnhancer {
+ lateinit var bluePrintContext: BluePrintContext
+ lateinit var error: BluePrintError
+
override fun enhance(bluePrintContext: BluePrintContext, error: BluePrintError, name: String, type: PolicyType) {
- TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+
+ this.bluePrintContext = bluePrintContext
+ this.error = error
+
+ // TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
}
}
\ No newline at end of file
import org.onap.ccsdk.apps.controllerblueprints.core.data.PropertyDefinition
import org.onap.ccsdk.apps.controllerblueprints.core.format
import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.BluePrintPropertyDefinitionEnhancer
+import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.BluePrintRepoService
import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.BluePrintTypeEnhancerService
import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintContext
-import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintRepoService
import org.springframework.beans.factory.config.ConfigurableBeanFactory
import org.springframework.context.annotation.Scope
import org.springframework.stereotype.Service
import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintError
import org.onap.ccsdk.apps.controllerblueprints.core.data.ServiceTemplate
+import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.BluePrintRepoService
import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.BluePrintServiceTemplateEnhancer
import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.BluePrintTypeEnhancerService
import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintContext
-import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintRepoService
import org.springframework.beans.factory.config.ConfigurableBeanFactory
import org.springframework.context.annotation.Scope
import org.springframework.stereotype.Service
import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintError
import org.onap.ccsdk.apps.controllerblueprints.core.data.TopologyTemplate
+import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.BluePrintRepoService
import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.BluePrintTopologyTemplateEnhancer
import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.BluePrintTypeEnhancerService
import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintContext
-import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintRepoService
import org.springframework.beans.factory.config.ConfigurableBeanFactory
import org.springframework.context.annotation.Scope
import org.springframework.stereotype.Service
enhanceTopologyTemplateInputs(type)
enhanceTopologyTemplateNodeTemplates(type)
+ enhanceTopologyTemplateWorkflowss(type)
}
open fun enhanceTopologyTemplateInputs(topologyTemplate: TopologyTemplate) {
bluePrintTypeEnhancerService.enhanceNodeTemplate(bluePrintContext, error, nodeTemplateName, nodeTemplate)
}
}
+
+ open fun enhanceTopologyTemplateWorkflowss(topologyTemplate: TopologyTemplate) {
+ topologyTemplate.workflows?.forEach { workflowName, workflow ->
+ bluePrintTypeEnhancerService.enhanceWorkflow(bluePrintContext, error, workflowName, workflow)
+ }
+ }
+
}
\ No newline at end of file
--- /dev/null
+/*
+ * Copyright © 2017-2018 AT&T Intellectual Property.
+ *
+ * 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
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.onap.ccsdk.apps.controllerblueprints.service.enhancer
+
+import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.*
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.context.ApplicationContext
+import org.springframework.stereotype.Service
+
+@Service
+open class BluePrintTypeEnhancerServiceImpl : BluePrintTypeEnhancerService {
+
+ @Autowired
+ private lateinit var context: ApplicationContext
+
+ override fun getServiceTemplateEnhancers(): List<BluePrintServiceTemplateEnhancer> {
+ return context.getBeansOfType(BluePrintServiceTemplateEnhancer::class.java).map { it.value }
+ }
+
+ override fun getTopologyTemplateEnhancers(): List<BluePrintTopologyTemplateEnhancer> {
+ return context.getBeansOfType(BluePrintTopologyTemplateEnhancer::class.java).map { it.value }
+ }
+
+ override fun getWorkflowEnhancers(): List<BluePrintWorkflowEnhancer> {
+ return context.getBeansOfType(BluePrintWorkflowEnhancer::class.java).map { it.value }
+ }
+
+ override fun getNodeTemplateEnhancers(): List<BluePrintNodeTemplateEnhancer> {
+ return context.getBeansOfType(BluePrintNodeTemplateEnhancer::class.java).map { it.value }
+ }
+
+ override fun getNodeTypeEnhancers(): List<BluePrintNodeTypeEnhancer> {
+ return context.getBeansOfType(BluePrintNodeTypeEnhancer::class.java).map { it.value }
+ }
+
+ override fun getPolicyTypeEnhancers(): List<BluePrintPolicyTypeEnhancer> {
+ return context.getBeansOfType(BluePrintPolicyTypeEnhancer::class.java).map { it.value }
+ }
+
+ override fun getPropertyDefinitionEnhancers(): List<BluePrintPropertyDefinitionEnhancer> {
+ return context.getBeansOfType(BluePrintPropertyDefinitionEnhancer::class.java).map { it.value }
+ }
+
+ override fun getAttributeDefinitionEnhancers(): List<BluePrintAttributeDefinitionEnhancer> {
+ return context.getBeansOfType(BluePrintAttributeDefinitionEnhancer::class.java).map { it.value }
+ }
+}
\ No newline at end of file
package org.onap.ccsdk.apps.controllerblueprints.service.enhancer
+import com.att.eelf.configuration.EELFLogger
+import com.att.eelf.configuration.EELFManager
import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintError
import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintProcessorException
import org.onap.ccsdk.apps.controllerblueprints.core.data.DataType
import org.onap.ccsdk.apps.controllerblueprints.core.data.Workflow
+import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.BluePrintRepoService
import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.BluePrintTypeEnhancerService
import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.BluePrintWorkflowEnhancer
import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintContext
-import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintRepoService
import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonUtils
import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceAssignment
import org.springframework.beans.factory.config.ConfigurableBeanFactory
private val bluePrintTypeEnhancerService: BluePrintTypeEnhancerService,
private val resourceAssignmentEnhancerService: ResourceAssignmentEnhancerService)
: BluePrintWorkflowEnhancer {
+ private val log: EELFLogger = EELFManager.getInstance().getLogger(BluePrintNodeTemplateEnhancerImpl::class.toString())
lateinit var bluePrintContext: BluePrintContext
lateinit var error: BluePrintError
private val workflowDataTypes: MutableMap<String, DataType> = hashMapOf()
override fun enhance(bluePrintContext: BluePrintContext, error: BluePrintError, name: String, workflow: Workflow) {
+ log.info("Enhancing Workflow($name)")
this.bluePrintContext = bluePrintContext
this.error = error
// Enrich Only for Resource Assignment and Dynamic Input Properties if any
- enhanceStepTargets(workflow)
+ //enhanceStepTargets(workflow)
// Enrich Workflow Inputs
- enhanceWorkflowInputs(name, workflow)
+ //enhanceWorkflowInputs(name, workflow)
}
open fun enhanceWorkflowInputs(name: String, workflow: Workflow) {
import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceDefinition\r
import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceDictionaryConstants\r
import org.onap.ccsdk.apps.controllerblueprints.resource.dict.factory.ResourceSourceMappingFactory\r
-import org.onap.ccsdk.apps.controllerblueprints.resource.dict.service.ResourceDefinitionRepoService\r
+import org.onap.ccsdk.apps.controllerblueprints.service.ResourceDefinitionRepoService\r
import org.springframework.beans.factory.config.ConfigurableBeanFactory\r
import org.springframework.context.annotation.Scope\r
import org.springframework.stereotype.Service\r
--- /dev/null
+/*
+ * Copyright © 2017-2018 AT&T Intellectual Property.
+ *
+ * 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
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.onap.ccsdk.apps.controllerblueprints.service.load
+
+import org.springframework.stereotype.Service
+
+@Service
+open class BluePrintCatalogLoad {
+
+ open fun loadBluePrintModelCatalog() {
+ // TODO
+ }
+
+}
\ No newline at end of file
--- /dev/null
+/*
+ * Copyright © 2017-2018 AT&T Intellectual Property.
+ *
+ * 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
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.onap.ccsdk.apps.controllerblueprints.service.load
+
+import com.att.eelf.configuration.EELFManager
+import org.apache.commons.io.FilenameUtils
+import org.apache.commons.lang3.text.StrBuilder
+import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintConstants
+import org.onap.ccsdk.apps.controllerblueprints.core.data.ArtifactType
+import org.onap.ccsdk.apps.controllerblueprints.core.data.DataType
+import org.onap.ccsdk.apps.controllerblueprints.core.data.NodeType
+import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonUtils
+import org.onap.ccsdk.apps.controllerblueprints.service.ModelTypeService
+import org.onap.ccsdk.apps.controllerblueprints.service.domain.ModelType
+import org.springframework.stereotype.Service
+import java.io.File
+import java.nio.charset.Charset
+
+@Service
+open class ModelTypeLoadService(private val modelTypeService: ModelTypeService) {
+
+ private val log = EELFManager.getInstance().getLogger(ModelTypeLoadService::class.java)
+ private val updateBySystem = "System"
+
+ open fun loadModelType(modelTypePaths: List<String>) {
+ modelTypePaths.forEach { loadModelType(it) }
+ }
+
+ open fun loadModelType(modelTypePath: String) {
+ log.info(" *************************** loadModelType **********************")
+ try {
+ val errorBuilder = StrBuilder()
+
+ val dataTypeFiles = File("$modelTypePath/data_type").listFiles()
+ dataTypeFiles.forEach { loadDataType(it, errorBuilder) }
+
+ val artifactTypefiles = File("$modelTypePath/artifact_type").listFiles()
+ artifactTypefiles.forEach { loadArtifactType(it, errorBuilder) }
+
+ val nodeTypeFiles = File("$modelTypePath/node_type").listFiles()
+ nodeTypeFiles.forEach { loadNodeType(it, errorBuilder) }
+
+ if (!errorBuilder.isEmpty) {
+ log.error(errorBuilder.toString())
+ }
+ } catch (e: Exception) {
+ log.error("Failed to loade ModelTypes under($modelTypePath)", e)
+ }
+ }
+
+ private fun loadDataType(file: File, errorBuilder: StrBuilder) {
+ try {
+ log.trace("Loading DataType(${file.name}")
+ val dataKey = FilenameUtils.getBaseName(file.name)
+ val definitionContent = file.readText(Charset.defaultCharset())
+ val dataType = JacksonUtils.readValue(definitionContent, DataType::class.java)
+ checkNotNull(dataType) { "failed to get data type from file : ${file.name}" }
+
+ val modelType = ModelType()
+ modelType.definitionType = BluePrintConstants.MODEL_DEFINITION_TYPE_DATA_TYPE
+ modelType.derivedFrom = dataType.derivedFrom
+ modelType.description = dataType.description
+ modelType.definition = JacksonUtils.jsonNode(definitionContent)
+ modelType.modelName = dataKey
+ modelType.version = dataType.version
+ modelType.updatedBy = updateBySystem
+ modelType.tags = (dataKey + "," + dataType.derivedFrom + "," + BluePrintConstants.MODEL_DEFINITION_TYPE_DATA_TYPE)
+ modelTypeService.saveModel(modelType)
+ log.trace("DataType(${file.name}) loaded successfully ")
+ } catch (e: Exception) {
+ errorBuilder.appendln("Couldn't load DataType(${file.name}: ${e.message}")
+ }
+ }
+
+ private fun loadArtifactType(file: File, errorBuilder: StrBuilder) {
+ try {
+ log.trace("Loading ArtifactType(${file.name}")
+ val dataKey = FilenameUtils.getBaseName(file.name)
+ val definitionContent = file.readText(Charset.defaultCharset())
+ val artifactType = JacksonUtils.readValue(definitionContent, ArtifactType::class.java)
+ checkNotNull(artifactType) { "failed to get artifact type from file : ${file.name}" }
+
+ val modelType = ModelType()
+ modelType.definitionType = BluePrintConstants.MODEL_DEFINITION_TYPE_ARTIFACT_TYPE
+ modelType.derivedFrom = artifactType.derivedFrom
+ modelType.description = artifactType.description
+ modelType.definition = JacksonUtils.jsonNode(definitionContent)
+ modelType.modelName = dataKey
+ modelType.version = artifactType.version
+ modelType.updatedBy = updateBySystem
+ modelType.tags = (dataKey + "," + artifactType.derivedFrom + "," + BluePrintConstants.MODEL_DEFINITION_TYPE_ARTIFACT_TYPE)
+ modelTypeService.saveModel(modelType)
+ log.trace("ArtifactType(${file.name}) loaded successfully ")
+ } catch (e: Exception) {
+ errorBuilder.appendln("Couldn't load ArtifactType(${file.name}: ${e.message}")
+ }
+ }
+
+ private fun loadNodeType(file: File, errorBuilder: StrBuilder) {
+ try {
+ log.trace("Loading NodeType(${file.name}")
+ val nodeKey = FilenameUtils.getBaseName(file.name)
+ val definitionContent = file.readText(Charset.defaultCharset())
+ val nodeType = JacksonUtils.readValue(definitionContent, NodeType::class.java)
+ checkNotNull(nodeType) { "failed to get node type from file : ${file.name}" }
+
+ val modelType = ModelType()
+ modelType.definitionType = BluePrintConstants.MODEL_DEFINITION_TYPE_NODE_TYPE
+ modelType.derivedFrom = nodeType.derivedFrom
+ modelType.description = nodeType.description
+ modelType.definition = JacksonUtils.jsonNode(definitionContent)
+ modelType.modelName = nodeKey
+ modelType.version = nodeType.version
+ modelType.updatedBy = updateBySystem
+ modelType.tags = (nodeKey + "," + BluePrintConstants.MODEL_DEFINITION_TYPE_NODE_TYPE + "," + nodeType.derivedFrom)
+ modelTypeService.saveModel(modelType)
+ log.trace("NodeType(${file.name}) loaded successfully ")
+ } catch (e: Exception) {
+ errorBuilder.appendln("Couldn't load NodeType(${file.name}: ${e.message}")
+ }
+ }
+
+}
\ No newline at end of file
--- /dev/null
+/*
+ * Copyright © 2017-2018 AT&T Intellectual Property.
+ *
+ * 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
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.onap.ccsdk.apps.controllerblueprints.service.load
+
+import com.att.eelf.configuration.EELFManager
+import org.apache.commons.lang3.StringUtils
+import org.apache.commons.lang3.text.StrBuilder
+import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintException
+import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonUtils
+import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceDefinition
+import org.onap.ccsdk.apps.controllerblueprints.service.ResourceDictionaryService
+import org.onap.ccsdk.apps.controllerblueprints.service.domain.ResourceDictionary
+import org.springframework.stereotype.Service
+import java.io.File
+import java.nio.charset.Charset
+
+@Service
+open class ResourceDictionaryLoadService(private val resourceDictionaryService: ResourceDictionaryService) {
+
+ private val log = EELFManager.getInstance().getLogger(ResourceDictionaryLoadService::class.java)
+
+ open fun loadResourceDictionary(resourceDictionaryPaths: List<String>) {
+ resourceDictionaryPaths.forEach { loadResourceDictionary(it) }
+ }
+
+ open fun loadResourceDictionary(resourceDictionaryPath: String) {
+ log.info(" *************************** loadResourceDictionary **********************")
+ val resourceDictionaries = File(resourceDictionaryPath).listFiles()
+ val errorBuilder = StrBuilder()
+
+ resourceDictionaries.forEach { file ->
+ try {
+ log.trace("Loading NodeType(${file.name}")
+ val definitionContent = file.readText(Charset.defaultCharset())
+ val resourceDefinition = JacksonUtils.readValue(definitionContent, ResourceDefinition::class.java)
+ if (resourceDefinition != null) {
+
+ checkNotNull(resourceDefinition.property) { "Failed to get Property Definition" }
+ val resourceDictionary = ResourceDictionary()
+ resourceDictionary.name = resourceDefinition.name
+ resourceDictionary.definition = resourceDefinition
+
+ checkNotNull(resourceDefinition.property) { "Property field is missing" }
+ resourceDictionary.description = resourceDefinition.property.description
+ resourceDictionary.dataType = resourceDefinition.property.type
+
+ if (resourceDefinition.property.entrySchema != null) {
+ resourceDictionary.entrySchema = resourceDefinition.property.entrySchema!!.type
+ }
+ resourceDictionary.updatedBy = resourceDefinition.updatedBy
+
+ if (StringUtils.isBlank(resourceDefinition.tags)) {
+ resourceDictionary.tags = (resourceDefinition.name + ", " + resourceDefinition.updatedBy
+ + ", " + resourceDefinition.updatedBy)
+
+ } else {
+ resourceDictionary.tags = resourceDefinition.tags
+ }
+ resourceDictionaryService.saveResourceDictionary(resourceDictionary)
+
+ log.trace("Resource dictionary(${file.name}) loaded successfully ")
+ } else {
+ throw BluePrintException("couldn't get dictionary from content information")
+ }
+ } catch (e: Exception) {
+ errorBuilder.appendln("Couldn't load Resource dictionary (${file.name}: ${e.message}")
+ }
+ }
+ if (!errorBuilder.isEmpty) {
+ log.error(errorBuilder.toString())
+ }
+ }
+
+}
\ No newline at end of file
--- /dev/null
+/*
+ * Copyright © 2017-2018 AT&T Intellectual Property.
+ *
+ * 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
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.onap.ccsdk.apps.controllerblueprints.service.enhancer;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.onap.ccsdk.apps.controllerblueprints.TestApplication;
+import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.BluePrintEnhancerService;
+import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintContext;
+import org.onap.ccsdk.apps.controllerblueprints.service.load.ModelTypeLoadService;
+import org.onap.ccsdk.apps.controllerblueprints.service.load.ResourceDictionaryLoadService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@ContextConfiguration(classes = {TestApplication.class})
+@TestPropertySource(locations = {"classpath:application.properties"})
+public class BluePrintEnhancerServiceImplTest {
+
+ @Autowired
+ private ModelTypeLoadService modelTypeLoadService;
+
+ @Autowired
+ private ResourceDictionaryLoadService resourceDictionaryLoadService;
+
+ @Autowired
+ private BluePrintEnhancerService bluePrintEnhancerService;
+
+ @Before
+ public void init() {
+ modelTypeLoadService.loadModelType("./../../../../components/model-catalog/definition-type/starter-type");
+ resourceDictionaryLoadService.loadResourceDictionary("./../../../../components/model-catalog/resource-dictionary/starter-dictionary");
+ }
+
+ @Test
+ public void testEnhancement() throws Exception {
+
+ String basePath = "./../../../../components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration";
+
+ BluePrintContext bluePrintContext = bluePrintEnhancerService.enhance(basePath);
+ Assert.assertNotNull("failed to get blueprintContext ", bluePrintContext);
+
+ }
+}
\ No newline at end of file
\r
import com.att.eelf.configuration.EELFLogger;\r
import com.att.eelf.configuration.EELFManager;\r
+import org.junit.Assert;\r
import org.junit.Before;\r
import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintException;\r
+import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonUtils;\r
+import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceAssignment;\r
import org.onap.ccsdk.apps.controllerblueprints.resource.dict.utils.ResourceDictionaryTestUtils;\r
\r
+import java.util.List;\r
+\r
/**\r
* ResourceAssignmentEnhancerService.\r
*\r
\r
//@Test\r
public void testEnhanceBluePrint() throws BluePrintException {\r
- /*\r
- FIXME("Test Once Implemented")\r
\r
- List<ResourceAssignment> resourceAssignments = JacksonUtils\r
- .getListFromClassPathFile("enhance/enhance-resource-assignment.json", ResourceAssignment.class);\r
+\r
+ List<ResourceAssignment> resourceAssignments = JacksonUtils.getListFromClassPathFile("enhance/enhance-resource-assignment.json", ResourceAssignment.class);\r
Assert.assertNotNull("Failed to get Resource Assignment", resourceAssignments);\r
\r
- ResourceDefinitionRepoService resourceDefinitionRepoService = new ResourceDefinitionFileRepoService("./../../../../components/model-catalog");\r
- ResourceAssignmentEnhancerService resourceAssignmentEnhancerService =\r
- new ResourceAssignmentEnhancerDefaultService(resourceDefinitionRepoService);\r
- ServiceTemplate serviceTemplate = resourceAssignmentEnhancerService.enhanceBluePrint(resourceAssignments);\r
- Assert.assertNotNull("Failed to get Enriched service Template", serviceTemplate);\r
- log.trace("Enhanced Service Template : {}", JacksonUtils.getJson(serviceTemplate, true));\r
- */\r
+// ResourceDefinitionRepoService resourceDefinitionRepoService = new ResourceDefinitionFileRepoService("./../../../../components/model-catalog");\r
+// ResourceAssignmentEnhancerService resourceAssignmentEnhancerService = new ResourceAssignmentEnhancerServiceImpl(resourceDefinitionRepoService);\r
+// ServiceTemplate serviceTemplate = resourceAssignmentEnhancerService.enhanceBluePrint(resourceAssignments);\r
+// Assert.assertNotNull("Failed to get Enriched service Template", serviceTemplate);\r
+// log.trace("Enhanced Service Template : {}", JacksonUtils.getJson(serviceTemplate, true));\r
+\r
}\r
}\r
\r
}\r
\r
\r
+ @Deprecated\r
@Test\r
public void test02SaveServiceTemplate() throws Exception {\r
log.info("************************ test02SaveServiceTemplate ******************");\r
}\r
\r
\r
+ @Deprecated\r
@Test\r
public void test04GetConfigModel() throws Exception {\r
log.info("** test04GetConfigModel *****************");\r
\r
}\r
\r
+ @Deprecated\r
@Test\r
public void test05GetCloneConfigModel() throws Exception {\r
log.info("** test05GetCloneConfigModel *****************");\r
import java.nio.charset.Charset;\r
import java.util.List;\r
\r
-\r
+@Deprecated\r
@RunWith(SpringRunner.class)\r
@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = {"blueprints.load.initial-data=true"})\r
@ContextConfiguration(classes = {TestApplication.class})\r
@Autowired\r
private ServiceTemplateRest serviceTemplateRest;\r
\r
- @Test\r
+ //@Test FIXME("Enable once Complete Enhancement Service Implemented")\r
public void test02EnrichServiceTemplate() throws Exception {\r
log.info("*********** test02EnrichServiceTemplate ***********************");\r
String file = "src/test/resources/enhance/enhance-template.json";\r
Code Review / ccsdk / cds.git / commitdiff