Merge "CM Data Subscriptions PoC/Performance test fixes"

[cps.git] / cps-ncmp-service / src / main / java / org / onap / cps / ncmp / api / impl / utils / YangDataConverter.java

diff --git a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/utils/YangDataConverter.java b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/utils/YangDataConverter.java
index 95ff48a..1b19075 100644 (file)
--- a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/utils/YangDataConverter.java
+++ b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/utils/YangDataConverter.java
@@ -1,6 +1,6 @@
 /*
  *  ============LICENSE_START=======================================================
- *  Copyright (C) 2022 Nordix Foundation
+ *  Copyright (C) 2022-2023 Nordix Foundation
  *  ================================================================================
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -20,20 +20,28 @@
 
 package org.onap.cps.ncmp.api.impl.utils;
 
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.onap.cps.ncmp.api.impl.inventory.CompositeState;
+import org.onap.cps.ncmp.api.impl.inventory.CompositeStateBuilder;
 import org.onap.cps.ncmp.api.impl.yangmodels.YangModelCmHandle;
-import org.onap.cps.ncmp.api.inventory.CompositeState;
-import org.onap.cps.ncmp.api.inventory.CompositeStateBuilder;
 import org.onap.cps.ncmp.api.models.NcmpServiceCmHandle;
 import org.onap.cps.spi.model.DataNode;
 
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
+@Slf4j
 public class YangDataConverter {
 
+    private static final Pattern cmHandleIdInXpathPattern = Pattern.compile("\\[@id='(.*?)']");
+
     /**
      * This method convert yang model cm handle to ncmp service cm handle.
      * @param yangModelCmHandle the yang model of the cm handle
@@ -78,10 +86,32 @@ public class YangDataConverter {
                 (String) cmHandleDataNode.getLeaves().get("dmi-service-name"),
                 (String) cmHandleDataNode.getLeaves().get("dmi-data-service-name"),
                 (String) cmHandleDataNode.getLeaves().get("dmi-model-service-name"),
-            ncmpServiceCmHandle
+                ncmpServiceCmHandle
         );
     }
 
+    /**
+     * This method convert cm handle data nodes to yang model cm handles.
+     * @param cmHandleDataNodes the datanode of the cm handle
+     * @return yang model cm handles
+     */
+    public static Collection<YangModelCmHandle> convertDataNodesToYangModelCmHandles(
+            final Collection<DataNode> cmHandleDataNodes) {
+        final Collection<YangModelCmHandle> yangModelCmHandles = new ArrayList<>(cmHandleDataNodes.size());
+        cmHandleDataNodes.forEach(dataNode -> {
+            final String cmHandleId = extractCmHandleIdFromXpath(dataNode.getXpath());
+            yangModelCmHandles.add(convertCmHandleToYangModel(dataNode, cmHandleId));
+        });
+        return yangModelCmHandles;
+    }
+
+    private static String extractCmHandleIdFromXpath(final String xpath) {
+        final Matcher matcher = cmHandleIdInXpathPattern.matcher(xpath);
+        matcher.find();
+        return matcher.group(1);
+    }
+
+
     private static void populateCmHandleDetails(final DataNode cmHandleDataNode,
                                                 final NcmpServiceCmHandle ncmpServiceCmHandle) {
         final Map<String, String> dmiProperties = new LinkedHashMap<>();
@@ -108,14 +138,14 @@ public class YangDataConverter {
     }
 
     private static void setDmiProperties(final List<YangModelCmHandle.Property> dmiProperties,
-                                  final NcmpServiceCmHandle ncmpServiceCmHandle) {
+                                         final NcmpServiceCmHandle ncmpServiceCmHandle) {
         final Map<String, String> dmiPropertiesMap = new LinkedHashMap<>(dmiProperties.size());
         asPropertiesMap(dmiProperties, dmiPropertiesMap);
         ncmpServiceCmHandle.setDmiProperties(dmiPropertiesMap);
     }
 
     private static void setPublicProperties(final List<YangModelCmHandle.Property> publicProperties,
-                                     final NcmpServiceCmHandle ncmpServiceCmHandle) {
+                                            final NcmpServiceCmHandle ncmpServiceCmHandle) {
         final Map<String, String> publicPropertiesMap = new LinkedHashMap<>();
         asPropertiesMap(publicProperties, publicPropertiesMap);
         ncmpServiceCmHandle.setPublicProperties(publicPropertiesMap);