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>
diff --git a/mso-catalog-db/src/main/resources/AllottedResourceCustomization.hbm.xml b/mso-catalog-db/src/main/resources/AllottedResourceCustomization.hbm.xml
index 2ca823f..7720a93 100644
--- a/mso-catalog-db/src/main/resources/AllottedResourceCustomization.hbm.xml
+++ b/mso-catalog-db/src/main/resources/AllottedResourceCustomization.hbm.xml
@@ -25,32 +25,41 @@
<class name="org.openecomp.mso.db.catalog.beans.AllottedResourceCustomization"
table="ALLOTTED_RESOURCE_CUSTOMIZATION">
<id name="modelCustomizationUuid" type="java.lang.String">
- <column name="MODEL_CUSTOMIZATION_UUID" length="200" not-null="true"/>
+ <column name="MODEL_CUSTOMIZATION_UUID" length="200"/>
<generator class="assigned" />
</id>
- <property name="version">
- <column name="MODEL_VERSION" length="20" not-null="true"/>
+ <property name="modelInstanceName" type="java.lang.String" length="200" not-null="true">
+ <column name="MODEL_INSTANCE_NAME" />
</property>
- <property name="modelVersion" update="false" insert="false">
- <column name="MODEL_VERSION" />
+ <property name="arModelUuid" type="java.lang.String" length="200" not-null="true">
+ <column name="AR_MODEL_UUID" />
</property>
- <property name="modelUuid" type="java.lang.String">
- <column name="MODEL_UUID" length="200" not-null="true"/>
+ <property name="providingServiceModelInvariantUuid" type="java.lang.String" length="200">
+ <column name="PROVIDING_SERVICE_MODEL_INVARIANT_UUID" />
</property>
- <property name="modelName" type="java.lang.String">
- <column name="MODEL_NAME" length="200" not-null="true"/>
+ <property name="targetNetworkRole" type="java.lang.String" length="200">
+ <column name="TARGET_NETWORK_ROLE" />
</property>
- <property name="modelInstanceName" type="java.lang.String">
- <column name="MODEL_INSTANCE_NAME" length="200" not-null="true"/>
+ <property name="nfFunction" type="java.lang.String" length="200">
+ <column name="NF_FUNCTION" />
+ </property>
+ <property name="nfType" type="java.lang.String" length="200">
+ <column name="NF_TYPE" />
+ </property>
+ <property name="nfRole" type="java.lang.String" length="200">
+ <column name="NF_ROLE" />
+ </property>
+ <property name="nfNamingCode" type="java.lang.String" length="200">
+ <column name="NF_NAMING_CODE" />
+ </property>
+ <property name="minInstances" type="java.lang.Integer">
+ <column name="MIN_INSTANCES" />
+ </property>
+ <property name="maxInstances" type="java.lang.Integer">
+ <column name="MAX_INSTANCES" />
</property>
<property name="created" type="timestamp" generated="insert" update="false" insert="false" >
<column name="CREATION_TIMESTAMP" not-null="true"/>
</property>
- <property name="description" type="java.lang.String">
- <column name="DESCRIPTION" length="200" not-null="false" default="null"/>
- </property>
- <property name="modelInvariantUuid" type="java.lang.String">
- <column name="MODEL_INVARIANT_UUID" length="200" not-null="true"/>
- </property>
</class>
</hibernate-mapping>
\ No newline at end of file