aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRob Daugherty <rd472p@att.com>2017-10-25 01:08:58 +0000
committerGerrit Code Review <gerrit@onap.org>2017-10-25 01:08:58 +0000
commiteb7b6b427608fa21cf6241620202a803089020af (patch)
treee92794c15da611d074289b84f4f8648e23357676
parentba489a051763c4d4f9a5ff36644d40144f887873 (diff)
parentc52588edfa229b2478f04ef3c24ecb3eb8ffbe2f (diff)
Merge "NetworkResource modelInvariantUUID is too short"
-rw-r--r--mso-catalog-db/src/main/resources/HeatFiles.hbm.xml2
-rw-r--r--mso-catalog-db/src/main/resources/NetworkResource.hbm.xml4
2 files changed, 3 insertions, 3 deletions
diff --git a/mso-catalog-db/src/main/resources/HeatFiles.hbm.xml b/mso-catalog-db/src/main/resources/HeatFiles.hbm.xml
index 4674239a99..5a2c4aa537 100644
--- a/mso-catalog-db/src/main/resources/HeatFiles.hbm.xml
+++ b/mso-catalog-db/src/main/resources/HeatFiles.hbm.xml
@@ -36,7 +36,7 @@
<property name="version" type="java.lang.String" length="20" not-null="true">
<column name="VERSION" />
</property>
- <property name="fileBody" type="java.lang.String" not-null="true">
+ <property name="fileBody" type="text" not-null="true">
<column name="BODY" />
</property>
<property name="created" type="java.sql.Timestamp" generated="insert" update="false" insert="false" not-null="true">
diff --git a/mso-catalog-db/src/main/resources/NetworkResource.hbm.xml b/mso-catalog-db/src/main/resources/NetworkResource.hbm.xml
index 7f4698e82b..1599cf5c66 100644
--- a/mso-catalog-db/src/main/resources/NetworkResource.hbm.xml
+++ b/mso-catalog-db/src/main/resources/NetworkResource.hbm.xml
@@ -29,7 +29,7 @@
<id name="modelUUID" column="MODEL_UUID" type="string" length="200"/>
<property name="modelName" column="MODEL_NAME" type="string" length="200" not-null="true" />
- <property name="modelInvariantUUID" column="MODEL_INVARIANT_UUID" type="string" length="20"/>
+ <property name="modelInvariantUUID" column="MODEL_INVARIANT_UUID" type="string" length="200"/>
<property name="modelVersion" column="MODEL_VERSION" type="string" length="20"/>
<property name="toscaNodeType" column="TOSCA_NODE_TYPE" type="string" length="200"/>
<property name="neutronNetworkType" column="NEUTRON_NETWORK_TYPE" type="string" length="20"/>
@@ -50,4 +50,4 @@
</class>
-</hibernate-mapping> \ No newline at end of file
+</hibernate-mapping>