1710 Rebase - Second Attempt

This commit rebases changes from openecomp-mso/internal-staging-1710 up to and including this codecloud commit:
54483fc6606ddb1591a2e9da61bff8712325f924
Wed Sep 6 18:12:56 2017 -0400

Rebasing was done on a branch on top of this commit in so/master in ONAP:
93fbdfbe46104f8859d4754040f979cb7997c157
Thu Sep 7 16:42:59 2017 +0000

Change-Id: I4ad9abf40da32bf5bdca43e868b8fa2dbcd9dc59
Issue-id: SO-107
Signed-off-by: Arthur Martella <amartell@research.att.com>

1 files changed, 21 insertions, 105 deletions

diff --git a/mso-catalog-db/src/main/resources/VnfResource.hbm.xml b/mso-catalog-db/src/main/resources/VnfResource.hbm.xml
index 2fc47009d7..85b9e2a751 100644
--- a/mso-catalog-db/src/main/resources/VnfResource.hbm.xml
+++ b/mso-catalog-db/src/main/resources/VnfResource.hbm.xml
@@ -27,110 +27,26 @@
 			This class describes a VNF Resource
 		</meta>
 
-		<id name="id" type="int" column="id">
-			<generator class="native"/>
-		</id>
-		<properties name="uk1" unique="true">
-			<property name="vnfType" type="string" >
-			  <column name="VNF_TYPE" not-null="true" length="200"/>
-			</property>
-		    <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>
-		<property name="environmentId"  type="int">
-		  <column name="ENVIRONMENT_ID" not-null="false"/>
-		</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="aicVersionMin" type="string" >
-		  <column name="AIC_VERSION_MIN" not-null="false" length="20"/>
-		</property>
-		<property name="aicVersionMax" type="string" >
-		  <column name="AIC_VERSION_MAX" not-null="false" length="20"/>
-		</property>
-		<property name="modelInvariantUuid" type="string" >
-		  <column name="MODEL_INVARIANT_UUID" not-null="false" length="200"/>
-		</property>
-		<property name="modelVersion" type="string" >
-		  <column name="MODEL_VERSION" not-null="true" length="20"/>
-		</property>
-        <property name="modelName" type="string" >
-          <column name="MODEL_NAME" 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"/>
-			</property>
-			<property name="version" type="string" >
-				<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="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="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>
-
+		<id name="modelUuid" 						type="string" 		column="MODEL_UUID" 					length="200"/>
+		<property name="modelInvariantUuid" 		type="string" 		column="MODEL_INVARIANT_UUID" 			length="200"/>
+		<property name="version" 					type="string" 		column="MODEL_VERSION" 					length="20"		not-null="true"/>
+		<property name="modelName"  				type="string" 		column="MODEL_NAME"						length="200"/>
+		<property name="toscaNodeType" 				type="string" 		column="TOSCA_NODE_TYPE" 				length="200"/>
+		<property name="description" 				type="string" 		column="DESCRIPTION" 					length="1200"/>
+		<property name="orchestrationMode" 			type="string" 		column="ORCHESTRATION_MODE" 			length="20"		not-null="true"/>
+		<property name="aicVersionMin" 				type="string" 		column="AIC_VERSION_MIN" 				length="20"/>
+		<property name="aicVersionMax" 				type="string" 		column="AIC_VERSION_MAX" 				length="20"/>
+		<property name="heatTemplateArtifactUUId" 	type="string" 		column="HEAT_TEMPLATE_ARTIFACT_UUID" 	length="200" />
+		<property name="created" 					type="timestamp" generated="insert" update="false" insert="false" column="CREATION_TIMESTAMP" not-null="true"/>
+		
+		<set name="vnfResourceCustomizations" inverse="true" access="field" cascade="all">
+            <key column="VNF_RESOURCE_MODEL_UUID" not-null="true" />
+            <one-to-many class="VnfResourceCustomization" />
+        </set>
+        
+        <set name="vfModules" inverse="true" cascade="all">
+            <key column="VNF_RESOURCE_MODEL_UUID" not-null="true" />
+            <one-to-many class="VfModule" />
+        </set>
 	</class>
-
 </hibernate-mapping>