Fix dependentOn for hpaCapability node

Added cloud-region along with flavor in the dependentOn field.
Modified hpa-feature-attribute to hpa-feature-attributes as it is an arraylist.

Change-Id: I7b0c3ee6e08b3bea97a1ebaeeaa8bcaeb8bb2b00
Issue-ID: AAI-742
Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>

diff --git a/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v12.json b/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v12.json
index ed34d44..8ed9c93 100644 (file)
--- a/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v12.json
+++ b/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v12.json
@@ -307,6 +307,19 @@
                        "default": "true",
                        "description":""
                },
+               {
+                       "from": "hpa-feature-attributes",
+                       "to": "hpa-capability",
+                       "label": "org.onap.relationships.inventory.BelongsTo",
+                       "direction": "OUT",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "!${direction}",
+                       "delete-other-v": "!${direction}",
+                       "SVC-INFRA": "!${direction}",
+                       "prevent-delete": "NONE",
+                       "default": "true",
+                       "description":""
+               },
                {
                        "from": "group-assignment",
                        "to": "cloud-region",

diff --git a/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v13.json b/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v13.json
index ed34d44..8ed9c93 100644 (file)
--- a/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v13.json
+++ b/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v13.json
@@ -307,6 +307,19 @@
                        "default": "true",
                        "description":""
                },
+               {
+                       "from": "hpa-feature-attributes",
+                       "to": "hpa-capability",
+                       "label": "org.onap.relationships.inventory.BelongsTo",
+                       "direction": "OUT",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "!${direction}",
+                       "delete-other-v": "!${direction}",
+                       "SVC-INFRA": "!${direction}",
+                       "prevent-delete": "NONE",
+                       "default": "true",
+                       "description":""
+               },
                {
                        "from": "group-assignment",
                        "to": "cloud-region",

diff --git a/aai-schema/src/main/resources/oxm/aai_oxm_v12.xml b/aai-schema/src/main/resources/oxm/aai_oxm_v12.xml
index 196d00f..805d500 100644 (file)
--- a/aai-schema/src/main/resources/oxm/aai_oxm_v12.xml
+++ b/aai-schema/src/main/resources/oxm/aai_oxm_v12.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
   ============LICENSE_START=======================================================
-  org.openecomp.aai
+  org.onap.aai
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ================================================================================
@@ -529,18 +529,18 @@
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList"/>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="hpaFeatureAttribute" name="hpa-feature-attribute" type="inventory.aai.onap.org.v12.HpaFeatureAttribute"/>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="hpaFeatureAttributes" name="hpa-feature-attributes" type="inventory.aai.onap.org.v12.HpaFeatureAttributes"/>
                        </java-attributes>
                        <xml-properties>
                                <xml-property name="description" value="Represents a HPA capability"/>
                                <xml-property name="indexedProps" value="hpa-feature,hpa-hw-arch,hpa-capability-id"/>
-                               <xml-property name="dependentOn" value="flavor"/>
+                               <xml-property name="dependentOn" value="flavor,cloud-region"/>
                                <xml-property name="container" value="hpa-capabilities"/>
                        </xml-properties>
                </java-type>
 
-               <java-type name="HpaFeatureAttribute">
-                       <xml-root-element name="hpa-feature-attribute"/>
+               <java-type name="HpaFeatureAttributes">
+                       <xml-root-element name="hpa-feature-attributes"/>
                        <java-attributes>
                                <xml-element java-attribute="hpaAttributeKey" name="hpa-attr-key" type="java.lang.String">
                                        <xml-properties>

diff --git a/aai-schema/src/main/resources/oxm/aai_oxm_v13.xml b/aai-schema/src/main/resources/oxm/aai_oxm_v13.xml
index 9c4272b..96f2227 100644 (file)
--- a/aai-schema/src/main/resources/oxm/aai_oxm_v13.xml
+++ b/aai-schema/src/main/resources/oxm/aai_oxm_v13.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
   ============LICENSE_START=======================================================
-  org.openecomp.aai
+  org.onap.aai
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ================================================================================
@@ -529,18 +529,18 @@
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList"/>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="hpaFeatureAttribute" name="hpa-feature-attribute" type="inventory.aai.onap.org.v13.HpaFeatureAttribute"/>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="hpaFeatureAttributes" name="hpa-feature-attributes" type="inventory.aai.onap.org.v13.HpaFeatureAttributes"/>
                        </java-attributes>
                        <xml-properties>
                                <xml-property name="description" value="Represents a HPA capability"/>
                                <xml-property name="indexedProps" value="hpa-feature,hpa-hw-arch,hpa-capability-id"/>
-                               <xml-property name="dependentOn" value="flavor"/>
+                               <xml-property name="dependentOn" value="flavor,cloud-region"/>
                                <xml-property name="container" value="hpa-capabilities"/>
                        </xml-properties>
                </java-type>
 
-               <java-type name="HpaFeatureAttribute">
-                       <xml-root-element name="hpa-feature-attribute"/>
+               <java-type name="HpaFeatureAttributes">
+                       <xml-root-element name="hpa-feature-attributes"/>
                        <java-attributes>
                                <xml-element java-attribute="hpaAttributeKey" name="hpa-attr-key" type="java.lang.String">
                                        <xml-properties>