sparate beans and repositories

Seperate out Beans and repositories for RequestDB

Change-Id: I67d6597d580e9828b6bb8faafaea7e09cc6467c0
Issue-ID: SO-999
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>

24 files changed, 0 insertions, 1912 deletions

diff --git a/mso-api-handlers/mso-requests-db/src/main/java/META-INF/MANIFEST.MF b/mso-api-handlers/mso-requests-db/src/main/java/META-INF/MANIFEST.MF
deleted file mode 100644
index 5e9495128c..0000000000
--- a/mso-api-handlers/mso-requests-db/src/main/java/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0

-Class-Path: 

-

diff --git a/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/ArchivedInfraRequestsRepository.java b/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/ArchivedInfraRequestsRepository.java
deleted file mode 100644
index 603f9bb494..0000000000
--- a/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/ArchivedInfraRequestsRepository.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 - 2018 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.db.request.data.repository;
-
-import org.onap.so.db.request.beans.ArchivedInfraRequests;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.rest.core.annotation.RepositoryRestResource;
-import org.springframework.stereotype.Repository;
-
-@RepositoryRestResource(collectionResourceRel = "archivedInfraRequests", path = "archivedInfraRequests")
-public interface ArchivedInfraRequestsRepository extends JpaRepository<ArchivedInfraRequests, String> {	
-
-}
diff --git a/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/InfraActiveRequestsRepository.java b/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/InfraActiveRequestsRepository.java
deleted file mode 100644
index cd25b122be..0000000000
--- a/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/InfraActiveRequestsRepository.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.db.request.data.repository;
-
-import java.util.Date;
-import java.util.List;
-
-import org.onap.so.db.request.beans.InfraActiveRequests;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.rest.core.annotation.RepositoryRestResource;
-
-
-@RepositoryRestResource(collectionResourceRel = "infraActiveRequests", path = "infraActiveRequests")
-public interface InfraActiveRequestsRepository extends JpaRepository<InfraActiveRequests, String>, InfraActiveRequestsRepositoryCustom {
-	
-	InfraActiveRequests findOneByRequestIdOrClientRequestId(String requestId, String clientRequestId);
-	InfraActiveRequests findOneByRequestIdOrClientRequestIdAndRequestType(String requestId,String clientRequestId, String requestType);
-	InfraActiveRequests findOneByRequestId(String string);
-	InfraActiveRequests findOneByRequestBody(String requestBody);
-	List<InfraActiveRequests> findByEndTimeLessThan(Date endTime, Pageable request);
-	List<InfraActiveRequests> findByStartTimeLessThanAndEndTime(Date startTime, Date endTime, Pageable request);
-}
diff --git a/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/InfraActiveRequestsRepositoryCustom.java b/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/InfraActiveRequestsRepositoryCustom.java
deleted file mode 100644
index 570861dfa1..0000000000
--- a/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/InfraActiveRequestsRepositoryCustom.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.db.request.data.repository;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.onap.so.db.request.beans.InfraActiveRequests;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface InfraActiveRequestsRepositoryCustom {
-
-    public boolean healthCheck();
-
-    public InfraActiveRequests getRequestFromInfraActive(String requestId);
-
-    public InfraActiveRequests checkInstanceNameDuplicate(HashMap<String, String> instanceIdMap, String instanceName,
-            String requestScope);
-
-    public List<InfraActiveRequests> getOrchestrationFiltersFromInfraActive(Map<String, List<String>> orchestrationMap);
-
-    // Added this method for Tenant Isolation project ( 1802-295491a) to query the mso_requests DB
-    // (infra_active_requests table) for operationalEnvId and OperationalEnvName
-    public List<InfraActiveRequests> getCloudOrchestrationFiltersFromInfraActive(Map<String, String> orchestrationMap);
-
-    public List<InfraActiveRequests> getRequestListFromInfraActive(String queryAttributeName, String queryValue,
-            String requestType);
-
-    public InfraActiveRequests getRequestFromInfraActive(String requestId, String requestType);
-
-    public InfraActiveRequests checkDuplicateByVnfName(String vnfName, String action, String requestType);
-
-    public InfraActiveRequests checkDuplicateByVnfId(String vnfId, String action, String requestType);
-
-    public InfraActiveRequests checkVnfIdStatus(String operationalEnvironmentId);
-
-    List<InfraActiveRequests> getInfraActiveRequests(final Map<String, String[]> filters, final long startTime,
-            final long endTime, final Integer maxResult);
-
-}
diff --git a/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/InfraActiveRequestsRepositoryImpl.java b/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/InfraActiveRequestsRepositoryImpl.java
deleted file mode 100644
index d66e378146..0000000000
--- a/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/InfraActiveRequestsRepositoryImpl.java
+++ /dev/null
@@ -1,618 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * Copyright (C) 2017 Huawei Technologies Co., Ltd. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.db.request.data.repository;
-
-import java.sql.Timestamp;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.concurrent.TimeUnit;
-
-import javax.persistence.EntityManager;
-import javax.persistence.NonUniqueResultException;
-import javax.persistence.Query;
-import javax.persistence.TypedQuery;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Order;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-
-import org.onap.so.db.request.beans.InfraActiveRequests;
-import org.onap.so.logger.MsoLogger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Repository;
-import org.springframework.transaction.annotation.Transactional;
-
-
-@Repository
-@Transactional(readOnly = true)
-public class InfraActiveRequestsRepositoryImpl implements InfraActiveRequestsRepositoryCustom {
-
-
-    @Qualifier("requestEntityManagerFactory")
-    @Autowired
-    private EntityManager entityManager;
-
-    protected static MsoLogger msoLogger =
-            MsoLogger.getMsoLogger(MsoLogger.Catalog.GENERAL, InfraActiveRequestsRepositoryImpl.class);
-
-    protected static final String REQUEST_STATUS = "requestStatus";
-    protected static final String SOURCE = "source";
-    protected static final String START_TIME = "startTime";
-    protected static final String END_TIME = "endTime";
-    protected static final String REQUEST_TYPE = "requestType";
-    protected static final String SERVICE_INSTANCE_ID = "serviceInstanceId";
-    protected static final String SERVICE_INSTANCE_NAME = "serviceInstanceName";
-    protected static final String VNF_INSTANCE_NAME = "vnfName";
-    protected static final String VNF_INSTANCE_ID = "vnfId";
-    protected static final String VOLUME_GROUP_INSTANCE_NAME = "volumeGroupName";
-    protected static final String VOLUME_GROUP_INSTANCE_ID = "volumeGroupId";
-    protected static final String VFMODULE_INSTANCE_NAME = "vfModuleName";
-    protected static final String VFMODULE_INSTANCE_ID = "vfModuleId";
-    protected static final String NETWORK_INSTANCE_NAME = "networkName";
-    protected static final String CONFIGURATION_INSTANCE_ID = "configurationId";
-    protected static final String CONFIGURATION_INSTANCE_NAME = "configurationName";
-    protected static final String OPERATIONAL_ENV_ID = "operationalEnvId";
-    protected static final String OPERATIONAL_ENV_NAME = "operationalEnvName";
-    protected static final String NETWORK_INSTANCE_ID = "networkId";
-    protected static final String GLOBAL_SUBSCRIBER_ID = "globalSubscriberId";
-    protected static final String SERVICE_NAME_VERSION_ID = "serviceNameVersionId";
-    protected static final String SERVICE_ID = "serviceId";
-    protected static final String SERVICE_VERSION = "serviceVersion";
-    protected static final String REQUEST_ID = "requestId";
-    protected static final String REQUESTOR_ID = "requestorId";
-    protected static final String ACTION = "action";
-
-    private static final List<String> VALID_COLUMNS =
-            Arrays.asList(REQUEST_ID, SERVICE_INSTANCE_ID, SERVICE_INSTANCE_NAME, ACTION, REQUEST_STATUS);
-
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.onap.so.requestsdb.InfraActiveRequestsRepositoryCustom#healthCheck()
-     */
-    @Override
-    public boolean healthCheck() {
-
-        final Query query = entityManager.createNativeQuery(" show tables ");
-
-        final List<?> list = query.getResultList();
-
-        return true;
-    }
-
-    private List<InfraActiveRequests> executeInfraQuery(final CriteriaQuery<InfraActiveRequests> crit,
-            final List<Predicate> predicates, final Order order) {
-
-        final long startTime = System.currentTimeMillis();
-        msoLogger.debug("Execute query on infra active request table");
-
-        List<InfraActiveRequests> results = new ArrayList<InfraActiveRequests>();
-
-        try {
-            final CriteriaBuilder cb = entityManager.getCriteriaBuilder();
-            crit.where(cb.and(predicates.toArray(new Predicate[0])));
-            crit.orderBy(order);
-            results = entityManager.createQuery(crit).getResultList();
-
-        } finally {
-            msoLogger.recordMetricEvent(startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc,
-                    "Successfully", "RequestDB", "getInfraActiveRequest", null);
-        }
-        return results;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.onap.so.requestsdb.InfraActiveRequestsRepositoryCustom#getRequestFromInfraActive(java.
-     * lang.String)
-     */
-    @Override
-    public InfraActiveRequests getRequestFromInfraActive(final String requestId) {
-        final long startTime = System.currentTimeMillis();
-        msoLogger.debug("Get request " + requestId + " from InfraActiveRequests DB");
-
-        InfraActiveRequests ar = null;
-        try {
-            final Query query = entityManager.createQuery(
-                    "from InfraActiveRequests where requestId = :requestId OR clientRequestId = :requestId");
-            query.setParameter(REQUEST_ID, requestId);
-            ar = this.getSingleResult(query);
-        } finally {
-
-            msoLogger.recordMetricEvent(startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc,
-                    "Successfully", "InfraRequestDB", "getRequestFromInfraActive", null);
-        }
-        return ar;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.onap.so.requestsdb.InfraActiveRequestsRepositoryCustom#checkInstanceNameDuplicate(java.
-     * util.HashMap, java.lang.String, java.lang.String)
-     */
-    @Override
-    public InfraActiveRequests checkInstanceNameDuplicate(final HashMap<String, String> instanceIdMap,
-            final String instanceName, final String requestScope) {
-
-        final List<Predicate> predicates = new LinkedList<>();
-        final CriteriaBuilder cb = entityManager.getCriteriaBuilder();
-        final CriteriaQuery<InfraActiveRequests> crit = cb.createQuery(InfraActiveRequests.class);
-        final Root<InfraActiveRequests> tableRoot = crit.from(InfraActiveRequests.class);
-
-        if (instanceName != null && !instanceName.equals("")) {
-
-            if ("service".equals(requestScope)) {
-                predicates.add(cb.equal(tableRoot.get(SERVICE_INSTANCE_NAME), instanceName));
-            } else if ("vnf".equals(requestScope)) {
-                predicates.add(cb.equal(tableRoot.get(VNF_INSTANCE_NAME), instanceName));
-            } else if ("volumeGroup".equals(requestScope)) {
-                predicates.add(cb.equal(tableRoot.get(VOLUME_GROUP_INSTANCE_NAME), instanceName));
-            } else if ("vfModule".equals(requestScope)) {
-                predicates.add(cb.equal(tableRoot.get(VFMODULE_INSTANCE_NAME), instanceName));
-            } else if ("network".equals(requestScope)) {
-                predicates.add(cb.equal(tableRoot.get(NETWORK_INSTANCE_NAME), instanceName));
-            } else if (requestScope.equals("configuration")) {
-                predicates.add(cb.equal(tableRoot.get(CONFIGURATION_INSTANCE_NAME), instanceName));
-            } else if (requestScope.equals("operationalEnvironment")) {
-                predicates.add(cb.equal(tableRoot.get(OPERATIONAL_ENV_NAME), instanceName));
-            }
-
-        } else {
-            if (instanceIdMap != null) {
-                if ("service".equals(requestScope) && instanceIdMap.get("serviceInstanceId") != null) {
-                    predicates
-                            .add(cb.equal(tableRoot.get(SERVICE_INSTANCE_ID), instanceIdMap.get("serviceInstanceId")));
-                }
-
-                if ("vnf".equals(requestScope) && instanceIdMap.get("vnfInstanceId") != null) {
-                    predicates.add(cb.equal(tableRoot.get(VNF_INSTANCE_ID), instanceIdMap.get("vnfInstanceId")));
-                }
-
-                if ("vfModule".equals(requestScope) && instanceIdMap.get("vfModuleInstanceId") != null) {
-                    predicates.add(
-                            cb.equal(tableRoot.get(VFMODULE_INSTANCE_ID), instanceIdMap.get("vfModuleInstanceId")));
-                }
-
-                if ("volumeGroup".equals(requestScope) && instanceIdMap.get("volumeGroupInstanceId") != null) {
-                    predicates.add(cb.equal(tableRoot.get(VOLUME_GROUP_INSTANCE_ID),
-                            instanceIdMap.get("volumeGroupInstanceId")));
-                }
-
-                if ("network".equals(requestScope) && instanceIdMap.get("networkInstanceId") != null) {
-                    predicates
-                            .add(cb.equal(tableRoot.get(NETWORK_INSTANCE_ID), instanceIdMap.get("networkInstanceId")));
-                }
-
-                if (requestScope.equals("configuration") && instanceIdMap.get("configurationInstanceId") != null) {
-                    predicates.add(cb.equal(tableRoot.get(CONFIGURATION_INSTANCE_ID),
-                            instanceIdMap.get("configurationInstanceId")));
-                }
-
-                if (requestScope.equals("operationalEnvironment")
-                        && instanceIdMap.get("operationalEnvironmentId") != null) {
-                    predicates.add(
-                            cb.equal(tableRoot.get(OPERATIONAL_ENV_ID), instanceIdMap.get("operationalEnvironmentId")));
-                }
-            }
-        }
-
-        predicates.add(tableRoot.get(REQUEST_STATUS)
-                .in(Arrays.asList("PENDING", "IN_PROGRESS", "TIMEOUT", "PENDING_MANUAL_TASK")));
-
-        final Order order = cb.desc(tableRoot.get(START_TIME));
-
-        final List<InfraActiveRequests> dupList = executeInfraQuery(crit, predicates, order);
-
-        InfraActiveRequests infraActiveRequests = null;
-
-        if (dupList != null && !dupList.isEmpty()) {
-            infraActiveRequests = dupList.get(0);
-        }
-
-        return infraActiveRequests;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.onap.so.requestsdb.InfraActiveRequestsRepositoryCustom#
-     * getOrchestrationFiltersFromInfraActive(java.util.Map)
-     */
-    @Override
-    public List<InfraActiveRequests> getOrchestrationFiltersFromInfraActive(
-            final Map<String, List<String>> orchestrationMap) {
-
-
-        final List<Predicate> predicates = new LinkedList<>();
-        final CriteriaBuilder cb = entityManager.getCriteriaBuilder();
-        final CriteriaQuery<InfraActiveRequests> crit = cb.createQuery(InfraActiveRequests.class);
-        final Root<InfraActiveRequests> tableRoot = crit.from(InfraActiveRequests.class);
-        for (final Map.Entry<String, List<String>> entry : orchestrationMap.entrySet()) {
-            String mapKey = entry.getKey();
-            if ("serviceInstanceId".equalsIgnoreCase(mapKey)) {
-                mapKey = "serviceInstanceId";
-            } else if ("serviceInstanceName".equalsIgnoreCase(mapKey)) {
-                mapKey = "serviceInstanceName";
-            } else if ("vnfInstanceId".equalsIgnoreCase(mapKey)) {
-                mapKey = "vnfId";
-            } else if ("vnfInstanceName".equalsIgnoreCase(mapKey)) {
-                mapKey = "vnfName";
-            } else if ("vfModuleInstanceId".equalsIgnoreCase(mapKey)) {
-                mapKey = "vfModuleId";
-            } else if ("vfModuleInstanceName".equalsIgnoreCase(mapKey)) {
-                mapKey = "vfModuleName";
-            } else if ("volumeGroupInstanceId".equalsIgnoreCase(mapKey)) {
-                mapKey = "volumeGroupId";
-            } else if ("volumeGroupInstanceName".equalsIgnoreCase(mapKey)) {
-                mapKey = "volumeGroupName";
-            } else if ("networkInstanceId".equalsIgnoreCase(mapKey)) {
-                mapKey = "networkId";
-            } else if ("networkInstanceName".equalsIgnoreCase(mapKey)) {
-                mapKey = "networkName";
-            } else if (mapKey.equalsIgnoreCase("configurationInstanceId")) {
-                mapKey = "configurationId";
-            } else if (mapKey.equalsIgnoreCase("configurationInstanceName")) {
-                mapKey = "configurationName";
-            } else if ("lcpCloudRegionId".equalsIgnoreCase(mapKey)) {
-                mapKey = "aicCloudRegion";
-            } else if ("tenantId".equalsIgnoreCase(mapKey)) {
-                mapKey = "tenantId";
-            } else if ("modelType".equalsIgnoreCase(mapKey)) {
-                mapKey = "requestScope";
-            } else if ("requestorId".equalsIgnoreCase(mapKey)) {
-                mapKey = "requestorId";
-            } else if ("requestExecutionDate".equalsIgnoreCase(mapKey)) {
-                mapKey = "startTime";
-            }
-
-            final String propertyValue = entry.getValue().get(1);
-            if ("startTime".equals(mapKey)) {
-                final SimpleDateFormat format = new SimpleDateFormat("MM-dd-yyyy");
-                try {
-                    final Date thisDate = format.parse(propertyValue);
-                    final Timestamp minTime = new Timestamp(thisDate.getTime());
-                    final Timestamp maxTime = new Timestamp(thisDate.getTime() + TimeUnit.DAYS.toMillis(1));
-
-                    if ("DOES_NOT_EQUAL".equalsIgnoreCase(entry.getValue().get(0))) {
-                        predicates.add(cb.or(cb.lessThan(tableRoot.get(mapKey), minTime),
-                                cb.greaterThanOrEqualTo(tableRoot.get(mapKey), maxTime)));
-                    } else {
-                        predicates.add(cb.between(tableRoot.get(mapKey), minTime, maxTime));
-                    }
-                } catch (final Exception e) {
-                    msoLogger.debug("Exception in getOrchestrationFiltersFromInfraActive(): + " + e.getMessage(), e);
-                    return null;
-                }
-            } else if ("DOES_NOT_EQUAL".equalsIgnoreCase(entry.getValue().get(0))) {
-                predicates.add(cb.notEqual(tableRoot.get(mapKey), propertyValue));
-            } else {
-                predicates.add(cb.equal(tableRoot.get(mapKey), propertyValue));
-            }
-
-        }
-
-        final Order order = cb.asc(tableRoot.get(START_TIME));
-
-        return executeInfraQuery(crit, predicates, order);
-    }
-
-    // Added this method for Tenant Isolation project ( 1802-295491a) to query the mso_requests DB
-    // (infra_active_requests table) for operationalEnvId and OperationalEnvName
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.onap.so.requestsdb.InfraActiveRequestsRepositoryCustom#
-     * getCloudOrchestrationFiltersFromInfraActive(java.util.Map)
-     */
-    @Override
-    public List<InfraActiveRequests> getCloudOrchestrationFiltersFromInfraActive(
-            final Map<String, String> orchestrationMap) {
-        final List<Predicate> predicates = new LinkedList<>();
-        final CriteriaBuilder cb = entityManager.getCriteriaBuilder();
-        final CriteriaQuery<InfraActiveRequests> crit = cb.createQuery(InfraActiveRequests.class);
-        final Root<InfraActiveRequests> tableRoot = crit.from(InfraActiveRequests.class);
-
-        // Add criteria on OperationalEnvironment RequestScope when requestorId is only specified in
-        // the filter
-        // as the same requestorId can also match on different API methods
-        final String resourceType = orchestrationMap.get("resourceType");
-        if (resourceType == null) {
-            predicates.add(cb.equal(tableRoot.get("requestScope"), "operationalEnvironment"));
-        }
-
-        for (final Map.Entry<String, String> entry : orchestrationMap.entrySet()) {
-            String mapKey = entry.getKey();
-            if (mapKey.equalsIgnoreCase("requestorId")) {
-                mapKey = "requestorId";
-            } else if (mapKey.equalsIgnoreCase("requestExecutionDate")) {
-                mapKey = "startTime";
-            } else if (mapKey.equalsIgnoreCase("operationalEnvironmentId")) {
-                mapKey = "operationalEnvId";
-            } else if (mapKey.equalsIgnoreCase("operationalEnvironmentName")) {
-                mapKey = "operationalEnvName";
-            } else if (mapKey.equalsIgnoreCase("resourceType")) {
-                mapKey = "requestScope";
-            }
-
-            final String propertyValue = entry.getValue();
-            if (mapKey.equals("startTime")) {
-                final SimpleDateFormat format = new SimpleDateFormat("MM-dd-yyyy");
-                try {
-                    final Date thisDate = format.parse(propertyValue);
-                    final Timestamp minTime = new Timestamp(thisDate.getTime());
-                    final Timestamp maxTime = new Timestamp(thisDate.getTime() + TimeUnit.DAYS.toMillis(1));
-
-                    predicates.add(cb.between(tableRoot.get(mapKey), minTime, maxTime));
-                } catch (final Exception e) {
-                    msoLogger.debug("Exception in getCloudOrchestrationFiltersFromInfraActive(): + " + e.getMessage());
-                    return null;
-                }
-            } else {
-                predicates.add(cb.equal(tableRoot.get(mapKey), propertyValue));
-            }
-        }
-
-        final Order order = cb.asc(tableRoot.get(START_TIME));
-        return executeInfraQuery(crit, predicates, order);
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.onap.so.requestsdb.InfraActiveRequestsRepositoryCustom#getRequestListFromInfraActive(java
-     * .lang.String, java.lang.String, java.lang.String)
-     */
-    @Override
-    public List<InfraActiveRequests> getRequestListFromInfraActive(final String queryAttributeName,
-            final String queryValue, final String requestType) {
-        msoLogger.debug("Get list of infra requests from DB with " + queryAttributeName + " = " + queryValue);
-
-
-        try {
-            final CriteriaBuilder cb = entityManager.getCriteriaBuilder();
-            final CriteriaQuery<InfraActiveRequests> crit = cb.createQuery(InfraActiveRequests.class);
-            final Root<InfraActiveRequests> candidateRoot = crit.from(InfraActiveRequests.class);
-            final Predicate isEqual = cb.equal(candidateRoot.get(queryAttributeName), queryValue);
-            final Predicate equalRequestType = cb.equal(candidateRoot.get(REQUEST_TYPE), requestType);
-            final Predicate isNull = cb.isNull(candidateRoot.get(REQUEST_TYPE));
-            final Predicate orClause = cb.or(equalRequestType, isNull);
-            final Order orderDesc = cb.desc(candidateRoot.get(START_TIME));
-            final Order orderAsc = cb.asc(candidateRoot.get(SOURCE));
-            crit.where(cb.and(isEqual, orClause)).orderBy(orderDesc, orderAsc);
-
-            final List<InfraActiveRequests> arList = entityManager.createQuery(crit).getResultList();
-            if (arList != null && !arList.isEmpty()) {
-                return arList;
-            }
-        } catch (final Exception exception) {
-            msoLogger.error("Unable to execute query", exception);
-        }
-        return Collections.emptyList();
-    }
-
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.onap.so.requestsdb.InfraActiveRequestsRepositoryCustom#getRequestFromInfraActive(java.
-     * lang.String, java.lang.String)
-     */
-    @Override
-    public InfraActiveRequests getRequestFromInfraActive(final String requestId, final String requestType) {
-        final long startTime = System.currentTimeMillis();
-        msoLogger.debug("Get infra request from DB with id " + requestId);
-
-        InfraActiveRequests ar = null;
-        try {
-            final Query query = entityManager.createQuery(
-                    "from InfraActiveRequests where (requestId = :requestId OR clientRequestId = :requestId) and requestType = :requestType");
-            query.setParameter(REQUEST_ID, requestId);
-            query.setParameter(REQUEST_TYPE, requestType);
-            ar = this.getSingleResult(query);
-        } finally {
-            msoLogger.recordMetricEvent(startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc,
-                    "Successfully", "RequestDB", "getRequestFromInfraActive", null);
-        }
-        return ar;
-    }
-
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.onap.so.requestsdb.InfraActiveRequestsRepositoryCustom#checkDuplicateByVnfName(java.lang.
-     * String, java.lang.String, java.lang.String)
-     */
-    @Override
-    public InfraActiveRequests checkDuplicateByVnfName(final String vnfName, final String action,
-            final String requestType) {
-
-        final long startTime = System.currentTimeMillis();
-        msoLogger.debug("Get infra request from DB for VNF " + vnfName + " and action " + action + " and requestType "
-                + requestType);
-
-        InfraActiveRequests ar = null;
-        try {
-            final Query query = entityManager.createQuery(
-                    "from InfraActiveRequests where vnfName = :vnfName and action = :action and (requestStatus = 'PENDING' or requestStatus = 'IN_PROGRESS' or requestStatus = 'TIMEOUT' or requestStatus = 'PENDING_MANUAL_TASK') and requestType = :requestType ORDER BY startTime DESC");
-            query.setParameter("vnfName", vnfName);
-            query.setParameter("action", action);
-            query.setParameter(REQUEST_TYPE, requestType);
-            @SuppressWarnings("unchecked")
-            final List<InfraActiveRequests> results = query.getResultList();
-            if (!results.isEmpty()) {
-                ar = results.get(0);
-            }
-        } finally {
-            msoLogger.recordMetricEvent(startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc,
-                    "Successfully", "RequestDB", "checkDuplicateByVnfName", null);
-        }
-
-        return ar;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.onap.so.requestsdb.InfraActiveRequestsRepositoryCustom#checkDuplicateByVnfId(java.lang.
-     * String, java.lang.String, java.lang.String)
-     */
-    @Override
-    public InfraActiveRequests checkDuplicateByVnfId(final String vnfId, final String action,
-            final String requestType) {
-
-        final long startTime = System.currentTimeMillis();
-        msoLogger.debug("Get list of infra requests from DB for VNF " + vnfId + " and action " + action);
-
-        InfraActiveRequests ar = null;
-        try {
-            final Query query = entityManager.createQuery(
-                    "from InfraActiveRequests where vnfId = :vnfId and action = :action and (requestStatus = 'PENDING' or requestStatus = 'IN_PROGRESS' or requestStatus = 'TIMEOUT' or requestStatus = 'PENDING_MANUAL_TASK') and requestType = :requestType ORDER BY startTime DESC");
-            query.setParameter("vnfId", vnfId);
-            query.setParameter("action", action);
-            query.setParameter(REQUEST_TYPE, requestType);
-            @SuppressWarnings("unchecked")
-            final List<InfraActiveRequests> results = query.getResultList();
-            if (!results.isEmpty()) {
-                ar = results.get(0);
-            }
-        } finally {
-            msoLogger.recordMetricEvent(startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc,
-                    "Successfully", "RequestDB", "checkDuplicateByVnfId", null);
-        }
-
-        return ar;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.onap.so.requestsdb.InfraActiveRequestsRepositoryCustom#checkVnfIdStatus(java.lang.String)
-     */
-    @Override
-    public InfraActiveRequests checkVnfIdStatus(final String operationalEnvironmentId) {
-        final long startTime = System.currentTimeMillis();
-        msoLogger.debug("Get Infra request from DB for OperationalEnvironmentId " + operationalEnvironmentId);
-
-        InfraActiveRequests ar = null;
-        try {
-            final CriteriaBuilder cb = entityManager.getCriteriaBuilder();
-            final CriteriaQuery<InfraActiveRequests> crit = cb.createQuery(InfraActiveRequests.class);
-            final Root<InfraActiveRequests> candidateRoot = crit.from(InfraActiveRequests.class);
-            final Predicate operationalEnvEq =
-                    cb.equal(candidateRoot.get("operationalEnvId"), operationalEnvironmentId);
-            final Predicate requestStatusNotEq = cb.notEqual(candidateRoot.get(REQUEST_STATUS), "COMPLETE");
-            final Predicate actionEq = cb.equal(candidateRoot.get("action"), "create");
-            final Order startTimeOrder = cb.desc(candidateRoot.get("startTime"));
-            crit.select(candidateRoot);
-            crit.where(cb.and(operationalEnvEq, requestStatusNotEq, actionEq));
-            crit.orderBy(startTimeOrder);
-            final TypedQuery<InfraActiveRequests> query = entityManager.createQuery(crit);
-            final List<InfraActiveRequests> results = query.getResultList();
-            if (!results.isEmpty()) {
-                ar = results.get(0);
-            }
-        } finally {
-            msoLogger.recordMetricEvent(startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc,
-                    "Successfully", "RequestDB", "checkDuplicateByVnfName", null);
-        }
-
-        return ar;
-    }
-
-    protected <T> T getSingleResult(final Query query) {
-        query.setMaxResults(1);
-        final List<T> list = query.getResultList();
-        if (list == null || list.isEmpty()) {
-            return null;
-        } else if (list.size() == 1) {
-            return list.get(0);
-        } else {
-            throw new NonUniqueResultException();
-        }
-
-    }
-
-    @Override
-    public List<InfraActiveRequests> getInfraActiveRequests(final Map<String, String[]> filters, final long startTime,
-            final long endTime, final Integer maxResult) {
-        if (filters == null) {
-            return Collections.emptyList();
-        }
-        try {
-            final CriteriaBuilder criteriaBuilder = entityManager.getCriteriaBuilder();
-            final CriteriaQuery<InfraActiveRequests> criteriaQuery =
-                    criteriaBuilder.createQuery(InfraActiveRequests.class);
-            final Root<InfraActiveRequests> tableRoot = criteriaQuery.from(InfraActiveRequests.class);
-            final List<Predicate> predicates = getPredicates(filters, criteriaBuilder, tableRoot);
-
-            final Timestamp minTime = new Timestamp(startTime);
-            final Timestamp maxTime = new Timestamp(endTime);
-            predicates.add(criteriaBuilder.greaterThanOrEqualTo(tableRoot.get(START_TIME), minTime));
-            predicates.add(criteriaBuilder.lessThanOrEqualTo(tableRoot.get(END_TIME), maxTime));
-
-            criteriaQuery.where(criteriaBuilder.and(predicates.toArray(new Predicate[predicates.size()])));
-            if (maxResult != null) {
-                return entityManager.createQuery(criteriaQuery).setMaxResults(maxResult).getResultList();
-            }
-            return entityManager.createQuery(criteriaQuery).getResultList();
-        } catch (final Exception exception) {
-            msoLogger.error("Unable to execute query using filters: " + filters, exception);
-            return Collections.emptyList();
-        }
-    }
-
-    private List<Predicate> getPredicates(final Map<String, String[]> filters, final CriteriaBuilder criteriaBuilder,
-            final Root<InfraActiveRequests> tableRoot) {
-        final List<Predicate> predicates = new LinkedList<>();
-        for (final Entry<String, String[]> entry : filters.entrySet()) {
-            final String[] params = entry.getValue();
-            if (VALID_COLUMNS.contains(entry.getKey()) && params.length == 2) {
-                final QueryOperationType operationType = QueryOperationType.getQueryOperationType(params[0]);
-                final Predicate predicate =
-                        operationType.getPredicate(criteriaBuilder, tableRoot, entry.getKey(), params[1]);
-                predicates.add(predicate);
-            }
-        }
-        return predicates;
-    }
-}
diff --git a/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/OperationStatusRepository.java b/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/OperationStatusRepository.java
deleted file mode 100644
index 16e10e3d5b..0000000000
--- a/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/OperationStatusRepository.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.db.request.data.repository;
-
-import org.onap.so.db.request.beans.OperationStatus;
-import org.onap.so.db.request.beans.OperationStatusId;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.repository.query.Param;
-import org.springframework.data.rest.core.annotation.RepositoryRestResource;
-
-@RepositoryRestResource(collectionResourceRel = "operationStatus", path = "operationStatus")
-public interface OperationStatusRepository extends JpaRepository<OperationStatus, OperationStatusId> {
-	
-	OperationStatus findOneByServiceIdAndOperationId(@Param("SERVICE_ID") String serviceId, @Param("OPERATION_ID") String operationId);
-	public OperationStatus findOneByServiceName(String serviceName);
-	public OperationStatus findOneByServiceId(String serviceId);
-}
diff --git a/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/OperationalEnvDistributionStatusRepository.java b/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/OperationalEnvDistributionStatusRepository.java
deleted file mode 100644
index e89755d565..0000000000
--- a/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/OperationalEnvDistributionStatusRepository.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.db.request.data.repository;
-
-import org.onap.so.db.request.beans.OperationalEnvDistributionStatus;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
-import org.springframework.data.rest.core.annotation.RepositoryRestResource;
-import org.springframework.transaction.annotation.Transactional;
-
-@RepositoryRestResource(collectionResourceRel = "operationalEnvDistributionStatus", path = "operationalEnvDistributionStatus")
-public interface OperationalEnvDistributionStatusRepository extends JpaRepository<OperationalEnvDistributionStatus, String> {
-
-	@Modifying
-	@Transactional
-	@Query("update OperationalEnvDistributionStatus set distributionIdStatus = :distributionIdStatus where "
-					+ "distributionId = :distributionId and operationalEnvId = :operationalEnvId and serviceModelVersionId = :serviceModelVersionId")
-	public int setDistributionIdStatus(@Param("distributionIdStatus") String distributionIdStatus,
-										@Param("distributionId") String distributionId,
-										@Param("operationalEnvId") String operationalEnvId,
-										@Param("serviceModelVersionId") String serviceModelVersionId);
-}
diff --git a/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/OperationalEnvServiceModelStatusRepository.java b/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/OperationalEnvServiceModelStatusRepository.java
deleted file mode 100644
index bcad9ce6d5..0000000000
--- a/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/OperationalEnvServiceModelStatusRepository.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.db.request.data.repository;
-
-import java.util.List;
-
-import org.onap.so.db.request.beans.OperationalEnvServiceModelStatus;
-import org.onap.so.db.request.beans.OperationalEnvServiceModelStatusId;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
-import org.springframework.data.rest.core.annotation.RepositoryRestResource;
-import org.springframework.transaction.annotation.Transactional;
-
-@RepositoryRestResource(collectionResourceRel = "operationalEnvServiceModelStatus", path = "operationalEnvServiceModelStatus")
-public interface OperationalEnvServiceModelStatusRepository extends JpaRepository<OperationalEnvServiceModelStatus, OperationalEnvServiceModelStatusId>{
-
-	public OperationalEnvServiceModelStatus findOneByOperationalEnvIdAndRequestId(String operationalEnvId, String requestId);
-	public List<OperationalEnvServiceModelStatus> findAllByOperationalEnvIdAndRequestId(@Param("OPERATIONAL_ENV_ID") String operationalEnvId, 
-																						@Param("REQUEST_ID") String requestId);
-	public OperationalEnvServiceModelStatus findOneByOperationalEnvIdAndServiceModelVersionId(@Param("OPERATIONAL_ENV_ID") String operationalEnvId, 
-																							  @Param("SERVICE_MODEL_VERSION_ID") String serviceModelVersionId);
-	
-}
diff --git a/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/RequestProcessingDataRepository.java b/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/RequestProcessingDataRepository.java
deleted file mode 100644
index f80be0525c..0000000000
--- a/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/RequestProcessingDataRepository.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.db.request.data.repository;
-
-import java.util.List;
-
-import org.onap.so.db.request.beans.RequestProcessingData;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.repository.query.Param;
-import org.springframework.data.rest.core.annotation.RepositoryRestResource;
-
-@RepositoryRestResource(collectionResourceRel = "requestProcessingData", path = "requestProcessingData")
-public interface RequestProcessingDataRepository extends JpaRepository<RequestProcessingData, Integer> {
-	RequestProcessingData findOneBySoRequestIdAndGroupingIdAndNameAndTag(
-			@Param("SO_REQUEST_ID") String soRequestId, @Param("GROUPING_ID") String groupingId,
-			@Param("NAME") String name, @Param("TAG") String tag);
-
-	List<RequestProcessingData> findBySoRequestIdOrderByGroupingIdDesc(@Param("SO_REQUEST_ID") String soRequestId);
-}
diff --git a/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/ResourceOperationStatusRepository.java b/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/ResourceOperationStatusRepository.java
deleted file mode 100644
index b93bf7840b..0000000000
--- a/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/ResourceOperationStatusRepository.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.db.request.data.repository;
-
-import java.util.List;
-
-import org.onap.so.db.request.beans.ResourceOperationStatus;
-import org.onap.so.db.request.beans.ResourceOperationStatusId;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.rest.core.annotation.RepositoryRestResource;
-import org.springframework.stereotype.Repository;
-
-@RepositoryRestResource(collectionResourceRel = "resourceOperationStatus", path = "resourceOperationStatus")
-public interface ResourceOperationStatusRepository extends JpaRepository<ResourceOperationStatus, ResourceOperationStatusId> {
-
-	List<ResourceOperationStatus> findByServiceIdAndOperationId(String serviceId, String operationId);
-}
diff --git a/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/SiteStatusRepository.java b/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/SiteStatusRepository.java
deleted file mode 100644
index 179d40ad23..0000000000
--- a/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/SiteStatusRepository.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.db.request.data.repository;
-
-import org.onap.so.db.request.beans.SiteStatus;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.rest.core.annotation.RepositoryRestResource;
-import org.springframework.stereotype.Repository;
-
-@RepositoryRestResource(collectionResourceRel = "siteStatus", path = "siteStatus")
-public interface SiteStatusRepository extends JpaRepository<SiteStatus, String> {	
-	SiteStatus findOneBySiteName(String siteName);
-
-}
diff --git a/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/WatchdogComponentDistributionStatusRepository.java b/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/WatchdogComponentDistributionStatusRepository.java
deleted file mode 100644
index 138ec0fb4d..0000000000
--- a/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/WatchdogComponentDistributionStatusRepository.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.db.request.data.repository;
-
-import java.util.List;
-
-import org.onap.so.db.request.beans.WatchdogComponentDistributionStatus;
-import org.onap.so.db.request.beans.WatchdogComponentDistributionStatusId;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.rest.core.annotation.RepositoryRestResource;
-import org.springframework.stereotype.Repository;
-
-@RepositoryRestResource(collectionResourceRel = "watchdogComponentDistributionStatus", path = "watchdogComponentDistributionStatus")
-public interface WatchdogComponentDistributionStatusRepository extends JpaRepository<WatchdogComponentDistributionStatus, WatchdogComponentDistributionStatusId> {
-
-	public List<WatchdogComponentDistributionStatus> findByDistributionId(String distributionId);
-}
diff --git a/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/WatchdogDistributionStatusRepository.java b/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/WatchdogDistributionStatusRepository.java
deleted file mode 100644
index fde8485e6d..0000000000
--- a/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/WatchdogDistributionStatusRepository.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.db.request.data.repository;
-
-import org.onap.so.db.request.beans.WatchdogDistributionStatus;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.rest.core.annotation.RepositoryRestResource;
-import org.springframework.stereotype.Repository;
-
-@RepositoryRestResource(collectionResourceRel = "watchdogDistributionStatus", path = "watchdogDistributionStatus")
-public interface WatchdogDistributionStatusRepository extends JpaRepository<WatchdogDistributionStatus, String> {
-
-}
diff --git a/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/WatchdogServiceModVerIdLookupRepository.java b/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/WatchdogServiceModVerIdLookupRepository.java
deleted file mode 100644
index b9585d495e..0000000000
--- a/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/WatchdogServiceModVerIdLookupRepository.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.db.request.data.repository;
-
-import org.onap.so.db.request.beans.WatchdogServiceModVerIdLookup;
-import org.onap.so.db.request.beans.WatchdogServiceModVerIdLookupId;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.rest.core.annotation.RepositoryRestResource;
-import org.springframework.stereotype.Repository;
-
-@RepositoryRestResource(collectionResourceRel = "watchdogServiceModVerIdLookup", path = "watchdogServiceModVerIdLookup")
-public interface WatchdogServiceModVerIdLookupRepository extends JpaRepository<WatchdogServiceModVerIdLookup, WatchdogServiceModVerIdLookupId> {
-
-	public WatchdogServiceModVerIdLookup findOneByDistributionId(String distributionId);
-	
-}
diff --git a/mso-api-handlers/mso-requests-db/src/main/resources/beans.xml b/mso-api-handlers/mso-requests-db/src/main/resources/beans.xml
deleted file mode 100644
index cd1bc8b7d7..0000000000
--- a/mso-api-handlers/mso-requests-db/src/main/resources/beans.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:jpa="http://www.springframework.org/schema/data/jpa"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans
-    http://www.springframework.org/schema/beans/spring-beans.xsd
-    http://www.springframework.org/schema/data/jpa
-    http://www.springframework.org/schema/data/jpa/spring-jpa.xsd">
-
-  <jpa:repositories base-package="org.onap.so.db.request.data.repository" />
-
-</beans>
\ No newline at end of file
diff --git a/mso-api-handlers/mso-requests-db/src/test/java/org/onap/so/BaseTest.java b/mso-api-handlers/mso-requests-db/src/test/java/org/onap/so/BaseTest.java
deleted file mode 100644
index 5a8df1d556..0000000000
--- a/mso-api-handlers/mso-requests-db/src/test/java/org/onap/so/BaseTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 - 2018 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.junit4.SpringRunner;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = TestApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@ActiveProfiles("test")
-public abstract class BaseTest {
-
-}
diff --git a/mso-api-handlers/mso-requests-db/src/test/java/org/onap/so/TestApplication.java b/mso-api-handlers/mso-requests-db/src/test/java/org/onap/so/TestApplication.java
deleted file mode 100644
index 00d212a23e..0000000000
--- a/mso-api-handlers/mso-requests-db/src/test/java/org/onap/so/TestApplication.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.Profile;
-
-@SpringBootApplication(scanBasePackages = { "org.onap.so.db" })
-@Profile("test")
-public class TestApplication {
-	public static void main(String... args) {
-		SpringApplication.run(TestApplication.class, args);
-		System.getProperties().setProperty("mso.db", "MARIADB");
-		System.getProperties().setProperty("server.name", "Springboot");
-	}
-}
diff --git a/mso-api-handlers/mso-requests-db/src/test/java/org/onap/so/db/request/OperationStatusTest.java b/mso-api-handlers/mso-requests-db/src/test/java/org/onap/so/db/request/OperationStatusTest.java
deleted file mode 100644
index a10d948b8f..0000000000
--- a/mso-api-handlers/mso-requests-db/src/test/java/org/onap/so/db/request/OperationStatusTest.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.db.request;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-
-import java.util.Date;
-
-import javax.transaction.Transactional;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.onap.so.TestApplication;
-import org.onap.so.db.request.beans.OperationStatus;
-import org.onap.so.db.request.beans.OperationStatusId;
-import org.onap.so.db.request.data.repository.OperationStatusRepository;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.junit4.SpringRunner;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = TestApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@ActiveProfiles("test")
-public class OperationStatusTest {	
-	
-	@Autowired
-	private OperationStatusRepository repository;
-	
-	@Test
-	@Transactional
-	public void timeStampCreated() throws InterruptedException {
-		
-		final String testServiceId = "test-service-id";
-		final String testOperationId = "test-operation-id";
-		final OperationStatusId id = new OperationStatusId(testServiceId, testOperationId);
-		OperationStatus status = new OperationStatus();
-		
-		status.setServiceId(testServiceId);
-		status.setOperationId(testOperationId);
-		
-		status = repository.saveAndFlush(status);
-		
-		OperationStatus found = repository.findOne(id);
-		
-		Date operateAt = found.getOperateAt();
-		assertNotNull(operateAt);
-		assertEquals(testServiceId, found.getServiceId());
-		Date finishedAt = found.getFinishedAt();
-		status.setProgress("test-progress");
-		//timestamps only set to save on 1 second changes
-		Thread.sleep(1000);
-		repository.saveAndFlush(status);
-		
-		OperationStatus foundUpdate = repository.findOne(id);
-
-		assertEquals(operateAt.toString(), foundUpdate.getOperateAt().toString());
-		assertNotNull(foundUpdate.getFinishedAt());
-		assertNotEquals(finishedAt.toString(), foundUpdate.getFinishedAt().toString());
-		assertEquals("test-progress", foundUpdate.getProgress());
-	}
-}
diff --git a/mso-api-handlers/mso-requests-db/src/test/java/org/onap/so/db/request/OperationalEnvServiceModelStatusTest.java b/mso-api-handlers/mso-requests-db/src/test/java/org/onap/so/db/request/OperationalEnvServiceModelStatusTest.java
deleted file mode 100644
index c12d3cbb7b..0000000000
--- a/mso-api-handlers/mso-requests-db/src/test/java/org/onap/so/db/request/OperationalEnvServiceModelStatusTest.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.db.request;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.onap.so.TestApplication;
-import org.onap.so.db.request.beans.OperationalEnvServiceModelStatus;
-import org.onap.so.db.request.data.repository.OperationalEnvServiceModelStatusRepository;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.data.domain.Example;
-import org.springframework.data.domain.ExampleMatcher;
-import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.junit4.SpringRunner;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = TestApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@ActiveProfiles("test")
-public class OperationalEnvServiceModelStatusTest {
-
-	@Autowired
-	private OperationalEnvServiceModelStatusRepository repository;
-	
-	
-	@Test
-	public void updateWithoutAllKeys() throws Exception {
-		
-		OperationalEnvServiceModelStatus status = new OperationalEnvServiceModelStatus();
-		status.setRequestId("request-id-1");
-		status.setOperationalEnvId("oper-env-id-1");
-		status.setServiceModelVersionId("service-model-ver-id-1");
-		status.setRetryCount(0);
-		
-		repository.saveAndFlush(status);
-		OperationalEnvServiceModelStatus status2 = repository.findOneByOperationalEnvIdAndServiceModelVersionId("oper-env-id-1", "service-model-ver-id-1");
-		status2.setRetryCount(1);
-		
-		repository.saveAndFlush(status2);
-		
-		OperationalEnvServiceModelStatus status3 = new OperationalEnvServiceModelStatus();
-
-		status3.setRequestId("request-id-2");
-		status3.setOperationalEnvId("oper-env-id-1");
-		status3.setServiceModelVersionId("service-model-ver-id-2");
-		status3.setRetryCount(2);
-		
-		repository.saveAndFlush(status3);
-		
-		OperationalEnvServiceModelStatus exampleObj = new OperationalEnvServiceModelStatus();
-		exampleObj.setOperationalEnvId("oper-env-id-1");
-		exampleObj.setServiceModelVersionId("service-model-ver-id-1");
-		ExampleMatcher matcher = ExampleMatcher.matching().withIgnorePaths("requestId");
-		OperationalEnvServiceModelStatus foundStatus = repository.findOne(Example.of(exampleObj,matcher));
-		if(foundStatus== null)
-			throw new Exception("No status found");
-
-		assertEquals(new Integer(1), foundStatus.getRetryCount());		
-	}
-}
diff --git a/mso-api-handlers/mso-requests-db/src/test/java/org/onap/so/db/request/RequestDBConfig.java b/mso-api-handlers/mso-requests-db/src/test/java/org/onap/so/db/request/RequestDBConfig.java
deleted file mode 100644
index 9bcff13699..0000000000
--- a/mso-api-handlers/mso-requests-db/src/test/java/org/onap/so/db/request/RequestDBConfig.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.db.request;
-
-
-import javax.persistence.EntityManagerFactory;
-import javax.sql.DataSource;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceBuilder;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
-import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
-import org.springframework.orm.jpa.JpaTransactionManager;
-import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
-import org.springframework.transaction.PlatformTransactionManager;
-import org.springframework.transaction.annotation.EnableTransactionManagement;
-
-@Configuration
-@EnableTransactionManagement
-@EnableJpaRepositories(
-		entityManagerFactoryRef = "requestEntityManagerFactory",transactionManagerRef = "requestTransactionManager",
-		basePackages = { "org.onap.so.db.request.data.repository" }
-		)
-public class RequestDBConfig {
-
-	@Primary
-	@Bean(name = "requestDataSource")
-	@ConfigurationProperties(prefix = "spring.datasource")
-	public DataSource dataSource() {
-		return DataSourceBuilder.create().build();
-	}
-
-	@Primary
-	@Bean(name = "requestEntityManagerFactory")
-	public LocalContainerEntityManagerFactoryBean 
-	entityManagerFactory(
-			EntityManagerFactoryBuilder builder,
-			@Qualifier("requestDataSource") DataSource dataSource
-			) {
-		return builder
-				.dataSource(dataSource)
-				.packages("org.onap.so.db.request.beans")
-				.persistenceUnit("requestDB")
-				.build();
-	}
-
-	@Primary
-	@Bean(name = "requestTransactionManager")
-	public PlatformTransactionManager transactionManager(
-			@Qualifier("requestEntityManagerFactory") EntityManagerFactory 
-			entityManagerFactory
-			) {
-		return new JpaTransactionManager(entityManagerFactory);
-	}
-
-}
diff --git a/mso-api-handlers/mso-requests-db/src/test/java/org/onap/so/db/request/SiteStatusTest.java b/mso-api-handlers/mso-requests-db/src/test/java/org/onap/so/db/request/SiteStatusTest.java
deleted file mode 100644
index 917f52d4ad..0000000000
--- a/mso-api-handlers/mso-requests-db/src/test/java/org/onap/so/db/request/SiteStatusTest.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.db.request;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import javax.transaction.Transactional;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.onap.so.TestApplication;
-import org.onap.so.db.request.beans.SiteStatus;
-import org.onap.so.db.request.data.repository.SiteStatusRepository;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.data.domain.Example;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Sort.Direction;
-import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.junit4.SpringRunner;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = TestApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@ActiveProfiles("test")
-public class SiteStatusTest {
-	
-	@Autowired
-	private SiteStatusRepository repository;
-	
-	@Test	
-	@Transactional
-	public void timeStampCreated() throws InterruptedException {
-		SiteStatus found = repository.findOne("test name4");		
-		assertNotNull(found.getCreated());
-		assertEquals("test name4", found.getSiteName());		
-	}
-	
-	@Test
-	public void sortByCreated() {
-		
-		final PageRequest page1 = new PageRequest(
-				  0, 20, Direction.DESC, "created"
-				);
-		
-		SiteStatus example = new SiteStatus();
-		example.setStatus(true);
-		Page<SiteStatus> found = repository.findAll(Example.of(example), page1);
-		
-		assertEquals("test name4", found.getContent().get(0).getSiteName());
-		
-	}
-	
-	@Test
-	public void updateStatus() {
-		
-		SiteStatus status = repository.findOne("test name update");
-		status.setStatus(false);
-		
-		repository.saveAndFlush(status);
-
-		assertEquals(false, repository.findOne("test name update").getStatus());
-		
-	}
-	
-}
diff --git a/mso-api-handlers/mso-requests-db/src/test/java/org/onap/so/db/request/data/repository/InfraActiveRequestsRepositoryImplTest.java b/mso-api-handlers/mso-requests-db/src/test/java/org/onap/so/db/request/data/repository/InfraActiveRequestsRepositoryImplTest.java
deleted file mode 100644
index d889a15fc4..0000000000
--- a/mso-api-handlers/mso-requests-db/src/test/java/org/onap/so/db/request/data/repository/InfraActiveRequestsRepositoryImplTest.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.db.request.data.repository;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertTrue;
-import static org.onap.so.db.request.data.repository.InfraActiveRequestsRepositoryImpl.ACTION;
-import static org.onap.so.db.request.data.repository.InfraActiveRequestsRepositoryImpl.REQUEST_ID;
-import static org.onap.so.db.request.data.repository.InfraActiveRequestsRepositoryImpl.SERVICE_INSTANCE_ID;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.onap.so.TestApplication;
-import org.onap.so.db.request.beans.InfraActiveRequests;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.junit4.SpringRunner;
-
-
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = TestApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@ActiveProfiles("test")
-public class InfraActiveRequestsRepositoryImplTest {
-
-    private static final int MAX_LIMIT = 1;
-    private static final long END_TIME_IN_MILISEC = 1482436800000l;
-    private static final long START_TIME_IN_MILISEC = 1482429600000l;
-    private static final String REQUEST_ID_VALUE = "00032ab7-3fb3-42e5-965d-8ea592502017";
-    private static final String SERVICE_INSTANCE_ID_VALUE = "e3b5744d-2ad1-4cdd-8390-c999a38829bc";
-
-    @Autowired
-    private InfraActiveRequestsRepository objUnderTest;
-
-    @Test
-    public void test_GetInfraActiveRequests_emptyFiltersMap() {
-        final List<InfraActiveRequests> actualRequests = objUnderTest.getInfraActiveRequests(Collections.emptyMap(),
-                START_TIME_IN_MILISEC, END_TIME_IN_MILISEC, null);
-        assertFalse(actualRequests.isEmpty());
-    }
-
-    @Test
-    public void test_GetInfraActiveRequests_invalidFiltersMap() {
-        final Map<String, String[]> filters = new HashMap<>();
-        filters.put("OverTheMoon", new String[] {"Humpty Dumpty Sat On The Wall"});
-        final long startTime = START_TIME_IN_MILISEC - TimeUnit.DAYS.toMillis(20);
-        final long endTime = END_TIME_IN_MILISEC - TimeUnit.DAYS.toMillis(20);
-        final List<InfraActiveRequests> actualRequests =
-                objUnderTest.getInfraActiveRequests(filters, startTime, endTime, null);
-        assertTrue(actualRequests.isEmpty());
-    }
-
-    @Test
-    public void test_GetInfraActiveRequests_invalidFiltersMapWithInvalidKey() {
-        final Map<String, String[]> filters = new HashMap<>();
-        filters.put("OverTheMoon", new String[] {"Avengers", "Humpty Dumpty Sat On The Wall"});
-        final List<InfraActiveRequests> actualRequests =
-                objUnderTest.getInfraActiveRequests(filters, START_TIME_IN_MILISEC, END_TIME_IN_MILISEC, null);
-        assertFalse(actualRequests.isEmpty());
-    }
-
-    @Test
-    public void test_GetInfraActiveRequestsData_withEqualServiceInstanceId() {
-        final Map<String, String[]> values = new HashMap<>();
-        values.put(SERVICE_INSTANCE_ID, new String[] {QueryOperationType.EQ.name(), SERVICE_INSTANCE_ID_VALUE});
-        final List<InfraActiveRequests> actualRequests =
-                objUnderTest.getInfraActiveRequests(values, START_TIME_IN_MILISEC, END_TIME_IN_MILISEC, 1);
-        assertFalse(actualRequests.isEmpty());
-
-        assertEquals(SERVICE_INSTANCE_ID_VALUE, actualRequests.get(0).getServiceInstanceId());
-    }
-
-
-    @Test
-    public void test_GetInfraActiveRequestsData_withLikeRequestID() {
-        final Map<String, String[]> values = new HashMap<>();
-        values.put(REQUEST_ID, new String[] {QueryOperationType.LIKE.name(), "00032ab7"});
-        final List<InfraActiveRequests> actualRequests =
-                objUnderTest.getInfraActiveRequests(values, START_TIME_IN_MILISEC, END_TIME_IN_MILISEC, 1);
-        assertFalse(actualRequests.isEmpty());
-
-        assertEquals(REQUEST_ID_VALUE, actualRequests.get(0).getRequestId());
-        assertEquals(SERVICE_INSTANCE_ID_VALUE, actualRequests.get(0).getServiceInstanceId());
-    }
-
-
-    @Test
-    public void test_GetInfraActiveRequestsData_withLikeRequestIDAndEqualToServiceInstanceId() {
-        final Map<String, String[]> values = new HashMap<>();
-        values.put(REQUEST_ID, new String[] {QueryOperationType.LIKE.name(), "00032ab7"});
-        values.put(SERVICE_INSTANCE_ID, new String[] {QueryOperationType.EQ.name(), SERVICE_INSTANCE_ID_VALUE});
-        final List<InfraActiveRequests> actualRequests =
-                objUnderTest.getInfraActiveRequests(values, START_TIME_IN_MILISEC, END_TIME_IN_MILISEC, 1);
-        assertFalse(actualRequests.isEmpty());
-
-        assertEquals(REQUEST_ID_VALUE, actualRequests.get(0).getRequestId());
-        assertEquals(SERVICE_INSTANCE_ID_VALUE, actualRequests.get(0).getServiceInstanceId());
-    }
-
-
-    @Test
-    public void test_GetInfraActiveRequestsData_withNotEqualAction() {
-        final Map<String, String[]> values = new HashMap<>();
-        values.put(ACTION, new String[] {QueryOperationType.NEQ.name(), "createInstance"});
-        final List<InfraActiveRequests> actualRequests =
-                objUnderTest.getInfraActiveRequests(values, START_TIME_IN_MILISEC, END_TIME_IN_MILISEC, null);
-        assertFalse(actualRequests.isEmpty());
-        for (final InfraActiveRequests actualActiveRequests : actualRequests) {
-            assertNotEquals("createInstance", actualActiveRequests.getAction());
-        }
-    }
-
-
-    @Test
-    public void test_GetInfraActiveRequestsData_withNotEqualToServiceInstanceNameAndServiceInstanceIdNul() {
-        final Map<String, String[]> values = new HashMap<>();
-        values.put(ACTION, new String[] {QueryOperationType.NEQ.name(), "createInstance"});
-        values.put(SERVICE_INSTANCE_ID, new String[] {QueryOperationType.EQ.name(), SERVICE_INSTANCE_ID_VALUE});
-
-        final List<InfraActiveRequests> actualRequests =
-                objUnderTest.getInfraActiveRequests(values, START_TIME_IN_MILISEC, END_TIME_IN_MILISEC, null);
-        assertFalse(actualRequests.isEmpty());
-        for (final InfraActiveRequests actualActiveRequests : actualRequests) {
-            assertNotEquals("createInstance", actualActiveRequests.getAction());
-            assertEquals(SERVICE_INSTANCE_ID_VALUE, actualActiveRequests.getServiceInstanceId());
-        }
-    }
-
-    @Test
-    public void test_GetInfraActiveRequestsData_withStartEndDateTimeNotEqualAction() {
-        final Map<String, String[]> values = new HashMap<>();
-        values.put(ACTION, new String[] {QueryOperationType.NEQ.name(), "createInstance"});
-        final List<InfraActiveRequests> actualRequests =
-                objUnderTest.getInfraActiveRequests(values, START_TIME_IN_MILISEC, END_TIME_IN_MILISEC, null);
-        assertFalse(actualRequests.isEmpty());
-        for (final InfraActiveRequests actualActiveRequests : actualRequests) {
-            assertNotEquals("createInstance", actualActiveRequests.getAction());
-        }
-    }
-
-    @Test
-    public void test_GetInfraActiveRequestsData_withLimitNotEqualAction() {
-        final Map<String, String[]> values = new HashMap<>();
-        values.put(ACTION, new String[] {QueryOperationType.NEQ.name(), "createInstance"});
-        final List<InfraActiveRequests> actualRequests =
-                objUnderTest.getInfraActiveRequests(values, START_TIME_IN_MILISEC, END_TIME_IN_MILISEC, MAX_LIMIT);
-        assertFalse(actualRequests.isEmpty());
-        for (final InfraActiveRequests actualActiveRequests : actualRequests) {
-            assertNotEquals("createInstance", actualActiveRequests.getAction());
-        }
-    }
-
-    @Test
-    public void test_GetInfraActiveRequestsData_withNullFilters() {
-        final List<InfraActiveRequests> actualRequests =
-                objUnderTest.getInfraActiveRequests(null, START_TIME_IN_MILISEC, END_TIME_IN_MILISEC, MAX_LIMIT);
-        assertTrue(actualRequests.isEmpty());
-    }
-}
diff --git a/mso-api-handlers/mso-requests-db/src/test/resources/afterMigrate.sql b/mso-api-handlers/mso-requests-db/src/test/resources/afterMigrate.sql
deleted file mode 100644
index 897dd3faca..0000000000
--- a/mso-api-handlers/mso-requests-db/src/test/resources/afterMigrate.sql
+++ /dev/null
@@ -1,35 +0,0 @@
-use requestdb;
-
-insert into operation_status(service_id, operation_id, service_name, user_id, result, operation_content, progress, reason, operate_at, finished_at) values
-('serviceid', 'operationid', 'servicename', 'userid', 'result', 'operationcontent', 'progress', 'reason', '2016-11-24 13:19:10', '2016-11-24 13:19:10'); 
-
-
-insert into infra_active_requests(request_id, client_request_id, action, request_status, status_message, progress, start_time, end_time, source, vnf_id, vnf_name, vnf_type, service_type, aic_node_clli, tenant_id, prov_status, vnf_params, vnf_outputs, request_body, response_body, last_modified_by, modify_time, request_type, volume_group_id, volume_group_name, vf_module_id, vf_module_name, vf_module_model_name, aai_service_id, aic_cloud_region, callback_url, correlator, network_id, network_name, network_type, request_scope, request_action, service_instance_id, service_instance_name, requestor_id, configuration_id, configuration_name, operational_env_id, operational_env_name) values
-('00032ab7-3fb3-42e5-965d-8ea592502017', '00032ab7-3fb3-42e5-965d-8ea592502016', 'deleteInstance', 'COMPLETE', 'Vf Module has been deleted successfully.', '100', '2016-12-22 18:59:54', '2016-12-22 19:00:28', 'VID', 'b92f60c8-8de3-46c1-8dc1-e4390ac2b005', null, null, null, null, '6accefef3cb442ff9e644d589fb04107', null, null, null, '{"requestDetails":{"modelInfo":{"modelType":"vfModule","modelName":"vSAMP10aDEV::base::module-0"},"requestInfo":{"source":"VID"},"cloudConfiguration":{"tenantId":"6accefef3cb442ff9e644d589fb04107","lcpCloudRegionId":"mtn6"}}}', null, 'BPMN', '2016-12-22 19:00:28', null, null, null, 'c7d527b1-7a91-49fd-b97d-1c8c0f4a7992', null, 'vSAMP10aDEV::base::module-0', null, 'mtn6', null, null, null, null, null, 'vfModule', 'deleteInstance', 'e3b5744d-2ad1-4cdd-8390-c999a38829bc', null, null, null, null, null, null),
-('00093944-bf16-4373-ab9a-3adfe730ff2d', null, 'createInstance', 'FAILED', 'Error: Locked instance - This service (MSODEV_1707_SI_vSAMP10a_011-4) already has a request being worked with a status of IN_PROGRESS (RequestId - 278e83b1-4f9f-450e-9e7d-3700a6ed22f4). The existing request must finish or be cleaned up before proceeding.', '100', '2017-07-11 18:33:26', '2017-07-11 18:33:26', 'VID', null, null, null, null, null, '19123c2924c648eb8e42a3c1f14b7682', null, null, null, '{"requestDetails":{"modelInfo":{"modelInvariantId":"9647dfc4-2083-11e7-93ae-92361f002671","modelType":"service","modelName":"MSOTADevInfra_vSAMP10a_Service","modelVersion":"1.0","modelVersionId":"5df8b6de-2083-11e7-93ae-92361f002671"},"requestInfo":{"source":"VID","instanceName":"MSODEV_1707_SI_vSAMP10a_011-4","suppressRollback":false,"requestorId":"xxxxxx"},"subscriberInfo":{"globalSubscriberId":"MSO_1610_dev","subscriberName":"MSO_1610_dev"},"cloudConfiguration":{"tenantId":"19123c2924c648eb8e42a3c1f14b7682","lcpCloudRegionId":"mtn6"},"requestParameters":{"subscriptionServiceType":"MSO-dev-service-type","userParams":[{"name":"someUserParam","value":"someValue"}],"aLaCarte":true,"autoBuildVfModules":false,"cascadeDelete":false,"usePreload":true,"alaCarteSet":true,"alaCarte":true}}}', null, 'APIH', '2016-12-22 19:00:28', null, null, null, null, null, null, null, 'mtn6', null, null, null, null, null, 'service', 'createInstance', null, 'MSODEV_1707_SI_vSAMP10a_011-4', 'xxxxxx', null, null, null, null),
-('001619d2-a297-4a4b-a9f5-e2823c88458f', '001619d2-a297-4a4b-a9f5-e2823c88458f', 'CREATE_VF_MODULE', 'COMPLETE', 'COMPLETED', '100', '2016-07-01 14:11:42', '2017-05-02 16:03:34', 'PORTAL', null, 'test-vscp', 'elena_test21', null, null, '381b9ff6c75e4625b7a4182f90fc68d3', null, null, null, '<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n<vnf-request xmlns=\"http://org.onap.so/mso/infra/vnf-request/v1\">\n    <request-info>\n        <request-id>001619d2-a297-4a4b-a9f5-e2823c88458f</request-id>\n        <action>CREATE_VF_MODULE</action>\n        <source>PORTAL</source>\n    </request-info>\n    <vnf-inputs>\n        <vnf-name>test-vscp</vnf-name>\n        <vf-module-name>moduleName</vf-module-name>\n        <vnf-type>elena_test21</vnf-type>\n        <vf-module-model-name>moduleModelName</vf-module-model-name>\n        <asdc-service-model-version>1.0</asdc-service-model-version>\n        <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>\n        <aic-cloud-region>mtn9</aic-cloud-region>\n        <tenant-id>381b9ff6c75e4625b7a4182f90fc68d3</tenant-id>\n        <persona-model-id></persona-model-id>\n        <persona-model-version></persona-model-version>\n        <is-base-vf-module>false</is-base-vf-module>\n    </vnf-inputs>\n    <vnf-params xmlns:tns=\"http://org.onap.so/mso/infra/vnf-request/v1\"/>\n</vnf-request>\n', 'NONE', 'RDBTEST', '2016-07-01 14:11:42', 'VNF', null, null, null, 'MODULENAME1', 'moduleModelName', 'a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb', 'mtn9', null, null, null, null, null, 'vfModule', 'createInstance', null, null, null, null, null, null, null),
-('00164b9e-784d-48a8-8973-bbad6ef818ed', null, 'createInstance', 'COMPLETE', 'Service Instance was created successfully.', '100', '2017-09-28 12:45:51', '2017-09-28 12:45:53', 'VID', null, null, null, null, null, '19123c2924c648eb8e42a3c1f14b7682', null, null, null, '{"requestDetails":{"requestDetails":{"modelInfo":{"modelCustomizationName":null,"modelInvariantId":"52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f","modelType":"service","modelNameVersionId":null,"modelName":"MSO Test Network","modelVersion":"1.0","modelCustomizationUuid":null,"modelVersionId":"aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e","modelCustomizationId":null,"modelUuid":null,"modelInvariantUuid":null,"modelInstanceName":null},"requestInfo":{"billingAccountNumber":null,"callbackUrl":null,"correlator":null,"orderNumber":null,"productFamilyId":null,"orderVersion":null,"source":"VID","instanceName":"DEV-MTN6-3100-0927-1","suppressRollback":false,"requestorId":"xxxxxx"},"relatedInstanceList":null,"subscriberInfo":{"globalSubscriberId":"MSO_1610_dev","subscriberName":"MSO_1610_dev"},"cloudConfiguration":{"aicNodeClli":null,"tenantId":"19123c2924c648eb8e42a3c1f14b7682","lcpCloudRegionId":"mtn6"},"requestParameters":{"subscriptionServiceType":"MSO-dev-service-type","userParams":[{"name":"someUserParam","value":"someValue"}],"aLaCarte":true,"autoBuildVfModules":false,"cascadeDelete":false,"usePreload":true,"alaCarte":true},"project":null,"owningEntity":null,"platform":null,"lineOfBusiness":null}}}', null, 'CreateGenericALaCarteServiceInstance', '2017-09-28 12:45:52', null, null, null, null, null, null, null, 'mtn6', null, null, null, null, null, 'service', 'createInstance', 'b2f59173-b7e5-4e0f-8440-232fd601b865', 'DEV-MTN6-3100-0927-1', 'xxxxxx', null, null, null, null),
-('00173cc9-5ce2-4673-a810-f87fefb2829e', null, 'createInstance', 'FAILED', 'Error parsing request.  No valid instanceName is specified', '100', '2017-04-14 21:08:46', '2017-04-14 21:08:46', 'VID', null, null, null, null, null, 'a259ae7b7c3f493cb3d91f95a7c18149', null, null, null, '{"requestDetails":{"modelInfo":{"modelInvariantId":"ff6163d4-7214-459e-9f76-507b4eb00f51","modelType":"service","modelName":"ConstraintsSrvcVID","modelVersion":"2.0","modelVersionId":"722d256c-a374-4fba-a14f-a59b76bb7656"},"requestInfo":{"productFamilyId":"LRSI-OSPF","source":"VID","requestorId":"xxxxxx"},"subscriberInfo":{"globalSubscriberId":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb"},"cloudConfiguration":{"tenantId":"a259ae7b7c3f493cb3d91f95a7c18149","lcpCloudRegionId":"mtn16"},"requestParameters":{"subscriptionServiceType":"Mobility","userParams":[{"name":"neutronport6_name","value":"8"},{"name":"neutronnet5_network_name","value":"8"},{"name":"contrailv2vlansubinterface3_name","value":"false"}]}}}', null, 'APIH', '2016-12-22 19:00:28', null, null, null, null, null, null, null, 'mtn16', null, null, null, null, null, 'service', 'createInstance', null, null, null, null, null, null, null),
-('0017f68c-eb2d-45bb-b7c7-ec31b37dc349', null, 'activateInstance', 'UNLOCKED', null, '20', '2017-09-26 16:09:29', '2017-09-28 12:45:53', 'VID', null, null, null, null, null, null, null, null, null, '{"requestDetails":{"modelInfo":{"modelCustomizationName":null,"modelInvariantId":"1587cf0e-f12f-478d-8530-5c55ac578c39","modelType":"configuration","modelNameVersionId":null,"modelName":null,"modelVersion":null,"modelCustomizationUuid":null,"modelVersionId":"36a3a8ea-49a6-4ac8-b06c-89a545444455","modelCustomizationId":"68dc9a92-214c-11e7-93ae-92361f002671","modelUuid":null,"modelInvariantUuid":null,"modelInstanceName":null},"requestInfo":{"billingAccountNumber":null,"callbackUrl":null,"correlator":null,"orderNumber":null,"productFamilyId":null,"orderVersion":null,"source":"VID","instanceName":null,"suppressRollback":false,"requestorId":"xxxxxx"},"relatedInstanceList":[{"relatedInstance":{"instanceName":null,"instanceId":"9e15a443-af65-4f05-9000-47ae495e937d","modelInfo":{"modelCustomizationName":null,"modelInvariantId":"de19ae10-9a25-11e7-abc4-cec278b6b50a","modelType":"service","modelNameVersionId":null,"modelName":"MSOTADevInfra_Configuration_Service","modelVersion":"1.0","modelCustomizationUuid":null,"modelVersionId":"ee938612-9a25-11e7-abc4-cec278b6b50a","modelCustomizationId":null,"modelUuid":null,"modelInvariantUuid":null,"modelInstanceName":null},"instanceDirection":null}}],"subscriberInfo":null,"cloudConfiguration":{"aicNodeClli":null,"tenantId":null,"lcpCloudRegionId":"mtn6"},"requestParameters":{"subscriptionServiceType":null,"userParams":[],"aLaCarte":false,"autoBuildVfModules":false,"cascadeDelete":false,"usePreload":true,"alaCarte":false},"project":null,"owningEntity":null,"platform":null,"lineOfBusiness":null}}', null, 'APIH', '2017-09-26 16:09:29', null, null, null, null, null, null, null, 'mtn6', null, null, null, null, null, 'configuration', 'activateInstance', '9e15a443-af65-4f05-9000-47ae495e937d', null, 'xxxxxx', '26ef7f15-57bb-48df-8170-e59edc26234c', null, null, null);        
-        
-insert into watchdog_distributionid_status(distribution_id, distribution_id_status, create_time, modify_time) values
-('1533c4bd-a3e3-493f-a16d-28c20614415e', '', '2017-11-30 15:48:09', '2017-11-30 15:48:09'),
-('55429711-809b-4a3b-9ee5-5120d46d9de0', '', '2017-11-30 16:35:36', '2017-11-30 16:35:36'),
-('67f0b2d1-9013-4b2b-9914-bbe2288284fb', '', '2017-11-30 15:54:39', '2017-11-30 15:54:39');   
-
-insert into watchdog_per_component_distribution_status(distribution_id, component_name, component_distribution_status, create_time, modify_time) values
-('1533c4bd-a3e3-493f-a16d-28c20614415e', 'MSO', 'COMPONENT_DONE_OK', '2017-11-30 15:48:09', '2017-11-30 15:48:09'),
-('55429711-809b-4a3b-9ee5-5120d46d9de0', 'MSO', 'COMPONENT_DONE_ERROR', '2017-11-30 16:35:36', '2017-11-30 16:35:36'),
-('67f0b2d1-9013-4b2b-9914-bbe2288284fb', 'MSO', 'COMPONENT_DONE_OK', '2017-11-30 15:54:39', '2017-11-30 15:54:39');        
-
-insert into watchdog_service_mod_ver_id_lookup(distribution_id, service_model_version_id, create_time, modify_time) values
-('1533c4bd-a3e3-493f-a16d-28c20614415e', '7e813ab5-88d3-4fcb-86c0-498c5d7eef9a', '2017-11-30 15:48:08', '2017-11-30 15:48:08'),
-('55429711-809b-4a3b-9ee5-5120d46d9de0', 'cc031e75-4442-4d1a-b774-8a2b434e0a50', '2017-11-30 16:35:36', '2017-11-30 16:35:36'),
-('67f0b2d1-9013-4b2b-9914-bbe2288284fb', 'eade1e9d-c1ec-4ef3-bc31-60570fba1573', '2017-11-30 15:54:39', '2017-11-30 15:54:39');    
-
-
-insert into site_status(site_name, status, creation_timestamp) values
-('testsite', 0, '2017-11-30 15:48:09');
-
-INSERT INTO requestdb.request_processing_data (ID, SO_REQUEST_ID, GROUPING_ID, NAME, VALUE, TAG) VALUES 
-(1, 'fbb8df64-9be5-11e8-98d0-529269fb1459', '12b84dc6-9be6-11e8-98d0-529269fb1459', 'test-name', 'test-value', 'test-tag');
\ No newline at end of file
diff --git a/mso-api-handlers/mso-requests-db/src/test/resources/schema.sql b/mso-api-handlers/mso-requests-db/src/test/resources/schema.sql
deleted file mode 100644
index ab554d440b..0000000000
--- a/mso-api-handlers/mso-requests-db/src/test/resources/schema.sql
+++ /dev/null
@@ -1,210 +0,0 @@
-
-create table ACTIVATE_OPERATIONAL_ENV_SERVICE_MODEL_DISTRIBUTION_STATUS (
-        REQUEST_ID varchar(255) not null,
-        OPERATIONAL_ENV_ID varchar(255) not null,
-		SERVICE_MODEL_VERSION_ID varchar(255) not null,
-		SERVICE_MOD_VER_FINAL_DISTR_STATUS varchar(255),
-		RECOVERY_ACTION varchar(255),
-		RETRY_COUNT_LEFT varchar(255),
-		WORKLOAD_CONTEXT varchar(255),
-		CREATE_TIME datetime,
-		MODIFY_TIME datetime,
-        primary key (REQUEST_ID,OPERATIONAL_ENV_ID, SERVICE_MODEL_VERSION_ID)
-    );
-    
-create table OPERATION_STATUS (
-        SERVICE_ID varchar(255) not null,
-        OPERATION_ID varchar(255) not null,
-        SERVICE_NAME varchar(255),
-		OPERATION_TYPE varchar(255),
-		USER_ID varchar(255),
-		RESULT varchar(255),
-		OPERATION_CONTENT varchar(255),
-		PROGRESS varchar(255),
-		REASON varchar(255),
-        OPERATE_AT datetime,
-		FINISHED_AT datetime,
-        primary key (SERVICE_ID,OPERATION_ID)
-    );
-    
-    
-INSERT INTO PUBLIC.OPERATION_STATUS(SERVICE_ID, OPERATION_ID, OPERATION_TYPE, USER_ID, RESULT, OPERATION_CONTENT, PROGRESS, REASON, OPERATE_AT, FINISHED_AT) VALUES
-('serviceId', 'operationId', 'operationType', 'userId', 'result', 'operationContent', 'progress', 'reason', '2016-11-24 13:19:10', '2016-11-24 13:19:10'); 
-
-	create table RESOURCE_OPERATION_STATUS (
-        SERVICE_ID varchar(255) not null,
-        OPERATION_ID varchar(255) not null,
-        RESOURCE_TEMPLATE_UUID varchar(255) not null,
-		OPER_TYPE varchar(255),
-		RESOURCE_INSTANCE_ID varchar(255),
-		JOB_ID varchar(255),
-		STATUS varchar(255),
-		PROGRESS varchar(255),
-		ERROR_CODE varchar(255) ,
-		STATUS_DESCRIPOTION varchar(255) ,
-        primary key (SERVICE_ID,OPERATION_ID,RESOURCE_TEMPLATE_UUID)
-    );
-
-CREATE CACHED TABLE PUBLIC.INFRA_ACTIVE_REQUESTS(
-    REQUEST_ID VARCHAR NOT NULL SELECTIVITY 100,
-    CLIENT_REQUEST_ID VARCHAR SELECTIVITY 6,
-    ACTION VARCHAR SELECTIVITY 1,
-    REQUEST_STATUS VARCHAR SELECTIVITY 1,
-    STATUS_MESSAGE longtext SELECTIVITY 36,
-    PROGRESS VARCHAR SELECTIVITY 1,
-    START_TIME VARCHAR,
-    END_TIME VARCHAR,
-    SOURCE VARCHAR SELECTIVITY 2,
-    VNF_ID VARCHAR SELECTIVITY 15,
-    VNF_NAME VARCHAR SELECTIVITY 11,
-    VNF_TYPE VARCHAR SELECTIVITY 5,
-    SERVICE_TYPE VARCHAR SELECTIVITY 1,
-    AIC_NODE_CLLI VARCHAR SELECTIVITY 1,
-    TENANT_ID VARCHAR SELECTIVITY 2,
-    PROV_STATUS VARCHAR SELECTIVITY 1,
-    VNF_PARAMS VARCHAR SELECTIVITY 1,
-    VNF_OUTPUTS VARCHAR SELECTIVITY 3,
-    REQUEST_BODY VARCHAR SELECTIVITY 79,
-    RESPONSE_BODY VARCHAR SELECTIVITY 7,
-    LAST_MODIFIED_BY VARCHAR SELECTIVITY 2,
-    MODIFY_TIME VARCHAR,
-    REQUEST_TYPE VARCHAR SELECTIVITY 1,
-    VOLUME_GROUP_ID VARCHAR SELECTIVITY 2,
-    VOLUME_GROUP_NAME VARCHAR SELECTIVITY 3,
-    VF_MODULE_ID VARCHAR SELECTIVITY 5,
-    VF_MODULE_NAME VARCHAR SELECTIVITY 8,
-    VF_MODULE_MODEL_NAME VARCHAR SELECTIVITY 3,
-    AAI_SERVICE_ID VARCHAR SELECTIVITY 1,
-    AIC_CLOUD_REGION VARCHAR SELECTIVITY 1,
-    CALLBACK_URL VARCHAR SELECTIVITY 1,
-    CORRELATOR VARCHAR SELECTIVITY 1,
-    NETWORK_ID VARCHAR SELECTIVITY 2,
-    NETWORK_NAME VARCHAR SELECTIVITY 4,
-    NETWORK_TYPE VARCHAR SELECTIVITY 1,
-    REQUEST_SCOPE VARCHAR SELECTIVITY 1,
-    REQUEST_ACTION VARCHAR SELECTIVITY 1,
-    SERVICE_INSTANCE_ID VARCHAR SELECTIVITY 34,
-    SERVICE_INSTANCE_NAME VARCHAR SELECTIVITY 25,
-    REQUESTOR_ID VARCHAR SELECTIVITY 2,
-    CONFIGURATION_ID VARCHAR SELECTIVITY 1,
-    CONFIGURATION_NAME VARCHAR SELECTIVITY 2,
-    OPERATIONAL_ENV_ID VARCHAR SELECTIVITY 1,
-    OPERATIONAL_ENV_NAME VARCHAR SELECTIVITY 1
-);          
-
-INSERT INTO PUBLIC.INFRA_ACTIVE_REQUESTS(REQUEST_ID, CLIENT_REQUEST_ID, ACTION, REQUEST_STATUS, STATUS_MESSAGE, PROGRESS, START_TIME, END_TIME, SOURCE, VNF_ID, VNF_NAME, VNF_TYPE, SERVICE_TYPE, AIC_NODE_CLLI, TENANT_ID, PROV_STATUS, VNF_PARAMS, VNF_OUTPUTS, REQUEST_BODY, RESPONSE_BODY, LAST_MODIFIED_BY, MODIFY_TIME, REQUEST_TYPE, VOLUME_GROUP_ID, VOLUME_GROUP_NAME, VF_MODULE_ID, VF_MODULE_NAME, VF_MODULE_MODEL_NAME, AAI_SERVICE_ID, AIC_CLOUD_REGION, CALLBACK_URL, CORRELATOR, NETWORK_ID, NETWORK_NAME, NETWORK_TYPE, REQUEST_SCOPE, REQUEST_ACTION, SERVICE_INSTANCE_ID, SERVICE_INSTANCE_NAME, REQUESTOR_ID, CONFIGURATION_ID, CONFIGURATION_NAME, OPERATIONAL_ENV_ID, OPERATIONAL_ENV_NAME) VALUES
-('00032ab7-3fb3-42e5-965d-8ea592502017', '00032ab7-3fb3-42e5-965d-8ea592502016', 'deleteInstance', 'COMPLETE', 'Vf Module has been deleted successfully.', '100', '2016-12-22 18:59:54', '2016-12-22 19:00:28', 'VID', 'b92f60c8-8de3-46c1-8dc1-e4390ac2b005', null, null, null, null, '6accefef3cb442ff9e644d589fb04107', null, null, null, '{"modelInfo":{"modelType":"vfModule","modelName":"vSAMP10aDEV::base::module-0"},"requestInfo":{"source":"VID"},"cloudConfiguration":{"tenantId":"6accefef3cb442ff9e644d589fb04107","lcpCloudRegionId":"mtn6"}}', null, 'BPMN', '2016-12-22 19:00:28', null, null, null, 'c7d527b1-7a91-49fd-b97d-1c8c0f4a7992', null, 'vSAMP10aDEV::base::module-0', null, 'mtn6', null, null, null, null, null, 'vfModule', 'deleteInstance', 'e3b5744d-2ad1-4cdd-8390-c999a38829bc', null, null, null, null, null, null),
-('00093944-bf16-4373-ab9a-3adfe730ff2d', null, 'createInstance', 'FAILED', 'Error: Locked instance - This service (MSODEV_1707_SI_vSAMP10a_011-4) already has a request being worked with a status of IN_PROGRESS (RequestId - 278e83b1-4f9f-450e-9e7d-3700a6ed22f4). The existing request must finish or be cleaned up before proceeding.', '100', '2017-07-11 18:33:26', '2017-07-11 18:33:26', 'VID', null, null, null, null, null, '19123c2924c648eb8e42a3c1f14b7682', null, null, null, '{"modelInfo":{"modelInvariantId":"9647dfc4-2083-11e7-93ae-92361f002671","modelType":"service","modelName":"MSOTADevInfra_vSAMP10a_Service","modelVersion":"1.0","modelVersionId":"5df8b6de-2083-11e7-93ae-92361f002671"},"requestInfo":{"source":"VID","instanceName":"MSODEV_1707_SI_vSAMP10a_011-4","suppressRollback":false,"requestorId":"xxxxxx"},"subscriberInfo":{"globalSubscriberId":"MSO_1610_dev","subscriberName":"MSO_1610_dev"},"cloudConfiguration":{"tenantId":"19123c2924c648eb8e42a3c1f14b7682","lcpCloudRegionId":"mtn6"},"requestParameters":{"subscriptionServiceType":"MSO-dev-service-type","userParams":[{"name":"someUserParam","value":"someValue"}],"aLaCarte":true,"autoBuildVfModules":false,"cascadeDelete":false,"usePreload":true,"alaCarteSet":true,"alaCarte":true}}', null, 'APIH', null, null, null, null, null, null, null, null, 'mtn6', null, null, null, null, null, 'service', 'createInstance', null, 'MSODEV_1707_SI_vSAMP10a_011-4', 'xxxxxx', null, null, null, null),
-('001619d2-a297-4a4b-a9f5-e2823c88458f', '001619d2-a297-4a4b-a9f5-e2823c88458f', 'CREATE_VF_MODULE', 'COMPLETE', 'COMPLETED', '100', '2016-07-01 14:11:42', '2017-05-02 16:03:34', 'PORTAL', null, 'test-vscp', 'elena_test21', null, null, '381b9ff6c75e4625b7a4182f90fc68d3', null, null, null, STRINGDECODE('<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n<vnf-request xmlns=\"http://org.onap.so/mso/infra/vnf-request/v1\">\n    <request-info>\n        <request-id>001619d2-a297-4a4b-a9f5-e2823c88458f</request-id>\n        <action>CREATE_VF_MODULE</action>\n        <source>PORTAL</source>\n    </request-info>\n    <vnf-inputs>\n        <vnf-name>test-vscp</vnf-name>\n        <vf-module-name>moduleName</vf-module-name>\n        <vnf-type>elena_test21</vnf-type>\n        <vf-module-model-name>moduleModelName</vf-module-model-name>\n        <asdc-service-model-version>1.0</asdc-service-model-version>\n        <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>\n        <aic-cloud-region>mtn9</aic-cloud-region>\n        <tenant-id>381b9ff6c75e4625b7a4182f90fc68d3</tenant-id>\n        <persona-model-id></persona-model-id>\n        <persona-model-version></persona-model-version>\n        <is-base-vf-module>false</is-base-vf-module>\n    </vnf-inputs>\n    <vnf-params xmlns:tns=\"http://org.onap.so/mso/infra/vnf-request/v1\"/>\n</vnf-request>\n'), 'NONE', 'RDBTEST', '2016-07-01 14:11:42', 'VNF', null, null, null, 'MODULENAME1', 'moduleModelName', 'a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb', 'mtn9', null, null, null, null, null, 'vfModule', 'createInstance', null, null, null, null, null, null, null);           
-INSERT INTO PUBLIC.INFRA_ACTIVE_REQUESTS(REQUEST_ID, CLIENT_REQUEST_ID, ACTION, REQUEST_STATUS, STATUS_MESSAGE, PROGRESS, START_TIME, END_TIME, SOURCE, VNF_ID, VNF_NAME, VNF_TYPE, SERVICE_TYPE, AIC_NODE_CLLI, TENANT_ID, PROV_STATUS, VNF_PARAMS, VNF_OUTPUTS, REQUEST_BODY, RESPONSE_BODY, LAST_MODIFIED_BY, MODIFY_TIME, REQUEST_TYPE, VOLUME_GROUP_ID, VOLUME_GROUP_NAME, VF_MODULE_ID, VF_MODULE_NAME, VF_MODULE_MODEL_NAME, AAI_SERVICE_ID, AIC_CLOUD_REGION, CALLBACK_URL, CORRELATOR, NETWORK_ID, NETWORK_NAME, NETWORK_TYPE, REQUEST_SCOPE, REQUEST_ACTION, SERVICE_INSTANCE_ID, SERVICE_INSTANCE_NAME, REQUESTOR_ID, CONFIGURATION_ID, CONFIGURATION_NAME, OPERATIONAL_ENV_ID, OPERATIONAL_ENV_NAME) VALUES
-('00164b9e-784d-48a8-8973-bbad6ef818ed', null, 'createInstance', 'COMPLETE', 'Service Instance was created successfully.', '100', '2017-09-28 12:45:51', '2017-09-28 12:45:53', 'VID', null, null, null, null, null, '19123c2924c648eb8e42a3c1f14b7682', null, null, null, '{"modelInfo":{"modelCustomizationName":null,"modelInvariantId":"52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f","modelType":"service","modelNameVersionId":null,"modelName":"MSO Test Network","modelVersion":"1.0","modelCustomizationUuid":null,"modelVersionId":"aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e","modelCustomizationId":null,"modelUuid":null,"modelInvariantUuid":null,"modelInstanceName":null},"requestInfo":{"billingAccountNumber":null,"callbackUrl":null,"correlator":null,"orderNumber":null,"productFamilyId":null,"orderVersion":null,"source":"VID","instanceName":"DEV-MTN6-3100-0927-1","suppressRollback":false,"requestorId":"xxxxxx"},"relatedInstanceList":null,"subscriberInfo":{"globalSubscriberId":"MSO_1610_dev","subscriberName":"MSO_1610_dev"},"cloudConfiguration":{"aicNodeClli":null,"tenantId":"19123c2924c648eb8e42a3c1f14b7682","lcpCloudRegionId":"mtn6"},"requestParameters":{"subscriptionServiceType":"MSO-dev-service-type","userParams":[{"name":"someUserParam","value":"someValue"}],"aLaCarte":true,"autoBuildVfModules":false,"cascadeDelete":false,"usePreload":true,"alaCarte":true},"project":null,"owningEntity":null,"platform":null,"lineOfBusiness":null}', null, 'CreateGenericALaCarteServiceInstance', '2017-09-28 12:45:52', null, null, null, null, null, null, null, 'mtn6', null, null, null, null, null, 'service', 'createInstance', 'b2f59173-b7e5-4e0f-8440-232fd601b865', 'DEV-MTN6-3100-0927-1', 'md5621', null, null, null, null),
-('00173cc9-5ce2-4673-a810-f87fefb2829e', null, 'createInstance', 'FAILED', 'Error parsing request.  No valid instanceName is specified', '100', '2017-04-14 21:08:46', '2017-04-14 21:08:46', 'VID', null, null, null, null, null, 'a259ae7b7c3f493cb3d91f95a7c18149', null, null, null, '{"modelInfo":{"modelInvariantId":"ff6163d4-7214-459e-9f76-507b4eb00f51","modelType":"service","modelName":"ConstraintsSrvcVID","modelVersion":"2.0","modelVersionId":"722d256c-a374-4fba-a14f-a59b76bb7656"},"requestInfo":{"productFamilyId":"LRSI-OSPF","source":"VID","requestorId":"xxxxxx"},"subscriberInfo":{"globalSubscriberId":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb"},"cloudConfiguration":{"tenantId":"a259ae7b7c3f493cb3d91f95a7c18149","lcpCloudRegionId":"mtn16"},"requestParameters":{"subscriptionServiceType":"Mobility","userParams":[{"name":"neutronport6_name","value":"8"},{"name":"neutronnet5_network_name","value":"8"},{"name":"contrailv2vlansubinterface3_name","value":"false"}]}}', null, 'APIH', null, null, null, null, null, null, null, null, 'mtn16', null, null, null, null, null, 'service', 'createInstance', null, null, null, null, null, null, null),
-('0017f68c-eb2d-45bb-b7c7-ec31b37dc349', null, 'activateInstance', 'UNLOCKED', null, '20', '2017-09-26 16:09:29', null, 'VID', null, null, null, null, null, null, null, null, null, '{"modelInfo":{"modelCustomizationName":null,"modelInvariantId":"1587cf0e-f12f-478d-8530-5c55ac578c39","modelType":"configuration","modelNameVersionId":null,"modelName":null,"modelVersion":null,"modelCustomizationUuid":null,"modelVersionId":"36a3a8ea-49a6-4ac8-b06c-89a545444455","modelCustomizationId":"68dc9a92-214c-11e7-93ae-92361f002671","modelUuid":null,"modelInvariantUuid":null,"modelInstanceName":null},"requestInfo":{"billingAccountNumber":null,"callbackUrl":null,"correlator":null,"orderNumber":null,"productFamilyId":null,"orderVersion":null,"source":"VID","instanceName":null,"suppressRollback":false,"requestorId":"xxxxxx"},"relatedInstanceList":[{"relatedInstance":{"instanceName":null,"instanceId":"9e15a443-af65-4f05-9000-47ae495e937d","modelInfo":{"modelCustomizationName":null,"modelInvariantId":"de19ae10-9a25-11e7-abc4-cec278b6b50a","modelType":"service","modelNameVersionId":null,"modelName":"MSOTADevInfra_Configuration_Service","modelVersion":"1.0","modelCustomizationUuid":null,"modelVersionId":"ee938612-9a25-11e7-abc4-cec278b6b50a","modelCustomizationId":null,"modelUuid":null,"modelInvariantUuid":null,"modelInstanceName":null},"instanceDirection":null}}],"subscriberInfo":null,"cloudConfiguration":{"aicNodeClli":null,"tenantId":null,"lcpCloudRegionId":"mtn6"},"requestParameters":{"subscriptionServiceType":null,"userParams":[],"aLaCarte":false,"autoBuildVfModules":false,"cascadeDelete":false,"usePreload":true,"alaCarte":false},"project":null,"owningEntity":null,"platform":null,"lineOfBusiness":null}', null, 'APIH', '2017-09-26 16:09:29', null, null, null, null, null, null, null, 'mtn6', null, null, null, null, null, 'configuration', 'activateInstance', '9e15a443-af65-4f05-9000-47ae495e937d', null, 'xxxxxx', '26ef7f15-57bb-48df-8170-e59edc26234c', null, null, null);        
-
-CREATE CACHED TABLE PUBLIC.ARCHIVED_INFRA_REQUESTS(
-    REQUEST_ID VARCHAR NOT NULL SELECTIVITY 100,
-    CLIENT_REQUEST_ID VARCHAR SELECTIVITY 6,
-    ACTION VARCHAR SELECTIVITY 1,
-    REQUEST_STATUS VARCHAR SELECTIVITY 1,
-    STATUS_MESSAGE longtext SELECTIVITY 36,
-    PROGRESS VARCHAR SELECTIVITY 1,
-    START_TIME VARCHAR,
-    END_TIME VARCHAR,
-    SOURCE VARCHAR SELECTIVITY 2,
-    VNF_ID VARCHAR SELECTIVITY 15,
-    VNF_NAME VARCHAR SELECTIVITY 11,
-    VNF_TYPE VARCHAR SELECTIVITY 5,
-    SERVICE_TYPE VARCHAR SELECTIVITY 1,
-    AIC_NODE_CLLI VARCHAR SELECTIVITY 1,
-    TENANT_ID VARCHAR SELECTIVITY 2,
-    PROV_STATUS VARCHAR SELECTIVITY 1,
-    VNF_PARAMS VARCHAR SELECTIVITY 1,
-    VNF_OUTPUTS VARCHAR SELECTIVITY 3,
-    REQUEST_BODY VARCHAR SELECTIVITY 79,
-    RESPONSE_BODY VARCHAR SELECTIVITY 7,
-    LAST_MODIFIED_BY VARCHAR SELECTIVITY 2,
-    MODIFY_TIME VARCHAR,
-    REQUEST_TYPE VARCHAR SELECTIVITY 1,
-    VOLUME_GROUP_ID VARCHAR SELECTIVITY 2,
-    VOLUME_GROUP_NAME VARCHAR SELECTIVITY 3,
-    VF_MODULE_ID VARCHAR SELECTIVITY 5,
-    VF_MODULE_NAME VARCHAR SELECTIVITY 8,
-    VF_MODULE_MODEL_NAME VARCHAR SELECTIVITY 3,
-    AAI_SERVICE_ID VARCHAR SELECTIVITY 1,
-    AIC_CLOUD_REGION VARCHAR SELECTIVITY 1,
-    CALLBACK_URL VARCHAR SELECTIVITY 1,
-    CORRELATOR VARCHAR SELECTIVITY 1,
-    NETWORK_ID VARCHAR SELECTIVITY 2,
-    NETWORK_NAME VARCHAR SELECTIVITY 4,
-    NETWORK_TYPE VARCHAR SELECTIVITY 1,
-    REQUEST_SCOPE VARCHAR SELECTIVITY 1,
-    REQUEST_ACTION VARCHAR SELECTIVITY 1,
-    SERVICE_INSTANCE_ID VARCHAR SELECTIVITY 34,
-    SERVICE_INSTANCE_NAME VARCHAR SELECTIVITY 25,
-    REQUESTOR_ID VARCHAR SELECTIVITY 2,
-    CONFIGURATION_ID VARCHAR SELECTIVITY 1,
-    CONFIGURATION_NAME VARCHAR SELECTIVITY 2,
-    OPERATIONAL_ENV_ID VARCHAR SELECTIVITY 1,
-    OPERATIONAL_ENV_NAME VARCHAR SELECTIVITY 1
-);
-
-CREATE CACHED TABLE PUBLIC.SITE_STATUS(
-    SITE_NAME VARCHAR NOT NULL,
-    STATUS VARCHAR,
-    CREATION_TIMESTAMP VARCHAR
-);             
-    
-INSERT INTO PUBLIC.SITE_STATUS(SITE_NAME, STATUS, CREATION_TIMESTAMP) VALUES
-('testSite', '0', '2017-11-30 15:48:09'),
-('test name', null, null),
-('test name2', '1', null),
-('test name3', '1', null),
-('test name4', '1', '2017-11-30 15:48:09'),
-('test name update', '0', null);
-         
-CREATE CACHED TABLE PUBLIC.WATCHDOG_DISTRIBUTIONID_STATUS(
-    DISTRIBUTION_ID VARCHAR NOT NULL,
-    DISTRIBUTION_ID_STATUS VARCHAR,
-    CREATE_TIME VARCHAR,
-    MODIFY_TIME VARCHAR
-); 
-           
-        
-INSERT INTO PUBLIC.WATCHDOG_DISTRIBUTIONID_STATUS(DISTRIBUTION_ID, DISTRIBUTION_ID_STATUS, CREATE_TIME, MODIFY_TIME) VALUES
-('1533c4bd-a3e3-493f-a16d-28c20614415e', '', '2017-11-30 15:48:09', '2017-11-30 15:48:09'),
-('55429711-809b-4a3b-9ee5-5120d46d9de0', '', '2017-11-30 16:35:36', '2017-11-30 16:35:36'),
-('67f0b2d1-9013-4b2b-9914-bbe2288284fb', '', '2017-11-30 15:54:39', '2017-11-30 15:54:39');   
-
-CREATE CACHED TABLE PUBLIC.WATCHDOG_PER_COMPONENT_DISTRIBUTION_STATUS(
-    DISTRIBUTION_ID VARCHAR NOT NULL,
-    COMPONENT_NAME VARCHAR NOT NULL,
-    COMPONENT_DISTRIBUTION_STATUS VARCHAR,
-    CREATE_TIME VARCHAR,
-    MODIFY_TIME VARCHAR
-);        
-
-           
-INSERT INTO PUBLIC.WATCHDOG_PER_COMPONENT_DISTRIBUTION_STATUS(DISTRIBUTION_ID, COMPONENT_NAME, COMPONENT_DISTRIBUTION_STATUS, CREATE_TIME, MODIFY_TIME) VALUES
-('1533c4bd-a3e3-493f-a16d-28c20614415e', 'MSO', 'COMPONENT_DONE_OK', '2017-11-30 15:48:09', '2017-11-30 15:48:09'),
-('55429711-809b-4a3b-9ee5-5120d46d9de0', 'MSO', 'COMPONENT_DONE_ERROR', '2017-11-30 16:35:36', '2017-11-30 16:35:36'),
-('67f0b2d1-9013-4b2b-9914-bbe2288284fb', 'MSO', 'COMPONENT_DONE_OK', '2017-11-30 15:54:39', '2017-11-30 15:54:39');        
-
-CREATE CACHED TABLE PUBLIC.WATCHDOG_SERVICE_MOD_VER_ID_LOOKUP(
-    DISTRIBUTION_ID VARCHAR NOT NULL,
-    SERVICE_MODEL_VERSION_ID VARCHAR NOT NULL,
-    CREATE_TIME VARCHAR,
-    MODIFY_TIME VARCHAR
-);
-        
-  
-INSERT INTO PUBLIC.WATCHDOG_SERVICE_MOD_VER_ID_LOOKUP(DISTRIBUTION_ID, SERVICE_MODEL_VERSION_ID, CREATE_TIME, MODIFY_TIME) VALUES
-('1533c4bd-a3e3-493f-a16d-28c20614415e', '7e813ab5-88d3-4fcb-86c0-498c5d7eef9a', '2017-11-30 15:48:08', '2017-11-30 15:48:08'),
-('55429711-809b-4a3b-9ee5-5120d46d9de0', 'cc031e75-4442-4d1a-b774-8a2b434e0a50', '2017-11-30 16:35:36', '2017-11-30 16:35:36'),
-('67f0b2d1-9013-4b2b-9914-bbe2288284fb', 'eade1e9d-c1ec-4ef3-bc31-60570fba1573', '2017-11-30 15:54:39', '2017-11-30 15:54:39');    
-
-ALTER TABLE PUBLIC.INFRA_ACTIVE_REQUESTS ADD CONSTRAINT PUBLIC.CONSTRAINT_E PRIMARY KEY(REQUEST_ID);          
-ALTER TABLE PUBLIC.SITE_STATUS ADD CONSTRAINT PUBLIC.CONSTRAINT_C PRIMARY KEY(SITE_NAME); 
-ALTER TABLE PUBLIC.WATCHDOG_DISTRIBUTIONID_STATUS ADD CONSTRAINT PUBLIC.CONSTRAINT_7 PRIMARY KEY(DISTRIBUTION_ID); 
-ALTER TABLE PUBLIC.WATCHDOG_PER_COMPONENT_DISTRIBUTION_STATUS ADD CONSTRAINT PUBLIC.CONSTRAINT_D PRIMARY KEY(DISTRIBUTION_ID, COMPONENT_NAME);
-ALTER TABLE PUBLIC.WATCHDOG_SERVICE_MOD_VER_ID_LOOKUP ADD CONSTRAINT PUBLIC.CONSTRAINT_6 PRIMARY KEY(DISTRIBUTION_ID, SERVICE_MODEL_VERSION_ID);   
-ALTER TABLE PUBLIC.WATCHDOG_PER_COMPONENT_DISTRIBUTION_STATUS ADD CONSTRAINT PUBLIC.CONSTRAINT_DE FOREIGN KEY(DISTRIBUTION_ID) REFERENCES PUBLIC.WATCHDOG_DISTRIBUTIONID_STATUS(DISTRIBUTION_ID) NOCHECK; 
\ No newline at end of file