[AAI] geo-region service-instance object relations

- AAI schema is updated to include relationship from service instance to geo-region object

Issue-ID: AAI-3935
Change-Id: I7d9df170905c21378ee52a856a03d23b97bb611d
Signed-off-by: vani.kv <vani.kv@accenture.com>

diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v29.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v29.xsd
index 12e3423..2932e70 100644 (file)
--- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v29.xsd
+++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v29.xsd
@@ -8933,7 +8933,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of a service",indexedProps="service-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,service-instance-name,service-instance-location-id,orchestration-status,environment-context,workload-context,operational-status,administrative-state,priority-label,data-owner,data-source,data-source-version",nameProps="service-instance-name",searchable="service-instance-id,service-instance-name,operational-status",uniqueProps="service-instance-id",dependentOn="service-subscription",container="service-instances",uriTemplate="/service-instances/service-instance/{service-instance-id}",requiredProps="service-instance-id")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of a service",indexedProps="service-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,service-instance-name,service-instance-location-id,orchestration-status,environment-context,workload-context,operational-status,service-type,administrative-state,priority-label,data-owner,data-source,data-source-version",nameProps="service-instance-name",searchable="service-instance-id,service-instance-name,operational-status",uniqueProps="service-instance-id",dependentOn="service-subscription",container="service-instances",uriTemplate="/service-instances/service-instance/{service-instance-id}",requiredProps="service-instance-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>

diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v29/DbEdgeRules_v29.json b/aai-schema/src/main/resources/onap/dbedgerules/v29/DbEdgeRules_v29.json
index 8c84f66..1629952 100644 (file)
--- a/aai-schema/src/main/resources/onap/dbedgerules/v29/DbEdgeRules_v29.json
+++ b/aai-schema/src/main/resources/onap/dbedgerules/v29/DbEdgeRules_v29.json
@@ -7495,7 +7495,18 @@
             "prevent-delete": "NONE",
             "default": "true",
             "description": "serv-attr-com belongsTo ul-thpt-per-ue"
+        },
+        {
+            "from": "service-instance",
+            "to": "geo-region",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "service-instance Uses geo-region"
         }
-               
     ]
 }