Containerization feature of SO

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

11 files changed, 12 insertions, 573 deletions

diff --git a/mso-api-handlers/mso-requests-db/src/main/resources/InfraActiveRequests.hbm.xml b/mso-api-handlers/mso-requests-db/src/main/resources/InfraActiveRequests.hbm.xml
deleted file mode 100644
index 79ead1de15..0000000000
--- a/mso-api-handlers/mso-requests-db/src/main/resources/InfraActiveRequests.hbm.xml
+++ /dev/null
@@ -1,161 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP MSO
-  ================================================================================
-  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=========================================================
-  -->
-
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-        "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<!-- Generated Jul 27, 2015 3:05:00 PM by Hibernate Tools 3.4.0.CR1 -->
-<hibernate-mapping>
-    <class name="org.openecomp.mso.requestsdb.InfraActiveRequests" table="INFRA_ACTIVE_REQUESTS">
-        <id name="requestId" type="string">
-            <column name="REQUEST_ID" length="45"/>
-            <generator class="assigned"/>
-        </id>
-        <property name="clientRequestId" type="string" unique="true">
-            <column name="CLIENT_REQUEST_ID" length="45" unique="true"/>
-        </property>
-        <property name="action" type="string">
-            <column name="ACTION" length="45" not-null="true"/>
-        </property>
-        <property name="requestStatus" type="string">
-            <column name="REQUEST_STATUS" length="20"/>
-        </property>
-        <property name="statusMessage" type="string">
-            <column name="STATUS_MESSAGE" length="2000"/>
-        </property>
-        <property name="progress" type="java.lang.Long">
-            <column name="PROGRESS" precision="11" scale="0"/>
-        </property>
-        <property name="startTime" type="timestamp">
-            <column name="START_TIME"/>
-        </property>
-        <property name="endTime" type="timestamp">
-            <column name="END_TIME"/>
-        </property>
-        <property name="source" type="string">
-            <column name="SOURCE" length="45"/>
-        </property>
-        <property name="vnfId" type="string">
-            <column name="VNF_ID" length="45"/>
-        </property>
-        <property name="vnfName" type="string">
-            <column name="VNF_NAME" length="80"/>
-        </property>
-        <property name="vnfType" type="string">
-            <column name="VNF_TYPE" length="200"/>
-        </property>
-        <property name="serviceType" type="string">
-            <column name="SERVICE_TYPE" length="45"/>
-        </property>
-        <property name="aicNodeClli" type="string">
-            <column name="AIC_NODE_CLLI" length="11"/>
-        </property>
-        <property name="tenantId" type="string">
-            <column name="TENANT_ID" length="45"/>
-        </property>
-        <property name="provStatus" type="string">
-            <column name="PROV_STATUS" length="20"/>
-        </property>
-        <property name="vnfParams" type="text">
-            <column name="VNF_PARAMS"/>
-        </property>
-        <property name="vnfOutputs" type="text">
-            <column name="VNF_OUTPUTS"/>
-        </property>
-        <property name="requestBody" type="text">
-            <column name="REQUEST_BODY"/>
-        </property>
-        <property name="responseBody" type="text">
-            <column name="RESPONSE_BODY"/>
-        </property>
-        <property name="lastModifiedBy" type="string">
-            <column name="LAST_MODIFIED_BY" length="50"/>
-        </property>
-        <property name="modifyTime" type="timestamp">
-            <column name="MODIFY_TIME"/>
-        </property>
-        <property name="requestType" type="string">
-            <column name="REQUEST_TYPE" length="20"/>
-        </property>
-        <property name="volumeGroupId" type="string">
-            <column name="VOLUME_GROUP_ID" length="45"/>
-        </property>
-        <property name="volumeGroupName" type="string">
-            <column name="VOLUME_GROUP_NAME" length="45"/>
-        </property>
-        <property name="vfModuleId" type="string">
-            <column name="VF_MODULE_ID" length="45"/>
-        </property>
-        <property name="vfModuleName" type="string">
-            <column name="VF_MODULE_NAME" length="200"/>
-        </property>
-        <property name="vfModuleModelName" type="string">
-            <column name="VF_MODULE_MODEL_NAME" length="200"/>
-        </property>
-         <property name="aaiServiceId" type="string">
-            <column name="AAI_SERVICE_ID" length="50"/>
-        </property>
-        <property name="aicCloudRegion" type="string">
-            <column name="AIC_CLOUD_REGION" length="200"/>
-        </property>
-        <property name="callBackUrl" type="string">
-            <column name="CALLBACK_URL" length="200"/>
-        </property>
-        <property name="correlator" type="string">
-            <column name="CORRELATOR" length="80"/>
-        </property>
-        <property name="serviceInstanceId" type="string">
-            <column name="SERVICE_INSTANCE_ID" length="45"/>
-        </property>
-        <property name="serviceInstanceName" type="string">
-            <column name="SERVICE_INSTANCE_NAME" length="80"/>
-        </property>
-        <property name="requestScope" type="string">
-            <column name="REQUEST_SCOPE" length="45"/>
-        </property>
-        <property name="requestAction" type="string">
-            <column name="REQUEST_ACTION" length="45" not-null="true"/>
-        </property>
-        <property name="networkId" type="string">
-            <column name="NETWORK_ID" length="45"/>
-        </property>
-        <property name="networkName" type="string">
-            <column name="NETWORK_NAME" length="80"/>
-        </property>
-        <property name="networkType" type="string">
-            <column name="NETWORK_TYPE" length="80"/>
-        </property>
-        <property name="requestorId" type="string">
-            <column name="REQUESTOR_ID" length="80"/>
-        </property>
-        <property name="configurationId" type="string">
-            <column name="CONFIGURATION_ID" length="45"/>
-        </property>
-        <property name="configurationName" type="string">
-            <column name="CONFIGURATION_NAME" length="200"/>
-        </property>
-         <property name="operationalEnvId" type="string">
-            <column name="OPERATIONAL_ENV_ID" length="45"/>
-        </property>
-        <property name="operationalEnvName" type="string">
-            <column name="OPERATIONAL_ENV_NAME" length="200"/>
-        </property>
-    </class>
-</hibernate-mapping>
diff --git a/mso-api-handlers/mso-requests-db/src/main/resources/OperationStatus.hbm.xml b/mso-api-handlers/mso-requests-db/src/main/resources/OperationStatus.hbm.xml
deleted file mode 100644
index 44094a1394..0000000000
--- a/mso-api-handlers/mso-requests-db/src/main/resources/OperationStatus.hbm.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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=========================================================
- */
-  -->
-
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping package="org.openecomp.mso.requestsdb">
-	<class name="OperationStatus" table="OPERATION_STATUS">
-		<meta attribute="class-description">
-			This class describes a operation status
-		</meta>
-        <composite-id>  
-             <key-property name="serviceId" type="string" column="SERVICE_ID"/>  
-             <key-property name="operationId" column="OPERATION_ID" type="string" length="256"/>  
-        </composite-id> 
-		<property name="serviceName" column="SERVICE_NAME" type="string" length="256"/>
-		<property name="operation" column="OPERATION_TYPE" type="string" length="256"/>		
-		<property name="userId" column="USER_ID" type="string" length="256"/>		
-		<property name="result" column="RESULT" type="string" length="256"/>
-		<property name="operationContent" column="OPERATION_CONTENT" type="string" length="256"/>
-		<property name="progress" column="PROGRESS" type="string" length="256"/>
-		<property name="reason" column="REASON" type="string" length="256"/>
-		<property name="operateAt" type="timestamp" generated="insert" insert="false" update="false" not-null="true">
-          <column name="OPERATE_AT" default="CURRENT_TIMESTAMP"/>
-        </property>
-		<property name="finishedAt" column="FINISHED_AT" type="timestamp" generated="always" insert="false" update="false"/>	
-	</class>
-</hibernate-mapping>
diff --git a/mso-api-handlers/mso-requests-db/src/main/resources/OperationalEnvDistributionStatus.hbm.xml b/mso-api-handlers/mso-requests-db/src/main/resources/OperationalEnvDistributionStatus.hbm.xml
deleted file mode 100644
index 08e60b2641..0000000000
--- a/mso-api-handlers/mso-requests-db/src/main/resources/OperationalEnvDistributionStatus.hbm.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP MSO
-  ================================================================================
-  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=========================================================
-  -->
-
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-        "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-<!-- Generated Jul 27, 2015 3:05:00 PM by Hibernate Tools 3.4.0.CR1 -->
-<hibernate-mapping>
-    <class name="org.openecomp.mso.requestsdb.OperationalEnvDistributionStatus" table="ACTIVATE_OPERATIONAL_ENV_PER_DISTRIBUTIONID_STATUS">
-      
-        <id name="distributionId" type="string">
-        	<column name="DISTRIBUTION_ID" length="45"/>
-        	<generator class="assigned"/>
-		</id>
-        
-		<property name="operationalEnvId" type="string">
-            <column name="OPERATIONAL_ENV_ID" length="45"/>
-        </property>
-        <property name="serviceModelVersionId" type="string">
-            <column name="SERVICE_MODEL_VERSION_ID" length="45"/>
-        </property>
-        <property name="distributionIdStatus" type="string">
-            <column name="DISTRIBUTION_ID_STATUS" length="45" />
-        </property>
-        <property name="distributionIdErrorReason" type="string">
-            <column name="DISTRIBUTION_ID_ERROR_REASON" length="250" />
-        </property>
-        <property name="requestId" type="string">
-            <column name="REQUEST_ID" length="45" />
-        </property>
-        <property name="createTime" type="timestamp">
-            <column name="CREATE_TIME"/>
-        </property>
-        <property name="modifyTime" type="timestamp">
-            <column name="MODIFY_TIME"/>
-        </property>
-
-    </class>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/mso-api-handlers/mso-requests-db/src/main/resources/OperationalEnvServiceModelStatus.hbm.xml b/mso-api-handlers/mso-requests-db/src/main/resources/OperationalEnvServiceModelStatus.hbm.xml
deleted file mode 100644
index 99a6232e0e..0000000000
--- a/mso-api-handlers/mso-requests-db/src/main/resources/OperationalEnvServiceModelStatus.hbm.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP MSO
-  ================================================================================
-  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=========================================================
-  -->
-
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-        "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-<!-- Generated Jul 27, 2015 3:05:00 PM by Hibernate Tools 3.4.0.CR1 -->
-<hibernate-mapping>
-    <class name="org.openecomp.mso.requestsdb.OperationalEnvServiceModelStatus" table="ACTIVATE_OPERATIONAL_ENV_SERVICE_MODEL_DISTRIBUTION_STATUS">
-      
-        <composite-id>
-			<key-property name="operationalEnvId" 	column="OPERATIONAL_ENV_ID" 		type="string" 	length="45" />
-			<key-property name="serviceModelVersionId" 	column="SERVICE_MODEL_VERSION_ID" 	type="string" 	length="45"/>
-			<key-property name="requestId" 	column="REQUEST_ID" 	type="string" 	length="45"/>
-		</composite-id> 
-		
-        <property name="serviceModelVersionDistrStatus" type="string">
-            <column name="SERVICE_MOD_VER_FINAL_DISTR_STATUS" length="45"/>
-        </property>
-        <property name="recoveryAction" type="string">
-            <column name="RECOVERY_ACTION" length="30" />
-        </property>
-        <property name="retryCount" type="integer">
-            <column name="RETRY_COUNT_LEFT"/>
-        </property>
-        <property name="workloadContext" type="string">
-            <column name="WORKLOAD_CONTEXT" length="80" />
-        </property>
-        <property name="createTime" type="timestamp">
-            <column name="CREATE_TIME"/>
-        </property>
-        <property name="modifyTime" type="timestamp">
-            <column name="MODIFY_TIME"/>
-        </property>
-
-    </class>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/mso-api-handlers/mso-requests-db/src/main/resources/ResourceOperationStatus.hbm.xml b/mso-api-handlers/mso-requests-db/src/main/resources/ResourceOperationStatus.hbm.xml
deleted file mode 100644
index 22d147402d..0000000000
--- a/mso-api-handlers/mso-requests-db/src/main/resources/ResourceOperationStatus.hbm.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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=========================================================
- */
-  -->
-
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping package="org.openecomp.mso.requestsdb">
-	<class name="ResourceOperationStatus" table="RESOURCE_OPERATION_STATUS">
-		<meta attribute="class-description">
-			This class describes a progress status
-		</meta>
-        <composite-id>  
-             <key-property name="serviceId" type="string" column="SERVICE_ID"/>  
-             <key-property name="operationId" type="string" column="OPERATION_ID" length="256"/> 
-             <key-property name="resourceTemplateUUID" type="string" column="RESOURCE_TEMPLATE_UUID"/>   
-        </composite-id>         
-        <property name="operType" column="OPER_TYPE" type="string" length="256"/>
-        <property name="resourceInstanceID" column="RESOURCE_INSTANCE_ID" type="string" length="256"/>
-		<property name="jobId" column="JOB_ID" type="string" length="256"/>
-		<property name="status" column="STATUS" type="string" length="256"/>
-		<property name="progress" column="PROGRESS" type="string" length="256"/>
-		<property name="errorCode" column="ERROR_CODE" type="string" length="256"/>
-		<property name="statusDescription" column="STATUS_DESCRIPOTION" type="string" length="256"/>	
-	</class>
-</hibernate-mapping>
diff --git a/mso-api-handlers/mso-requests-db/src/main/resources/SiteStatus.hbm.xml b/mso-api-handlers/mso-requests-db/src/main/resources/SiteStatus.hbm.xml
deleted file mode 100644
index f755ad0b0b..0000000000
--- a/mso-api-handlers/mso-requests-db/src/main/resources/SiteStatus.hbm.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP MSO
-  ================================================================================
-  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=========================================================
-  -->
-
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping package="org.openecomp.mso.requestsdb">
-	<class name="SiteStatus" table="SITE_STATUS">
-		<meta attribute="class-description">
-			This class describes a Site Status
-		</meta>
-		
-		<id name="siteName" type="string" column="SITE_NAME"/>
-
-		<property name="status" column="STATUS" type="boolean" length="256"/>
-		<property name="created" type="timestamp" generated="insert" insert="false" update="false" not-null="true">
-          <column name="CREATION_TIMESTAMP" default="CURRENT_TIMESTAMP"/>
-        </property>
-	</class>
-</hibernate-mapping>
diff --git a/mso-api-handlers/mso-requests-db/src/main/resources/WatchdogComponentDistributionStatus.hbm.xml b/mso-api-handlers/mso-requests-db/src/main/resources/WatchdogComponentDistributionStatus.hbm.xml
deleted file mode 100644
index ea66153157..0000000000
--- a/mso-api-handlers/mso-requests-db/src/main/resources/WatchdogComponentDistributionStatus.hbm.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP MSO
-  ================================================================================
-  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=========================================================
-  -->
-
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-        "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-<!-- Generated Jul 27, 2015 3:05:00 PM by Hibernate Tools 3.4.0.CR1 -->
-<hibernate-mapping>
-    <class name="org.openecomp.mso.requestsdb.WatchdogComponentDistributionStatus" table="WATCHDOG_PER_COMPONENT_DISTRIBUTION_STATUS">
-      
-        <composite-id>
-			<key-property name="distributionId" 	column="DISTRIBUTION_ID" 		type="string" 	length="45" />
-			<key-property name="componentName" 	column="COMPONENT_NAME" 	type="string" 	length="45"/>
-		</composite-id> 
-        
-        <property name="componentDistributionStatus" type="string">
-            <column name="COMPONENT_DISTRIBUTION_STATUS" length="45" />
-        </property>
-        
-        <property name="createTime" type="timestamp">
-            <column name="CREATE_TIME"/>
-        </property>
-        
-        <property name="modifyTime" type="timestamp">
-            <column name="MODIFY_TIME"/>
-        </property>
-
-    </class>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/mso-api-handlers/mso-requests-db/src/main/resources/WatchdogDistributionStatus.hbm.xml b/mso-api-handlers/mso-requests-db/src/main/resources/WatchdogDistributionStatus.hbm.xml
deleted file mode 100644
index 2da3071c71..0000000000
--- a/mso-api-handlers/mso-requests-db/src/main/resources/WatchdogDistributionStatus.hbm.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP MSO
-  ================================================================================
-  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=========================================================
-  -->
-
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-        "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-<!-- Generated Jul 27, 2015 3:05:00 PM by Hibernate Tools 3.4.0.CR1 -->
-<hibernate-mapping>
-    <class name="org.openecomp.mso.requestsdb.WatchdogDistributionStatus" table="WATCHDOG_DISTRIBUTIONID_STATUS">
-      
-        <id name="distributionId" type="string">
-        	<column name="DISTRIBUTION_ID" length="45"/>
-        	<generator class="assigned"/>
-		</id>
-        
-        <property name="distributionIdStatus" type="string">
-            <column name="DISTRIBUTION_ID_STATUS" length="45" />
-        </property>
-        
-        <property name="createTime" type="timestamp">
-            <column name="CREATE_TIME"/>
-        </property>
-        
-        <property name="modifyTime" type="timestamp">
-            <column name="MODIFY_TIME"/>
-        </property>
-
-    </class>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/mso-api-handlers/mso-requests-db/src/main/resources/WatchdogServiceModVerIdLookup.hbm.xml b/mso-api-handlers/mso-requests-db/src/main/resources/WatchdogServiceModVerIdLookup.hbm.xml
deleted file mode 100644
index b6b1d9bf58..0000000000
--- a/mso-api-handlers/mso-requests-db/src/main/resources/WatchdogServiceModVerIdLookup.hbm.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP MSO
-  ================================================================================
-  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=========================================================
-  -->
-
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-        "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-<!-- Generated Jul 27, 2015 3:05:00 PM by Hibernate Tools 3.4.0.CR1 -->
-<hibernate-mapping>
-    <class name="org.openecomp.mso.requestsdb.WatchdogServiceModVerIdLookup" table="WATCHDOG_SERVICE_MOD_VER_ID_LOOKUP">
-      
-        <composite-id>
-			<key-property name="distributionId" 	column="DISTRIBUTION_ID" 		type="string" 	length="45" />	
-			<key-property name="serviceModelVersionId" 	column="SERVICE_MODEL_VERSION_ID" 	type="string" 	length="45"/>	
-		</composite-id> 
-        
-        <property name="createTime" type="timestamp">
-            <column name="CREATE_TIME"/>
-        </property>
-
-    </class>
-</hibernate-mapping>
\ No newline at end of file
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
new file mode 100644
index 0000000000..cd1bc8b7d7
--- /dev/null
+++ b/mso-api-handlers/mso-requests-db/src/main/resources/beans.xml
@@ -0,0 +1,12 @@
+<?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/main/resources/hibernate-requests-core-mysql.cfg.xml b/mso-api-handlers/mso-requests-db/src/main/resources/hibernate-requests-core-mysql.cfg.xml
deleted file mode 100644
index 1305dfb97b..0000000000
--- a/mso-api-handlers/mso-requests-db/src/main/resources/hibernate-requests-core-mysql.cfg.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP MSO
-  ================================================================================
-  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=========================================================
-  -->
-
-<!DOCTYPE hibernate-configuration PUBLIC
-		"-//Hibernate/Hibernate Configuration DTD 3.0//EN"
-		"http://www.hibernate.org/dtd/hibernate-configuration-3.0.dtd">
-<hibernate-configuration>
-    <session-factory>
-        <property name="hibernate.dialect">org.hibernate.dialect.MySQL5Dialect</property>
-        <property name="hibernate.show_sql">false</property>
-        <property name="hibernate.format_sql">true</property>
-        <property name="connection.datasource">java:jboss/datasources/mso-requests</property>
-		
-<!-- 		<property name="hibernate.hbm2ddl.auto">create</property> -->
-
-        <mapping resource="InfraActiveRequests.hbm.xml"></mapping>
-        <mapping resource="OperationalEnvServiceModelStatus.hbm.xml"></mapping>
-        <mapping resource="OperationalEnvDistributionStatus.hbm.xml"></mapping>
-        <mapping resource="OperationStatus.hbm.xml"></mapping>
-        <mapping resource="ResourceOperationStatus.hbm.xml"></mapping>
-        <mapping resource="SiteStatus.hbm.xml"></mapping>
-        <mapping resource="WatchdogDistributionStatus.hbm.xml"></mapping>
-        <mapping resource="WatchdogComponentDistributionStatus.hbm.xml"></mapping>
-        <mapping resource="WatchdogServiceModVerIdLookup.hbm.xml"></mapping>
-    </session-factory>
-</hibernate-configuration>