1710 Rebase - Second Attempt

[so.git] / mso-catalog-db / src / main / resources / NetworkResource.hbm.xml

diff --git a/mso-catalog-db/src/main/resources/NetworkResource.hbm.xml b/mso-catalog-db/src/main/resources/NetworkResource.hbm.xml
index 931db68..b8c2f39 100644 (file)
--- 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