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/HeatEnvironment.hbm.xml b/mso-catalog-db/src/main/resources/HeatEnvironment.hbm.xml
index 8e86c58..711b73a 100644
--- a/mso-catalog-db/src/main/resources/HeatEnvironment.hbm.xml
+++ b/mso-catalog-db/src/main/resources/HeatEnvironment.hbm.xml
@@ -27,35 +27,24 @@
<meta attribute="class-description">
This class describes a HEAT Environment
</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_heatenv" unique="true">
<property name="name" type="string" >
<column name="NAME" length="100" 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" 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">
- <column name="ENVIRONMENT" not-null="true"/>
+ <column name="BODY" not-null="true"/>
</property>
<property name="created" type="timestamp" generated="insert" insert="false" update="false">
<column name="CREATION_TIMESTAMP" not-null="true"/>
</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"/>
+ <column name="ARTIFACT_CHECKSUM" length="200" default="'MANUAL RECORD'" not-null="false"/>
</property>
-
</class>
-</hibernate-mapping>
+</hibernate-mapping>
\ No newline at end of file