Uploaded image for project: 'External API Framework'
  1. External API Framework
  2. EXTAPI-67

Missing requestDetails json wrapper in SO payload as part of NBI serviceOrder

XMLWordPrintable

    • Icon: Bug Bug
    • Resolution: Done
    • Icon: High High
    • Beijing Release
    • Beijing Release
    • None
    • None

      Currently, the SO payload is missing the requestDetails wrapper :

      {
      "cloudConfiguration": {
      "lcpCloudRegionId": "RegionOne",
      "tenantId": "6f2d976d3e1649dc844a13012863d1f2"
      },
      "modelInfo": {
      "modelCustomizationId": null,
      "modelCustomizationName": null,
      "modelInvariantId": "c99f82ac-3265-4753-9144-d98a12581f85",
      "modelName": "demoVFWCL",
      "modelVersionId": "db522fa6-950a-46d0-9411-010b235646f3",
      "modelType": "service",
      "modelVersion": "1.0"
      },
      "requestInfo": {
      "instanceName": "vFW0001",
      "productFamilyId": null,
      "requestorId": "NBI",
      "source": "VID",
      "suppressRollback": false
      },
      "requestParameters": {
      "aLaCarte": true,
      "subscriptionServiceType": "demoVFWCL",
      "userParams": []
      },
      "subscriberInfo": {
      "globalSubscriberId": "generic",
      "subscriberName": "generic"
      }
      }

      Created the following file :

      src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/MSOPayload.java 

      package org.onap.nbi.apis.serviceorder.model.consumer;

      public class MSOPayload {

          private RequestDetails requestDetails;

          public RequestDetails getRequestDetails() {

              return requestDetails;

          }

          public void setRequestDetails(RequestDetails requestDetails) {

              this.requestDetails = requestDetails;

          }

          @Override

          public String toString() {

              return "MSOPayload{" + "requestDetails=" + requestDetails+ '}';

          }

      Also modified this one :

      • src/main/java/org/onap/nbi/apis/serviceorder/workflow/SOTaskProcessor.java

       

      < import org.onap.nbi.apis.serviceorder.model.consumer.MSOPayload;

      127,128d141

      <         MSOPayload msoPayload = new MSOPayload();

      <         msoPayload.setRequestDetails(requestDetails);

      132c145

      <                 response = soClient.callCreateServiceInstance(msoPayload);

      >                 response = soClient.callCreateServiceInstance(requestDetails);

      135c148

      <                 response = soClient.callDeleteServiceInstance(msoPayload, serviceOrderItem.getService().getId());

      >                 response = soClient.callDeleteServiceInstance(requestDetails, serviceOrderItem.getService().getId()); 

      And this one:

      src/main/java/org/onap/nbi/apis/serviceorder/SoClient.java

       ** 

      < import org.onap.nbi.apis.serviceorder.model.consumer.MSOPayload;

      > import org.onap.nbi.apis.serviceorder.model.consumer.RequestDetails;

      45c61

      <     public ResponseEntity<CreateServiceInstanceResponse> callCreateServiceInstance(MSOPayload msoPayload) {

      >     public ResponseEntity<CreateServiceInstanceResponse> callCreateServiceInstance(RequestDetails requestDetails) {

      48c64

      <             LOGGER.debug("Calling SO CreateServiceInstance with msoPayload : " + msoPayload.toString());

      >             LOGGER.debug("Calling SO CreateServiceInstance with requestDetails : " + requestDetails.toString());

      53c69

      <         HttpEntity<MSOPayload> requestDetailEntity = new HttpEntity<>(msoPayload, buildRequestHeader());

      >         HttpEntity<RequestDetails> requestDetailEntity = new HttpEntity<>(requestDetails, buildRequestHeader());

      57c73

      68c84

      <     public ResponseEntity<CreateServiceInstanceResponse> callDeleteServiceInstance(MSOPayload msoPayload,

      >     public ResponseEntity<CreateServiceInstanceResponse> callDeleteServiceInstance(RequestDetails requestDetails,

      72c88

      <             LOGGER.debug("Calling SO DeleteServiceInstance with msoPayload : " + msoPayload.toString());

      >             LOGGER.debug("Calling SO DeleteServiceInstance with requestDetails : " + requestDetails.toString());

      77c93

      <         HttpEntity<MSOPayload> requestDetailEntity = new HttpEntity<>(msoPayload, buildRequestHeader());

      >         HttpEntity<RequestDetails> requestDetailEntity = new HttpEntity<>(requestDetails, buildRequestHeader());

       

            nilap nilap
            chiarelloa chiarelloa
            Votes:
            0 Vote for this issue
            Watchers:
            3 Start watching this issue

              Created:
              Updated:
              Resolved: