diff options
| author |   SagarS <sagar.shetty@est.tech> | 2022-06-07 15:26:45 +0100 |
|---|---|---|
| committer | SagarS <sagar.shetty@est.tech> | 2022-06-07 16:24:01 +0100 |
| commit | cc6009334c69b0856dad1b95755ef560fbeab174 (patch) | |
| tree | 325e2839805512110de6efff7f045b83c0725c3a /mso-api-handlers | |
| parent | a26443597d3c617dda67228cbecd77808a04a18d (diff) | |
[SO] CNF Updates
Change-Id: I85ca8e675ca408d33ede87703d97c0ffd212f316
Signed-off-by: SagarS <sagar.shetty@est.tech>
Issue-ID: SO-3905
Diffstat (limited to 'mso-api-handlers')
3 files changed, 5 insertions, 3 deletions
diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/MsoRequest.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/MsoRequest.java index 811d88869e..f8ab2cb0b9 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/MsoRequest.java +++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/MsoRequest.java @@ -716,7 +716,8 @@ public class MsoRequest { } else if (requestScope.equalsIgnoreCase(ModelType.vfModule.name())) { vnfType = serviceModelName + "/" + vnfModelName; sir.setVolumeGroupInstanceId(volumeGroupId); - } else if (requestScope.equalsIgnoreCase(ModelType.vnf.name())) + } else if (requestScope.equalsIgnoreCase(ModelType.vnf.name()) + || requestScope.equalsIgnoreCase(ModelType.cnf.name())) vnfType = serviceModelName + "/" + sir.getRequestDetails().getModelInfo().getModelCustomizationName(); return vnfType; diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/RequestHandlerUtils.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/RequestHandlerUtils.java index efa037d393..e0511f259e 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/RequestHandlerUtils.java +++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/RequestHandlerUtils.java @@ -408,7 +408,8 @@ public class RequestHandlerUtils extends AbstractRestHandler { if (StringUtils.isNotBlank(instanceId)) { if (ModelType.service.name().equalsIgnoreCase(requestScope)) { currentActiveReq.setServiceInstanceId(instanceId); - } else if (ModelType.vnf.name().equalsIgnoreCase(requestScope)) { + } else if (ModelType.vnf.name().equalsIgnoreCase(requestScope) + || ModelType.cnf.name().equalsIgnoreCase(requestScope)) { currentActiveReq.setVnfId(instanceId); } else if (ModelType.vfModule.name().equalsIgnoreCase(requestScope)) { currentActiveReq.setVfModuleId(instanceId); diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/vnfbeans/ModelType.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/vnfbeans/ModelType.java index e24ecd4eac..723bdd558b 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/vnfbeans/ModelType.java +++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/vnfbeans/ModelType.java @@ -24,5 +24,5 @@ package org.onap.so.apihandlerinfra.vnfbeans; * Enum for Status values returned by API Handler to Tail-F */ public enum ModelType { - service, vnf, vfModule, volumeGroup, network + service, vnf, vfModule, volumeGroup, network, cnf } |