From c15e8d50e7b69dcacb9185c560ca2b66f2917fff Mon Sep 17 00:00:00 2001 From: "halil.cakal" Date: Mon, 20 May 2024 15:10:45 +0100 Subject: [PATCH] Fix performance build output being lost - this fix for CpsPath Registry attributes Query plot - also include bump up lombok to latest to fix the error does not have member field com.sun.tools.javac.tree.JCTree qualid - rename conflicting the performance test name: CpsPath Registry attributes Query to fix plot issue Issue-ID: CPS-2232 Change-Id: I7a0536ac2b48565df62fa46dddd27785addafa42 Signed-off-by: halil.cakal --- cps-dependencies/pom.xml | 2 +- .../ncmp/CmHandleQueryByAlternateIdPerfTest.groovy | 14 ++++++++------ .../performance/ncmp/CmHandleQueryPerfTest.groovy | 3 +-- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/cps-dependencies/pom.xml b/cps-dependencies/pom.xml index effaa06f6..f323cd707 100644 --- a/cps-dependencies/pom.xml +++ b/cps-dependencies/pom.xml @@ -261,7 +261,7 @@ org.projectlombok lombok - 1.18.24 + 1.18.32 org.testcontainers diff --git a/integration-test/src/test/groovy/org/onap/cps/integration/performance/ncmp/CmHandleQueryByAlternateIdPerfTest.groovy b/integration-test/src/test/groovy/org/onap/cps/integration/performance/ncmp/CmHandleQueryByAlternateIdPerfTest.groovy index bbff5a83f..4f33d030e 100644 --- a/integration-test/src/test/groovy/org/onap/cps/integration/performance/ncmp/CmHandleQueryByAlternateIdPerfTest.groovy +++ b/integration-test/src/test/groovy/org/onap/cps/integration/performance/ncmp/CmHandleQueryByAlternateIdPerfTest.groovy @@ -20,14 +20,16 @@ package org.onap.cps.integration.performance.ncmp -import static org.onap.cps.spi.FetchDescendantsOption.OMIT_DESCENDANTS - -import org.onap.cps.ncmp.api.impl.ncmppersistence.NcmpPersistence -import org.onap.cps.ncmp.api.impl.inventory.InventoryPersistence import org.onap.cps.integration.ResourceMeter import org.onap.cps.integration.performance.base.NcmpPerfTestBase +import org.onap.cps.ncmp.api.impl.inventory.InventoryPersistence + import java.util.stream.Collectors +import static org.onap.cps.ncmp.api.impl.ncmppersistence.NcmpPersistence.NCMP_DATASPACE_NAME +import static org.onap.cps.ncmp.api.impl.ncmppersistence.NcmpPersistence.NCMP_DMI_REGISTRY_ANCHOR +import static org.onap.cps.spi.FetchDescendantsOption.OMIT_DESCENDANTS + class CmHandleQueryByAlternateIdPerfTest extends NcmpPerfTestBase { InventoryPersistence objectUnderTest @@ -43,11 +45,11 @@ class CmHandleQueryByAlternateIdPerfTest extends NcmpPerfTestBase { and: 'the ids of the result are extracted and converted to xpath' def cpsXpaths = dataNodes.stream().map(dataNode -> "/dmi-registry/cm-handles[@id='${dataNode.leaves.id}']".toString() ).collect(Collectors.toSet()) and: 'a single get is executed to get all the parent objects and their descendants' - cpsDataService.getDataNodesForMultipleXpaths(NcmpPersistence.NCMP_DATASPACE_NAME, NcmpPersistence.NCMP_DMI_REGISTRY_ANCHOR, cpsXpaths, OMIT_DESCENDANTS) + cpsDataService.getDataNodesForMultipleXpaths(NCMP_DATASPACE_NAME, NCMP_DMI_REGISTRY_ANCHOR, cpsXpaths, OMIT_DESCENDANTS) resourceMeter.stop() def durationInSeconds = resourceMeter.getTotalTimeInSeconds() print 'Total time in seconds to query ch handle by alternate id: ' + durationInSeconds then: 'the required operations are performed within required time and memory limit' - recordAndAssertResourceUsage('CpsPath Registry attributes Query', 1, durationInSeconds, 300, resourceMeter.getTotalMemoryUsageInMB()) + recordAndAssertResourceUsage('Look up cm-handle by longest match alternate-id', 1, durationInSeconds, 300, resourceMeter.getTotalMemoryUsageInMB()) } } diff --git a/integration-test/src/test/groovy/org/onap/cps/integration/performance/ncmp/CmHandleQueryPerfTest.groovy b/integration-test/src/test/groovy/org/onap/cps/integration/performance/ncmp/CmHandleQueryPerfTest.groovy index d518234f5..db0e24e93 100644 --- a/integration-test/src/test/groovy/org/onap/cps/integration/performance/ncmp/CmHandleQueryPerfTest.groovy +++ b/integration-test/src/test/groovy/org/onap/cps/integration/performance/ncmp/CmHandleQueryPerfTest.groovy @@ -20,7 +20,6 @@ package org.onap.cps.integration.performance.ncmp - import org.onap.cps.api.CpsQueryService import org.onap.cps.integration.ResourceMeter import org.onap.cps.integration.performance.base.NcmpPerfTestBase @@ -68,7 +67,7 @@ class CmHandleQueryPerfTest extends NcmpPerfTestBase { resourceMeter.stop() def durationInSeconds = resourceMeter.getTotalTimeInSeconds() then: 'the required operations are performed within required time' - recordAndAssertResourceUsage("CpsPath Registry attributes Query", 3.96, durationInSeconds, 300, resourceMeter.getTotalMemoryUsageInMB()) + recordAndAssertResourceUsage("CpsPath Registry attributes Query", 3.96, durationInSeconds, 400, resourceMeter.getTotalMemoryUsageInMB()) and: 'all nodes are returned' result.size() == TOTAL_CM_HANDLES and: 'the tree contains all the expected descendants too' -- 2.16.6