diff options
Diffstat (limited to 'cps-ncmp-service/src/test')
3 files changed, 23 insertions, 12 deletions
diff --git a/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/impl/config/embeddedcache/SynchronizationCacheConfigSpec.groovy b/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/impl/config/embeddedcache/SynchronizationCacheConfigSpec.groovy index 567debdde..c0fc18abf 100644 --- a/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/impl/config/embeddedcache/SynchronizationCacheConfigSpec.groovy +++ b/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/impl/config/embeddedcache/SynchronizationCacheConfigSpec.groovy @@ -59,20 +59,28 @@ class SynchronizationCacheConfigSpec extends Specification { def 'Verify configs for Distributed objects'(){ given: 'the Module Sync Work Queue config' - def queueConfig = Hazelcast.getHazelcastInstanceByName('moduleSyncWorkQueue').config.queueConfigs.get('defaultQueueConfig') + def moduleSyncWorkQueueConfig = Hazelcast.getHazelcastInstanceByName('moduleSyncWorkQueue').config + def moduleSyncDefaultWorkQueueConfig = moduleSyncWorkQueueConfig.queueConfigs.get('defaultQueueConfig') and: 'the Module Sync Started Cm Handle Map config' - def moduleSyncStartedOnCmHandlesConfig = Hazelcast.getHazelcastInstanceByName('moduleSyncStartedOnCmHandles').config.mapConfigs.get('moduleSyncStartedConfig') + def moduleSyncStartedOnCmHandlesConfig = Hazelcast.getHazelcastInstanceByName('moduleSyncStartedOnCmHandles').config + def moduleSyncStartedOnCmHandlesMapConfig = moduleSyncStartedOnCmHandlesConfig.mapConfigs.get('moduleSyncStartedConfig') and: 'the Data Sync Semaphores Map config' - def dataSyncSemaphoresConfig = Hazelcast.getHazelcastInstanceByName('dataSyncSemaphores').config.mapConfigs.get('dataSyncSemaphoresConfig') + def dataSyncSemaphoresConfig = Hazelcast.getHazelcastInstanceByName('dataSyncSemaphores').config + def dataSyncSemaphoresMapConfig = dataSyncSemaphoresConfig.mapConfigs.get('dataSyncSemaphoresConfig') expect: 'system created instance with correct config of Module Sync Work Queue' - assert queueConfig.backupCount == 3 - assert queueConfig.asyncBackupCount == 3 + assert moduleSyncDefaultWorkQueueConfig.backupCount == 3 + assert moduleSyncDefaultWorkQueueConfig.asyncBackupCount == 3 and: 'Module Sync Started Cm Handle Map has the correct settings' - assert moduleSyncStartedOnCmHandlesConfig.backupCount == 3 - assert moduleSyncStartedOnCmHandlesConfig.asyncBackupCount == 3 + assert moduleSyncStartedOnCmHandlesMapConfig.backupCount == 3 + assert moduleSyncStartedOnCmHandlesMapConfig.asyncBackupCount == 3 and: 'Data Sync Semaphore Map has the correct settings' - assert dataSyncSemaphoresConfig.backupCount == 3 - assert dataSyncSemaphoresConfig.asyncBackupCount == 3 + assert dataSyncSemaphoresMapConfig.backupCount == 3 + assert dataSyncSemaphoresMapConfig.asyncBackupCount == 3 + and: 'all instances are part of same cluster' + def testClusterName = 'cps-and-ncmp-test-caches' + assert moduleSyncWorkQueueConfig.clusterName == testClusterName + assert moduleSyncStartedOnCmHandlesConfig.clusterName == testClusterName + assert dataSyncSemaphoresConfig.clusterName == testClusterName } def 'Verify deployment network configs for Distributed objects'() { diff --git a/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/impl/event/avc/ForwardedSubscriptionEventCacheConfigSpec.groovy b/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/impl/event/avc/ForwardedSubscriptionEventCacheConfigSpec.groovy index 7448daf59..03d3a1c10 100644 --- a/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/impl/event/avc/ForwardedSubscriptionEventCacheConfigSpec.groovy +++ b/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/impl/event/avc/ForwardedSubscriptionEventCacheConfigSpec.groovy @@ -44,10 +44,12 @@ class ForwardedSubscriptionEventCacheConfigSpec extends Specification { def 'Verify configs for Distributed Caches'(){ given: 'the Forwarded Subscription Event Cache config' - def forwardedSubscriptionEventCacheConfig = Hazelcast.getHazelcastInstanceByName('hazelCastInstanceSubscriptionEvents').config.mapConfigs.get('forwardedSubscriptionEventCacheMapConfig') + def forwardedSubscriptionEventCacheConfig = Hazelcast.getHazelcastInstanceByName('hazelCastInstanceSubscriptionEvents').config + def forwardedSubscriptionEventCacheMapConfig = forwardedSubscriptionEventCacheConfig.mapConfigs.get('forwardedSubscriptionEventCacheMapConfig') expect: 'system created instance with correct config' - assert forwardedSubscriptionEventCacheConfig.backupCount == 3 - assert forwardedSubscriptionEventCacheConfig.asyncBackupCount == 3 + assert forwardedSubscriptionEventCacheConfig.clusterName == 'cps-and-ncmp-test-caches' + assert forwardedSubscriptionEventCacheMapConfig.backupCount == 3 + assert forwardedSubscriptionEventCacheMapConfig.asyncBackupCount == 3 } def 'Verify deployment network configs for Distributed Caches'() { diff --git a/cps-ncmp-service/src/test/resources/application.yml b/cps-ncmp-service/src/test/resources/application.yml index 679248ba8..66194ad9e 100644 --- a/cps-ncmp-service/src/test/resources/application.yml +++ b/cps-ncmp-service/src/test/resources/application.yml @@ -39,6 +39,7 @@ ncmp: # Custom Hazelcast Config. hazelcast: + cluster-name: "cps-and-ncmp-test-caches" mode: kubernetes: enabled: false |