1 files changed, 21 insertions, 3 deletions
diff --git a/adapters/mso-requests-db-adapter/src/main/java/org/openecomp/mso/adapters/requestsdb/MsoRequestsDbAdapterImpl.java b/adapters/mso-requests-db-adapter/src/main/java/org/openecomp/mso/adapters/requestsdb/MsoRequestsDbAdapterImpl.java
index 99f6e86b00..358fe53ecb 100644
--- a/adapters/mso-requests-db-adapter/src/main/java/org/openecomp/mso/adapters/requestsdb/MsoRequestsDbAdapterImpl.java
+++ b/adapters/mso-requests-db-adapter/src/main/java/org/openecomp/mso/adapters/requestsdb/MsoRequestsDbAdapterImpl.java
@@ -61,6 +61,8 @@ public class MsoRequestsDbAdapterImpl implements MsoRequestsDbAdapter {
                                     String vfModuleId,
                                     String volumeGroupId,
                                     String serviceInstanceName,
+                                    String configurationId,
+                                    String configurationName,
                                     String vfModuleName) throws MsoRequestsDbException {
         MsoLogger.setLogContext (requestId, null);
         Session session = requestsDbSessionFactoryManager.getSessionFactory ().openSession ();
@@ -105,6 +107,12 @@ public class MsoRequestsDbAdapterImpl implements MsoRequestsDbAdapter {
             if (vfModuleName != null) {
                 queryString += "vfModuleName = :vfModuleName, ";
             }
+            if (configurationId != null) {
+                queryString += "configurationId = :configurationId, ";
+            }
+            if (configurationName != null) {
+                queryString += "configurationName = :configurationName, ";
+            }
             if (requestStatus == RequestStatusType.COMPLETE || requestStatus == RequestStatusType.FAILED) {
                 queryString += "endTime = :endTime, ";
             } else {
@@ -165,6 +173,18 @@ public class MsoRequestsDbAdapterImpl implements MsoRequestsDbAdapter {
                 query.setParameter ("vfModuleName", vfModuleName);
                 logger.debug ("vfModuleName in updateInfraRequest is set to: " + vfModuleName);
             }
+            if (configurationId != null) {
+                query.setParameter ("configurationId", configurationId);
+                logger.debug ("configurationId in updateInfraRequest is set to: " + configurationId);
+            }
+            if (configurationName != null) {
+                query.setParameter ("configurationName", configurationName);
+                logger.debug ("configurationName in updateInfraRequest is set to: " + configurationName);
+            }
+            if (vfModuleName != null) {
+                query.setParameter ("vfModuleName", vfModuleName);
+                logger.debug ("vfModuleName in updateInfraRequest is set to: " + vfModuleName);
+            }
             Timestamp nowTimeStamp = new Timestamp (System.currentTimeMillis ());
             if (requestStatus == RequestStatusType.COMPLETE || requestStatus == RequestStatusType.FAILED) {
                 query.setParameter ("endTime", nowTimeStamp);
@@ -282,13 +302,11 @@ public class MsoRequestsDbAdapterImpl implements MsoRequestsDbAdapter {
      * @since   ONAP Amsterdam Release
      */
     @Override
-    public void updateServiceOperationStatus(String serviceId, String operationId, String serviceName,String operationType, String userId,
+    public void updateServiceOperationStatus(String serviceId, String operationId, String operationType, String userId,
             String result, String operationContent, String progress, String reason) throws MsoRequestsDbException {
         OperationStatus operStatus = new OperationStatus();
-        operStatus.setResult(RequestsDbConstant.Status.PROCESSING);
         operStatus.setServiceId(serviceId);
         operStatus.setOperationId(operationId);
-        operStatus.setServiceName(serviceName);
         operStatus.setUserId(userId);
         operStatus.setOperation(operationType);
         operStatus.setReason(reason);