From c4c404f6274fda1079aa2bdfdbcd25cb3173a261 Mon Sep 17 00:00:00 2001 From: deepikasatheesh Date: Thu, 14 Oct 2021 13:17:16 +0000 Subject: RAN NSSI Selection Fix Issue-ID: SO-3788 Signed-off-by: deepikasatheesh Change-Id: Ia94392f7ebffc2b54418329c16ab1a29b2a0511e --- .../main/java/org/onap/so/adapters/nssmf/consts/NssmfAdapterConsts.java | 2 +- .../org/onap/so/adapters/nssmf/manager/impl/ExternalNssmfManager.java | 1 + .../so/adapters/nssmf/manager/impl/external/ExternalAnNssmfManager.java | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/so-nssmf-adapter-application/src/main/java/org/onap/so/adapters/nssmf/consts/NssmfAdapterConsts.java b/so-nssmf-adapter-application/src/main/java/org/onap/so/adapters/nssmf/consts/NssmfAdapterConsts.java index 31dddd0..48f50a5 100644 --- a/so-nssmf-adapter-application/src/main/java/org/onap/so/adapters/nssmf/consts/NssmfAdapterConsts.java +++ b/so-nssmf-adapter-application/src/main/java/org/onap/so/adapters/nssmf/consts/NssmfAdapterConsts.java @@ -133,7 +133,7 @@ public class NssmfAdapterConsts { urlInfoMap.put(generateKey(ExecutorType.EXTERNAL, NetworkType.CORE, ActionType.DEACTIVATE), new NssmfUrlInfo(EXTERNAL_CN_DEACTIVATE_URL, HttpMethod.PUT)); urlInfoMap.put(generateKey(ExecutorType.INTERNAL, null, ActionType.DEACTIVATE), - new NssmfUrlInfo(INTERNAL_DEACTIVATE_URL, HttpMethod.PUT)); + new NssmfUrlInfo(INTERNAL_DEACTIVATE_URL, HttpMethod.POST)); urlInfoMap.put(generateKey(ExecutorType.EXTERNAL, NetworkType.ACCESS, ActionType.TERMINATE), new NssmfUrlInfo(EXTERNAL_AN_TERMINATE_URL, HttpMethod.DELETE)); diff --git a/so-nssmf-adapter-application/src/main/java/org/onap/so/adapters/nssmf/manager/impl/ExternalNssmfManager.java b/so-nssmf-adapter-application/src/main/java/org/onap/so/adapters/nssmf/manager/impl/ExternalNssmfManager.java index a9ff249..b465230 100644 --- a/so-nssmf-adapter-application/src/main/java/org/onap/so/adapters/nssmf/manager/impl/ExternalNssmfManager.java +++ b/so-nssmf-adapter-application/src/main/java/org/onap/so/adapters/nssmf/manager/impl/ExternalNssmfManager.java @@ -96,6 +96,7 @@ public abstract class ExternalNssmfManager extends BaseNssmfManager { nssiInstance.setServiceInstanceLocationId(serviceInfo.getPLMNIdList()); nssiInstance.setEnvironmentContext(esrInfo.getNetworkType().getNetworkType()); nssiInstance.setWorkloadContext(esrInfo.getNetworkType().getNetworkType().toUpperCase()); //Subnet Type + nssiInstance.setServiceFunction(serviceInfo.getResourceSharingLevel()); nssiInstance.setServiceRole("nssi"); restUtil.createServiceInstance(nssiInstance, serviceInfo); diff --git a/so-nssmf-adapter-application/src/main/java/org/onap/so/adapters/nssmf/manager/impl/external/ExternalAnNssmfManager.java b/so-nssmf-adapter-application/src/main/java/org/onap/so/adapters/nssmf/manager/impl/external/ExternalAnNssmfManager.java index fdce3fd..b9a96c5 100644 --- a/so-nssmf-adapter-application/src/main/java/org/onap/so/adapters/nssmf/manager/impl/external/ExternalAnNssmfManager.java +++ b/so-nssmf-adapter-application/src/main/java/org/onap/so/adapters/nssmf/manager/impl/external/ExternalAnNssmfManager.java @@ -183,6 +183,6 @@ public class ExternalAnNssmfManager extends ExternalNssmfManager { @Override protected SelectionType doQueryNSSISelectionCapability() { - return SelectionType.NSSMF; + return SelectionType.NSMF; } } -- cgit 1.2.3-korg