Merge "Enabled so/so-nssmf-adapter to flow the activate/deactivate slice events to external RAN NSSMF simulator (option-2)."

1 files changed, 1 insertions, 21 deletions

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 b9a96c5..f1ef20c 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
@@ -3,6 +3,7 @@
  * ONAP - SO

  * ================================================================================

  # Copyright (c) 2020, CMCC Technologies Co., Ltd.

+ # Contribution (c) 2022, Aarna Networks, Inc.

  #

  # Licensed under the Apache License, Version 2.0 (the "License")

  # you may not use this file except in compliance with the License.

@@ -140,27 +141,6 @@ public class ExternalAnNssmfManager extends ExternalNssmfManager {
     }

 

     @Override

-    public RestResponse activateNssi(NssmfAdapterNBIRequest nbiRequest, String snssai) throws ApplicationException {

-        NssiResponse resp = new NssiResponse();

-        String nssiId = nbiRequest.getActDeActNssi().getNssiId();

-        resp.setJobId(UUID.randomUUID().toString());

-        resp.setNssiId(nssiId);

-

-        RestResponse returnRsp = new RestResponse();

-

-        returnRsp.setStatus(202);

-        returnRsp.setResponseContent(marshal(resp));

-

-        ResourceOperationStatus status =

-                new ResourceOperationStatus(serviceInfo.getNsiId(), resp.getJobId(), serviceInfo.getServiceUuid());

-        status.setResourceInstanceID(nssiId);

-        status.setOperType(actionType.toString());

-

-        updateDbStatus(status, returnRsp.getStatus(), JobStatus.FINISHED, NssmfAdapterUtil.getStatusDesc(actionType));

-        return returnRsp;

-    }

-

-    @Override

     protected RestResponse doQueryJobStatus(ResourceOperationStatus status) throws ApplicationException {

         ResponseDescriptor responseDescriptor = new ResponseDescriptor();

         responseDescriptor.setStatus(JobStatus.FINISHED.toString());