Merge "Fix dependentOn for hpaCapability node"

4 files changed, 36 insertions, 10 deletions

diff --git a/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v12.json b/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v12.json
index ed34d44e..8ed9c93b 100644
--- a/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v12.json
+++ b/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v12.json
@@ -308,6 +308,19 @@
 			"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",
 			"label": "org.onap.relationships.inventory.BelongsTo",
diff --git a/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v13.json b/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v13.json
index ed34d44e..8ed9c93b 100644
--- a/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v13.json
+++ b/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v13.json
@@ -308,6 +308,19 @@
 			"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",
 			"label": "org.onap.relationships.inventory.BelongsTo",
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 196d00f0..805d5009 100644
--- 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 9c4272b1..96f22270 100644
--- 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>