diff options
author | Arthur Martella <amartell@research.att.com> | 2017-09-08 13:27:46 -0400 |
---|---|---|
committer | Arthur Martella <amartell@research.att.com> | 2017-09-08 13:32:24 -0400 |
commit | 62cd6aaaf74aa91ee0037c0e155c8e7284f07567 (patch) | |
tree | 68c0c53c9156f5aa3c6b3599ac940770f986633d /mso-catalog-db/src/main/resources/NetworkRecipe.hbm.xml | |
parent | fa1a211d28a912892fcd888569df033900eb01ee (diff) |
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>
Diffstat (limited to 'mso-catalog-db/src/main/resources/NetworkRecipe.hbm.xml')
-rw-r--r-- | mso-catalog-db/src/main/resources/NetworkRecipe.hbm.xml | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/mso-catalog-db/src/main/resources/NetworkRecipe.hbm.xml b/mso-catalog-db/src/main/resources/NetworkRecipe.hbm.xml index 28589ea639..25c5ccd827 100644 --- a/mso-catalog-db/src/main/resources/NetworkRecipe.hbm.xml +++ b/mso-catalog-db/src/main/resources/NetworkRecipe.hbm.xml @@ -26,14 +26,14 @@ <meta attribute="class-description"> This class describes a Network recipe </meta> - + <id name="id" type="int" column="id"> <generator class="native"/> </id> <properties name="uk_network_recipe" unique="true"> - <property name="networkType" type="string" > - <column name="NETWORK_TYPE" not-null="true" length="20"/> + <property name="modelName" type="string" > + <column name="MODEL_NAME" not-null="true" length="20"/> </property> <property name="action" type="string" > <column name="ACTION" not-null="true" length="20"/> @@ -41,21 +41,21 @@ <property name="version" type="string"> <column name="VERSION_STR" not-null="true" length="20"/> </property> - + </properties> - + + <property name="serviceType" type="string" length="45"> + <column name="SERVICE_TYPE" not-null="false" length="45"/> + </property> <property name="description" column="DESCRIPTION" type="string" length="1200"/> <property name="orchestrationUri" type="string"> <column name="ORCHESTRATION_URI" not-null="true" length="256"/> </property> <property name="networkParamXSD" column="NETWORK_PARAM_XSD" type="string" length="2048"/> <property name="recipeTimeout" column="RECIPE_TIMEOUT" type="int"/> - <property name="serviceType" type="string" > - <column name="SERVICE_TYPE" not-null="false" length="45" default="null"/> - </property> <property name="created" type="timestamp" generated="insert" update="false" insert="false" > <column name="CREATION_TIMESTAMP" not-null="true"/> </property> </class> - -</hibernate-mapping> + +</hibernate-mapping>
\ No newline at end of file |