diff options
| author |   deepikasatheesh <deepika.s84@wipro.com> | 2021-10-14 13:17:16 +0000 |
|---|---|---|
| committer | Deepika S <deepika.s84@wipro.com> | 2021-12-10 10:12:33 +0000 |
| commit | c4c404f6274fda1079aa2bdfdbcd25cb3173a261 (patch) | |
| tree | 46e491035e2cb16deca45431fcc650fa34f85815 /so-nssmf-adapter-application/src/main/java/org/onap | |
| parent | cec2855c52d86b0964b4e08e6b8251394ca8e9d4 (diff) | |
RAN NSSI Selection Fixistanbul
Issue-ID: SO-3788
Signed-off-by: deepikasatheesh <deepika.s84@wipro.com>
Change-Id: Ia94392f7ebffc2b54418329c16ab1a29b2a0511e
Diffstat (limited to 'so-nssmf-adapter-application/src/main/java/org/onap')
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;
}
}
|