aboutsummaryrefslogtreecommitdiffstats
path: root/mso-catalog-db/src/main/resources
diff options
context:
space:
mode:
authorRob Daugherty <rd472p@att.com>2018-03-14 02:07:32 -0400
committerRob Daugherty <rd472p@att.com>2018-03-14 04:08:41 -0400
commit38f720752af4d4aad8c4e467a288d9048659f688 (patch)
treee81066a8b5c77272e30fb57a64999573c4db4d86 /mso-catalog-db/src/main/resources
parentaee3d223f92a6f250f43e17558a2dfd576ff7294 (diff)
AT&T 1712 and 1802 release code
This is code from AT&T's 1712 and 1802 releases. Change-Id: Ie1e85851e94bc66c4d9514a0226c221939531a04 Issue-ID: SO-425 Signed-off-by: Rob Daugherty <rd472p@att.com>
Diffstat (limited to 'mso-catalog-db/src/main/resources')
-rw-r--r--mso-catalog-db/src/main/resources/AllottedResourceCustomization.hbm.xml6
-rw-r--r--mso-catalog-db/src/main/resources/HeatFiles.hbm.xml2
-rw-r--r--mso-catalog-db/src/main/resources/NetworkResource.hbm.xml4
-rw-r--r--mso-catalog-db/src/main/resources/Service.hbm.xml3
-rw-r--r--mso-catalog-db/src/main/resources/VnfResourceCustomization.hbm.xml1
5 files changed, 13 insertions, 3 deletions
diff --git a/mso-catalog-db/src/main/resources/AllottedResourceCustomization.hbm.xml b/mso-catalog-db/src/main/resources/AllottedResourceCustomization.hbm.xml
index 0cf50166ea..2154928a84 100644
--- a/mso-catalog-db/src/main/resources/AllottedResourceCustomization.hbm.xml
+++ b/mso-catalog-db/src/main/resources/AllottedResourceCustomization.hbm.xml
@@ -61,5 +61,11 @@
<property name="created" type="timestamp" generated="insert" update="false" insert="false" not-null="true">
<column name="CREATION_TIMESTAMP" default="CURRENT_TIMESTAMP"/>
</property>
+ <property name="providingServiceModelUuid" type="java.lang.String" length="200">
+ <column name="PROVIDING_SERVICE_MODEL_UUID" />
+ </property>
+ <property name="providingServiceModelName" type="java.lang.String" length="200">
+ <column name="PROVIDING_SERVICE_MODEL_NAME" />
+ </property>
</class>
</hibernate-mapping> \ No newline at end of file
diff --git a/mso-catalog-db/src/main/resources/HeatFiles.hbm.xml b/mso-catalog-db/src/main/resources/HeatFiles.hbm.xml
index 5a2c4aa537..4674239a99 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="text" not-null="true">
+ <property name="fileBody" type="java.lang.String" 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 41e049ad8d..5d8a2a1edb 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="200"/>
+ <property name="modelInvariantUUID" column="MODEL_INVARIANT_UUID" type="string" length="20"/>
<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>
+</hibernate-mapping> \ No newline at end of file
diff --git a/mso-catalog-db/src/main/resources/Service.hbm.xml b/mso-catalog-db/src/main/resources/Service.hbm.xml
index 70f5731b7d..07f7795725 100644
--- a/mso-catalog-db/src/main/resources/Service.hbm.xml
+++ b/mso-catalog-db/src/main/resources/Service.hbm.xml
@@ -42,6 +42,9 @@
<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"/>
+
<map name="recipes" inverse="true" cascade="all">
<key column="SERVICE_MODEL_UUID"/>
diff --git a/mso-catalog-db/src/main/resources/VnfResourceCustomization.hbm.xml b/mso-catalog-db/src/main/resources/VnfResourceCustomization.hbm.xml
index f0af7cb97c..78ed9c5ff6 100644
--- a/mso-catalog-db/src/main/resources/VnfResourceCustomization.hbm.xml
+++ b/mso-catalog-db/src/main/resources/VnfResourceCustomization.hbm.xml
@@ -36,6 +36,7 @@
<property name="nfType" column="NF_TYPE" type="string" length="200"/>
<property name="nfRole" column="NF_ROLE" type="string" length="200"/>
<property name="nfNamingCode" column="NF_NAMING_CODE" type="string" length="200"/>
+ <property name="multiStageDesign" column="MULTI_STAGE_DESIGN" type="string" length="200"/>
<property name="vnfResourceModelUuid" column="VNF_RESOURCE_MODEL_UUID" type="string" length="200" not-null="true" />
<property name="created" type="timestamp" generated="insert" update="false" insert="false" not-null="true">