From 6ad41e3ccd398a2721f41ad61c80b7bb03f7d127 Mon Sep 17 00:00:00 2001
From: Ittay Stern <ittay.stern@att.com>
Date: Mon, 31 Dec 2018 17:21:27 +0200
Subject: Merge from ECOMP's repository

Main Features
--------------

-  Async-Instantiation jobs mechanism major update; still WIP (package
   `org.onap.vid.job`)

-  New features in View/Edit: Activate fabric configuration; show
   related networks; soft delete

-  Support AAI service-tree traversal (`AAIServiceTree`)

-  In-memory cache for SDC models and certain A&AI queries
   (`CacheProviderWithLoadingCache`)

-  Upgrade TOSCA Parser and add parsing options; fix malformed TOSCA
   models

-  Resolve Cloud-Owner values for MSO

-  Pass X-ONAP headers to MSO

Infrastructure
--------------
-  Remove codehaus' jackson mapper; use soley fasterxml 2.9.7
-  Surefire invokes both TestNG and JUnit tests
-  Support Kotlin source files
-  AaiController2 which handles errors in a "Spring manner"
-  Inline generated-sources and remove jsonschema2pojo

Quality
--------
-  Cumulative bug fixes (A&AI API, UI timeouts, and many more)
-  Many Sonar issues cleaned-up
-  Some unused classes removed
-  Minor changes in vid-automation project, allowing some API
   verification to run

Hard Merges
------------
-  HTTP Clients (MSO, A&AI, WebConfig, OutgoingRequestHeadersTest)
-  Moved `package org.onap.vid.controllers` to `controller`, without
   plural -- just to keep semantic sync with ECOMP.

Reference commit in ECOMP: 3d1141625

Issue-ID: VID-378
Change-Id: I9c8d1e74caa41815891d441fc0760bb5f29c5788
Signed-off-by: Ittay Stern <ittay.stern@att.com>
---
 .../vid/job/command/MsoResultHandlerService.kt     | 66 ++++++++++++++++++++++
 1 file changed, 66 insertions(+)
 create mode 100644 vid-app-common/src/main/java/org/onap/vid/job/command/MsoResultHandlerService.kt

(limited to 'vid-app-common/src/main/java/org/onap/vid/job/command/MsoResultHandlerService.kt')

diff --git a/vid-app-common/src/main/java/org/onap/vid/job/command/MsoResultHandlerService.kt b/vid-app-common/src/main/java/org/onap/vid/job/command/MsoResultHandlerService.kt
new file mode 100644
index 000000000..9760f667f
--- /dev/null
+++ b/vid-app-common/src/main/java/org/onap/vid/job/command/MsoResultHandlerService.kt
@@ -0,0 +1,66 @@
+package org.onap.vid.job.command
+
+import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate
+import org.onap.vid.job.Job
+import org.onap.vid.job.impl.JobSharedData
+import org.onap.vid.model.RequestReferencesContainer
+import org.onap.vid.model.serviceInstantiation.ServiceInstantiation
+import org.onap.vid.mso.RestObject
+import org.onap.vid.services.AsyncInstantiationBusinessLogic
+import org.onap.vid.services.AuditService
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.stereotype.Service
+import java.util.*
+
+@Service
+class MsoResultHandlerService
+@Autowired constructor(private val asyncInstantiationBL: AsyncInstantiationBusinessLogic, private val auditService: AuditService) {
+
+    companion object {
+        private val LOGGER = EELFLoggerDelegate.getLogger(MsoResultHandlerService::class.java)
+    }
+
+    fun getRequest(jobSharedData: JobSharedData): ServiceInstantiation {
+        return jobSharedData.request as ServiceInstantiation
+    }
+
+    fun handleRootResponse(jobUUID: UUID, msoResponse: RestObject<RequestReferencesContainer>): MsoResult {
+        return if (msoResponse.statusCode in 200..399) {
+            val jobStatus = Job.JobStatus.IN_PROGRESS
+            val msoResourceIds = MsoResourceIds(msoResponse.get().requestReferences.requestId, msoResponse.get().requestReferences.instanceId)
+            asyncInstantiationBL.auditVidStatus(jobUUID, jobStatus)
+            setInitialRequestAuditStatusFromMso(jobUUID, msoResourceIds.requestId)
+            asyncInstantiationBL.updateServiceInfo(jobUUID) { x ->
+                x.jobStatus = jobStatus
+                x.serviceInstanceId = msoResourceIds.instanceId
+                x.msoRequestId = UUID.fromString(msoResourceIds.requestId)
+            }
+            MsoResult(jobStatus, msoResourceIds)
+        } else {
+            auditService.setFailedAuditStatusFromMso(jobUUID, null, msoResponse.statusCode, msoResponse.raw)
+            handleRootCommandFailed(jobUUID)
+        }
+    }
+
+    fun handleResponse(msoResponse: RestObject<RequestReferencesContainer>, actionDescription: String): MsoResult {
+        return if (msoResponse.statusCode in 200..399) {
+            val msoResourceIds = MsoResourceIds(msoResponse.get().requestReferences.requestId, msoResponse.get().requestReferences.instanceId)
+            LOGGER.debug("Successfully sent $actionDescription. Request id: ${msoResourceIds.requestId}")
+            MsoResult(Job.JobStatus.COMPLETED_WITH_NO_ACTION, msoResourceIds)
+        } else {
+            LOGGER.debug("Failed to $actionDescription. Details: ${msoResponse.raw}")
+            MsoResult(Job.JobStatus.FAILED)
+        }
+    }
+
+
+    fun handleRootCommandFailed(jobUUID: UUID): MsoResult {
+        asyncInstantiationBL.handleFailedInstantiation(jobUUID)
+        return MsoResult(Job.JobStatus.FAILED)
+    }
+
+    private fun setInitialRequestAuditStatusFromMso(jobUUID: UUID, requestId: String) {
+        val initialMsoRequestStatus = "REQUESTED"
+        asyncInstantiationBL.auditMsoStatus(jobUUID, initialMsoRequestStatus, requestId, null)
+    }
+}
-- 
cgit 1.2.3-korg