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/Service.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/Service.hbm.xml')
| -rw-r--r-- | mso-catalog-db/src/main/resources/Service.hbm.xml | 69 |
1 files changed, 15 insertions, 54 deletions
diff --git a/mso-catalog-db/src/main/resources/Service.hbm.xml b/mso-catalog-db/src/main/resources/Service.hbm.xml index f6049961fd..b48c55dec7 100644 --- a/mso-catalog-db/src/main/resources/Service.hbm.xml +++ b/mso-catalog-db/src/main/resources/Service.hbm.xml @@ -27,67 +27,28 @@ This class describes a Service that may be orchestrated </meta> - <id name="id" type="int" column="id"> - <generator class="native"/> - </id> - - <properties name="uk" unique="true"> - <property name="serviceNameVersionId" type="string" > - <column name="SERVICE_NAME_VERSION_ID" length="50" not-null="true" default="'MANUAL_RECORD'" /> - </property> - <property name="serviceName" column="SERVICE_NAME" type="string" length="40"/> - </properties> - - <property name="version" type="string" > - <column name="VERSION_STR" length="20" 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="version" column="MODEL_VERSION" type="string" length="20" not-null="true"/> <property name="description" column="DESCRIPTION" type="string" length="1200"/> + <property name="toscaCsarArtifactUUID" column="TOSCA_CSAR_ARTIFACT_UUID" type="string" length="200" /> - <property name="serviceVersion" column="SERVICE_VERSION" type="string" length="10"/> - <property name="httpMethod" column="HTTP_METHOD" type="string" length="50"/> - <property name="created" type="timestamp" generated="insert" update="false" insert="false" > - <column name="CREATION_TIMESTAMP" not-null="true"/> - </property> + <property name="created" type="timestamp" generated="insert" update="false" insert="false" column="CREATION_TIMESTAMP" not-null="true"/> <property name="modelInvariantUUID" type="string"> <column name="MODEL_INVARIANT_UUID" default="'MANUAL_RECORD'" not-null="true" length="200"/> </property> - - <map name="recipes" cascade="all"> - <key column="SERVICE_ID"/> + <property name="serviceType" column="SERVICE_TYPE" type="string" length="20"/> + <property name="serviceRole" column="SERVICE_ROLE" type="string" length="20"/> + + <map name="recipes" inverse="true" cascade="all"> + <key column="SERVICE_MODEL_UUID"/> <map-key column="action" type="string"/> <one-to-many class="ServiceRecipe"/> </map> - </class> - - <class name="ServiceRecipe" table="SERVICE_RECIPE"> - <meta attribute="class-description"> - This class describes a Service recipe - </meta> - - <id name="id" type="int" column="id"> - <generator class="native"/> - </id> - <properties name="uk1_service_recipe" unique="true"> - <property name="serviceId" type="int"> - <column name="SERVICE_ID" not-null="true" length="11"/> - </property> - <property name="action" type="string" > - <column name="ACTION" not-null="true" length="40"/> - </property> - </properties> - <property name="version" type="string"> - <column name="VERSION_STR" not-null="false" length="20" default="null"/> - </property> - <property name="description" column="DESCRIPTION" type="string" length="1200"/> - <property name="orchestrationUri" type="string"> - <column name="ORCHESTRATION_URI" not-null="true" length="256"/> - </property> - <property name="serviceParamXSD" column="SERVICE_PARAM_XSD" type="string" length="2048"/> - <property name="recipeTimeout" column="RECIPE_TIMEOUT" type="int"/> - <property name="serviceTimeoutInterim" column="SERVICE_TIMEOUT_INTERIM" type="java.lang.Integer"/> - <property name="created" type="timestamp" generated="insert" update="false" insert="false" > - <column name="CREATION_TIMESTAMP" not-null="true"/> - </property> + <set name="serviceResourceCustomizations" inverse="true" cascade="all"> + <key column="SERVICE_MODEL_UUID" not-null="true" /> + <one-to-many class="ServiceToResourceCustomization" /> + </set> </class> -</hibernate-mapping> +</hibernate-mapping>
\ No newline at end of file |