X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=mecm%2Fmepm%2Fapplcm%2Fbroker%2Fpkg%2Fhandlers%2FhandlersImpl.go;h=282d5b0129a9c2dbce810d3e8a83ff9913024796;hb=246be669d7a8109bfc7ce3d7101268a248854be4;hp=83594eca328d1b456565b8e1698670faf3c33629;hpb=03c5aa6fb40816544dc88e903509ba7e84e32307;p=ealt-edge.git diff --git a/mecm/mepm/applcm/broker/pkg/handlers/handlersImpl.go b/mecm/mepm/applcm/broker/pkg/handlers/handlersImpl.go index 83594ec..282d5b0 100644 --- a/mecm/mepm/applcm/broker/pkg/handlers/handlersImpl.go +++ b/mecm/mepm/applcm/broker/pkg/handlers/handlersImpl.go @@ -297,6 +297,7 @@ func (impl *HandlerImpl) InstantiateAppInstance(w http.ResponseWriter, r *http.R return } pluginInfo = "helm.plugin" + ":" + os.Getenv("HELM_PLUGIN_PORT") + impl.logger.Infof("Plugin Info ", pluginInfo) case "kubernetes": pkgPath := PackageFolderPath + packageName + PackageArtifactPath + "Kubernetes" artifact = impl.getDeploymentArtifact(pkgPath, "*.yaml") @@ -312,7 +313,7 @@ func (impl *HandlerImpl) InstantiateAppInstance(w http.ResponseWriter, r *http.R impl.logger.Infof("Artifact to deploy:", artifact) adapter := pluginAdapter.NewPluginAdapter(pluginInfo, impl.logger) - workloadId, err := adapter.Instantiate(pluginInfo, req.SelectedMECHostInfo.HostID, artifact) + workloadId, err, resStatus := adapter.Instantiate(pluginInfo, req.SelectedMECHostInfo.HostID, artifact) if err != nil { st, ok := status.FromError(err) if ok && st.Code() == codes.InvalidArgument { @@ -322,9 +323,13 @@ func (impl *HandlerImpl) InstantiateAppInstance(w http.ResponseWriter, r *http.R respondError(w, http.StatusInternalServerError, err.Error()) } } - impl.dbAdapter.UpdateAppInstanceInfoInstStatusHostAndWorkloadId(appInstanceId, "INSTANTIATED", req.SelectedMECHostInfo.HostID, workloadId) - respondJSON(w, http.StatusAccepted, json.NewEncoder(w).Encode("")) + if resStatus == "Failure" { + respondError(w, http.StatusInternalServerError, err.Error()) + } + + impl.dbAdapter.UpdateAppInstanceInfoInstStatusHostAndWorkloadId(appInstanceId, "INSTANTIATED", req.SelectedMECHostInfo.HostID, workloadId) + respondJSON(w, http.StatusAccepted, json.NewEncoder(w).Encode(workloadId)) } // Gets deployment artifact