Skip to content
Snippets Groups Projects
Commit eada418f authored by trantzas's avatar trantzas
Browse files

Merge branch 'hotfix/45-nslcm-statuses-are-presented-as-strings-rather-than-jsons' into 'develop' 

NSLCM Statuses are now being offered as an array of Json Nodes

See merge request !37
parents d8b4a223 18f6798d
No related branches found
No related tags found
2 merge requests!59MR for Release 2024Q4,!37NSLCM Statuses are now being offered as an array of Json Nodes
Pipeline #9577 failed
Stage: build
Expand all Hide whitespace changes
Inline Side-by-side
src/main/java/org/etsi/osl/tmf/sim638/service/ServiceRepoService.java
+ 58
− 29
View file @ eada418f
......@@ -32,6 +32,8 @@ import java.util.Optional;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.datatype.hibernate5.jakarta.Hibernate5JakartaModule;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
......@@ -760,43 +762,72 @@ public class ServiceRepoService {
ObjectMapper primitivesObjectMapper = new ObjectMapper();
// Retrieve the service characteristic based on the name
Characteristic aNSLCMCharacteristic = service.getServiceCharacteristicByName(n.getName());
// Retrieve the current value as a string directly from the service characteristic
String aNSLCMCharacteristicValue = service.getServiceCharacteristicByName(n.getName()).getValue().getValue();
// Check if the current service characteristic value is null or explicitly "null" and initialize if needed
if (aNSLCMCharacteristicValue == null || "null".equals(aNSLCMCharacteristicValue) || aNSLCMCharacteristicValue.equals("")) {
service.getServiceCharacteristicByName(n.getName()).getValue().setValue("[]");
}
Characteristic aNSLCMStatusesCharacteristic = service.getServiceCharacteristicByName(n.getName());
// Retrieve the current NSLCM statuses, and extract the new status
// to be appended
String aNSLCMStatusesBeforeUpdate = service
.getServiceCharacteristicByName(n.getName()).getValue().getValue();
String aNSLCMNewStatus = n.getValue().getValue();
// Check if the current NSLCM statuses value is null or explicitly "null"
// and, if thats the case start an empty JSON array (this takes place when initializing the characteristic)
if ( aNSLCMStatusesBeforeUpdate == null ||
aNSLCMStatusesBeforeUpdate.isEmpty() ||
aNSLCMStatusesBeforeUpdate.equals("null")
){
try {
service.getServiceCharacteristicByName(n.getName()).getValue().setValue(
primitivesObjectMapper.writeValueAsString(primitivesObjectMapper.createArrayNode())
);
} catch (JsonProcessingException e) {
e.printStackTrace();
}
}
// Check if the current characteristic value is not null and not explicitly "null"
if (n.getValue().getValue() != null || !"null".equals(n.getValue().getValue())) {
aNSLCMCharacteristicValue = service.getServiceCharacteristicByName(n.getName()).getValue().getValue();
if ( aNSLCMNewStatus != null &&
!aNSLCMNewStatus.isEmpty() &&
!aNSLCMNewStatus.equals("null")
) {
try {
// Deserialize the current statuses back to an array list
ArrayNode nslcmStatusesJsonArray = (ArrayNode) primitivesObjectMapper.readTree(
service.getServiceCharacteristicByName(n.getName()).getValue().getValue()
);
ArrayList<String> arrayList = null;
// Map the current status to json
JsonNode currenNSLCMStatus = primitivesObjectMapper.readTree(n.getValue().getValue());
// Deserialize the current value back to an array list
try {
arrayList = primitivesObjectMapper.readValue(aNSLCMCharacteristicValue, new TypeReference<ArrayList<String>>() {});
// Add the new status to the list if it's not already present and is not null
if (!containsNode(nslcmStatusesJsonArray, currenNSLCMStatus)) {
nslcmStatusesJsonArray.add(currenNSLCMStatus);
}
// Finally, map the statuses list to a Json encoded one
aNSLCMStatusesCharacteristic.setValue(
new Any(primitivesObjectMapper.writeValueAsString(nslcmStatusesJsonArray), n.getValue().getAlias())
);
} catch (JsonProcessingException e) {
e.printStackTrace();
}
}
return service;
}
// Add the new value to the list if it's not already present and is not null
if (!arrayList.contains(n.getValue().getValue()) && n.getValue().getValue() != null) {
arrayList.add(n.getValue().getValue());
}
// Update the characteristic with the newly modified list
try {
aNSLCMCharacteristic.setValue(new Any(primitivesObjectMapper.writeValueAsString(arrayList), n.getValue().getAlias()));
} catch (JsonProcessingException e) {
e.printStackTrace();
/**
* Helper method to check if an ArrayNode contains a specific JsonNode.
* This method uses Jackson's `equals()` for deep equality.
* @param arrayNode Array of Json Nodes
* @param jsonNode the object encoded as Jsons
*/
private static boolean containsNode(ArrayNode arrayNode, JsonNode jsonNode) {
for (JsonNode node : arrayNode) {
if (node.equals(jsonNode)) {
return true;
}
}
return service;
return false;
}
......@@ -1248,7 +1279,5 @@ public class ServiceRepoService {
}
}
src/test/java/org/etsi/osl/services/service/ServiceRepoServiceTest.java
+ 51
− 9
View file @ eada418f
......@@ -43,6 +43,9 @@ import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.junit4.SpringRunner;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.ArrayNode;
@RunWith(SpringRunner.class)
@ActiveProfiles("testing")
......@@ -174,7 +177,22 @@ public class ServiceRepoServiceTest {
serviceRepoService.updateNSLCMCharacteristic(service, n);
assertEquals("[\"null\"]", service.getServiceCharacteristicByName(n.getName()).getValue().getValue());
try {
ArrayNode expected = (ArrayNode) objectMapper.readTree(
"[]"
);
ArrayNode actual = (ArrayNode) objectMapper.readTree(
service.getServiceCharacteristicByName(n.getName()).getValue().getValue()
);
assertEquals(
expected,
actual
);
break;
} catch (JsonProcessingException e) {
e.printStackTrace();
}
}
}
}
......@@ -211,10 +229,22 @@ public class ServiceRepoServiceTest {
serviceRepoService.updateNSLCMCharacteristic(service, n);
assertEquals(
"[\"{\\\"queuePosition\\\":0,\\\"lcmOperationType\\\":\\\"instantiate\\\",\\\"detailed-status\\\":\\\"Done\\\",\\\"operationState\\\":\\\"COMPLETED\\\",\\\"errorMessage\\\":null,\\\"nsInstanceId\\\":\\\"420fa806-f2f8-405e-8348-11e4fcd13f25\\\",\\\"_admin\\\":{\\\"projects_write\\\":[\\\"92636b50-d607-4801-98b5-f0da541363be\\\"],\\\"created\\\":1.7169792184842422E9,\\\"modified\\\":1.7169794444025614E9,\\\"worker\\\":\\\"d6f95b754d12\\\",\\\"projects_read\\\":[\\\"92636b50-d607-4801-98b5-f0da541363be\\\"]},\\\"detailedStatus\\\":null,\\\"stage\\\":\\\"\\\",\\\"operationParams\\\":{\\\"nsInstanceId\\\":\\\"420fa806-f2f8-405e-8348-11e4fcd13f25\\\",\\\"ssh_keys\\\":[\\\"\\\"],\\\"lcmOperationType\\\":\\\"instantiate\\\",\\\"nsdId\\\":\\\"338d3a8c-af70-446a-af37-ed8bb97a6641\\\",\\\"nsName\\\":\\\"Service_Order_65bcf307-1a47-4a48-b211-be94c3390b81\\\",\\\"vimAccountId\\\":\\\"479356bf-72ff-4dfd-8483-5c23f48dd0bc\\\"},\\\"startTime\\\":1.7169792184841862E9,\\\"links\\\":{\\\"nsInstance\\\":\\\"/osm/nslcm/v1/ns_instances/420fa806-f2f8-405e-8348-11e4fcd13f25\\\",\\\"self\\\":\\\"/osm/nslcm/v1/ns_lcm_op_occs/e0836187-7d4a-49ac-a317-fc4108ed2f93\\\"},\\\"_id\\\":\\\"e0836187-7d4a-49ac-a317-fc4108ed2f93\\\",\\\"id\\\":\\\"e0836187-7d4a-49ac-a317-fc4108ed2f93\\\",\\\"isAutomaticInvocation\\\":false,\\\"isCancelPending\\\":false,\\\"statusEnteredTime\\\":1.7169794444025595E9}\"]",
try {
ArrayNode expected = (ArrayNode) objectMapper.readTree(
"[{\"queuePosition\":0,\"lcmOperationType\":\"instantiate\",\"detailed-status\":\"Done\",\"operationState\":\"COMPLETED\",\"errorMessage\":null,\"nsInstanceId\":\"420fa806-f2f8-405e-8348-11e4fcd13f25\",\"_admin\":{\"projects_write\":[\"92636b50-d607-4801-98b5-f0da541363be\"],\"created\":1.7169792184842422E9,\"modified\":1.7169794444025614E9,\"worker\":\"d6f95b754d12\",\"projects_read\":[\"92636b50-d607-4801-98b5-f0da541363be\"]},\"detailedStatus\":null,\"stage\":\"\",\"operationParams\":{\"nsInstanceId\":\"420fa806-f2f8-405e-8348-11e4fcd13f25\",\"ssh_keys\":[\"\"],\"lcmOperationType\":\"instantiate\",\"nsdId\":\"338d3a8c-af70-446a-af37-ed8bb97a6641\",\"nsName\":\"Service_Order_65bcf307-1a47-4a48-b211-be94c3390b81\",\"vimAccountId\":\"479356bf-72ff-4dfd-8483-5c23f48dd0bc\"},\"startTime\":1.7169792184841862E9,\"links\":{\"nsInstance\":\"/osm/nslcm/v1/ns_instances/420fa806-f2f8-405e-8348-11e4fcd13f25\",\"self\":\"/osm/nslcm/v1/ns_lcm_op_occs/e0836187-7d4a-49ac-a317-fc4108ed2f93\"},\"_id\":\"e0836187-7d4a-49ac-a317-fc4108ed2f93\",\"id\":\"e0836187-7d4a-49ac-a317-fc4108ed2f93\",\"isAutomaticInvocation\":false,\"isCancelPending\":false,\"statusEnteredTime\":1.7169794444025595E9}]"
);
ArrayNode actual = (ArrayNode) objectMapper.readTree(
service.getServiceCharacteristicByName(n.getName()).getValue().getValue()
);
);
assertEquals(
expected,
actual
);
break;
} catch (JsonProcessingException e) {
e.printStackTrace();
}
}
}
}
......@@ -247,15 +277,27 @@ public class ServiceRepoServiceTest {
// Check if the name contains "NSLCM" in any case
if (n.getName().toUpperCase().contains("NSLCM")) {
// Set the value of NSLCM to null
service.getServiceCharacteristicByName(n.getName()).getValue().setValue("[\"existingValue\"]");
// Set the value of NSLCM
service.getServiceCharacteristicByName(n.getName()).getValue().setValue("[{\"test\": 2}]");
serviceRepoService.updateNSLCMCharacteristic(service, n);
assertEquals(
"[\"existingValue\",\"{\\\"queuePosition\\\":0,\\\"lcmOperationType\\\":\\\"instantiate\\\",\\\"detailed-status\\\":\\\"Done\\\",\\\"operationState\\\":\\\"COMPLETED\\\",\\\"errorMessage\\\":null,\\\"nsInstanceId\\\":\\\"420fa806-f2f8-405e-8348-11e4fcd13f25\\\",\\\"_admin\\\":{\\\"projects_write\\\":[\\\"92636b50-d607-4801-98b5-f0da541363be\\\"],\\\"created\\\":1.7169792184842422E9,\\\"modified\\\":1.7169794444025614E9,\\\"worker\\\":\\\"d6f95b754d12\\\",\\\"projects_read\\\":[\\\"92636b50-d607-4801-98b5-f0da541363be\\\"]},\\\"detailedStatus\\\":null,\\\"stage\\\":\\\"\\\",\\\"operationParams\\\":{\\\"nsInstanceId\\\":\\\"420fa806-f2f8-405e-8348-11e4fcd13f25\\\",\\\"ssh_keys\\\":[\\\"\\\"],\\\"lcmOperationType\\\":\\\"instantiate\\\",\\\"nsdId\\\":\\\"338d3a8c-af70-446a-af37-ed8bb97a6641\\\",\\\"nsName\\\":\\\"Service_Order_65bcf307-1a47-4a48-b211-be94c3390b81\\\",\\\"vimAccountId\\\":\\\"479356bf-72ff-4dfd-8483-5c23f48dd0bc\\\"},\\\"startTime\\\":1.7169792184841862E9,\\\"links\\\":{\\\"nsInstance\\\":\\\"/osm/nslcm/v1/ns_instances/420fa806-f2f8-405e-8348-11e4fcd13f25\\\",\\\"self\\\":\\\"/osm/nslcm/v1/ns_lcm_op_occs/e0836187-7d4a-49ac-a317-fc4108ed2f93\\\"},\\\"_id\\\":\\\"e0836187-7d4a-49ac-a317-fc4108ed2f93\\\",\\\"id\\\":\\\"e0836187-7d4a-49ac-a317-fc4108ed2f93\\\",\\\"isAutomaticInvocation\\\":false,\\\"isCancelPending\\\":false,\\\"statusEnteredTime\\\":1.7169794444025595E9}\"]",
try {
ArrayNode expected = (ArrayNode) objectMapper.readTree(
"[{\"test\": 2}, {\"queuePosition\":0,\"lcmOperationType\":\"instantiate\",\"detailed-status\":\"Done\",\"operationState\":\"COMPLETED\",\"errorMessage\":null,\"nsInstanceId\":\"420fa806-f2f8-405e-8348-11e4fcd13f25\",\"_admin\":{\"projects_write\":[\"92636b50-d607-4801-98b5-f0da541363be\"],\"created\":1.7169792184842422E9,\"modified\":1.7169794444025614E9,\"worker\":\"d6f95b754d12\",\"projects_read\":[\"92636b50-d607-4801-98b5-f0da541363be\"]},\"detailedStatus\":null,\"stage\":\"\",\"operationParams\":{\"nsInstanceId\":\"420fa806-f2f8-405e-8348-11e4fcd13f25\",\"ssh_keys\":[\"\"],\"lcmOperationType\":\"instantiate\",\"nsdId\":\"338d3a8c-af70-446a-af37-ed8bb97a6641\",\"nsName\":\"Service_Order_65bcf307-1a47-4a48-b211-be94c3390b81\",\"vimAccountId\":\"479356bf-72ff-4dfd-8483-5c23f48dd0bc\"},\"startTime\":1.7169792184841862E9,\"links\":{\"nsInstance\":\"/osm/nslcm/v1/ns_instances/420fa806-f2f8-405e-8348-11e4fcd13f25\",\"self\":\"/osm/nslcm/v1/ns_lcm_op_occs/e0836187-7d4a-49ac-a317-fc4108ed2f93\"},\"_id\":\"e0836187-7d4a-49ac-a317-fc4108ed2f93\",\"id\":\"e0836187-7d4a-49ac-a317-fc4108ed2f93\",\"isAutomaticInvocation\":false,\"isCancelPending\":false,\"statusEnteredTime\":1.7169794444025595E9}]"
);
ArrayNode actual = (ArrayNode) objectMapper.readTree(
service.getServiceCharacteristicByName(n.getName()).getValue().getValue()
);
);
assertEquals(
expected,
actual
);
break;
} catch (JsonProcessingException e) {
e.printStackTrace();
}
}
}
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment