summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorleventecsanyi <levente.csanyi@est.tech>2024-02-20 13:15:11 +0100
committerleventecsanyi <levente.csanyi@est.tech>2024-02-21 09:02:30 +0100
commitb82d45a6d32a24e6f59f0d9730a8bfe613c991ae (patch)
tree0f6251b975ea1fae7bf13cc187d7a3e09f011407
parent179b2e47b44d69b7d8a254706d467e4e7eacce28 (diff)
Remove alternate ID caches
- removed alternate id cache related classes and updated deployment.rst Issue-ID: CPS-2107 Change-Id: I567af7b2f44107fceffaef370205b00a5cf79522 Signed-off-by: leventecsanyi <levente.csanyi@est.tech>
-rw-r--r--cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/config/embeddedcache/AlternateIdCacheConfig.java59
-rw-r--r--cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/impl/config/embeddedcache/AlternateIdCacheConfigSpec.groovy59
-rw-r--r--docs/deployment.rst6
3 files changed, 1 insertions, 123 deletions
diff --git a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/config/embeddedcache/AlternateIdCacheConfig.java b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/config/embeddedcache/AlternateIdCacheConfig.java
deleted file mode 100644
index a69d144766..0000000000
--- a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/config/embeddedcache/AlternateIdCacheConfig.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * ============LICENSE_START========================================================
- * Copyright (C) 2024 Nordix Foundation
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.cps.ncmp.api.impl.config.embeddedcache;
-
-import com.hazelcast.config.MapConfig;
-import java.util.Map;
-import org.onap.cps.cache.HazelcastCacheConfig;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-public class AlternateIdCacheConfig extends HazelcastCacheConfig {
-
- private static final MapConfig alternateIdPerCmHandleIdMapConfig =
- createMapConfig("alternateIdPerCmHandleIdMapConfig");
-
- private static final MapConfig cmHandleIdPerAlternateIdMapConfig =
- createMapConfig("cmHandleIdPerAlternateIdMapConfig");
-
- /**
- * Distributed instance of alternate id cache containing the alternate id per cm handle id.
- *
- * @return the cached map.
- */
- @Bean
- public Map<String, String> alternateIdPerCmHandleId() {
- return createHazelcastInstance("hazelcastInstanceAlternateIdPerCmHandleIdMap",
- alternateIdPerCmHandleIdMapConfig).getMap("alternateIdPerCmHandleId");
- }
-
- /**
- * Distributed instance of alternate id cache containing the cm handle id per alternate id.
- *
- * @return the cached map.
- */
- @Bean
- public Map<String, String> cmHandleIdPerAlternateId() {
- return createHazelcastInstance("hazelcastInstanceCmHandleIdPerAlternateIdMap",
- cmHandleIdPerAlternateIdMapConfig).getMap("cmHandleIdPerAlternateId");
- }
-}
diff --git a/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/impl/config/embeddedcache/AlternateIdCacheConfigSpec.groovy b/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/impl/config/embeddedcache/AlternateIdCacheConfigSpec.groovy
deleted file mode 100644
index 71c5293e27..0000000000
--- a/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/impl/config/embeddedcache/AlternateIdCacheConfigSpec.groovy
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * ============LICENSE_START========================================================
- * Copyright (C) 2024 Nordix Foundation
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.cps.ncmp.api.impl.config.embeddedcache
-
-import com.hazelcast.core.Hazelcast
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.boot.test.context.SpringBootTest
-import spock.lang.Specification
-
-@SpringBootTest(classes = [AlternateIdCacheConfig])
-class AlternateIdCacheConfigSpec extends Specification {
-
- @Autowired
- private Map<String, String> cmHandleIdPerAlternateId
- @Autowired
- private Map<String, String> alternateIdPerCmHandleId
-
- def 'Embedded (hazelcast) cache for alternate id - cm handle id caches.'() {
- expect: 'system is able to create an instance of the Alternate ID Cache'
- assert null != cmHandleIdPerAlternateId
- assert null != alternateIdPerCmHandleId
- and: 'there are at least 2 instances'
- assert Hazelcast.allHazelcastInstances.size() > 1
- and: 'Alternate ID Caches are present'
- assert Hazelcast.allHazelcastInstances.name.contains('hazelcastInstanceAlternateIdPerCmHandleIdMap')
- && Hazelcast.allHazelcastInstances.name.contains('hazelcastInstanceCmHandleIdPerAlternateIdMap')
- }
-
- def 'Verify configs of the alternate id distributed objects.'(){
- when: 'retrieving the map config of module set tag'
- def alternateIdConfig = Hazelcast.getHazelcastInstanceByName('hazelcastInstanceAlternateIdPerCmHandleIdMap').config
- def alternateIdMapConfig = alternateIdConfig.mapConfigs.get('alternateIdPerCmHandleIdMapConfig')
- def cmHandleIdConfig = Hazelcast.getHazelcastInstanceByName('hazelcastInstanceCmHandleIdPerAlternateIdMap').config
- def cmHandleIdIdMapConfig = cmHandleIdConfig.mapConfigs.get('cmHandleIdPerAlternateIdMapConfig')
- then: 'the map configs have the correct number of backups'
- assert alternateIdMapConfig.backupCount == 3
- assert alternateIdMapConfig.asyncBackupCount == 3
- assert cmHandleIdIdMapConfig.backupCount == 3
- assert cmHandleIdIdMapConfig.asyncBackupCount == 3
- }
-}
diff --git a/docs/deployment.rst b/docs/deployment.rst
index 3b5aad1bfc..c1ee1eb2ea 100644
--- a/docs/deployment.rst
+++ b/docs/deployment.rst
@@ -335,9 +335,5 @@ Below are the list of distributed datastructures that we have.
+--------------+------------------------------------+-----------------------------------------------------------+
| cps-ncmp | cmNotificationSubscriptionCache | Stores and tracks cm notification subscription requests. |
+--------------+------------------------------------+-----------------------------------------------------------+
-| cps-ncmp | alternateIdPerCmHandleId | Stores the alternate id for each cm handle id. |
-+--------------+------------------------------------+-----------------------------------------------------------+
-| cps-ncmp | cmHandleIdPerAlternateId | Stores the cm handle id for each alternate id. |
-+--------------+------------------------------------+-----------------------------------------------------------+
-Total number of caches : 10
+Total number of caches : 8