From 62cd6aaaf74aa91ee0037c0e155c8e7284f07567 Mon Sep 17 00:00:00 2001
From: Arthur Martella <amartell@research.att.com>
Date: Fri, 8 Sep 2017 13:27:46 -0400
Subject: 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>
---
 .../resources/NetworkResourceCustomization.hbm.xml | 36 ++++++++--------------
 1 file changed, 13 insertions(+), 23 deletions(-)

(limited to 'mso-catalog-db/src/main/resources/NetworkResourceCustomization.hbm.xml')

diff --git a/mso-catalog-db/src/main/resources/NetworkResourceCustomization.hbm.xml b/mso-catalog-db/src/main/resources/NetworkResourceCustomization.hbm.xml
index b8287ed122..37bb77fe77 100644
--- a/mso-catalog-db/src/main/resources/NetworkResourceCustomization.hbm.xml
+++ b/mso-catalog-db/src/main/resources/NetworkResourceCustomization.hbm.xml
@@ -21,34 +21,24 @@
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping>
-    <class name="org.openecomp.mso.db.catalog.beans.NetworkResourceCustomization" table="NETWORK_RESOURCE_CUSTOMIZATION">
-
-
-        <composite-id>
-            <key-property name="modelCustomizationUuid"  type="java.lang.String" >
-                <column name="MODEL_CUSTOMIZATION_UUID" length="200" not-null="true"/>
-            </key-property>
-            <key-property name="networkResourceId" type="int" >
-                <column name="NETWORK_RESOURCE_ID" length="11" not-null="false" default="null" />
-            </key-property>
-        </composite-id>
-
-        <property name="modelUuid" type="java.lang.String">
-            <column name="MODEL_UUID" length="200" not-null="true"/>
+    <class name="org.openecomp.mso.db.catalog.beans.NetworkResourceCustomization" table="NETWORK_RESOURCE_CUSTOMIZATION"> 
+		<id name="modelCustomizationUuid" column="MODEL_CUSTOMIZATION_UUID" type="java.lang.String" length="200"/>
+		<property name="networkResourceModelUuid" column="NETWORK_RESOURCE_MODEL_UUID" type="java.lang.String" length="200" not-null="true"/>
+        <property name="modelInstanceName" type="java.lang.String" length="200" not-null="true">
+            <column name="MODEL_INSTANCE_NAME" />
         </property>
-        <property name="modelName" type="java.lang.String">
-            <column name="MODEL_NAME" length="200" not-null="true"/>
+        <property name="networkTechnology" type="java.lang.String" length="45">
+            <column name="NETWORK_TECHNOLOGY" />
         </property>
-        <property name="modelInstanceName" type="java.lang.String">
-            <column name="MODEL_INSTANCE_NAME" length="200" not-null="true"/>
+        <property name="networkType" type="java.lang.String" length="45">
+            <column name="NETWORK_TYPE" />
         </property>
-        <property name="modelVersion" type="java.lang.String">
-            <column name="MODEL_VERSION" length="20" not-null="true"/>
+        <property name="networkScope" type="java.lang.String" length="45">
+            <column name="NETWORK_SCOPE" />
         </property>
-        <property name="modelInvariantUuid" type="java.lang.String">
-            <column name="MODEL_INVARIANT_UUID" length="200" not-null="true"/>
+        <property name="networkRole" type="java.lang.String" length="200">
+            <column name="NETWORK_ROLE" />
         </property>
-
         <property name="created" type="timestamp" generated="insert" update="false" insert="false" >
             <column name="CREATION_TIMESTAMP" not-null="true"/>
         </property>
-- 
cgit 1.2.3-korg