diff options
Diffstat (limited to 'src/main/java/org/onap/clamp/loop/service/CsarServiceInstaller.java')
-rw-r--r-- | src/main/java/org/onap/clamp/loop/service/CsarServiceInstaller.java | 54 |
1 files changed, 0 insertions, 54 deletions
diff --git a/src/main/java/org/onap/clamp/loop/service/CsarServiceInstaller.java b/src/main/java/org/onap/clamp/loop/service/CsarServiceInstaller.java index 6db6d920f..c43f2cb6d 100644 --- a/src/main/java/org/onap/clamp/loop/service/CsarServiceInstaller.java +++ b/src/main/java/org/onap/clamp/loop/service/CsarServiceInstaller.java @@ -28,9 +28,7 @@ import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import com.google.gson.JsonObject; import java.util.Map.Entry; -import org.onap.clamp.clds.client.CdsServices; import org.onap.clamp.clds.exception.sdc.controller.SdcArtifactInstallerException; -import org.onap.clamp.clds.model.cds.CdsBpWorkFlowListResponse; import org.onap.clamp.clds.sdc.controller.installer.CsarHandler; import org.onap.clamp.clds.util.JsonUtils; import org.onap.sdc.tosca.parser.api.IEntityDetails; @@ -54,9 +52,6 @@ public class CsarServiceInstaller { @Autowired ServicesRepository serviceRepository; - @Autowired - CdsServices cdsServices; - /** * Install the Service from the csar. * @@ -90,14 +85,6 @@ public class CsarServiceInstaller { for (NodeTemplate nodeTemplate : csar.getSdcCsarHelper().getServiceNodeTemplateBySdcType(type)) { resourcesPropByType.add(nodeTemplate.getName(), JsonUtils.GSON.toJsonTree(nodeTemplate.getMetaData().getAllProperties())); - // get cds artifact information and save in resources Prop - if (SdcTypes.PNF == type || SdcTypes.VF == type) { - JsonObject controllerProperties = createCdsArtifactProperties(nodeTemplate); - if (controllerProperties != null) { - resourcesPropByType.getAsJsonObject(nodeTemplate.getName()) - .add("controllerProperties", controllerProperties); - } - } } resourcesProp.add(type.getValue(), resourcesPropByType); } @@ -139,45 +126,4 @@ public class CsarServiceInstaller { return alreadyInstalled; } - - /** - * Retrive CDS artifacts information from node template and save in resource object. - * - * @param nodeTemplate node template - * @return Returns CDS artifacts information - */ - private JsonObject createCdsArtifactProperties(NodeTemplate nodeTemplate) { - Object artifactName = nodeTemplate.getPropertyValue("sdnc_model_name"); - Object artifactVersion = nodeTemplate.getPropertyValue("sdnc_model_version"); - if (artifactName != null && artifactVersion != null) { - CdsBpWorkFlowListResponse response = - queryCdsToGetWorkFlowList(artifactName.toString(), artifactVersion.toString()); - if (response == null) { - return null; - } - - JsonObject workFlowProps = new JsonObject(); - for (String workFlow : response.getWorkflows()) { - JsonObject inputs = queryCdsToGetWorkFlowInputProperties(response.getBlueprintName(), - response.getVersion(), workFlow); - workFlowProps.add(workFlow, inputs); - } - - JsonObject controllerProperties = new JsonObject(); - controllerProperties.addProperty("sdnc_model_name", artifactName.toString()); - controllerProperties.addProperty("sdnc_model_version", artifactVersion.toString()); - controllerProperties.add("workflows", workFlowProps); - return controllerProperties; - } - return null; - } - - private CdsBpWorkFlowListResponse queryCdsToGetWorkFlowList(String artifactName, String artifactVersion) { - return cdsServices.getBlueprintWorkflowList(artifactName, artifactVersion); - } - - private JsonObject queryCdsToGetWorkFlowInputProperties(String artifactName, String artifactVersion, - String workFlow) { - return cdsServices.getWorkflowInputProperties(artifactName, artifactVersion, workFlow); - } } |