From aef5d4ba9128c0cc4418b6dd9e12533b3d76bc84 Mon Sep 17 00:00:00 2001 From: xg353y Date: Mon, 11 Feb 2019 13:50:16 +0100 Subject: Remove SDC query Remove the query to SDC to get Service/VF related parameters. Also remove the UI which triggers the SDC query. Issue-ID: CLAMP-290 Change-Id: Ie7864942b91c022a3a7329c17ab2785448aae9ff Signed-off-by: xg353y --- .../clds/client/req/sdc/SdcCatalogServices.java | 1050 -------------------- .../clamp/clds/client/req/sdc/SdcRequests.java | 227 ----- src/main/java/org/onap/clamp/clds/dao/CldsDao.java | 39 - .../org/onap/clamp/clds/service/CldsService.java | 95 +- .../partials/portfolios/global_properties.html | 92 +- .../designer/partials/portfolios/refresh_asdc.html | 146 --- .../resources/designer/scripts/CldsModelService.js | 36 - .../designer/scripts/CldsOpenModelCtrl.js | 7 - .../designer/scripts/GlobalPropertiesCtrl.js | 10 +- .../META-INF/resources/designer/scripts/aOnBoot.js | 108 +- .../META-INF/resources/designer/scripts/app.js | 23 - src/main/resources/META-INF/resources/swagger.html | 383 +++---- src/main/resources/application-noaaf.properties | 17 - src/main/resources/application.properties | 18 - .../resources/clds/camel/rest/clds-services.xml | 10 - .../clds/templates/sdc-decode-service_ids.json | 1 - .../resources/clds/templates/sdc-template.json | 1 - .../java/org/onap/clamp/clds/it/CldsDaoItCase.java | 34 - .../org/onap/clamp/clds/it/CldsServiceItCase.java | 36 - .../clamp/clds/it/SdcCatalogServicesItCase.java | 305 ------ .../java/org/onap/clamp/clds/it/SdcReqItCase.java | 106 -- .../it/config/CldsReferencePropertiesItCase.java | 9 +- src/test/resources/application.properties | 17 - 23 files changed, 155 insertions(+), 2615 deletions(-) delete mode 100644 src/main/java/org/onap/clamp/clds/client/req/sdc/SdcCatalogServices.java delete mode 100644 src/main/java/org/onap/clamp/clds/client/req/sdc/SdcRequests.java delete mode 100644 src/main/resources/META-INF/resources/designer/partials/portfolios/refresh_asdc.html delete mode 100644 src/main/resources/clds/templates/sdc-decode-service_ids.json delete mode 100644 src/main/resources/clds/templates/sdc-template.json delete mode 100644 src/test/java/org/onap/clamp/clds/it/SdcCatalogServicesItCase.java delete mode 100644 src/test/java/org/onap/clamp/clds/it/SdcReqItCase.java (limited to 'src') diff --git a/src/main/java/org/onap/clamp/clds/client/req/sdc/SdcCatalogServices.java b/src/main/java/org/onap/clamp/clds/client/req/sdc/SdcCatalogServices.java deleted file mode 100644 index 37c62576..00000000 --- a/src/main/java/org/onap/clamp/clds/client/req/sdc/SdcCatalogServices.java +++ /dev/null @@ -1,1050 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP CLAMP - * ================================================================================ - * Copyright (C) 2017-2018 AT&T Intellectual Property. 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. - * 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. - * ============LICENSE_END============================================ - * Modifications copyright (c) 2018 Nokia - * =================================================================== - * - */ - -package org.onap.clamp.clds.client.req.sdc; - -import com.att.eelf.configuration.EELFLogger; -import com.att.eelf.configuration.EELFManager; - -import com.google.gson.JsonArray; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.JsonParseException; -import com.google.gson.reflect.TypeToken; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.Reader; -import java.io.StringReader; -import java.lang.reflect.Type; -import java.net.HttpURLConnection; -import java.net.URL; -import java.nio.charset.StandardCharsets; -import java.security.GeneralSecurityException; -import java.util.ArrayList; -import java.util.Base64; -import java.util.Collections; -import java.util.Date; -import java.util.Iterator; -import java.util.List; - -import org.apache.commons.codec.DecoderException; -import org.apache.commons.csv.CSVFormat; -import org.apache.commons.csv.CSVRecord; -import org.apache.commons.io.IOUtils; -import org.apache.commons.lang3.StringUtils; -import org.apache.http.HttpHeaders; -import org.onap.clamp.clds.config.ClampProperties; -import org.onap.clamp.clds.exception.sdc.SdcCommunicationException; -import org.onap.clamp.clds.model.CldsAlarmCondition; -import org.onap.clamp.clds.model.CldsServiceData; -import org.onap.clamp.clds.model.CldsVfData; -import org.onap.clamp.clds.model.CldsVfKPIData; -import org.onap.clamp.clds.model.CldsVfcData; -import org.onap.clamp.clds.model.sdc.SdcResource; -import org.onap.clamp.clds.model.sdc.SdcResourceBasicInfo; -import org.onap.clamp.clds.model.sdc.SdcServiceDetail; -import org.onap.clamp.clds.model.sdc.SdcServiceInfo; -import org.onap.clamp.clds.service.CldsService; -import org.onap.clamp.clds.util.CryptoUtils; -import org.onap.clamp.clds.util.JsonUtils; -import org.onap.clamp.clds.util.LoggingUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Primary; -import org.springframework.stereotype.Component; - -@Component -@Primary -public class SdcCatalogServices { - - private static final EELFLogger logger = EELFManager.getInstance().getLogger(SdcCatalogServices.class); - private static final EELFLogger metricsLogger = EELFManager.getInstance().getMetricsLogger(); - private static final String RESOURCE_VF_TYPE = "VF"; - private static final String RESOURCE_VFC_TYPE = "VFC"; - private static final String RESOURCE_CVFC_TYPE = "CVFC"; - private static final String SDC_REQUESTID_PROPERTY_NAME = "sdc.header.requestId"; - private static final String SDC_METADATA_URL_PREFIX = "/metadata"; - private static final String SDC_INSTANCE_ID_PROPERTY_NAME = "sdc.InstanceID"; - private static final String SDC_CATALOG_URL_PROPERTY_NAME = "sdc.catalog.url"; - private static final String SDC_SERVICE_URL_PROPERTY_NAME = "sdc.serviceUrl"; - private static final String SDC_INSTANCE_ID_CLAMP = "CLAMP-Tool"; - private static final String RESOURCE_URL_PREFIX = "resources"; - private static final LoggingUtils utils = new LoggingUtils(logger); - - private static final Type LIST_SDC_SERVICE_INFO_TYPE = new TypeToken>() { - }.getType(); - - private static final Type LIST_SDC_RESOURCE_BASIC_INFO_TYPE = new TypeToken>() { - }.getType(); - - @Autowired - private ClampProperties refProp; - - /** - * Return SDC id and pw as a HTTP Basic Auth string (for example: Basic - * dGVzdDoxMjM0NTY=). - * - * @return The String with Basic Auth and password - * @throws GeneralSecurityException - * In case of issue when decryting the SDC password - * @throws DecoderException - * In case of issues with the decoding of the HexString message - */ - public String getSdcBasicAuth() throws GeneralSecurityException, DecoderException { - String sdcId = refProp.getStringValue("sdc.serviceUsername"); - String sdcPw = refProp.getStringValue("sdc.servicePassword"); - String password = CryptoUtils.decrypt(sdcPw); - String idPw = Base64.getEncoder().encodeToString((sdcId + ":" + password).getBytes(StandardCharsets.UTF_8)); - return "Basic " + idPw; - } - - /** - * This method get the SDC services Information with the corresponding Service - * UUID. - * - * @param uuid - * The service UUID - * @return A Json String with all the service list - * @throws GeneralSecurityException - * In case of issue when decryting the SDC password - * @throws DecoderException - * In case of issues with the decoding of the Hex String - */ - public String getSdcServicesInformation(String uuid) throws GeneralSecurityException, DecoderException { - Date startTime = new Date(); - String baseUrl = refProp.getStringValue(SDC_SERVICE_URL_PROPERTY_NAME); - String basicAuth = getSdcBasicAuth(); - try { - String url = baseUrl; - if (uuid != null && !uuid.isEmpty()) { - url = baseUrl + "/" + uuid + SDC_METADATA_URL_PREFIX; - } - URL urlObj = new URL(url); - HttpURLConnection conn = (HttpURLConnection) urlObj.openConnection(); - conn = utils.invoke(conn, "SDC", "getSdcServicesInformation"); - conn.setRequestProperty(refProp.getStringValue(SDC_INSTANCE_ID_PROPERTY_NAME), SDC_INSTANCE_ID_CLAMP); - conn.setRequestProperty(HttpHeaders.AUTHORIZATION, basicAuth); - conn.setRequestProperty(HttpHeaders.CONTENT_TYPE, "application/json;charset=UTF-8"); - conn.setRequestProperty(refProp.getStringValue(SDC_REQUESTID_PROPERTY_NAME), LoggingUtils.getRequestId()); - conn.setRequestMethod("GET"); - String resp = getResponse(conn); - logger.debug("Services list received from SDC:" + resp); - utils.invokeReturn(); - return resp; - } catch (IOException e) { - LoggingUtils.setResponseContext("900", "Get sdc services failed", this.getClass().getName()); - LoggingUtils.setErrorContext("900", "Get sdc services error"); - logger.error("not able to get any service information from sdc for uuid:" + uuid, e); - } finally { - LoggingUtils.setTimeContext(startTime, new Date()); - metricsLogger.info("getSdcServicesInformation complete"); - } - utils.invokeReturn(); - return ""; - } - - /** - * To remove duplicate serviceUUIDs from sdc services List. - * - * @param rawCldsSdcServiceList - * A list of CldsSdcServiceInfo - * @return A list of CldsSdcServiceInfo without duplicate service UUID - */ - public List removeDuplicateServices(List rawCldsSdcServiceList) { - List cldsSdcServiceInfoList = null; - if (rawCldsSdcServiceList != null && !rawCldsSdcServiceList.isEmpty()) { - // sort list - Collections.sort(rawCldsSdcServiceList); - // and then take only the services with the max version (last in the - // list with the same name) - cldsSdcServiceInfoList = new ArrayList<>(); - for (int i = 1; i < rawCldsSdcServiceList.size(); i++) { - // compare name with previous - if not equal, then keep the - // previous (it's the last with that name) - SdcServiceInfo prev = rawCldsSdcServiceList.get(i - 1); - if (!rawCldsSdcServiceList.get(i).getName().equals(prev.getName())) { - cldsSdcServiceInfoList.add(prev); - } - } - // add the last in the list - cldsSdcServiceInfoList.add(rawCldsSdcServiceList.get(rawCldsSdcServiceList.size() - 1)); - } - return cldsSdcServiceInfoList; - } - - /** - * To remove duplicate serviceUUIDs from sdc resources List. - * - * @param rawCldsSdcResourceList - * @return List of CldsSdcResource - */ - public List removeDuplicateSdcResourceInstances(List rawCldsSdcResourceList) { - List cldsSdcResourceList = null; - if (rawCldsSdcResourceList != null && !rawCldsSdcResourceList.isEmpty()) { - // sort list - Collections.sort(rawCldsSdcResourceList); - // and then take only the resources with the max version (last in - // the list with the same name) - cldsSdcResourceList = new ArrayList<>(); - for (int i = 1; i < rawCldsSdcResourceList.size(); i++) { - // compare name with previous - if not equal, then keep the - // previous (it's the last with that name) - SdcResource prev = rawCldsSdcResourceList.get(i - 1); - if (!rawCldsSdcResourceList.get(i).getResourceInstanceName().equals(prev.getResourceInstanceName())) { - cldsSdcResourceList.add(prev); - } - } - // add the last in the list - cldsSdcResourceList.add(rawCldsSdcResourceList.get(rawCldsSdcResourceList.size() - 1)); - } - return cldsSdcResourceList; - } - - /** - * To remove duplicate basic resources with same resourceUUIDs. - * - * @param rawCldsSdcResourceListBasicList - * @return List of CldsSdcResourceBasicInfo - */ - public List removeDuplicateSdcResourceBasicInfo( - List rawCldsSdcResourceListBasicList) { - List cldsSdcResourceBasicInfoList = new ArrayList<>(); - if (rawCldsSdcResourceListBasicList != null && !rawCldsSdcResourceListBasicList.isEmpty()) { - // sort list - Collections.sort(rawCldsSdcResourceListBasicList); - // and then take only the resources with the max version (last in - // the list with the same name) - for (int i = 1; i < rawCldsSdcResourceListBasicList.size(); i++) { - // compare name with previous - if not equal, then keep the - // previous (it's the last with that name) - SdcResourceBasicInfo prev = rawCldsSdcResourceListBasicList.get(i - 1); - if (!rawCldsSdcResourceListBasicList.get(i).getName().equals(prev.getName())) { - cldsSdcResourceBasicInfoList.add(prev); - } - } - // add the last in the list - cldsSdcResourceBasicInfoList - .add(rawCldsSdcResourceListBasicList.get(rawCldsSdcResourceListBasicList.size() - 1)); - } - return cldsSdcResourceBasicInfoList; - } - - /** - * To get ServiceUUID by using serviceInvariantUUID. - * - * @param invariantId - * The invariant ID - * @return The service UUID - * @throws GeneralSecurityException - * In case of issue when decryting the SDC password - * @throws DecoderException - * In case of issues with the decoding of the Hex String - */ - public String getServiceUuidFromServiceInvariantId(String invariantId) - throws GeneralSecurityException, DecoderException { - String serviceUuid = ""; - String responseStr = getSdcServicesInformation(null); - List rawCldsSdcServicesList = getCldsSdcServicesListFromJson(responseStr); - List cldsSdcServicesList = removeDuplicateServices(rawCldsSdcServicesList); - if (cldsSdcServicesList != null && !cldsSdcServicesList.isEmpty()) { - for (SdcServiceInfo currCldsSdcServiceInfo : cldsSdcServicesList) { - if (currCldsSdcServiceInfo != null && currCldsSdcServiceInfo.getInvariantUUID() != null - && currCldsSdcServiceInfo.getInvariantUUID().equalsIgnoreCase(invariantId)) { - serviceUuid = currCldsSdcServiceInfo.getUuid(); - break; - } - } - } - return serviceUuid; - } - - /** - * To get CldsAsdsServiceInfo class by parsing json string. - * - * @param jsonStr - * The Json string that must be decoded - * @return The list of CldsSdcServiceInfo, if there is a failure it return an - * empty list - */ - private List getCldsSdcServicesListFromJson(String jsonStr) { - if (StringUtils.isBlank(jsonStr)) { - return new ArrayList<>(); - } - try { - return JsonUtils.GSON.fromJson(jsonStr, LIST_SDC_SERVICE_INFO_TYPE); - } catch (JsonParseException e) { - logger.error("Error when attempting to decode the JSON containing CldsSdcServiceInfo", e); - return new ArrayList<>(); - } - } - - /** - * To get List of CldsSdcResourceBasicInfo class by parsing json string. - * - * @param jsonStr - * The JSOn string that must be decoded - * @return The list of CldsSdcResourceBasicInfo, an empty list in case of issues - */ - private List getAllSdcResourcesListFromJson(String jsonStr) { - if (StringUtils.isBlank(jsonStr)) { - return new ArrayList<>(); - } - try { - return JsonUtils.GSON.fromJson(jsonStr, LIST_SDC_RESOURCE_BASIC_INFO_TYPE); - } catch (JsonParseException e) { - logger.error("Exception occurred when attempting to decode the list of CldsSdcResourceBasicInfo JSON", e); - return new ArrayList<>(); - } - } - - /** - * To get CldsSdcServiceDetail by parsing json string. - * - * @param jsonStr - * @return - */ - public SdcServiceDetail decodeCldsSdcServiceDetailFromJson(String jsonStr) { - try { - return JsonUtils.GSON.fromJson(jsonStr, SdcServiceDetail.class); - } catch (JsonParseException e) { - logger.error("Exception when attempting to decode the CldsSdcServiceDetail JSON", e); - return null; - } - } - - public String getResponse(HttpURLConnection conn) { - try (InputStream is = getInputStream(conn)) { - try (BufferedReader in = new BufferedReader(new InputStreamReader(is))) { - return IOUtils.toString(in); - } - } catch (IOException e) { - logger.error("Exception when attempting to open SDC response", e); - throw new SdcCommunicationException("Exception when attempting to open SDC response", e); - } - } - - private InputStream getInputStream(HttpURLConnection conn) { - try { - InputStream inStream = conn.getErrorStream(); - if (inStream == null) { - inStream = conn.getInputStream(); - } - return inStream; - } catch (IOException e) { - logger.error("Exception when attempting to open SDC error stream", e); - throw new SdcCommunicationException("Exception when attempting to open SDC error stream", e); - } - } - - /** - * Check if the SDC Info in cache has expired. - * - * @param cldsServiceData - * The object representing the service data - * @return boolean flag - * @throws GeneralSecurityException - * In case of issues with the decryting the encrypted password - * @throws DecoderException - * In case of issues with the decoding of the Hex String - */ - public boolean isCldsSdcCacheDataExpired(CldsServiceData cldsServiceData) - throws GeneralSecurityException, DecoderException { - if (cldsServiceData != null && cldsServiceData.getServiceUUID() != null) { - String cachedServiceUuid = cldsServiceData.getServiceUUID(); - String latestServiceUuid = getServiceUuidFromServiceInvariantId(cldsServiceData.getServiceInvariantUUID()); - String configuredMaxAge = refProp.getStringValue("clds.service.cache.invalidate.after.seconds"); - if (configuredMaxAge == null) { - logger.warn( - "clds.service.cache.invalidate.after.seconds NOT set in clds-reference.properties file, taking 60s as default"); - configuredMaxAge = "60"; - } - return (!cachedServiceUuid.equalsIgnoreCase(latestServiceUuid)) || (cldsServiceData.getAgeOfRecord() != null - && cldsServiceData.getAgeOfRecord() > Long.parseLong(configuredMaxAge)); - } else { - return true; - } - } - - /** - * Get the Service Data with Alarm Conditions for a given invariantServiceUuid. - * - * @param invariantServiceUuid - * @return The CldsServiceData - * @throws GeneralSecurityException - * In case of issues with the decryting the encrypted password - * @throws DecoderException - * In case of issues with the decoding of the Hex String - */ - public CldsServiceData getCldsServiceDataWithAlarmConditions(String invariantServiceUuid) - throws GeneralSecurityException, DecoderException { - String url = refProp.getStringValue(SDC_SERVICE_URL_PROPERTY_NAME); - String catalogUrl = refProp.getStringValue(SDC_CATALOG_URL_PROPERTY_NAME); - String serviceUuid = getServiceUuidFromServiceInvariantId(invariantServiceUuid); - String serviceDetailUrl = url + "/" + serviceUuid + SDC_METADATA_URL_PREFIX; - String responseStr = getCldsServicesOrResourcesBasedOnURL(serviceDetailUrl); - CldsServiceData cldsServiceData = new CldsServiceData(); - if (responseStr != null) { - SdcServiceDetail cldsSdcServiceDetail; - try { - cldsSdcServiceDetail = JsonUtils.GSON.fromJson(responseStr, SdcServiceDetail.class); - } catch (JsonParseException e) { - logger.error("Exception when decoding the CldsServiceData JSON from SDC", e); - throw new SdcCommunicationException("Exception when decoding the CldsServiceData JSON from SDC", e); - } - // To remove duplicate resources from serviceDetail and add valid - // vfs to service - if (cldsSdcServiceDetail != null && cldsSdcServiceDetail.getResources() != null) { - cldsServiceData.setServiceUUID(cldsSdcServiceDetail.getUuid()); - cldsServiceData.setServiceInvariantUUID(cldsSdcServiceDetail.getInvariantUUID()); - List cldsSdcResourceList = removeDuplicateSdcResourceInstances( - cldsSdcServiceDetail.getResources()); - if (cldsSdcResourceList != null && !cldsSdcResourceList.isEmpty()) { - List cldsVfDataList = new ArrayList<>(); - for (SdcResource currCldsSdcResource : cldsSdcResourceList) { - if (currCldsSdcResource != null && currCldsSdcResource.getResoucreType() != null - && "VF".equalsIgnoreCase(currCldsSdcResource.getResoucreType())) { - CldsVfData currCldsVfData = new CldsVfData(); - currCldsVfData.setVfName(currCldsSdcResource.getResourceInstanceName()); - currCldsVfData.setVfInvariantResourceUUID(currCldsSdcResource.getResourceInvariantUUID()); - cldsVfDataList.add(currCldsVfData); - } - } - cldsServiceData.setCldsVfs(cldsVfDataList); - // For each vf in the list , add all vfc's - getAllVfcForVfList(cldsVfDataList, catalogUrl); - logger.info("Invariant Service ID of cldsServiceData:" + cldsServiceData.getServiceInvariantUUID()); - } - } - } - return cldsServiceData; - } - - private void getAllVfcForVfList(List cldsVfDataList, String catalogUrl) - throws GeneralSecurityException { - // todo : refact this.. - if (cldsVfDataList != null && !cldsVfDataList.isEmpty()) { - List allVfResources = getAllSdcVForVfcResourcesBasedOnResourceType(RESOURCE_VF_TYPE); - List allVfcResources = getAllSdcVForVfcResourcesBasedOnResourceType( - RESOURCE_VFC_TYPE); - allVfcResources.addAll(getAllSdcVForVfcResourcesBasedOnResourceType(RESOURCE_CVFC_TYPE)); - for (CldsVfData currCldsVfData : cldsVfDataList) { - if (currCldsVfData != null && currCldsVfData.getVfInvariantResourceUUID() != null) { - String resourceUuid = getResourceUuidFromResourceInvariantUuid( - currCldsVfData.getVfInvariantResourceUUID(), allVfResources); - if (resourceUuid != null) { - String vfResourceUuidUrl = catalogUrl + RESOURCE_URL_PREFIX + "/" + resourceUuid - + SDC_METADATA_URL_PREFIX; - String vfResponse = getCldsServicesOrResourcesBasedOnURL(vfResourceUuidUrl); - if (vfResponse != null) { - // Below 2 line are to get the KPI(field path) data - // associated with the VF's - List cldsVfKPIDataList = getFieldPathFromVF(vfResponse); - currCldsVfData.setCldsKPIList(cldsVfKPIDataList); - List vfcDataListFromVfResponse = getVfcDataListFromVfResponse(vfResponse); - if (vfcDataListFromVfResponse != null) { - currCldsVfData.setCldsVfcs(vfcDataListFromVfResponse); - if (!vfcDataListFromVfResponse.isEmpty()) { - // To get artifacts for every VFC and get - // alarm conditions from artifact - for (CldsVfcData currCldsVfcData : vfcDataListFromVfResponse) { - if (currCldsVfcData != null - && currCldsVfcData.getVfcInvariantResourceUUID() != null) { - String resourceVfcUuid = getResourceUuidFromResourceInvariantUuid( - currCldsVfcData.getVfcInvariantResourceUUID(), allVfcResources); - if (resourceVfcUuid != null) { - String vfcResourceUuidUrl = catalogUrl + RESOURCE_URL_PREFIX + "/" - + resourceVfcUuid + SDC_METADATA_URL_PREFIX; - String vfcResponse = getCldsServicesOrResourcesBasedOnURL( - vfcResourceUuidUrl); - if (vfcResponse != null) { - List alarmCondtionsFromVfc = getAlarmCondtionsFromVfc( - vfcResponse); - currCldsVfcData.setCldsAlarmConditions(alarmCondtionsFromVfc); - } - } else { - logger.info("No resourceVFC UUID found for given invariantID:" - + currCldsVfcData.getVfcInvariantResourceUUID()); - } - } - } - } - } - } - } else { - logger.info("No resourceUUID found for given invariantREsourceUUID:" - + currCldsVfData.getVfInvariantResourceUUID()); - } - } - } - } - } - - private List getVfcDataListFromVfResponse(String vfResponse) { - JsonObject vfResponseNode; - try { - vfResponseNode = JsonUtils.GSON.fromJson(vfResponse, JsonObject.class); - } catch (JsonParseException e) { - logger.error("Exception when decoding the JSON list of CldsVfcData", e); - return new ArrayList<>(); - } - JsonArray vfcArrayNode = vfResponseNode.get("resources").getAsJsonArray(); - List cldsVfcDataList = new ArrayList<>(); - if (vfcArrayNode != null) { - for (JsonElement vfcjsonNode : vfcArrayNode) { - JsonObject currVfcNode = vfcjsonNode.getAsJsonObject(); - JsonElement resourceTypeNode = currVfcNode.get("resoucreType"); - if (resourceTypeNode != null && resourceTypeNode.isJsonPrimitive()) { - if ("VFC".equalsIgnoreCase(resourceTypeNode.getAsString())) { - handleVFCtypeNode(currVfcNode, cldsVfcDataList); - } else if ("CVFC".equalsIgnoreCase(resourceTypeNode.getAsString())) { - handleCVFCtypeNode(currVfcNode, cldsVfcDataList); - } - } - } - } - return cldsVfcDataList; - } - - private void handleVFCtypeNode(JsonObject currVfcNode, List cldsVfcDataList) { - CldsVfcData currCldsVfcData = new CldsVfcData(); - String vfcResourceName = currVfcNode.get("resourceInstanceName").getAsString(); - String vfcInvariantResourceUuid = currVfcNode.get("resourceInvariantUUID").getAsString(); - currCldsVfcData.setVfcName(vfcResourceName); - currCldsVfcData.setVfcInvariantResourceUUID(vfcInvariantResourceUuid); - cldsVfcDataList.add(currCldsVfcData); - } - - private void handleCVFCtypeNode(JsonObject currVfcNode, List cldsVfcDataList) { - handleVFCtypeNode(currVfcNode, cldsVfcDataList); - cldsVfcDataList.addAll(getVFCfromCVFC(currVfcNode.get("resourceUUID").getAsString())); - } - - private List getVFCfromCVFC(String resourceUUID) { - String catalogUrl = refProp.getStringValue(SDC_CATALOG_URL_PROPERTY_NAME); - List cldsVfcDataList = new ArrayList<>(); - if (resourceUUID != null) { - String vfcResourceUUIDUrl = catalogUrl + RESOURCE_URL_PREFIX + "/" + resourceUUID + SDC_METADATA_URL_PREFIX; - try { - String vfcResponse = getCldsServicesOrResourcesBasedOnURL(vfcResourceUUIDUrl); - JsonObject vfResponseNode = JsonUtils.GSON.fromJson(vfcResponse, JsonObject.class); - JsonArray vfcArrayNode = vfResponseNode.get("resources").getAsJsonArray(); - if (vfcArrayNode != null) { - for (JsonElement vfcjsonNode : vfcArrayNode) { - JsonObject currVfcNode = vfcjsonNode.getAsJsonObject(); - JsonElement resourceTypeNode = currVfcNode.get("resoucreType"); - if (resourceTypeNode != null && resourceTypeNode.isJsonPrimitive() && "VFC".equalsIgnoreCase(resourceTypeNode.getAsString())) { - handleVFCtypeNode(currVfcNode, cldsVfcDataList); - } - } - } - } catch (JsonParseException e) { - logger.error("Exception during JSON analyzis", e); - } - } - return cldsVfcDataList; - } - - private String removeUnwantedBracesFromString(String id) { - return (id != null) ? id.replaceAll("\"", "") : ""; - } - - private List getAlarmCondtionsFromVfc(String vfcResponse) throws GeneralSecurityException { - List cldsAlarmConditionList = new ArrayList<>(); - JsonObject vfcResponseNode; - try { - vfcResponseNode = JsonUtils.GSON.fromJson(vfcResponse, JsonObject.class); - } catch (JsonParseException e) { - logger.error("Exception when decoding the JSON list of CldsAlarmCondition", e); - return cldsAlarmConditionList; - } - JsonElement artifactsNode = vfcResponseNode.get("artifacts"); - if (artifactsNode != null && artifactsNode.isJsonArray() && artifactsNode.getAsJsonArray().size() > 0) { - JsonArray artifactsList = artifactsNode.getAsJsonArray(); - for (int index = 0; index < artifactsList.size(); index++) { - JsonObject currArtifactNode = artifactsList.get(index).getAsJsonObject(); - JsonElement artifactUrlNode = currArtifactNode.get("artifactURL"); - if (artifactUrlNode != null && artifactUrlNode.isJsonPrimitive()) { - String responsesFromArtifactUrl = getResponsesFromArtifactUrl(artifactUrlNode.getAsString()); - cldsAlarmConditionList.addAll(parseCsvToGetAlarmConditions(responsesFromArtifactUrl)); - logger.info(responsesFromArtifactUrl); - } - } - } - return cldsAlarmConditionList; - } - - private List parseCsvToGetAlarmConditions(String allAlarmCondsValues) { - try { - List cldsAlarmConditionList = new ArrayList<>(); - Reader alarmReader = new StringReader(allAlarmCondsValues); - Iterable records = CSVFormat.RFC4180.parse(alarmReader); - if (records != null) { - Iterator it = records.iterator(); - if (it.hasNext()) { - it.next(); - } - it.forEachRemaining(record -> processRecord(cldsAlarmConditionList, record)); - } - return cldsAlarmConditionList; - } catch (IOException e) { - logger.error("Exception when attempting to parse the CSV containing the alarm", e); - return new ArrayList<>(); - } - } - - // Method to get the artifact for any particular VF - private List getFieldPathFromVF(String vfResponse) throws GeneralSecurityException { - List cldsVfKPIDataList = new ArrayList<>(); - JsonObject vfResponseNode; - try { - vfResponseNode = JsonUtils.GSON.fromJson(vfResponse, JsonObject.class); - } catch (JsonParseException e) { - logger.error("Exception when decoding the JSON list of CldsVfKPIData", e); - return cldsVfKPIDataList; - } - JsonArray artifactsArrayNode = vfResponseNode.get("artifacts").getAsJsonArray(); - if (artifactsArrayNode != null && artifactsArrayNode.size() > 0) { - for (int index = 0; index < artifactsArrayNode.size(); index++) { - JsonObject currArtifactNode = artifactsArrayNode.get(index).getAsJsonObject(); - JsonElement artifactUrlNode = currArtifactNode.get("artifactURL"); - JsonElement artifactNameNode = currArtifactNode.get("artifactName"); - String artifactName = ""; - if (artifactNameNode != null) { - artifactName = artifactNameNode.getAsString(); - artifactName = artifactName.substring(artifactName.lastIndexOf('.') + 1); - } - if (artifactUrlNode != null && "csv".equalsIgnoreCase(artifactName)) { - String responsesFromArtifactUrl = getResponsesFromArtifactUrl(artifactUrlNode.getAsString()); - cldsVfKPIDataList.addAll(parseCsvToGetFieldPath(responsesFromArtifactUrl)); - logger.info(responsesFromArtifactUrl); - } - } - } - return cldsVfKPIDataList; - } - - private CldsVfKPIData convertCsvRecordToKpiData(CSVRecord record) { - if (record.size() < 6) { - logger.debug("invalid csv field path Record,total columns less than 6: " + record); - return null; - } - if (StringUtils.isBlank(record.get(1)) || StringUtils.isBlank(record.get(3)) - || StringUtils.isBlank(record.get(5))) { - logger.debug("Invalid csv field path Record,one of column is having blank value : " + record); - return null; - } - CldsVfKPIData cldsVfKPIData = new CldsVfKPIData(); - cldsVfKPIData.setNfNamingCode(record.get(0).trim()); - cldsVfKPIData.setNfNamingValue(record.get(1).trim()); - cldsVfKPIData.setFieldPath(record.get(2).trim()); - cldsVfKPIData.setFieldPathValue(record.get(3).trim()); - cldsVfKPIData.setThresholdName(record.get(4).trim()); - cldsVfKPIData.setThresholdValue(record.get(5).trim()); - return cldsVfKPIData; - } - - // Method to get the artifactURL Data and set the CldsVfKPIData node - private List parseCsvToGetFieldPath(String allFieldPathValues) { - try { - List cldsVfKPIDataList = new ArrayList<>(); - Reader alarmReader = new StringReader(allFieldPathValues); - Iterable records = CSVFormat.RFC4180.parse(alarmReader); - if (records != null) { - for (CSVRecord record : records) { - CldsVfKPIData kpiData = this.convertCsvRecordToKpiData(record); - if (kpiData != null) { - cldsVfKPIDataList.add(kpiData); - } - } - } - return cldsVfKPIDataList; - } catch (IOException e) { - logger.error("Exception when attempting to parse the CSV containing the alarm kpi data", e); - return new ArrayList<>(); - } - } - - private void processRecord(List cldsAlarmConditionList, CSVRecord record) { - if (record == null) { - return; - } - if (record.size() < 5) { - logger.debug("invalid csv alarm Record,total columns less than 5: " + record); - return; - } - if (StringUtils.isBlank(record.get(1)) || StringUtils.isBlank(record.get(3)) - || StringUtils.isBlank(record.get(4))) { - logger.debug("invalid csv alarm Record,one of column is having blank value : " + record); - return; - } - CldsAlarmCondition cldsAlarmCondition = new CldsAlarmCondition(); - cldsAlarmCondition.setEventSourceType(record.get(1)); - cldsAlarmCondition.setEventName(record.get(2)); - cldsAlarmCondition.setAlarmConditionKey(record.get(3)); - cldsAlarmCondition.setSeverity(record.get(4)); - cldsAlarmConditionList.add(cldsAlarmCondition); - } - - // Get the responses for the current artifact from the artifacts URL. - private String getResponsesFromArtifactUrl(String artifactsUrl) { - String hostUrl = refProp.getStringValue("sdc.hostUrl"); - String artifactsUrlReworked = artifactsUrl.replaceAll("\"", ""); - String artifactUrl = hostUrl + artifactsUrlReworked; - logger.info("value of artifactURl:" + artifactUrl); - String currArtifactResponse = getCldsServicesOrResourcesBasedOnURL(artifactUrl); - logger.info("value of artifactResponse:" + currArtifactResponse); - return currArtifactResponse; - } - - /** - * Service to services/resources/artifacts from sdc.Pass alarmConditions as true - * to get alarm conditons from artifact url and else it is false - * - * @param url - * The URL to trigger - * @return The String containing the payload - */ - public String getCldsServicesOrResourcesBasedOnURL(String url) { - Date startTime = new Date(); - try { - LoggingUtils.setTargetContext("SDC", "getCldsServicesOrResourcesBasedOnURL"); - String urlReworked = removeUnwantedBracesFromString(url); - URL urlObj = new URL(urlReworked); - HttpURLConnection conn = (HttpURLConnection) urlObj.openConnection(); - conn = utils.invoke(conn, "SDC", "getSdcResources"); - String basicAuth = getSdcBasicAuth(); - conn.setRequestProperty(refProp.getStringValue(SDC_INSTANCE_ID_PROPERTY_NAME), SDC_INSTANCE_ID_CLAMP); - conn.setRequestProperty(HttpHeaders.AUTHORIZATION, basicAuth); - conn.setRequestProperty(HttpHeaders.CONTENT_TYPE, "application/json;charset=UTF-8"); - conn.setRequestProperty(refProp.getStringValue(SDC_REQUESTID_PROPERTY_NAME), LoggingUtils.getRequestId()); - conn.setRequestMethod("GET"); - int responseCode = conn.getResponseCode(); - logger.info("Sdc resource url - " + urlReworked + " , responseCode=" + responseCode); - try (BufferedReader in = new BufferedReader(new InputStreamReader(conn.getInputStream()))) { - String response = IOUtils.toString(in); - return response; - } - } catch (IOException e) { - LoggingUtils.setErrorContext("900", "Get sdc resources error"); - logger.error("Exception occurred during query to SDC", e); - return ""; - } catch (DecoderException e) { - LoggingUtils.setErrorContext("900", "Get sdc resources error"); - logger.error("Exception when attempting to decode the Hex string", e); - throw new SdcCommunicationException("Exception when attempting to decode the Hex string", e); - } catch (GeneralSecurityException e) { - LoggingUtils.setErrorContext("900", "Get sdc resources error"); - logger.error("Exception when attempting to decrypt the encrypted password", e); - throw new SdcCommunicationException("Exception when attempting to decrypt the encrypted password", e); - } finally { - LoggingUtils.setTimeContext(startTime, new Date()); - metricsLogger.info("getCldsServicesOrResourcesBasedOnURL completed"); - utils.invokeReturn(); - } - } - - /** - * To create properties object by using cldsServicedata. - * - * @throws IOException In case of issues during the parsing of the Global Properties - */ - public String createPropertiesObjectByUUID(CldsServiceData cldsServiceData) throws IOException { - String totalPropsStr; - JsonObject globalPropsJson = refProp.getJsonTemplate(CldsService.GLOBAL_PROPERTIES_KEY).getAsJsonObject(); - if (cldsServiceData != null && cldsServiceData.getServiceUUID() != null) { - // Objectnode to save all byservice, byvf , byvfc and byalarm nodes - JsonObject byIdObjectNode = new JsonObject(); - // To create vf ResourceUUID node with serviceInvariantUUID - JsonObject invariantUuidObjectNodeWithVf = createVfObjectNodeByServiceInvariantUuid(cldsServiceData); - byIdObjectNode.add("byService", invariantUuidObjectNodeWithVf); - // To create byVf and vfcResourceNode with vfResourceUUID - JsonObject vfcObjectNodeByVfUuid = createVfcObjectNodeByVfUuid(cldsServiceData.getCldsVfs()); - byIdObjectNode.add("byVf", vfcObjectNodeByVfUuid); - // To create byKpi - JsonObject kpiJsonObject = new JsonObject(); - if (cldsServiceData.getCldsVfs() != null && !cldsServiceData.getCldsVfs().isEmpty()) { - for (CldsVfData currCldsVfData : cldsServiceData.getCldsVfs()) { - if (currCldsVfData != null) { - createKpiObjectNodeByVfUuid(kpiJsonObject, currCldsVfData.getCldsKPIList()); - } - } - } - byIdObjectNode.add("byKpi", kpiJsonObject); - // To create byVfc and alarmCondition with vfcResourceUUID - JsonObject vfcResourceUuidObjectNode = new JsonObject(); - if (cldsServiceData.getCldsVfs() != null && !cldsServiceData.getCldsVfs().isEmpty()) { - for (CldsVfData currCldsVfData : cldsServiceData.getCldsVfs()) { - if (currCldsVfData != null) { - createAlarmCondObjectNodeByVfcUuid(vfcResourceUuidObjectNode, currCldsVfData.getCldsVfcs()); - } - } - } - byIdObjectNode.add("byVfc", vfcResourceUuidObjectNode); - // To create byAlarmCondition with alarmConditionKey - List allAlarmConditions = getAllAlarmConditionsFromCldsServiceData(cldsServiceData, - "alarmCondition"); - JsonObject alarmCondObjectNodeByAlarmKey = createAlarmCondObjectNodeByAlarmKey(allAlarmConditions); - byIdObjectNode.add("byAlarmCondition", alarmCondObjectNodeByAlarmKey); - // To create byAlertDescription with AlertDescription - List allAlertDescriptions = getAllAlarmConditionsFromCldsServiceData(cldsServiceData, - "alertDescription"); - JsonObject alertDescObjectNodeByAlert = createAlarmCondObjectNodeByAlarmKey(allAlertDescriptions); - byIdObjectNode.add("byAlertDescription", alertDescObjectNodeByAlert); - globalPropsJson.add("shared", byIdObjectNode); - logger.info("Global properties JSON created with SDC info:" + globalPropsJson); - } - totalPropsStr = globalPropsJson.toString(); - return totalPropsStr; - } - - /** - * Method to get alarm conditions/alert description from Service Data. - * - * @param cldsServiceData - * CldsServiceData the Service Data to analyze - * @param eventName - * The String event name that will be used to filter the alarm list - * @return The list of CldsAlarmCondition for the event name specified - */ - public List getAllAlarmConditionsFromCldsServiceData(CldsServiceData cldsServiceData, - String eventName) { - List alarmCondList = new ArrayList<>(); - if (cldsServiceData != null && cldsServiceData.getCldsVfs() != null - && !cldsServiceData.getCldsVfs().isEmpty()) { - for (CldsVfData currCldsVfData : cldsServiceData.getCldsVfs()) { - alarmCondList.addAll(getAllAlarmConditionsFromCldsVfData(currCldsVfData, eventName)); - } - } - return alarmCondList; - } - - /** - * Method to get alarm conditions/alert description from VF Data. - * - * @param currCldsVfData - * The Vf Data to analyze - * @param eventName - * The String event name that will be used to filter the alarm list - * @return The list of CldsAlarmCondition for the event name specified - */ - private List getAllAlarmConditionsFromCldsVfData(CldsVfData currCldsVfData, String eventName) { - List alarmCondList = new ArrayList<>(); - if (currCldsVfData != null && currCldsVfData.getCldsVfcs() != null && !currCldsVfData.getCldsVfcs().isEmpty()) { - for (CldsVfcData currCldsVfcData : currCldsVfData.getCldsVfcs()) { - alarmCondList.addAll(getAllAlarmConditionsFromCldsVfcData(currCldsVfcData, eventName)); - } - } - return alarmCondList; - } - - /** - * Method to get alarm conditions/alert description from VFC Data. - * - * @param currCldsVfcData - * The VfC Data to analyze - * @param eventName - * The String event name that will be used to filter the alarm list - * @return The list of CldsAlarmCondition for the event name specified - */ - private List getAllAlarmConditionsFromCldsVfcData(CldsVfcData currCldsVfcData, - String eventName) { - List alarmCondList = new ArrayList<>(); - if (currCldsVfcData != null && currCldsVfcData.getCldsAlarmConditions() != null - && !currCldsVfcData.getCldsAlarmConditions().isEmpty()) { - for (CldsAlarmCondition currCldsAlarmCondition : currCldsVfcData.getCldsAlarmConditions()) { - if (currCldsAlarmCondition != null - && currCldsAlarmCondition.getEventName().equalsIgnoreCase(eventName)) { - alarmCondList.add(currCldsAlarmCondition); - } - } - } - return alarmCondList; - } - - private JsonObject createAlarmCondObjectNodeByAlarmKey(List cldsAlarmCondList) { - JsonObject alarmCondKeyNode = new JsonObject(); - if (cldsAlarmCondList != null && !cldsAlarmCondList.isEmpty()) { - for (CldsAlarmCondition currCldsAlarmCondition : cldsAlarmCondList) { - if (currCldsAlarmCondition != null) { - JsonObject alarmCondNode = new JsonObject(); - alarmCondNode.addProperty("eventSourceType", currCldsAlarmCondition.getEventSourceType()); - alarmCondNode.addProperty("eventSeverity", currCldsAlarmCondition.getSeverity()); - alarmCondKeyNode.add(currCldsAlarmCondition.getAlarmConditionKey(), alarmCondNode); - } - } - } else { - JsonObject alarmCondNode = new JsonObject(); - alarmCondNode.addProperty("eventSourceType", ""); - alarmCondNode.addProperty("eventSeverity", ""); - alarmCondKeyNode.add("", alarmCondNode); - } - return alarmCondKeyNode; - } - - private JsonObject createVfObjectNodeByServiceInvariantUuid(CldsServiceData cldsServiceData) { - JsonObject invariantUuidObjectNode = new JsonObject(); - JsonObject vfObjectNode = new JsonObject(); - JsonObject vfUuidNode = new JsonObject(); - List cldsVfsList = cldsServiceData.getCldsVfs(); - if (cldsVfsList != null && !cldsVfsList.isEmpty()) { - for (CldsVfData currCldsVfData : cldsVfsList) { - if (currCldsVfData != null) { - vfUuidNode.addProperty(currCldsVfData.getVfInvariantResourceUUID(), currCldsVfData.getVfName()); - } - } - } else { - vfUuidNode.addProperty("", ""); - } - vfObjectNode.add("vf", vfUuidNode); - invariantUuidObjectNode.add(cldsServiceData.getServiceInvariantUUID(), vfObjectNode); - return invariantUuidObjectNode; - } - - private void createKpiObjectNodeByVfUuid(JsonObject vfResourceUuidObjectNode, - List cldsVfKpiDataList) { - if (cldsVfKpiDataList != null && !cldsVfKpiDataList.isEmpty()) { - for (CldsVfKPIData currCldsVfKpiData : cldsVfKpiDataList) { - if (currCldsVfKpiData != null) { - JsonObject thresholdNameObjectNode = new JsonObject(); - JsonObject fieldPathObjectNode = new JsonObject(); - JsonObject nfNamingCodeNode = new JsonObject(); - fieldPathObjectNode.addProperty(currCldsVfKpiData.getFieldPathValue(), - currCldsVfKpiData.getFieldPathValue()); - nfNamingCodeNode.addProperty(currCldsVfKpiData.getNfNamingValue(), currCldsVfKpiData.getNfNamingValue()); - thresholdNameObjectNode.add("fieldPath", fieldPathObjectNode); - thresholdNameObjectNode.add("nfNamingCode", nfNamingCodeNode); - vfResourceUuidObjectNode.add(currCldsVfKpiData.getThresholdValue(), thresholdNameObjectNode); - } - } - } - } - - private void createAlarmCondObjectNodeByVfcUuid(JsonObject vfcResourceUuidObjectNode, - List cldsVfcDataList) { - JsonObject vfcObjectNode = new JsonObject(); - JsonObject alarmCondNode = new JsonObject(); - JsonObject alertDescNode = new JsonObject(); - if (cldsVfcDataList != null && !cldsVfcDataList.isEmpty()) { - for (CldsVfcData currCldsVfcData : cldsVfcDataList) { - if (currCldsVfcData != null) { - if (currCldsVfcData.getCldsAlarmConditions() != null - && !currCldsVfcData.getCldsAlarmConditions().isEmpty()) { - for (CldsAlarmCondition currCldsAlarmCondition : currCldsVfcData.getCldsAlarmConditions()) { - if ("alarmCondition".equalsIgnoreCase(currCldsAlarmCondition.getEventName())) { - alarmCondNode.addProperty(currCldsAlarmCondition.getAlarmConditionKey(), - currCldsAlarmCondition.getAlarmConditionKey()); - } else { - alertDescNode.addProperty(currCldsAlarmCondition.getAlarmConditionKey(), - currCldsAlarmCondition.getAlarmConditionKey()); - } - } - } - vfcObjectNode.add("alarmCondition", alarmCondNode); - vfcObjectNode.add("alertDescription", alertDescNode); - vfcResourceUuidObjectNode.add(currCldsVfcData.getVfcInvariantResourceUUID(), vfcObjectNode); - } - } - } else { - alarmCondNode.addProperty("", ""); - vfcObjectNode.add("alarmCondition", alarmCondNode); - alertDescNode.addProperty("", ""); - vfcObjectNode.add("alertDescription", alarmCondNode); - vfcResourceUuidObjectNode.add("", vfcObjectNode); - } - } - - /** - * Method to create vfc and kpi nodes inside vf node - * - * @param mapper - * @param cldsVfDataList - * @return - */ - private JsonObject createVfcObjectNodeByVfUuid(List cldsVfDataList) { - JsonObject vfUuidObjectNode = new JsonObject(); - if (cldsVfDataList != null && !cldsVfDataList.isEmpty()) { - for (CldsVfData currCldsVfData : cldsVfDataList) { - if (currCldsVfData != null) { - JsonObject vfObjectNode = new JsonObject(); - JsonObject vfcUuidNode = new JsonObject(); - JsonObject kpiObjectNode = new JsonObject(); - if (currCldsVfData.getCldsVfcs() != null && !currCldsVfData.getCldsVfcs().isEmpty()) { - for (CldsVfcData currCldsVfcData : currCldsVfData.getCldsVfcs()) { - if (currCldsVfcData.getCldsAlarmConditions() != null - && !currCldsVfcData.getCldsAlarmConditions().isEmpty()) { - vfcUuidNode.addProperty(currCldsVfcData.getVfcInvariantResourceUUID(), - currCldsVfcData.getVfcName()); - } - } - } else { - vfcUuidNode.addProperty("", ""); - } - if (currCldsVfData.getCldsKPIList() != null && !currCldsVfData.getCldsKPIList().isEmpty()) { - for (CldsVfKPIData currCldsVfKPIData : currCldsVfData.getCldsKPIList()) { - // ToDo: something wrong happened here - kpiObjectNode.addProperty(currCldsVfKPIData.getThresholdValue(), - currCldsVfKPIData.getThresholdValue()); - } - } else { - kpiObjectNode.addProperty("", ""); - } - vfObjectNode.add("vfc", vfcUuidNode); - vfObjectNode.add("kpi", kpiObjectNode); - vfUuidObjectNode.add(currCldsVfData.getVfInvariantResourceUUID(), vfObjectNode); - } - } - } else { - JsonObject vfcUuidNode = new JsonObject(); - vfcUuidNode.addProperty("", ""); - JsonObject vfcObjectNode = new JsonObject(); - vfcObjectNode.add("vfc", vfcUuidNode); - vfUuidObjectNode.add("", vfcObjectNode); - } - return vfUuidObjectNode; - } - - // To get all sdc VF/VFC Resources basic info. - private List getAllSdcVForVfcResourcesBasedOnResourceType(String resourceType) { - String catalogUrl = refProp.getStringValue(SDC_CATALOG_URL_PROPERTY_NAME); - String resourceUrl = catalogUrl + "resources?resourceType=" + resourceType; - String allSdcVfcResources = getCldsServicesOrResourcesBasedOnURL(resourceUrl); - return removeDuplicateSdcResourceBasicInfo(getAllSdcResourcesListFromJson(allSdcVfcResources)); - } - - private String getResourceUuidFromResourceInvariantUuid(String resourceInvariantUuid, - List resourceInfoList) { - String resourceUuid = null; - if (resourceInfoList != null && !resourceInfoList.isEmpty()) { - for (SdcResourceBasicInfo currResource : resourceInfoList) { - if (currResource != null && currResource.getInvariantUUID() != null && currResource.getUuid() != null - && currResource.getInvariantUUID().equalsIgnoreCase(resourceInvariantUuid)) { - resourceUuid = currResource.getUuid(); - break; - } - } - } - return resourceUuid; - } -} diff --git a/src/main/java/org/onap/clamp/clds/client/req/sdc/SdcRequests.java b/src/main/java/org/onap/clamp/clds/client/req/sdc/SdcRequests.java deleted file mode 100644 index d9093f4e..00000000 --- a/src/main/java/org/onap/clamp/clds/client/req/sdc/SdcRequests.java +++ /dev/null @@ -1,227 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP CLAMP - * ================================================================================ - * Copyright (C) 2017-2018 AT&T Intellectual Property. 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. - * 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. - * ============LICENSE_END============================================ - * =================================================================== - * - */ - -package org.onap.clamp.clds.client.req.sdc; - -import com.att.eelf.configuration.EELFLogger; -import com.att.eelf.configuration.EELFManager; - -import com.google.gson.JsonArray; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import java.io.IOException; -import java.nio.charset.StandardCharsets; -import java.security.GeneralSecurityException; -import java.util.ArrayList; -import java.util.Base64; -import java.util.Iterator; -import java.util.List; -import java.util.Map.Entry; - -import org.apache.commons.codec.DecoderException; -import org.onap.clamp.clds.client.req.tca.TcaRequestFormatter; -import org.onap.clamp.clds.config.ClampProperties; -import org.onap.clamp.clds.model.properties.Global; -import org.onap.clamp.clds.model.properties.ModelProperties; -import org.onap.clamp.clds.model.properties.Tca; -import org.onap.clamp.clds.model.sdc.SdcResource; -import org.onap.clamp.clds.model.sdc.SdcServiceDetail; -import org.onap.clamp.clds.util.JsonUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Primary; -import org.springframework.stereotype.Component; - -/** - * Construct a Sdc request given CLDS objects. - */ -@Component -@Primary -public class SdcRequests { - - protected static final EELFLogger logger = EELFManager.getInstance().getLogger(SdcRequests.class); - protected static final EELFLogger metricsLogger = EELFManager.getInstance().getMetricsLogger(); - @Autowired - private SdcCatalogServices sdcCatalogServices; - @Autowired - protected ClampProperties refProp; - - /** - * Format the Blueprint from a Yaml - * - * @param prop - * The ModelProperties describing the clds model - * @param docText - * The Yaml file that must be converted - * @return A String containing the BluePrint - * @throws IOException - * In case of issues - */ - public String formatBlueprint(ModelProperties prop, String docText) throws IOException { - String yamlvalue = getYamlvalue(docText); - String updatedBlueprint = ""; - Tca tca = prop.getType(Tca.class); - if (tca.isFound()) { - updatedBlueprint = TcaRequestFormatter.updatedBlueprintWithConfiguration(refProp, prop, yamlvalue); - } - logger.info("value of blueprint:" + updatedBlueprint); - return updatedBlueprint; - } - - /** - * Format the SDC Locations Request in the JSON Format - * - * @param prop - * The ModelProperties describing the clds model - * @param artifactName - * The name of the artifact - * @return SDC Locations request in the JSON Format - */ - public String formatSdcLocationsReq(ModelProperties prop, String artifactName) { - Global global = prop.getGlobal(); - List locationsList = global.getLocation(); - JsonArray locationsArrayNode = new JsonArray(); - JsonObject locationObject = new JsonObject(); - for (String currLocation : locationsList) { - locationsArrayNode.add(currLocation); - } - locationObject.addProperty("artifactName", artifactName); - locationObject.add("locations", locationsArrayNode); - String locationJsonFormat = locationObject.toString(); - logger.info("Value of location Json Artifact:" + locationsArrayNode); - return locationJsonFormat; - } - - /** - * Format the SDC Request - * - * @param payloadData - * The ModelProperties describing the clds model - * @param artifactName - * The name of the artifact - * @param artifactLabel - * The Label of the artifact - * @param artifactType - * The type of the artifact - * @return formatted SDC Request - */ - public String formatSdcReq(String payloadData, String artifactName, String artifactLabel, String artifactType) { - logger.info("artifact=" + payloadData); - String base64Artifact = Base64.getEncoder().encodeToString(payloadData.getBytes(StandardCharsets.UTF_8)); - return "{ \n" + "\"payloadData\" : \"" + base64Artifact + "\",\n" + "\"artifactLabel\" : \"" + artifactLabel - + "\",\n" + "\"artifactName\" :\"" + artifactName + "\",\n" + "\"artifactType\" : \"" + artifactType - + "\",\n" + "\"artifactGroupType\" : \"DEPLOYMENT\",\n" + "\"description\" : \"from CLAMP Cockpit\"\n" - + "} \n"; - } - - private List filterVfResourceList(String serviceUuid, List sdcResourcesList, - List cldsResourceVfList) { - List urlList = new ArrayList<>(); - for (SdcResource cldsSdcResource : sdcResourcesList) { - if (cldsSdcResource != null && cldsSdcResource.getResoucreType() != null - && cldsSdcResource.getResoucreType().equalsIgnoreCase("VF") - && cldsResourceVfList.contains(cldsSdcResource.getResourceInvariantUUID())) { - String normalizedResourceInstanceName = normalizeResourceInstanceName( - cldsSdcResource.getResourceInstanceName()); - String svcUrl = createUrlForResource(normalizedResourceInstanceName, serviceUuid); - urlList.add(svcUrl); - } - } - return urlList; - } - - private String createUrlForResource(String normalizedResourceInstanceName, String serviceUuid) { - return refProp.getStringValue("sdc.serviceUrl") + "/" + serviceUuid + "/resourceInstances/" - + normalizedResourceInstanceName + "/artifacts"; - } - - /** - * To get List of urls for all vfresources - * - * @param prop - * The model properties JSON describing the closed loop flow - * @return A list of Service URL - * @throws GeneralSecurityException - * In case of issues when decrypting the password - * @throws DecoderException - * In case of issues when decoding the Hex String - */ - public List getSdcReqUrlsList(ModelProperties prop) throws GeneralSecurityException, DecoderException { - List urlList = new ArrayList<>(); - Global globalProps = prop.getGlobal(); - if (globalProps != null && globalProps.getService() != null && globalProps.getResourceVf() != null) { - String serviceUuid = sdcCatalogServices.getServiceUuidFromServiceInvariantId(globalProps.getService()); - SdcServiceDetail sdcServiceDetail = sdcCatalogServices - .decodeCldsSdcServiceDetailFromJson(sdcCatalogServices.getSdcServicesInformation(serviceUuid)); - if (sdcServiceDetail != null) { - urlList = filterVfResourceList(serviceUuid, sdcServiceDetail.getResources(), - globalProps.getResourceVf()); - } - } else { - logger.warn("GlobalProperties json is empty, skipping getSdcReqUrlsList and returning empty list"); - } - return urlList; - } - - /** - * "Normalize" the resource instance name: - Remove spaces, underscores, - * dashes, and periods. - make lower case This is required by SDC when using - * the resource instance name to upload an artifact. - * - * @param inText - * @return - */ - public String normalizeResourceInstanceName(String inText) { - return inText.replace(" ", "").replace("-", "").replace(".", "").toLowerCase(); - } - - /** - * Method to get yaml/template properties value from json. - * - * @param jsonGlobal - * The Json containing a Yaml file - * @return The yaml extracted from the JSON - * @throws IOException - * In case of issues with the Json parser - */ - protected String getYamlvalue(String jsonGlobal) throws IOException { - String yamlFileValue = ""; - JsonObject root = JsonUtils.GSON.fromJson(jsonGlobal, JsonObject.class); - Iterator> entryItr = root.entrySet().iterator(); - while (entryItr.hasNext()) { - Entry entry = entryItr.next(); - String key = entry.getKey(); - if (key != null && key.equalsIgnoreCase("global")) { - JsonArray arrayNode = entry.getValue().getAsJsonArray(); - for (JsonElement anArrayNode : arrayNode) { - JsonObject node = anArrayNode.getAsJsonObject(); - JsonArray arrayValueNode = node.get("value").getAsJsonArray(); - JsonElement jsonNode = arrayValueNode.get(0); - yamlFileValue = jsonNode.getAsString(); - logger.info("value:" + yamlFileValue); - } - break; - } - } - return yamlFileValue; - } -} diff --git a/src/main/java/org/onap/clamp/clds/dao/CldsDao.java b/src/main/java/org/onap/clamp/clds/dao/CldsDao.java index b6e27c5e..eef63535 100644 --- a/src/main/java/org/onap/clamp/clds/dao/CldsDao.java +++ b/src/main/java/org/onap/clamp/clds/dao/CldsDao.java @@ -336,45 +336,6 @@ public class CldsDao { return template; } - public void clearServiceCache() { - String clearCldsServiceCacheSql = "TRUNCATE clds_service_cache"; - jdbcTemplateObject.execute(clearCldsServiceCacheSql); - } - - public CldsServiceData getCldsServiceCache(String invariantUUID) { - CldsServiceData cldsServiceData = null; - try { - String getCldsServiceSQL = "SELECT * , TIMESTAMPDIFF(SECOND, timestamp, CURRENT_TIMESTAMP()) FROM clds_service_cache where invariant_service_id = ? "; - cldsServiceData = jdbcTemplateObject.queryForObject(getCldsServiceSQL, new Object[] { invariantUUID }, - new CldsServiceDataMapper()); - if (cldsServiceData != null) { - logger.info("CldsServiceData found in cache for Service Invariant ID:" - + cldsServiceData.getServiceInvariantUUID()); - return cldsServiceData; - } else { - logger.warn("CldsServiceData not found in cache for Service Invariant ID:" + invariantUUID); - return null; - } - } catch (EmptyResultDataAccessException e) { - logger.info("CldsServiceData not found in cache for Service Invariant ID: " + invariantUUID); - logger.debug("CldsServiceData not found in cache for Service Invariant ID: " + invariantUUID, e); - return null; - } - } - - public void setCldsServiceCache(CldsDbServiceCache cldsDBServiceCache) { - if (cldsDBServiceCache != null && cldsDBServiceCache.getInvariantId() != null - && cldsDBServiceCache.getServiceId() != null) { - String invariantUuid = cldsDBServiceCache.getInvariantId(); - String serviceUuid = cldsDBServiceCache.getServiceId(); - InputStream is = cldsDBServiceCache.getCldsDataInstream(); - String insertCldsServiceCacheSql = "INSERT INTO clds_service_cache" - + "(invariant_service_id,service_id,timestamp,object_data) VALUES" - + "(?,?,CURRENT_TIMESTAMP,?) ON DUPLICATE KEY UPDATE invariant_service_id = VALUES(invariant_service_id) , timestamp = CURRENT_TIMESTAMP , object_data = VALUES(object_data) "; - jdbcTemplateObject.update(insertCldsServiceCacheSql, invariantUuid, serviceUuid, is); - } - } - private static Map logSqlExecution(SimpleJdbcCall call, SqlParameterSource source) { try { return call.execute(source); diff --git a/src/main/java/org/onap/clamp/clds/service/CldsService.java b/src/main/java/org/onap/clamp/clds/service/CldsService.java index 2bad07f4..42e9cf71 100644 --- a/src/main/java/org/onap/clamp/clds/service/CldsService.java +++ b/src/main/java/org/onap/clamp/clds/service/CldsService.java @@ -35,7 +35,6 @@ import java.lang.reflect.Type; import java.security.GeneralSecurityException; import java.util.Date; import java.util.List; -import java.util.Optional; import java.util.UUID; import javax.servlet.http.HttpServletRequest; @@ -45,23 +44,19 @@ import javax.xml.transform.TransformerException; import org.apache.camel.Produce; import org.apache.commons.codec.DecoderException; -import org.apache.commons.lang3.StringUtils; import org.json.simple.parser.ParseException; import org.onap.clamp.clds.camel.CamelProxy; import org.onap.clamp.clds.client.DcaeDispatcherServices; import org.onap.clamp.clds.client.DcaeInventoryServices; -import org.onap.clamp.clds.client.req.sdc.SdcCatalogServices; import org.onap.clamp.clds.config.ClampProperties; import org.onap.clamp.clds.dao.CldsDao; import org.onap.clamp.clds.exception.policy.PolicyClientException; import org.onap.clamp.clds.exception.sdc.SdcCommunicationException; -import org.onap.clamp.clds.model.CldsDbServiceCache; import org.onap.clamp.clds.model.CldsEvent; import org.onap.clamp.clds.model.CldsInfo; import org.onap.clamp.clds.model.CldsModel; import org.onap.clamp.clds.model.CldsModelProp; import org.onap.clamp.clds.model.CldsMonitoringDetails; -import org.onap.clamp.clds.model.CldsServiceData; import org.onap.clamp.clds.model.CldsTemplate; import org.onap.clamp.clds.model.DcaeEvent; import org.onap.clamp.clds.model.ValueItem; @@ -94,11 +89,9 @@ public class CldsService extends SecureServiceBase { protected static final EELFLogger logger = EELFManager.getInstance().getLogger(CldsService.class); public static final String GLOBAL_PROPERTIES_KEY = "files.globalProperties"; - private final String cldsPersmissionTypeCl; private final String cldsPermissionTypeClManage; private final String cldsPermissionTypeClEvent; private final String cldsPermissionTypeFilterVf; - private final String cldsPermissionTypeTemplate; private final String cldsPermissionInstance; final SecureServicePermission permissionReadCl; final SecureServicePermission permissionUpdateCl; @@ -110,7 +103,6 @@ public class CldsService extends SecureServiceBase { private final CldsDao cldsDao; private final XslTransformer cldsBpmnTransformer; private final ClampProperties refProp; - private final SdcCatalogServices sdcCatalogServices; private final DcaeDispatcherServices dcaeDispatcherServices; private final DcaeInventoryServices dcaeInventoryServices; private LoggingUtils util = new LoggingUtils(logger); @@ -120,7 +112,7 @@ public class CldsService extends SecureServiceBase { @Autowired public CldsService(CldsDao cldsDao, XslTransformer cldsBpmnTransformer, ClampProperties refProp, - SdcCatalogServices sdcCatalogServices, DcaeDispatcherServices dcaeDispatcherServices, + DcaeDispatcherServices dcaeDispatcherServices, DcaeInventoryServices dcaeInventoryServices, @Value("${clamp.config.security.permission.type.cl:permission-type-cl}") String cldsPersmissionTypeCl, @Value("${clamp.config.security.permission.type.cl.manage:permission-type-cl-manage}") String cldsPermissionTypeClManage, @@ -132,14 +124,11 @@ public class CldsService extends SecureServiceBase { this.cldsDao = cldsDao; this.cldsBpmnTransformer = cldsBpmnTransformer; this.refProp = refProp; - this.sdcCatalogServices = sdcCatalogServices; this.dcaeDispatcherServices = dcaeDispatcherServices; this.dcaeInventoryServices = dcaeInventoryServices; - this.cldsPersmissionTypeCl = cldsPersmissionTypeCl; this.cldsPermissionTypeClManage = cldsPermissionTypeClManage; this.cldsPermissionTypeClEvent = cldsPermissionTypeClEvent; this.cldsPermissionTypeFilterVf = cldsPermissionTypeFilterVf; - this.cldsPermissionTypeTemplate = cldsPermissionTypeTemplate; this.cldsPermissionInstance = cldsPermissionInstance; permissionReadCl = SecureServicePermission.create(cldsPersmissionTypeCl, cldsPermissionInstance, "read"); permissionUpdateCl = SecureServicePermission.create(cldsPersmissionTypeCl, cldsPermissionInstance, "update"); @@ -469,32 +458,6 @@ public class CldsService extends SecureServiceBase { return msgInfo; } - /** - * REST service that retrieves sdc services - * - * @throws GeneralSecurityException - * In case of issue when decryting the SDC password - * @throws DecoderException - * In case of issues with the decoding of the Hex String - */ - public String getSdcServices() throws GeneralSecurityException, DecoderException { - util.entering(request, "CldsService: GET sdc services"); - Date startTime = new Date(); - String retStr; - try { - retStr = createUiServiceFormatJson(sdcCatalogServices.getSdcServicesInformation(null)); - } catch (IOException e) { - logger.error("IOException during SDC communication", e); - throw new SdcCommunicationException("IOException during SDC communication", e); - } - logger.info("value of sdcServices : {}", retStr); - // audit log - LoggingUtils.setTimeContext(startTime, new Date()); - auditLogger.info("GET sdc services completed"); - util.exiting("200", "Get sdc services success", Level.INFO, ONAPLogConstants.ResponseStatus.COMPLETED); - return retStr; - } - /** * REST service that retrieves total properties required by UI * @@ -505,41 +468,6 @@ public class CldsService extends SecureServiceBase { return refProp.getJsonTemplate(GLOBAL_PROPERTIES_KEY).toString(); } - /** - * REST service that retrieves total properties by using invariantUUID based on - * refresh and non refresh - * - * @throws GeneralSecurityException - * In case of issues with the decryting the encrypted password - * @throws DecoderException - * In case of issues with the decoding of the Hex String - * @throws IOException - * In case of issue to convert CldsServiceCache to InputStream - */ - public String getSdcPropertiesByServiceUUIDForRefresh(String serviceInvariantUUID, Boolean refresh) - throws GeneralSecurityException, DecoderException, IOException { - util.entering(request, "CldsService: GET sdc properties by uuid"); - Date startTime = new Date(); - CldsServiceData cldsServiceData = new CldsServiceData(); - cldsServiceData.setServiceInvariantUUID(serviceInvariantUUID); - if (!Optional.ofNullable(refresh).orElse(false)) { - cldsServiceData = cldsDao.getCldsServiceCache(serviceInvariantUUID); - } - if (sdcCatalogServices.isCldsSdcCacheDataExpired(cldsServiceData)) { - cldsServiceData = sdcCatalogServices.getCldsServiceDataWithAlarmConditions(serviceInvariantUUID); - cldsDao.setCldsServiceCache(new CldsDbServiceCache(cldsServiceData)); - } - // filter out VFs the user is not authorized for - cldsServiceData.filterVfs(this); - // format retrieved data into properties json - String sdcProperties = sdcCatalogServices.createPropertiesObjectByUUID(cldsServiceData); - // audit log - LoggingUtils.setTimeContext(startTime, new Date()); - auditLogger.info("GET sdc properties by uuid completed"); - util.exiting("200", "Get sdc properties by uuid success", Level.INFO, - ONAPLogConstants.ResponseStatus.COMPLETED); - return sdcProperties; - } /** * Determine if the user is authorized for a particular VF by its invariant @@ -579,27 +507,6 @@ public class CldsService extends SecureServiceBase { } } - private String createUiServiceFormatJson(String responseStr) throws IOException { - if (StringUtils.isBlank(responseStr)) { - return ""; - } - List rawList = JsonUtils.GSON.fromJson(responseStr, LIST_OF_SDC_SERVICE_INFO_TYPE); - JsonObject invariantIdServiceNode = new JsonObject(); - JsonObject serviceNode = new JsonObject(); - logger.info("value of cldsserviceiNfolist: {}", rawList); - if (rawList != null && !rawList.isEmpty()) { - List cldsSdcServiceInfoList = sdcCatalogServices.removeDuplicateServices(rawList); - for (SdcServiceInfo currCldsSdcServiceInfo : cldsSdcServiceInfoList) { - if (currCldsSdcServiceInfo != null) { - invariantIdServiceNode.addProperty(currCldsSdcServiceInfo.getInvariantUUID(), - currCldsSdcServiceInfo.getName()); - } - } - serviceNode.add("service", invariantIdServiceNode); - } - return serviceNode.toString(); - } - public ResponseEntity deployModel(String modelName, CldsModel model) { util.entering(request, "CldsService: Deploy model"); Date startTime = new Date(); diff --git a/src/main/resources/META-INF/resources/designer/partials/portfolios/global_properties.html b/src/main/resources/META-INF/resources/designer/partials/portfolios/global_properties.html index 811f6b71..c47e90a4 100644 --- a/src/main/resources/META-INF/resources/designer/partials/portfolios/global_properties.html +++ b/src/main/resources/META-INF/resources/designer/partials/portfolios/global_properties.html @@ -47,28 +47,6 @@
-
- - -
- -
-
-
- - -
- - -
-
-
@@ -125,63 +103,8 @@ -
- diff --git a/src/main/resources/META-INF/resources/designer/scripts/CldsModelService.js b/src/main/resources/META-INF/resources/designer/scripts/CldsModelService.js index 9d4598b8..0e44aec1 100644 --- a/src/main/resources/META-INF/resources/designer/scripts/CldsModelService.js +++ b/src/main/resources/META-INF/resources/designer/scripts/CldsModelService.js @@ -117,34 +117,6 @@ app handleQueryToBackend(def, action, deployUrl, requestData); return def.promise; }; - this.getASDCServices = function() { - - var def = $q.defer(); - var sets = []; - var svcUrl = "/restservices/clds/v1/clds/sdc/services/"; - $http.get(svcUrl).success(function(data) { - - def.resolve(data); - }).error(function(data) { - - def.reject("sdc Services not found"); - }); - return def.promise; - }; - this.getASDCService = function(uuid) { - - var def = $q.defer(); - var sets = []; - var svcUrl = "/restservices/clds/v1/clds/sdc/services/" + uuid; - $http.get(svcUrl).success(function(data) { - - def.resolve(data); - }).error(function(data) { - - def.reject("SDC service not found"); - }); - return def.promise; - }; this.getModel = function(modelName) { var def = $q.defer(); @@ -373,8 +345,6 @@ app .remove('ThisLink'); document.getElementById('Refresh Status').classList .remove('ThisLink'); - document.getElementById('Refresh ASDC').classList - .remove('ThisLink'); } // enable/disable menu options based on permittedActionCd // list @@ -392,10 +362,4 @@ app this.checkPermittedActionCd(permittedActionCd, 'UnDeploy', 'UNDEPLOY'); } - this.getASDCServices().then(function(pars) { - - var obj = JSON.parse(pars); - var services = obj.service; - asdc_Services = services - }); } ]); diff --git a/src/main/resources/META-INF/resources/designer/scripts/CldsOpenModelCtrl.js b/src/main/resources/META-INF/resources/designer/scripts/CldsOpenModelCtrl.js index a64af746..2b7c6258 100644 --- a/src/main/resources/META-INF/resources/designer/scripts/CldsOpenModelCtrl.js +++ b/src/main/resources/META-INF/resources/designer/scripts/CldsOpenModelCtrl.js @@ -51,8 +51,6 @@ function($scope, $rootScope, $modalInstance, $window, $uibModalInstance, cldsMod }); $scope.paramsRetry = function() { // $("#paramsWarn").hide(); - var currentValue = $("#service").val() == null ? previous : $( - "#service").val(); $("#ridinSpinners").css("display", "") loadSharedPropertyByService(currentValue, true, callBack); $("#ridinSpinners").css("display", "none") @@ -71,11 +69,6 @@ function($scope, $rootScope, $modalInstance, $window, $uibModalInstance, cldsMod $scope.close(); } } - $scope.refreshASDC = function() { - $("#ridinSpinners").css("display", "") - var bool = loadSharedPropertyByService(undefined, true, callBack); - $("#ridinSpinners").css("display", "none"); - } cldsTemplateService.getSavedTemplate().then(function(pars) { $scope.templateNamel = [] for (var i = 0; i < pars.length; i++) { diff --git a/src/main/resources/META-INF/resources/designer/scripts/GlobalPropertiesCtrl.js b/src/main/resources/META-INF/resources/designer/scripts/GlobalPropertiesCtrl.js index f4c658ce..21572a5f 100644 --- a/src/main/resources/META-INF/resources/designer/scripts/GlobalPropertiesCtrl.js +++ b/src/main/resources/META-INF/resources/designer/scripts/GlobalPropertiesCtrl.js @@ -31,15 +31,9 @@ app.controller('GlobalPropertiesCtrl', [ function($scope, $rootScope, $uibModalInstance, cldsModelService, $location, dialogs, cldsTemplateService) { $scope.$watch('name', function(newValue, oldValue) { - var services = asdc_Services + setASDCFields() - // add blank service item as the default service, to force user chose - // the correct service by themselves - $("#service").append("") - for (k in services) { - $("#service").append( - "") - } + var el = elementMap["global"]; if (el !== undefined) { for (var i = 0; i < el.length; i++) { diff --git a/src/main/resources/META-INF/resources/designer/scripts/aOnBoot.js b/src/main/resources/META-INF/resources/designer/scripts/aOnBoot.js index b69cfea0..11ad5fa9 100644 --- a/src/main/resources/META-INF/resources/designer/scripts/aOnBoot.js +++ b/src/main/resources/META-INF/resources/designer/scripts/aOnBoot.js @@ -142,56 +142,7 @@ function setMultiSelect() { } function loadSharedPropertyByService(onChangeUUID, refresh, callBack) { - var uuid = onChangeUUID; - if (uuid === undefined) { - uuid = elementMap["global"] && elementMap["global"].length > 0 ? - elementMap["global"][0].value : ""; - } - var share = null, - serviceUrl = '/restservices/clds/v1/clds/properties/' + uuid; - if (refresh) { - serviceUrl = '/restservices/clds/v1/clds/properties/' + uuid + '?refresh=true'; - } - - $.ajax({ - async: false, - dataType: "json", - url: serviceUrl, - success: function(data) { - vf_Services = JSON.parse(data); setASDCFields() - if (refresh) { - $("#paramsWarnrefresh").hide(); - } - if ($("#paramsWarn")) { - $("#paramsWarn").hide(); - } - if (callBack && _.isFunction(callBack)) { - callBack(true); - } - }, - error: function(s, a, err) { - if (refresh) { - $("#paramsWarnrefresh").show(); - } - if ($("#paramsWarn")) { - $("#paramsWarn").show(); - } - - $('#servName').text($("#service option:selected").text()); - if (callBack && _.isFunction(callBack)) { - callBack(false); - } - console.log(err) - console.log(s) - console.log(a) - }, - timeout: 100000 - - }); - - //vf_Services=share['shared']['byService'][uuid]; - //location_values = share['global']['location']; } function loadSharedPropertyByServiceProperties(callBack) { @@ -218,45 +169,8 @@ function loadSharedPropertyByServiceProperties(callBack) { } function setASDCFields() { - if (vf_Services === null || vf_Services === undefined) { - loadSharedPropertyByService() - } else { try { - $("#vf").empty().multiselect("refresh"); - $("#location").empty().multiselect("refresh"); - $("#actionSet").empty().multiselect("refresh"); - $("#vfc").empty().multiselect("refresh"); - $("#paramsWarn").hide(); - var uuid = Object.keys(vf_Services['shared']['byService'])[0]; - - var vf_values = vf_Services['shared']['byService'][uuid] && - vf_Services['shared']['byService'][uuid]['vf'] && - _.keys(vf_Services['shared']['byService'][uuid]['vf']).length > 0 ? - vf_Services['shared']['byService'][uuid]['vf'] : null; - - var selectedVF = {} - for (let e in elementMap["global"]) { - if (elementMap['global'][e].name === "vf") { - selectedVF = elementMap['global'][e].value[0] - } - } - - var vfc_values2 = selectedVF && - vf_Services['shared']['byVf'][selectedVF] && - vf_Services['shared']['byVf'][selectedVF]['vfc'] && - _.keys(vf_Services['shared']['byVf'][selectedVF]['vfc']).length > 0 ? - vf_Services['shared']['byVf'][selectedVF]['vfc'] : null; - - if (vf_values) { - for (key in vf_values) { - if ($("#vf").length > 0) { - $("#vf").append("