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/VnfComponentsRecipe.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/VnfComponentsRecipe.hbm.xml')
-rw-r--r-- | mso-catalog-db/src/main/resources/VnfComponentsRecipe.hbm.xml | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/mso-catalog-db/src/main/resources/VnfComponentsRecipe.hbm.xml b/mso-catalog-db/src/main/resources/VnfComponentsRecipe.hbm.xml index 6297e1c52f..69a3a456a1 100644 --- a/mso-catalog-db/src/main/resources/VnfComponentsRecipe.hbm.xml +++ b/mso-catalog-db/src/main/resources/VnfComponentsRecipe.hbm.xml @@ -32,16 +32,14 @@ </id> <properties name="uk_vnf_component_recipe" unique="true"> <property name="vnfType" column="VNF_TYPE" type="string" length="200"/> + <property name="vfModuleModelUUId" column="VF_MODULE_MODEL_UUID" type="string" length="100" not-null="false"/> <property name="vnfComponentType" type="string"> <column name="VNF_COMPONENT_TYPE" not-null="true" length="45"/> </property> - <property name="vfModuleId" column="VF_MODULE_ID" type="string" length="100" not-null="false"/> <property name="action" type="string"> <column name="ACTION" not-null="true" length="20"/> </property> - <property name="serviceType" type="string"> - <column name="SERVICE_TYPE" not-null="false" length="45" default="null"/> - </property> + <property name="serviceType" column="SERVICE_TYPE" type="string" length="45"/> <property name="version" column="VERSION" type="string" length="20"/> </properties> <property name="description" column="DESCRIPTION" type="string" length="1200"/> |