* See the License for the specific language governing permissions and\r
* limitations under the License.\r
* ============LICENSE_END============================================\r
+ * Modifications copyright (c) 2018 Nokia\r
* ===================================================================\r
- * \r
+ *\r
*/\r
\r
package org.onap.clamp.clds.client;\r
\r
import com.att.eelf.configuration.EELFLogger;\r
import com.att.eelf.configuration.EELFManager;\r
-import com.fasterxml.jackson.core.JsonProcessingException;\r
-import com.fasterxml.jackson.databind.node.ObjectNode;\r
\r
import java.io.IOException;\r
import java.util.Date;\r
import java.util.List;\r
\r
-import javax.ws.rs.BadRequestException;\r
-\r
import org.json.simple.JSONArray;\r
import org.json.simple.JSONObject;\r
import org.json.simple.parser.JSONParser;\r
import org.onap.clamp.clds.model.dcae.DcaeInventoryResponse;\r
import org.onap.clamp.clds.model.properties.Global;\r
import org.onap.clamp.clds.model.properties.ModelProperties;\r
-import org.onap.clamp.clds.util.JacksonUtils;\r
+import org.onap.clamp.clds.util.JsonUtils;\r
import org.onap.clamp.clds.util.LoggingUtils;\r
+import org.onap.clamp.util.HttpConnectionManager;\r
import org.springframework.beans.factory.annotation.Autowired;\r
import org.springframework.stereotype.Component;\r
\r
public static final String DCAE_INVENTORY_URL = "dcae.inventory.url";\r
public static final String DCAE_INVENTORY_RETRY_INTERVAL = "dcae.intentory.retry.interval";\r
public static final String DCAE_INVENTORY_RETRY_LIMIT = "dcae.intentory.retry.limit";\r
- public static final String DCAE_TYPE_NAME = "typeName";\r
- public static final String DCAE_TYPE_ID = "typeId";\r
- @Autowired\r
- private ClampProperties refProp;\r
+ private final ClampProperties refProp;\r
+ private final CldsDao cldsDao;\r
+ private final HttpConnectionManager httpConnectionManager;\r
+\r
+ /**\r
+ * Constructor.\r
+ */\r
@Autowired\r
- private CldsDao cldsDao;\r
+ public DcaeInventoryServices(ClampProperties refProp, CldsDao cldsDao,\r
+ HttpConnectionManager httpConnectionManager) {\r
+ this.refProp = refProp;\r
+ this.cldsDao = cldsDao;\r
+ this.httpConnectionManager = httpConnectionManager;\r
+ }\r
\r
/**\r
* Set the event inventory.\r
- * \r
+ *\r
* @param cldsModel\r
- * The CldsModel\r
+ * The CldsModel\r
* @param userId\r
- * The user ID\r
+ * The user ID\r
* @throws ParseException\r
- * In case of DCAE Json parse exception\r
+ * In case of DCAE Json parse exception\r
*/\r
- public void setEventInventory(CldsModel cldsModel, String userId) throws ParseException, InterruptedException {\r
+ public void setEventInventory(CldsModel cldsModel, String userId) throws InterruptedException {\r
String artifactName = cldsModel.getControlName();\r
DcaeEvent dcaeEvent = new DcaeEvent();\r
DcaeInventoryResponse dcaeResponse = null;\r
try {\r
// Below are the properties required for calling the dcae inventory\r
ModelProperties prop = new ModelProperties(cldsModel.getName(), cldsModel.getControlName(), null, false,\r
- "{}", cldsModel.getPropText());\r
+ "{}", cldsModel.getPropText());\r
Global global = prop.getGlobal();\r
String invariantServiceUuid = global.getService();\r
List<String> resourceUuidList = global.getResourceVf();\r
dcaeEvent.setArtifactName(artifactName);\r
dcaeEvent.setEvent(DcaeEvent.EVENT_DISTRIBUTION);\r
LoggingUtils.setResponseContext("0", "Set inventory success", this.getClass().getName());\r
- } catch (JsonProcessingException e) {\r
+ } catch (ParseException e) {\r
LoggingUtils.setResponseContext("900", "Set inventory failed", this.getClass().getName());\r
LoggingUtils.setErrorContext("900", "Set inventory error");\r
logger.error("Error during JSON decoding", e);\r
}\r
\r
private void analyzeAndSaveDcaeResponse(DcaeInventoryResponse dcaeResponse, CldsModel cldsModel,\r
- DcaeEvent dcaeEvent, String userId) {\r
+ DcaeEvent dcaeEvent, String userId) {\r
if (dcaeResponse != null) {\r
logger.info("Dcae Response for query on inventory: " + dcaeResponse);\r
String oldTypeId = cldsModel.getTypeId();\r
- String newTypeId = "";\r
if (dcaeResponse.getTypeId() != null) {\r
- newTypeId = dcaeResponse.getTypeId();\r
cldsModel.setTypeId(dcaeResponse.getTypeId());\r
}\r
if (dcaeResponse.getTypeName() != null) {\r
cldsModel.setTypeName(dcaeResponse.getTypeName());\r
}\r
- if (oldTypeId == null || !oldTypeId.equalsIgnoreCase(newTypeId)\r
- || cldsModel.getEvent().getActionCd().equalsIgnoreCase(CldsEvent.ACTION_SUBMITDCAE)) {\r
+ if (oldTypeId == null || !cldsModel.getEvent().getActionCd().equalsIgnoreCase(CldsEvent.ACTION_DISTRIBUTE)\r
+ || cldsModel.getEvent().getActionCd().equalsIgnoreCase(CldsEvent.ACTION_SUBMITDCAE)) {\r
CldsEvent.insEvent(cldsDao, dcaeEvent.getControlName(), userId, dcaeEvent.getCldsActionCd(),\r
- CldsEvent.ACTION_STATE_RECEIVED, null);\r
+ CldsEvent.ACTION_STATE_RECEIVED, null);\r
}\r
cldsModel.save(cldsDao, userId);\r
} else {\r
return totalCount.intValue();\r
}\r
\r
- private DcaeInventoryResponse getItemsFromDcaeInventoryResponse(String responseStr)\r
- throws ParseException, IOException {\r
+ private DcaeInventoryResponse getItemsFromDcaeInventoryResponse(String responseStr) throws ParseException {\r
JSONParser parser = new JSONParser();\r
Object obj0 = parser.parse(responseStr);\r
JSONObject jsonObj = (JSONObject) obj0;\r
JSONArray itemsArray = (JSONArray) jsonObj.get("items");\r
JSONObject dcaeServiceType0 = (JSONObject) itemsArray.get(0);\r
- return JacksonUtils.getObjectMapperInstance().readValue(dcaeServiceType0.toString(),\r
- DcaeInventoryResponse.class);\r
+ return JsonUtils.GSON.fromJson(dcaeServiceType0.toString(), DcaeInventoryResponse.class);\r
}\r
\r
/**\r
* DO a query to DCAE to get some Information.\r
- * \r
+ *\r
* @param artifactName\r
- * The artifact Name\r
+ * The artifact Name\r
* @param serviceUuid\r
- * The service UUID\r
+ * The service UUID\r
* @param resourceUuid\r
- * The resource UUID\r
+ * The resource UUID\r
* @return The DCAE inventory for the artifact in DcaeInventoryResponse\r
* @throws IOException\r
- * In case of issues with the stream\r
+ * In case of issues with the stream\r
* @throws ParseException\r
- * In case of issues with the Json parsing\r
+ * In case of issues with the Json parsing\r
*/\r
public DcaeInventoryResponse getDcaeInformation(String artifactName, String serviceUuid, String resourceUuid)\r
- throws IOException, ParseException, InterruptedException {\r
- Date startTime = new Date();\r
+ throws IOException, ParseException, InterruptedException {\r
LoggingUtils.setTargetContext("DCAE", "getDcaeInformation");\r
String queryString = "?asdcResourceId=" + resourceUuid + "&asdcServiceId=" + serviceUuid + "&typeName="\r
- + artifactName;\r
+ + artifactName;\r
String fullUrl = refProp.getStringValue(DCAE_INVENTORY_URL) + "/dcae-service-types" + queryString;\r
logger.info("Dcae Inventory Service full url - " + fullUrl);\r
DcaeInventoryResponse response = queryDcaeInventory(fullUrl);\r
LoggingUtils.setResponseContext("0", "Get Dcae Information success", this.getClass().getName());\r
+ Date startTime = new Date();\r
LoggingUtils.setTimeContext(startTime, new Date());\r
return response;\r
}\r
\r
private DcaeInventoryResponse queryDcaeInventory(String fullUrl)\r
- throws IOException, InterruptedException, ParseException {\r
+ throws IOException, InterruptedException, ParseException {\r
int retryInterval = 0;\r
int retryLimit = 1;\r
if (refProp.getStringValue(DCAE_INVENTORY_RETRY_LIMIT) != null) {\r
}\r
for (int i = 0; i < retryLimit; i++) {\r
metricsLogger.info("Attempt n°" + i + " to contact DCAE inventory");\r
- String response = DcaeHttpConnectionManager.doDcaeHttpQuery(fullUrl, "GET", null, null);\r
+ String response = httpConnectionManager.doGeneralHttpQuery(fullUrl, "GET", null, null, "DCAE", null, null);\r
int totalCount = getTotalCountFromDcaeInventoryResponse(response);\r
metricsLogger.info("getDcaeInformation complete: totalCount returned=" + totalCount);\r
if (totalCount > 0) {\r
return getItemsFromDcaeInventoryResponse(response);\r
}\r
logger.info(\r
- "Dcae inventory totalCount returned is 0, so waiting " + retryInterval + "ms before retrying ...");\r
+ "Dcae inventory totalCount returned is 0, so waiting " + retryInterval + "ms before retrying ...");\r
// wait for a while and try to connect to DCAE again\r
Thread.sleep(retryInterval);\r
}\r
logger.warn("Dcae inventory totalCount returned is still 0, after " + retryLimit + " attempts, returning NULL");\r
return null;\r
}\r
-\r
- /**\r
- * Inserts a new DCAEServiceType or updates an existing instance. If the\r
- * typeName is same second time(already exists) then the\r
- * DCAEServiceTypeRequest is updated\r
- * \r
- * @param blueprintTemplate\r
- * blueprint content\r
- * @param owner\r
- * owner of the data\r
- * @param typeName\r
- * The type/artifact Name\r
- * @param typeVersion\r
- * type version\r
- * @param asdcServiceId\r
- * The service UUID\r
- * @param asdcResourceId\r
- * The vf UUID\r
- * @return The DCAE inventory type id\r
- */\r
- public String createupdateDCAEServiceType(String blueprintTemplate, String owner, String typeName, int typeVersion,\r
- String asdcServiceId, String asdcResourceId) {\r
- Date startTime = new Date();\r
- LoggingUtils.setTargetContext("DCAE", "createDCAEServiceType");\r
- String typeId = null;\r
- try {\r
- ObjectNode dcaeServiceTypeRequest = JacksonUtils.getObjectMapperInstance().createObjectNode();\r
- dcaeServiceTypeRequest.put("blueprintTemplate", blueprintTemplate);\r
- dcaeServiceTypeRequest.put("owner", owner);\r
- dcaeServiceTypeRequest.put("typeName", typeName);\r
- dcaeServiceTypeRequest.put("typeVersion", typeVersion);\r
- dcaeServiceTypeRequest.put("asdcServiceId", asdcServiceId);\r
- dcaeServiceTypeRequest.put("asdcResourceId", asdcResourceId);\r
- String apiBodyString = dcaeServiceTypeRequest.toString();\r
- logger.info("Dcae api Body String - " + apiBodyString);\r
- String url = refProp.getStringValue(DCAE_INVENTORY_URL) + "/dcae-service-types";\r
- String responseStr = DcaeHttpConnectionManager.doDcaeHttpQuery(url, "POST", apiBodyString,\r
- "application/json");\r
- // If the DCAEServiceTypeRequest is created successfully it will\r
- // return a json object responce containing a node for newly created\r
- // "typeId"\r
- // The newly generated DCAEServiceTypeRequest can then be accessed\r
- // via URL: https://<DCAE_INVENTORY_URL>/dcae-service-types/<typeId>\r
- JSONParser parser = new JSONParser();\r
- Object obj0 = parser.parse(responseStr);\r
- JSONObject jsonObj = (JSONObject) obj0;\r
- typeId = (String) jsonObj.get("typeId"); // need to save this\r
- // as\r
- // service_type_id\r
- // in model table\r
- } catch (IOException | ParseException e) {\r
- logger.error("Exception occurred during createupdateDCAEServiceType Operation with DCAE", e);\r
- throw new BadRequestException("Exception occurred during createupdateDCAEServiceType Operation with DCAE",\r
- e);\r
- } finally {\r
- if (typeId != null) {\r
- LoggingUtils.setResponseContext("0", "Create update DCAE ServiceType success",\r
- this.getClass().getName());\r
- } else {\r
- LoggingUtils.setResponseContext("900", "Create update DCAE ServiceType failed",\r
- this.getClass().getName());\r
- LoggingUtils.setErrorContext("900", "Create update DCAE ServiceType error");\r
- }\r
- LoggingUtils.setTimeContext(startTime, new Date());\r
- metricsLogger.info("createupdateDCAEServiceType complete");\r
- }\r
- return typeId;\r
- }\r
}\r
Code Review / clamp.git / blobdiff