summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNiharika Sharma <niharika.sharma1@bell.ca>2021-08-09 14:31:50 -0400
committerNiharika Sharma <niharika.sharma@amdocs.com>2021-08-10 11:10:40 -0400
commit8a91f32b353a049d0f6a59ffae6a023a3a43c79c (patch)
tree6c0d49f1a6c848883436e480f9ed9df1cb96cde9
parent4c6f290ec55342952db093852eac3a25adc6b78d (diff)
aai-schema introduce composed-resource to build
parent child relationship between service instances this allows us to identify which object is parent and which is child service Issue-ID: AAI-3366 Signed-off-by: Niharika Sharma <niharika.sharma@amdocs.com> Change-Id: Ic98353c35902610792de8680effd0aa1b7ce36a6
-rw-r--r--aai-schema/src/main/resources/onap/dbedgerules/v24/DbEdgeRules_v24.json48
-rw-r--r--aai-schema/src/main/resources/onap/oxm/v24/aai_oxm_v24.xml24
2 files changed, 27 insertions, 45 deletions
diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v24/DbEdgeRules_v24.json b/aai-schema/src/main/resources/onap/dbedgerules/v24/DbEdgeRules_v24.json
index 6826a78..1735909 100644
--- a/aai-schema/src/main/resources/onap/dbedgerules/v24/DbEdgeRules_v24.json
+++ b/aai-schema/src/main/resources/onap/dbedgerules/v24/DbEdgeRules_v24.json
@@ -1779,30 +1779,30 @@
"default": "true",
"description": ""
},
- {
- "from": "composed-resource",
- "to": "service-instance",
- "label": "org.onap.relationships.inventory.ComposedOf",
- "direction": "OUT",
- "multiplicity": "MANY2ONE",
- "contains-other-v": "!${direction}",
- "delete-other-v": "!${direction}",
- "prevent-delete": "NONE",
- "default": "true",
- "description": ""
- },
- {
- "from": "service-instance",
- "to": "composed-resource",
- "label": "org.onap.relationships.inventory.BelongsTo",
- "direction": "OUT",
- "multiplicity": "ONE2ONE",
- "contains-other-v": "NONE",
- "delete-other-v": "NONE",
- "prevent-delete": "NONE",
- "default": "true",
- "description": ""
- },
+ {
+ "from": "composed-resource",
+ "to": "service-instance",
+ "label": "org.onap.relationships.inventory.ComposedOf",
+ "direction": "OUT",
+ "multiplicity": "MANY2ONE",
+ "contains-other-v": "!${direction}",
+ "delete-other-v": "!${direction}",
+ "prevent-delete": "NONE",
+ "default": "true",
+ "description": ""
+ },
+ {
+ "from": "service-instance",
+ "to": "composed-resource",
+ "label": "org.onap.relationships.inventory.BelongsTo",
+ "direction": "OUT",
+ "multiplicity": "ONE2ONE",
+ "contains-other-v": "NONE",
+ "delete-other-v": "NONE",
+ "prevent-delete": "NONE",
+ "default": "true",
+ "description": ""
+ },
{
"from": "service-instance",
"to": "instance-group",
diff --git a/aai-schema/src/main/resources/onap/oxm/v24/aai_oxm_v24.xml b/aai-schema/src/main/resources/onap/oxm/v24/aai_oxm_v24.xml
index 6c730a3..6591ec1 100644
--- a/aai-schema/src/main/resources/onap/oxm/v24/aai_oxm_v24.xml
+++ b/aai-schema/src/main/resources/onap/oxm/v24/aai_oxm_v24.xml
@@ -9837,7 +9837,7 @@
</java-type>
<java-type name="ComposedResources">
<xml-properties>
- <xml-property name="description" value="This object is used to store slices of services being offered"/>
+ <xml-property name="description" value="This object is used to represent parent-child relationship between service-instance"/>
</xml-properties>
<xml-root-element name="composed-resources"/>
<java-attributes>
@@ -9863,23 +9863,6 @@
<xml-property name="description" value="Link back to more information in the controller"/>
</xml-properties>
</xml-element>
- <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
- <xml-properties>
- <xml-property name="description" value="the ASDC model id for this resource or service model."/>
- <xml-property name="visibility" value="deployment"/>
- <xml-property name="requires" value="model-version-id"/>
- <xml-property name="dbAlias" value="model-invariant-id-local"/>
- </xml-properties>
- </xml-element>
- <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
- <xml-properties>
- <xml-property name="description" value="the ASDC model version for this resource or service model."/>
- <xml-property name="visibility" value="deployment"/>
- <xml-property name="requires" value="model-invariant-id"/>
- <xml-property name="dbAlias" value="model-version-id-local"/>
- <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
- </xml-properties>
- </xml-element>
<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
<xml-properties>
<xml-property name="description" value="Concurrency value"/>
@@ -9961,14 +9944,13 @@
<xml-property name="description" value="Identifies the version of the upstream source."/>
</xml-properties>
</xml-element>
- <xml-element java-attribute="tunnelXconnects" name="tunnel-xconnects" type="inventory.aai.onap.org.v24.TunnelXconnects"/>
<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v24.RelationshipList"/>
</java-attributes>
<xml-properties>
- <xml-property name="description" value="Represents a slice or partial piece of a resource that gets separately composed"/>
+ <xml-property name="description" value="Represents a resource that acts as a bridge between service-instance to define parent-child relationship"/>
<xml-property name="nameProps" value="description,composed-resource-name"/>
- <xml-property name="indexedProps" value="id,model-invariant-id,model-version-id,type,role,composed-resource-name,access-provider-id,access-client-id,access-topology-id,access-node-id,access-ltp-id,vpn-name,orchestration-status,data-owner,data-source,data-source-version"/>
+ <xml-property name="indexedProps" value="id,type,role,composed-resource-name,access-provider-id,access-client-id,access-topology-id,access-node-id,access-ltp-id,vpn-name,orchestration-status,data-owner,data-source,data-source-version"/>
<xml-property name="dependentOn" value="service-instance"/>
<xml-property name="container" value="composed-resources"/>
<!-- <xml-property name="namespace" value="network" /> -->