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>
diff --git a/mso-catalog-db/src/main/resources/HeatTemplate.hbm.xml b/mso-catalog-db/src/main/resources/HeatTemplate.hbm.xml
index b776568..c1866e9 100644
--- a/mso-catalog-db/src/main/resources/HeatTemplate.hbm.xml
+++ b/mso-catalog-db/src/main/resources/HeatTemplate.hbm.xml
@@ -27,47 +27,33 @@
This class describes a HEAT template
</meta>
- <id name="id" type="int" column="id">
- <generator class="native"/>
+ <id name="artifactUuid" type="string" column="ARTIFACT_UUID" length="200">
+ <generator class="assigned" />
</id>
- <properties name="uk_template" unique="true">
<property name="templateName" type="string" >
- <column name="TEMPLATE_NAME" length="200" not-null="true"/>
+ <column name="NAME" length="200" not-null="true"/>
</property>
<property name="version" type="string" >
<column name="VERSION" length="20" not-null="true"/>
</property>
- <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"/>
+ <column name="BODY" not-null="true"/>
</property>
<property name="timeoutMinutes" column="TIMEOUT_MINUTES" type="int"/>
<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"/>
+ <property name="artifactChecksum" type="string">
+ <column name="ARTIFACT_CHECKSUM" length="200" default="'MANUAL RECORD'" not-null="true"/>
+ </property>
+ <set name="parameters" inverse="true" cascade="all">
+ <key column="HEAT_TEMPLATE_ARTIFACT_UUID"/>
<one-to-many class="HeatTemplateParam"/>
</set>
- <set name="files" table="HEAT_NESTED_TEMPLATE" cascade="all">
- <key column="CHILD_TEMPLATE_ID"/>
- <one-to-many class="HeatTemplate" not-found="ignore"/>
- </set>
+
</class>
@@ -76,16 +62,17 @@
This class describes an input parameter to a heat template
</meta>
- <id name="id" type="int" column="id">
- <generator class="native"/>
- </id>
+ <composite-id>
+ <key-property name="heatTemplateArtifactUuid" column="HEAT_TEMPLATE_ARTIFACT_UUID" type="string" />
+ <key-property name="paramName" column="PARAM_NAME" type="string" />
+ </composite-id>
<properties name="uk_heat_params" unique="true">
- <property name="heatTemplateId" type="int">
- <column name="HEAT_TEMPLATE_ID" not-null="true"/>
+ <property name="heatTemplateArtifactUuid" type="string" insert="false" update="false">
+ <column name="HEAT_TEMPLATE_ARTIFACT_UUID" not-null="true"/>
</property>
- <property name="paramName" type="string" >
- <column name="PARAM_NAME" length="100" not-null="true"/>
+ <property name="paramName" type="string" insert="false" update="false">
+ <column name="PARAM_NAME" length="100" not-null="true" />
</property>
</properties>
<property name="required" type="boolean">
@@ -94,4 +81,5 @@
<property name="paramType" column="PARAM_TYPE" type="string" length="20"/>
<property name="paramAlias" column="PARAM_ALIAS" type="string" length="45"/>
</class>
+
</hibernate-mapping>