[MSO-8] Update the maven dependency

Update the maven depenency for sdc-distribution-client to cooperate with the sdc changes.

Change-Id: I2da936e5c40cb68c7181bb78307192dd5655b5dc
Signed-off-by: xg353y <xg353y@intl.att.com>

15 files changed, 438 insertions, 118 deletions

diff --git a/mso-catalog-db/src/main/resources/AllottedResourceCustomization.hbm.xml b/mso-catalog-db/src/main/resources/AllottedResourceCustomization.hbm.xml
new file mode 100644
index 0000000000..4a039a45c4
--- /dev/null
+++ b/mso-catalog-db/src/main/resources/AllottedResourceCustomization.hbm.xml
@@ -0,0 +1,59 @@
+<?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 Dec 14, 2016 10:57:53 AM by Hibernate Tools 3.4.0.CR1 -->
+<hibernate-mapping>
+    <class name="org.openecomp.mso.db.catalog.beans.AllottedResourceCustomization"
+    table="ALLOTTED_RESOURCE_CUSTOMIZATION">
+        <id name="modelCustomizationUuid" type="java.lang.String">
+            <column name="MODEL_CUSTOMIZATION_UUID" length="200" not-null="true"/>
+            <generator class="assigned" />
+        </id>
+        <property name="version">
+            <column name="MODEL_VERSION" length="20" not-null="true"/>
+        </property>
+        <property name="modelVersion" update="false" insert="false">
+            <column name="MODEL_VERSION" />
+        </property>
+        <property name="modelUuid" type="java.lang.String">
+            <column name="MODEL_UUID" length="200" not-null="true"/>
+        </property>
+        <property name="modelName" type="java.lang.String">
+            <column name="MODEL_NAME" length="200" not-null="true"/>
+        </property>
+        <property name="modelInstanceName" type="java.lang.String">
+            <column name="MODEL_INSTANCE_NAME" length="200" not-null="true"/>
+        </property>
+        <!-- <property name="created" type="java.sql.Timestamp">
+            <column name="CREATION_TIMESTAMP" />
+        </property> -->
+        <property name="created" type="timestamp" generated="insert" update="false" insert="false" >
+		    <column name="CREATION_TIMESTAMP" not-null="true"/>
+		</property>
+        <property name="description" type="java.lang.String">
+            <column name="DESCRIPTION" length="200" not-null="false" default="null"/>
+        </property>
+        <property name="modelInvariantUuid" type="java.lang.String">
+            <column name="MODEL_INVARIANT_UUID" length="200" not-null="true"/>
+        </property>
+    </class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/mso-catalog-db/src/main/resources/HeatEnvironment.hbm.xml b/mso-catalog-db/src/main/resources/HeatEnvironment.hbm.xml
index 992e5d467a..8e86c584d5 100644
--- a/mso-catalog-db/src/main/resources/HeatEnvironment.hbm.xml
+++ b/mso-catalog-db/src/main/resources/HeatEnvironment.hbm.xml
@@ -8,9 +8,9 @@
   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.
@@ -27,7 +27,7 @@
 		<meta attribute="class-description">
 			This class describes a HEAT Environment
 		</meta>
-		
+
 		<id name="id" type="int" column="id">
 			<generator class="native"/>
 		</id>
@@ -41,6 +41,9 @@
 			<property name="asdcResourceName" type="string" >
 			      <column name="ASDC_RESOURCE_NAME" length="100" default="'MANUAL RECORD'" not-null="true"/>
 			</property>
+			<property name="asdcUuid" type="string">
+				<column name="ASDC_UUID" length="200" default="'MANUAL RECORD'" not-null="true"/>
+			</property>
 		</properties>
 		<property name="description" column="DESCRIPTION" type="string" length="1200"/>
 		<property name="environment" type="text">
@@ -49,10 +52,10 @@
 		<property name="created" type="timestamp" generated="insert" insert="false" update="false">
 		    <column name="CREATION_TIMESTAMP" not-null="true"/>
 		</property>
-		<property name="asdcUuid" type="string">
-		  <column name="ASDC_UUID" length="200" default="'MANUAL RECORD'" not-null="false"/>
-		</property>
 		<property name="asdcLabel" column="ASDC_LABEL" type="string" length="200"/>
-		
+		<property name="artifactChecksum" type="string">
+			<column name="ARTIFACT_CHECKSUM" length="200" default="'MANUAL RECORD'" not-null="true"/>
+		</property>
+
     </class>
 </hibernate-mapping>
diff --git a/mso-catalog-db/src/main/resources/HeatTemplate.hbm.xml b/mso-catalog-db/src/main/resources/HeatTemplate.hbm.xml
index 9bc6fb1414..b77656896e 100644
--- a/mso-catalog-db/src/main/resources/HeatTemplate.hbm.xml
+++ b/mso-catalog-db/src/main/resources/HeatTemplate.hbm.xml
@@ -8,9 +8,9 @@
   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.
@@ -26,11 +26,11 @@
 		<meta attribute="class-description">
 			This class describes a HEAT template
 		</meta>
-		
+
 		<id name="id" type="int" column="id">
 			<generator class="native"/>
 		</id>
-		
+
 		<properties name="uk_template" unique="true">
 			<property name="templateName" type="string" >
 			     <column name="TEMPLATE_NAME" length="200" not-null="true"/>
@@ -41,21 +41,25 @@
 			<property name="asdcResourceName" type="string" >
 			      <column name="ASDC_RESOURCE_NAME" default="'MANUAL RECORD'" length="100" not-null="true"/>
 			</property>
+			<property name="asdcUuid" type="string" >
+				<column name="ASDC_UUID" length="200" default="'MANUAL RECORD'" not-null="true"/>
+			</property>
 		</properties>
-	
+
 		<property name="templatePath" column="TEMPLATE_PATH" type="string" length="100"/>
 		<property name="templateBody" type="text">
 		   <column name="TEMPLATE_BODY" not-null="true"/>
 		</property>
 		<property name="timeoutMinutes" column="TIMEOUT_MINUTES" type="int"/>
-		<property name="asdcUuid" type="string" >
-		  <column name="ASDC_UUID" length="200" default="'MANUAL RECORD'" not-null="true"/>
-		</property>
 		<property name="description" column="DESCRIPTION" type="string" length="1200"/>
 		<property name="asdcLabel" column="ASDC_LABEL" type="string" length="200"/>
+		<property name="artifactChecksum" type="string">
+			<column name="ARTIFACT_CHECKSUM" length="200" default="'MANUAL RECORD'" not-null="true"/>
+		</property>
 		<property name="created" type="timestamp" generated="insert" update="false" insert="false" >
 		  <column name="CREATION_TIMESTAMP" not-null="true"/>
 		</property>
+
 		<set name="parameters" cascade="all">
 			<key column="HEAT_TEMPLATE_ID"/>
 			<one-to-many class="HeatTemplateParam"/>
@@ -64,14 +68,14 @@
 			<key column="CHILD_TEMPLATE_ID"/>
 			<one-to-many class="HeatTemplate" not-found="ignore"/>
 		</set>
-		
+
 	</class>
-	
+
 	<class name="HeatTemplateParam" table="HEAT_TEMPLATE_PARAMS">
 		<meta attribute="class-description">
 			This class describes an input parameter to a heat template
 		</meta>
-		
+
 		<id name="id" type="int" column="id">
 			<generator class="native"/>
 		</id>
diff --git a/mso-catalog-db/src/main/resources/ModelRecipe.hbm.xml b/mso-catalog-db/src/main/resources/ModelRecipe.hbm.xml
new file mode 100644
index 0000000000..e59bb5c23b
--- /dev/null
+++ b/mso-catalog-db/src/main/resources/ModelRecipe.hbm.xml
@@ -0,0 +1,87 @@
+<?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.db.catalog.beans">
+	<class name="Model" table="MODEL">
+		<meta attribute="class-description">
+			This class describes a Model that may be orchestrated
+		</meta>
+
+		<id name="id" type="int" column="id">
+			<generator class="native"/>
+		</id>
+
+		<properties name="uk1_model" unique="true">
+			<property name="modelType" type="string">
+			     <column name="MODEL_TYPE" not-null="true" length="20"/>
+			</property>
+			<property name="modelVersionId" type="string">
+			     <column name="MODEL_VERSION_ID" not-null="true" length="40"/>
+			</property>
+		</properties>
+		<property name="modelInvariantId" column="MODEL_INVARIANT_ID" type="string" length="40"/>
+		<property name="modelName" type="string">
+          <column name="MODEL_NAME" not-null="true" length="40"/>
+        </property>
+		<property name="modelVersion" column="MODEL_VERSION" type="string" length="20"/>
+		<property name="modelCustomizationId" column="MODEL_CUSTOMIZATION_ID" type="string" length="40"/>
+		<property name="modelCustomizationName" column="MODEL_CUSTOMIZATION_NAME" type="string" length="40"/>
+		<property name="created" type="timestamp" generated="insert" update="false" insert="false" >
+		    <column name="CREATION_TIMESTAMP" not-null="true"/>
+		</property>
+
+		<map name="recipes" cascade="all">
+			<key column="MODEL_ID"/>
+			<map-key column="action" type="string"/>
+			<one-to-many class="ModelRecipe"/>
+		</map>
+	</class>
+
+	<class name="ModelRecipe" table="MODEL_RECIPE">
+		<meta attribute="class-description">
+			This class describes a Model recipe
+		</meta>
+
+		<id name="id" type="int" column="id">
+			<generator class="native"/>
+		</id>
+
+		<properties name="uk1_model_recipe" unique="true">
+			<property name="modelId" type="int">
+			     <column name="MODEL_ID" not-null="true"/>
+			</property>
+			<property name="action" type="string" >
+			     <column name="ACTION" not-null="true" length="20"/>
+			</property>
+		</properties>
+		<property name="schemaVersion" column="SCHEMA_VERSION" type="string" length="20"/>
+		<property name="description" column="DESCRIPTION" type="string" length="1200"/>
+		<property name="orchestrationUri" type="string">
+          <column name="ORCHESTRATION_URI" not-null="true" length="256"/>
+        </property>
+		<property name="modelParamXSD" column="MODEL_PARAM_XSD" type="string" length="2048"/>
+		<property name="recipeTimeout" column="RECIPE_TIMEOUT" type="int"/>
+		<property name="created" type="timestamp" generated="insert" update="false" insert="false" >
+		    <column name="CREATION_TIMESTAMP" not-null="true"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/mso-catalog-db/src/main/resources/NetworkRecipe.hbm.xml b/mso-catalog-db/src/main/resources/NetworkRecipe.hbm.xml
index bdd16d37e6..28589ea639 100644
--- a/mso-catalog-db/src/main/resources/NetworkRecipe.hbm.xml
+++ b/mso-catalog-db/src/main/resources/NetworkRecipe.hbm.xml
@@ -8,9 +8,9 @@
   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.
@@ -26,7 +26,7 @@
 		<meta attribute="class-description">
 			This class describes a Network recipe
 		</meta>
-		
+
 		<id name="id" type="int" column="id">
 			<generator class="native"/>
 		</id>
@@ -41,21 +41,21 @@
 			<property name="version" type="string">
 			     <column name="VERSION_STR" not-null="true" length="20"/>
 			</property>
-			
+
 		</properties>
-		
-		<property name="serviceType" type="string" length="45">
-                 <column name="SERVICE_TYPE" not-null="false" length="45"/>
-        </property>
+
 		<property name="description" column="DESCRIPTION" type="string" length="1200"/>
 		<property name="orchestrationUri" type="string">
 		  <column name="ORCHESTRATION_URI" not-null="true" length="256"/>
 		</property>
 		<property name="networkParamXSD" column="NETWORK_PARAM_XSD" type="string" length="2048"/>
 		<property name="recipeTimeout" column="RECIPE_TIMEOUT" type="int"/>
+		<property name="serviceType" type="string" >
+			<column name="SERVICE_TYPE" not-null="false" length="45" default="null"/>
+		</property>
 		<property name="created" type="timestamp" generated="insert" update="false" insert="false" >
 		    <column name="CREATION_TIMESTAMP" not-null="true"/>
 		</property>
 	</class>
-	
+
 </hibernate-mapping>
diff --git a/mso-catalog-db/src/main/resources/NetworkResource.hbm.xml b/mso-catalog-db/src/main/resources/NetworkResource.hbm.xml
index b3b657aa9f..931db68406 100644
--- a/mso-catalog-db/src/main/resources/NetworkResource.hbm.xml
+++ b/mso-catalog-db/src/main/resources/NetworkResource.hbm.xml
@@ -8,9 +8,9 @@
   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.
@@ -26,7 +26,7 @@
 		<meta attribute="class-description">
 			This class describes a Network Resource
 		</meta>
-		
+
 		<id name="id" type="int" column="id"/>
 
 		<properties name="uk_network_resource" unique="true">
@@ -40,16 +40,18 @@
 		<property name="orchestrationMode" column="ORCHESTRATION_MODE" type="string" length="20"/>
 		<property name="description" column="DESCRIPTION" type="string" length="1200"/>
 		<property name="templateId" column="TEMPLATE_ID" type="int"/>
+		<property name="neutronNetworkType" type="string"  >
+			<column name="NEUTRON_NETWORK_TYPE" not-null="false" default="null" length="20" />
+		</property>
 		<property name="created" type="timestamp" generated="insert" update="false" insert="false" >
 		    <column name="CREATION_TIMESTAMP" not-null="true"/>
 		</property>
 		<property name="aicVersionMin" type="string" >
-			<column name="AIC_VERSION_MIN" not-null="false" default="2.5" length="20" />
+			<column name="AIC_VERSION_MIN" not-null="true" length="20" />
 		</property>
 		<property name="aicVersionMax" type="string">
-			<column name="AIC_VERSION_MAX" not-null="false" default="2.5" length="20"/>
+			<column name="AIC_VERSION_MAX" not-null="false" default="null" length="20"/>
 		</property>
-		<property name="neutronNetworkType" column="NEUTRON_NETWORK_TYPE" type="string" length="20"/>
 	</class>
-	
+
 </hibernate-mapping>
diff --git a/mso-catalog-db/src/main/resources/NetworkResourceCustomization.hbm.xml b/mso-catalog-db/src/main/resources/NetworkResourceCustomization.hbm.xml
new file mode 100644
index 0000000000..401bca1f8d
--- /dev/null
+++ b/mso-catalog-db/src/main/resources/NetworkResourceCustomization.hbm.xml
@@ -0,0 +1,59 @@
+<?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">
+
+<hibernate-mapping>
+    <class name="org.openecomp.mso.db.catalog.beans.NetworkResourceCustomization" table="NETWORK_RESOURCE_CUSTOMIZATION">
+
+
+        <composite-id>
+            <key-property name="modelCustomizationUuid"  type="java.lang.String" >
+                <column name="MODEL_CUSTOMIZATION_UUID" length="200" not-null="true"/>
+            </key-property>
+            <key-property name="networkResourceId" type="int" >
+                <column name="NETWORK_RESOURCE_ID" length="11" not-null="false" default="null" />
+            </key-property>
+        </composite-id>
+
+        <property name="modelUuid" type="java.lang.String">
+            <column name="MODEL_UUID" length="200" not-null="true"/>
+        </property>
+        <property name="modelName" type="java.lang.String">
+            <column name="MODEL_NAME" length="200" not-null="true"/>
+        </property>
+        <property name="modelInstanceName" type="java.lang.String">
+            <column name="MODEL_INSTANCE_NAME" length="200" not-null="true"/>
+        </property>
+        <property name="modelVersion" type="java.lang.String">
+            <column name="MODEL_VERSION" length="20" not-null="true"/>
+        </property>
+        <property name="modelInvariantUuid" type="java.lang.String">
+            <column name="MODEL_INVARIANT_UUID" length="200" not-null="true"/>
+        </property>
+
+        <property name="created" type="timestamp" generated="insert" update="false" insert="false" >
+            <column name="CREATION_TIMESTAMP" not-null="true"/>
+        </property>
+        <!-- <property name="created" type="java.sql.Timestamp">
+            <column name="CREATION_TIMESTAMP" />
+        </property> -->
+    </class>
+</hibernate-mapping>
diff --git a/mso-catalog-db/src/main/resources/Service.hbm.xml b/mso-catalog-db/src/main/resources/Service.hbm.xml
index 4e43413f47..f6049961fd 100644
--- a/mso-catalog-db/src/main/resources/Service.hbm.xml
+++ b/mso-catalog-db/src/main/resources/Service.hbm.xml
@@ -8,9 +8,9 @@
   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.
@@ -26,16 +26,23 @@
 		<meta attribute="class-description">
 			This class describes a Service that may be orchestrated
 		</meta>
-		
+
 		<id name="id" type="int" column="id">
 			<generator class="native"/>
 		</id>
-		
-		<property name="serviceName" column="SERVICE_NAME" type="string" length="40"/>
-		<property name="version" column="VERSION_STR" type="string" length="20"/>
+
+		<properties name="uk" unique="true">
+			<property name="serviceNameVersionId" type="string" >
+				<column name="SERVICE_NAME_VERSION_ID" length="50" not-null="true" default="'MANUAL_RECORD'" />
+			</property>
+			<property name="serviceName" column="SERVICE_NAME" type="string" length="40"/>
+		</properties>
+
+		<property name="version"  type="string" >
+				<column name="VERSION_STR" length="20" not-null="true"/>
+		</property>
 		<property name="description" column="DESCRIPTION" type="string" length="1200"/>
-		<property name="serviceNameVersionId" column="SERVICE_NAME_VERSION_ID" type="string" length="50"/>
-		
+
 		<property name="serviceVersion" column="SERVICE_VERSION" type="string" length="10"/>
 		<property name="httpMethod" column="HTTP_METHOD" type="string" length="50"/>
 		<property name="created" type="timestamp" generated="insert" update="false" insert="false" >
@@ -44,32 +51,34 @@
 		<property name="modelInvariantUUID" type="string">
            <column name="MODEL_INVARIANT_UUID" default="'MANUAL_RECORD'" not-null="true" length="200"/>
         </property>
-		
+
 		<map name="recipes" cascade="all">
 			<key column="SERVICE_ID"/>
 			<map-key column="action" type="string"/>
 			<one-to-many class="ServiceRecipe"/>
 		</map>
 	</class>
-	
+
 	<class name="ServiceRecipe" table="SERVICE_RECIPE">
 		<meta attribute="class-description">
 			This class describes a Service recipe
 		</meta>
-		
+
 		<id name="id" type="int" column="id">
 			<generator class="native"/>
 		</id>
 
 		<properties name="uk1_service_recipe" unique="true">
 			<property name="serviceId" type="int">
-			     <column name="SERVICE_ID" not-null="true"/>
+			     <column name="SERVICE_ID" not-null="true" length="11"/>
 			</property>
 			<property name="action" type="string" >
 			     <column name="ACTION" not-null="true" length="40"/>
 			</property>
 		</properties>
-		<property name="version" column="VERSION_STR" type="string" length="20"/>
+		<property name="version" type="string">
+			<column name="VERSION_STR" not-null="false" length="20" default="null"/>
+		</property>
 		<property name="description" column="DESCRIPTION" type="string" length="1200"/>
 		<property name="orchestrationUri" type="string">
           <column name="ORCHESTRATION_URI" not-null="true" length="256"/>
diff --git a/mso-catalog-db/src/main/resources/ServiceToAllottedResources.hbm.xml b/mso-catalog-db/src/main/resources/ServiceToAllottedResources.hbm.xml
new file mode 100644
index 0000000000..1d471ca193
--- /dev/null
+++ b/mso-catalog-db/src/main/resources/ServiceToAllottedResources.hbm.xml
@@ -0,0 +1,41 @@
+<?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 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" >
+<hibernate-mapping package="org.openecomp.mso.db.catalog.beans">
+	<class name="ServiceToAllottedResources" table="SERVICE_TO_ALLOTTED_RESOURCES">
+		<meta attribute="class-description">
+			This class describes a Service to Allotted Resource Customization relationship
+		</meta>
+
+		<composite-id>
+			<key-property name="serviceModelUuid" type="string" >
+				<column name="SERVICE_MODEL_UUID" length="200" not-null="true"/>
+			</key-property>
+			<key-property name="arModelCustomizationUuid" type="string">
+				<column name="AR_MODEL_CUSTOMIZATION_UUID" length="200" not-null="true"/>
+			</key-property>
+		</composite-id>
+		<property name="created" type="timestamp" generated="insert" update="false" insert="false" >
+		    <column name="CREATION_TIMESTAMP" not-null="true"/>
+		</property>
+	</class>
+
+</hibernate-mapping>
\ No newline at end of file
diff --git a/mso-catalog-db/src/main/resources/ServiceToNetworks.hbm.xml b/mso-catalog-db/src/main/resources/ServiceToNetworks.hbm.xml
new file mode 100644
index 0000000000..1c96f7ba95
--- /dev/null
+++ b/mso-catalog-db/src/main/resources/ServiceToNetworks.hbm.xml
@@ -0,0 +1,41 @@
+<?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 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" >
+<hibernate-mapping package="org.openecomp.mso.db.catalog.beans">
+	<class name="ServiceToNetworks" table="SERVICE_TO_NETWORKS">
+		<meta attribute="class-description">
+			This class describes a Service to a Network Resource Customization relationship
+		</meta>
+
+		<composite-id>
+			<key-property name="serviceModelUuid" type="string">
+				<column name="SERVICE_MODEL_UUID" not-null="true" length="200"/>
+			</key-property>
+			<key-property name="networkModelCustomizationUuid" type="string">
+				<column name="NETWORK_MODEL_CUSTOMIZATION_UUID" not-null="true" length="200"/>
+			</key-property>
+		</composite-id>
+		<property name="created" type="timestamp" generated="insert" update="false" insert="false" >
+		    <column name="CREATION_TIMESTAMP" not-null="true"/>
+		</property>
+	</class>
+
+</hibernate-mapping>
\ No newline at end of file
diff --git a/mso-catalog-db/src/main/resources/VfModule.hbm.xml b/mso-catalog-db/src/main/resources/VfModule.hbm.xml
index 1ccc48daf6..1631057bfd 100644
--- a/mso-catalog-db/src/main/resources/VfModule.hbm.xml
+++ b/mso-catalog-db/src/main/resources/VfModule.hbm.xml
@@ -8,9 +8,9 @@
   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.
@@ -27,55 +27,66 @@
         <id name="id" type="int" column="id">
         	<generator class="native"/>
         </id>
-        
+        <property name="asdcUuid" type="java.lang.String" >
+            <column name="ASDC_UUID" not-null="false" length="200" default="null"/>
+        </property>
+        <property name="volEnvironmentId" type="java.lang.Integer" >
+            <column name="VOL_ENVIRONMENT_ID" not-null="false" length="11" default="null"/>
+        </property>
         <properties name="uk_vfmodule" unique="true">
             <property name="type" type="string" >
                 <column name="TYPE" not-null="true" length="200"/>
             </property>
-            <property name="version" type="string" >
+            <property name="version" type="string">
                 <column name="ASDC_SERVICE_MODEL_VERSION" not-null="true" length="20"/>
             </property>
         </properties>
-        
+        <property name="modelCustomizationUuid" type="java.lang.String" >
+            <column name="MODEL_CUSTOMIZATION_UUID" not-null="false" length="200"/>
+        </property>
         <property name="modelName" type="string" >
             <column name="MODEL_NAME" not-null="true" length="200"/>
         </property>
         <property name="modelVersion" type="string" >
             <column name="MODEL_VERSION" not-null="true" length="20"/>
         </property>
-        
-        <property name="asdcUuid" type="java.lang.String" >
-            <column name="ASDC_UUID" not-null="false" length="255"/>
-        </property>
-        <property name="volEnvironmentId" type="java.lang.Integer" >
-            <column name="VOL_ENVIRONMENT_ID" not-null="false"/>
-        </property>
-        <property name="templateId" type="java.lang.Integer" >
-            <column name="TEMPLATE_ID" not-null="false"/>
-        </property>
-        <property name="isBase" type="int">
-            <column name="IS_BASE" not-null="true"/>
-        </property>
 
        	<property name="created" type="timestamp" generated="insert" update="false" insert="false" >
        	      <column name="CREATION_TIMESTAMP" not-null="true"/>
        	</property>
-        
         <property name="description" type="java.lang.String" >
-            <column name="DESCRIPTION" not-null="false" length="255"/>
+            <column name="DESCRIPTION" not-null="false" length="255" default="null"/>
         </property>
         <property name="volTemplateId" type="java.lang.Integer" >
-            <column name="VOL_TEMPLATE_ID" not-null="false"/>
+            <column name="VOL_TEMPLATE_ID" not-null="false" default="null" length="11"/>
+        </property>
+        <property name="templateId" type="java.lang.Integer" >
+            <column name="TEMPLATE_ID" not-null="false" length="11" default="null"/>
         </property>
         <property name="vnfResourceId" type="java.lang.Integer" >
-            <column name="VNF_RESOURCE_ID" not-null="true"/>
+            <column name="VNF_RESOURCE_ID" not-null="true" length="11"/>
+        </property>
+        <property name="isBase" type="int">
+            <column name="IS_BASE" not-null="true" length="11"/>
         </property>
         <property name="environmentId" type="java.lang.Integer" >
             <column name="ENVIRONMENT_ID" not-null="false"/>
         </property>
         <property name="modelInvariantUuid" type="java.lang.String" >
-            <column name="MODEL_INVARIANT_UUID" not-null="false" length="255"/>
+            <column name="MODEL_INVARIANT_UUID" not-null="false" length="200" default="null"/>
         </property>
 
+        <property name="minInstances" type="java.lang.Integer" >
+            <column name="MIN_INSTANCES" not-null="false" length="11" default="0"/>
+        </property>
+        <property name="maxInstances" type="java.lang.Integer" >
+            <column name="MAX_INSTANCES" not-null="false" length="11" default="null"/>
+        </property>
+        <property name="initialCount" type="java.lang.Integer" >
+            <column name="INITIAL_COUNT" not-null="false" length="11" default="0"/>
+        </property>
+        <property name="label" type="java.lang.String" >
+            <column name="LABEL" not-null="false" length="200" default="null"/>
+        </property>
     </class>
 </hibernate-mapping>
diff --git a/mso-catalog-db/src/main/resources/VnfComponentsRecipe.hbm.xml b/mso-catalog-db/src/main/resources/VnfComponentsRecipe.hbm.xml
index e0ef0d2bc2..6297e1c52f 100644
--- a/mso-catalog-db/src/main/resources/VnfComponentsRecipe.hbm.xml
+++ b/mso-catalog-db/src/main/resources/VnfComponentsRecipe.hbm.xml
@@ -8,9 +8,9 @@
   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.
@@ -26,20 +26,22 @@
 		<meta attribute="class-description">
 			This class describes a VNF Components Recipe
 		</meta>
-		
+
 		<id name="id" type="int" column="id">
 			<generator class="native"/>
 		</id>
 		<properties name="uk_vnf_component_recipe" unique="true">
 			<property name="vnfType" column="VNF_TYPE" type="string" length="200"/>
-			<property name="vfModuleId" column="VF_MODULE_ID" type="string" length="100" not-null="false"/>
 			<property name="vnfComponentType" type="string">
-			     <column name="VNF_COMPONENT_TYPE" not-null="true" length="45"/>
+				<column name="VNF_COMPONENT_TYPE" not-null="true" length="45"/>
 			</property>
+			<property name="vfModuleId" column="VF_MODULE_ID" type="string" length="100" not-null="false"/>
 			<property name="action" type="string">
 			     <column name="ACTION" not-null="true" length="20"/>
 			</property>
-			<property name="serviceType" column="SERVICE_TYPE" type="string" length="45"/>
+			<property name="serviceType" type="string">
+				<column name="SERVICE_TYPE" not-null="false" length="45" default="null"/>
+			</property>
 			<property name="version" column="VERSION" type="string" length="20"/>
 		</properties>
 		<property name="description" column="DESCRIPTION" type="string" length="1200"/>
diff --git a/mso-catalog-db/src/main/resources/VnfRecipe.hbm.xml b/mso-catalog-db/src/main/resources/VnfRecipe.hbm.xml
index ea2b39e861..4c471edfee 100644
--- a/mso-catalog-db/src/main/resources/VnfRecipe.hbm.xml
+++ b/mso-catalog-db/src/main/resources/VnfRecipe.hbm.xml
@@ -8,9 +8,9 @@
   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.
@@ -26,13 +26,13 @@
 		<meta attribute="class-description">
 			This class describes a VNF Recipe
 		</meta>
-		
+
 		<id name="id" type="int" column="id">
 			<generator class="native"/>
 		</id>
 
         <properties name="uk_vnf_recipe" unique="true">
-        
+
 	        <property name="vfModuleId" type="string">
 	            <column name="VF_MODULE_ID" not-null="false" length="100" />
 	        </property>
@@ -42,23 +42,23 @@
 	        <property name="version" type="string">
                 <column name="VERSION_STR" not-null="true" length="20" />
             </property>
-            
+
         </properties>
-        
+
 		<property name="vnfType" type="string">
 			<column name="VNF_TYPE" not-null="false" length="200" />
 		</property>
-		
+
 		<property name="serviceType" type="string">
-			<column name="SERVICE_TYPE" not-null="false" length="45" />
+			<column name="SERVICE_TYPE" not-null="false" length="45" default="null"/>
 		</property>
-				
+
 		<property name="description" column="DESCRIPTION" type="string" length="1200"/>
-		
+
 		<property name="orchestrationUri" type="string">
           <column name="ORCHESTRATION_URI" not-null="true" length="256"/>
         </property>
-        
+
 		<property name="vnfParamXSD" column="VNF_PARAM_XSD" type="string" length="2048"/>
 		<property name="recipeTimeout" column="RECIPE_TIMEOUT" type="int"/>
 		<property name="created" column="CREATION_TIMESTAMP" type="timestamp" generated="insert" update="false" insert="false" />
diff --git a/mso-catalog-db/src/main/resources/VnfResource.hbm.xml b/mso-catalog-db/src/main/resources/VnfResource.hbm.xml
index 4c9e3b59e3..2fc47009d7 100644
--- a/mso-catalog-db/src/main/resources/VnfResource.hbm.xml
+++ b/mso-catalog-db/src/main/resources/VnfResource.hbm.xml
@@ -8,9 +8,9 @@
   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.
@@ -26,7 +26,7 @@
 		<meta attribute="class-description">
 			This class describes a VNF Resource
 		</meta>
-		
+
 		<id name="id" type="int" column="id">
 			<generator class="native"/>
 		</id>
@@ -37,14 +37,20 @@
 		    <property name="version" type="string" >
 		      <column name="ASDC_SERVICE_MODEL_VERSION" not-null="true" length="20"/>
 		    </property>
+			<property name="serviceModelInvariantUUID" type="string" >
+				<column name="SERVICE_MODEL_INVARIANT_UUID" not-null="false" length="200"/>
+			</property>
 		</properties>
+		<property name="modelCustomizationName" type="string" >
+			<column name="MODEL_CUSTOMIZATION_NAME" not-null="false" length="200"/>
+		</property>
 		<property name="orchestrationMode" type="string" >
 		      <column name="ORCHESTRATION_MODE" not-null="true" length="20"/>
 		</property>
 		<property name="description" type="string" >
 		  <column name="DESCRIPTION" not-null="false" length="1200"/>
 		</property>
-		
+
 		<property name="templateId" type="int" not-null="false">
 		  <column name="TEMPLATE_ID" not-null="false"/>
 		</property>
@@ -69,66 +75,62 @@
 		<property name="modelVersion" type="string" >
 		  <column name="MODEL_VERSION" not-null="true" length="20"/>
 		</property>
-		<property name="modelCustomizationName" type="string" >
-          <column name="MODEL_CUSTOMIZATION_NAME" not-null="false" length="200"/>
-        </property>
         <property name="modelName" type="string" >
           <column name="MODEL_NAME" not-null="false" length="200"/>
         </property>
-        <property name="serviceModelInvariantUUID" type="string" >
-          <column name="SERVICE_MODEL_INVARIANT_UUID" not-null="false" length="200"/>
-        </property>
-		
+		<property name="modelCustomizationUuid" type="string" >
+			<column name="MODEL_CUSTOMIZATION_UUID" not-null="false" length="255"/>
+		</property>
 		<map name="heatFiles" cascade="all">
 			<key column="VNF_RESOURCE_ID" foreign-key="none"/>
 			<map-key column="FILE_NAME" type="string"/>
 			<one-to-many class="HeatFiles"/>
 		</map>
-		
+
 	</class>
-	
+
 	<class name="HeatFiles" table="HEAT_FILES">
 		<meta attribute="class-description">
 			This class describes a HEAT Template File
 		</meta>
-		
+
 		<id name="id" type="int" column="id">
 			<generator class="native"/>
 		</id>
-
+		<property name="description"  type="string" >
+			<column name="DESCRIPTION" not-null="false" length="1200" default="null"/>
+		</property>
 		<properties name="uk_heat_files" unique="true">
 			<property name="fileName" type="string" >
 			     <column name="FILE_NAME" not-null="true" length="200"/>
 			</property>
 			<property name="asdcResourceName" type="string" >
-			     <column name="ASDC_RESOURCE_NAME" not-null="true" length="100"/>
+				<column name="ASDC_RESOURCE_NAME" not-null="true" length="100"/>
 			</property>
 			<property name="version" type="string" >
-			     <column name="VERSION" not-null="true" length="20"/>
+				<column name="VERSION" not-null="true" length="20"/>
+			</property>
+			<property name="asdcUuid"  type="string"  >
+				<column name="ASDC_UUID" not-null="false" length="200" default="'MANUAL RECORD'"/>
 			</property>
 		</properties>
-		
-		<property name="vnfResourceId" type="int">
-                 <column name="VNF_RESOURCE_ID" not-null="false"/>
-        </property>
-		<property name="description"  type="string" >
-		  <column name="DESCRIPTION" not-null="false" length="1200"/>
-		</property>
+
 		<property name="fileBody" type="text">
 		  <column name="FILE_BODY" not-null="true"/>
 		</property>
+		<property name="vnfResourceId" type="int">
+			<column name="VNF_RESOURCE_ID" not-null="false" length="11" default="null"/>
+		</property>
 		<property name="created"  type="timestamp" generated="insert" update="false" insert="false">
 		  <column name="CREATION_TIMESTAMP" not-null="true"/>
 		</property>
-		
-		<property name="asdcUuid"  type="string"  >
-		  <column name="ASDC_UUID" not-null="false" length="200"/>
-		</property>
 		<property name="asdcLabel"  type="string"  >
 		  <column name="ASDC_LABEL" not-null="false" length="200"/>
 		</property>
-		
-		
+		<property name="artifactChecksum" type="string">
+			<column name="ARTIFACT_CHECKSUM" length="200" default="'MANUAL RECORD'" not-null="true"/>
+		</property>
+
 	</class>
-	
+
 </hibernate-mapping>
diff --git a/mso-catalog-db/src/main/resources/hibernate-catalog-mysql.cfg.xml b/mso-catalog-db/src/main/resources/hibernate-catalog-core-mysql.cfg.xml
index 306dfc6d0b..306dfc6d0b 100644
--- a/mso-catalog-db/src/main/resources/hibernate-catalog-mysql.cfg.xml
+++ b/mso-catalog-db/src/main/resources/hibernate-catalog-core-mysql.cfg.xml