Merge "Implement E2EService activation/deactivation for NetworkSlicing"

diff --cc src/main/java/org/onap/nbi/apis/serviceorder/workflow/PostSoProcessor.java
index 17b72e4,9c673f9..4568b80
--- 1/src/main/java/org/onap/nbi/apis/serviceorder/workflow/PostSoProcessor.java
--- 2/src/main/java/org/onap/nbi/apis/serviceorder/workflow/PostSoProcessor.java
+++ b/src/main/java/org/onap/nbi/apis/serviceorder/workflow/PostSoProcessor.java
@@@ -575,89 -578,5 +590,89 @@@ public class PostSoProcessor 
  
          return userParams;
      }
 +    
 +    /**
 +       * Build a list of InstanceParams for the SO Macro request by browsing a list of
 +       * ServiceCharacteristics
 +       */
 +      private HashMap<String, Object> retrieveInstanceParamsFromServiceCharacteristics(
 +                      List<ServiceCharacteristic> characteristics) {
 +
 +              HashMap<String, Object> instanceParams = new HashMap<>();
 +
 +              if (!CollectionUtils.isEmpty(characteristics)) {
 +                      for (ServiceCharacteristic characteristic : characteristics) {
 +                              // Check is the characteristic is of type object, if proceed as before to allow
 +                              // for
 +                              // backwards compatibility.
 +                              if (characteristic.getValueType() != null && !characteristic.getValueType().isEmpty()
 +                                              && characteristic.getValueType().equals("object")) {
 +                                      ObjectMapper mapper = new ObjectMapper();
 +                                      JsonNode jsonNode = null;
 +                                      try {
 +                                              jsonNode = mapper.readTree(characteristic.getValue().getServiceCharacteristicValue());
 +                                      } catch (IOException e) {
 +                                              LOGGER.error("Failed to read object json {} , exception is ",
 +                                                              characteristic.getValue().getServiceCharacteristicValue(), e.getMessage());
 +                                      }
 +                                      ObjectNode objectNode = (ObjectNode) jsonNode;
 +                                      Iterator<Map.Entry<String, JsonNode>> iter = objectNode.fields();
 +                                      while (iter.hasNext()) {
 +                                              Map.Entry<String, JsonNode> entry = iter.next();
 +                                              if (!entry.getValue().isArray()) {
 +                                                      instanceParams.put(entry.getKey(), entry.getValue().asText());
 +                                              } else {
 +                                                      ArrayNode arrayNode = (ArrayNode) entry.getValue();
 +                                                      String arrayNodeValueString = arrayNode.toString();
 +                                                      instanceParams.put(entry.getKey(), arrayNodeValueString);
 +                                              }
 +                                      }
 +                              } else {
 +                                      instanceParams.put(characteristic.getName(),
 +                                                      characteristic.getValue().getServiceCharacteristicValue());
 +                              }
 +                      }
 +              }
 +
 +              return instanceParams;
 +      }
 +      
 +      /**
 +       * Build and distinguish InstanceParams at VNF Level and Service level and overwrite values from ServiceOrder JSON Request.
 +       * Can be used as buildAndDistinguishServiceAndVnfLevelParams.get("vnf"); or buildAndDistinguishServiceAndVnfLevelParams.get("cnf");
 +       */
 +      private Map<String, Object> buildAndDistinguishServiceAndVnfLevelParams(
 +                      Map<String, Object> instanceParamsFromServiceCharacteristic, Map<String, Object> existingVNFParams,
 +                      Map<String, Object> existingServiceParams) {
 +
 +              //To be used by passing key as "vnf" or "service" for respective instanceParams
 +              Map<String, Object> serviceAndVNFLevelInstanceParams = new HashMap<>();
 +
 +              Map<String, Object> resultVNFParams = new HashMap<>();
 +              Map<String, Object> resultServiceParams = new HashMap<>();
 +
 +              // First Filter VNF level Params From Service Characteristics and overwrite
 +              // values
 +              resultVNFParams = instanceParamsFromServiceCharacteristic.entrySet().stream()
 +                              .filter(entry -> existingVNFParams.containsKey(entry.getKey()))
 +                              .collect(Collectors.toMap(Entry::getKey, Entry::getValue));
 +
 +              //Add it as VNF level Params
 +              serviceAndVNFLevelInstanceParams.put("vnf", resultVNFParams);
 +
 +              // Filter VNF level Params From Service Level
 +              existingServiceParams.entrySet().removeIf(e -> existingVNFParams.containsKey(e.getKey()));
 +
 +              // Filter Service level Params From Service Characteristics and overwrite values
 +              resultServiceParams = instanceParamsFromServiceCharacteristic.entrySet().stream()
 +                              .filter(entry -> existingServiceParams.containsKey(entry.getKey()))
 +                              .collect(Collectors.toMap(Entry::getKey, Entry::getValue));
 +
 +              //Add it as Service level params
 +              serviceAndVNFLevelInstanceParams.put("service", resultServiceParams);
 +
 +              return serviceAndVNFLevelInstanceParams;
 +
 +      }
  
- }
+ }

diff --cc src/test/java/org/onap/nbi/apis/assertions/ServiceOrderExecutionTaskAssertions.java
Simple merge

diff --cc src/test/java/org/onap/nbi/test/ExecutionTaskTest.java
Simple merge