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/NetworkResource.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/NetworkResource.hbm.xml')
-rw-r--r-- | mso-catalog-db/src/main/resources/NetworkResource.hbm.xml | 38 |
1 files changed, 16 insertions, 22 deletions
diff --git a/mso-catalog-db/src/main/resources/NetworkResource.hbm.xml b/mso-catalog-db/src/main/resources/NetworkResource.hbm.xml index 931db68406..b8c2f39943 100644 --- a/mso-catalog-db/src/main/resources/NetworkResource.hbm.xml +++ b/mso-catalog-db/src/main/resources/NetworkResource.hbm.xml @@ -27,31 +27,25 @@ This class describes a Network Resource </meta> - <id name="id" type="int" column="id"/> - - <properties name="uk_network_resource" unique="true"> - <property name="networkType" type="string" > - <column name="NETWORK_TYPE" not-null="true" length="45"/> - </property> - <property name="version" type="string" > - <column name="VERSION_STR" not-null="true" length="20"/> - </property> - </properties> - <property name="orchestrationMode" column="ORCHESTRATION_MODE" type="string" length="20"/> - <property name="description" column="DESCRIPTION" type="string" length="1200"/> - <property name="templateId" column="TEMPLATE_ID" type="int"/> - <property name="neutronNetworkType" type="string" > - <column name="NEUTRON_NETWORK_TYPE" not-null="false" default="null" length="20" /> - </property> - <property name="created" type="timestamp" generated="insert" update="false" insert="false" > - <column name="CREATION_TIMESTAMP" not-null="true"/> - </property> + <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="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"/> + <property name="description" column="DESCRIPTION" type="string" length="1200"/> + <property name="orchestrationMode" column="ORCHESTRATION_MODE" type="string" length="20"/> + <property name="heatTemplateArtifactUUID" column="HEAT_TEMPLATE_ARTIFACT_UUID" type="string" length="200" not-null="true" /> + <property name="aicVersionMin" type="string" > - <column name="AIC_VERSION_MIN" not-null="true" length="20" /> + <column name="AIC_VERSION_MIN" not-null="true" default="2.5" length="20" /> </property> <property name="aicVersionMax" type="string"> - <column name="AIC_VERSION_MAX" not-null="false" default="null" length="20"/> + <column name="AIC_VERSION_MAX" not-null="false" default="2.5" length="20"/> </property> + + <property name="created" type="timestamp" generated="insert" update="false" insert="false" column="CREATION_TIMESTAMP" not-null="true"/> + </class> -</hibernate-mapping> +</hibernate-mapping>
\ No newline at end of file |