From 8d93387688812e438ed6d3daabba161950fa2a31 Mon Sep 17 00:00:00 2001
From: Rob Daugherty <rd472p@att.com>
Date: Mon, 2 Apr 2018 23:43:53 -0400
Subject: SO application deployment issues

There are a few problems here.

1) Hibernate definitions for a few tables don't match the column
   definitions in the MySQL schema scripts.

2) The process engine in MSOInfrastructureBPMN is defined incorrectly.

3) Several bpmn flows have errors that block deployment.

Change-Id: I029238b82736a3d4977fdf56416c5feb2705b041
Issue-ID: SO-557
Signed-off-by: Rob Daugherty <rd472p@att.com>
---
 mso-catalog-db/src/main/resources/HeatFiles.hbm.xml       |  2 +-
 mso-catalog-db/src/main/resources/NetworkResource.hbm.xml |  4 ++--
 mso-catalog-db/src/main/resources/Service.hbm.xml         | 11 +++++++----
 3 files changed, 10 insertions(+), 7 deletions(-)

(limited to 'mso-catalog-db')

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 5d8a2a1edb..41e049ad8d 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"/>
@@ -52,4 +52,4 @@
 
 	</class>
 
-</hibernate-mapping>
\ No newline at end of file
+</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 07f7795725..2344432056 100644
--- a/mso-catalog-db/src/main/resources/Service.hbm.xml
+++ b/mso-catalog-db/src/main/resources/Service.hbm.xml
@@ -42,9 +42,12 @@
         <property name="category" 				column="SERVICE_CATEGORY" 				type="string" 		length="20"/>
         <property name="serviceType" 				column="SERVICE_TYPE" 				type="string" 		length="20"/>
         <property name="serviceRole" 				column="SERVICE_ROLE" 				type="string" 		length="20"/>
-        <property name="environmentContext" 		column="ENVIRONMENT_CONTEXT" 		type="string" 		length="200"/>
-        <property name="workloadContext" 			column="WORKLOAD_CONTEXT" 			type="string" 		length="200"/>
-        
+        <property name="environmentContext" 		type="string" 		length="200">
+          <column name="ENVIRONMENT_CONTEXT" default="null"/>
+        </property>
+        <property name="workloadContext" 			type="string" 		length="200">
+          <column name="WORKLOAD_CONTEXT" default="null"/>
+        </property>
         
 		<map name="recipes" inverse="true" cascade="all">
 			<key column="SERVICE_MODEL_UUID"/>
@@ -57,4 +60,4 @@
             <one-to-many class="ServiceToResourceCustomization" />
         </set>
 	</class>
-</hibernate-mapping>
\ No newline at end of file
+</hibernate-mapping>
-- 
cgit 1.2.3-korg