Fix issue where VNFImage data UUID is being overwritten, causing rollback
failures.
Change-Id: I66fd9125f7806c74d80ede6d2f0d4c04d0756cc0
Issue-ID: AAI-1148
Signed-off-by: Lee, Tian (tl5884) <tianl@amdocs.com>
// If an empty dataItem is supplied, do nothing.\r
if (dataItem.isEmpty()) {\r
logger.warn(ModelLoaderMsgs.DISTRIBUTION_EVENT, "Empty image data supplied, skipping ingestion.");\r
// If an empty dataItem is supplied, do nothing.\r
if (dataItem.isEmpty()) {\r
logger.warn(ModelLoaderMsgs.DISTRIBUTION_EVENT, "Empty image data supplied, skipping ingestion.");\r
}\r
\r
String urlParams;\r
}\r
\r
String urlParams;\r
String uuid = UUID.randomUUID().toString();\r
dataItem.put(ATTR_UUID, uuid);\r
\r
String uuid = UUID.randomUUID().toString();\r
dataItem.put(ATTR_UUID, uuid);\r
\r
- String payload = createVnfImagePayload(dataItem);\r
+ String payload = new Gson().toJson(dataItem);\r
String putUrl = config.getAaiBaseUrl() + config.getAaiVnfImageUrl() + "/vnf-image/" + uuid;\r
OperationResult putResp =\r
restClient.putResource(putUrl, payload, distributionId, MediaType.APPLICATION_JSON_TYPE);\r
return putResp != null && putResp.getResultCode() == Response.Status.CREATED.getStatusCode();\r
}\r
\r
String putUrl = config.getAaiBaseUrl() + config.getAaiVnfImageUrl() + "/vnf-image/" + uuid;\r
OperationResult putResp =\r
restClient.putResource(putUrl, payload, distributionId, MediaType.APPLICATION_JSON_TYPE);\r
return putResp != null && putResp.getResultCode() == Response.Status.CREATED.getStatusCode();\r
}\r
\r
- private String createVnfImagePayload(Map<String, String> dataItem) {\r
- dataItem.put(ATTR_UUID, UUID.randomUUID().toString());\r
- return new Gson().toJson(dataItem);\r
- }\r
-\r
private List<Map<String, String>> unmarshallVnfcData(Artifact vnfcArtifact) {\r
// Unmarshall Babel JSON payload into a List of Maps of JSON attribute name/values.\r
return new Gson().fromJson(StringEscapeUtils.unescapeJson(vnfcArtifact.getPayload()),\r
private List<Map<String, String>> unmarshallVnfcData(Artifact vnfcArtifact) {\r
// Unmarshall Babel JSON payload into a List of Maps of JSON attribute name/values.\r
return new Gson().fromJson(StringEscapeUtils.unescapeJson(vnfcArtifact.getPayload()),\r