summaryrefslogtreecommitdiffstats
path: root/aai-schema/src/main
diff options
context:
space:
mode:
authorDileep Ranganathan <dileep.ranganathan@intel.com>2018-03-08 10:35:17 -0800
committerDileep Ranganathan <dileep.ranganathan@intel.com>2018-03-09 05:21:58 -0800
commit056d0d23b9c89321abf5da10a596f2ddd396616a (patch)
treeec41892827245bde2926f90bd105c7764ca164e4 /aai-schema/src/main
parent8d980b759d7e878530c6ebf404fe89e99ed0aab4 (diff)
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>
Diffstat (limited to 'aai-schema/src/main')
-rw-r--r--aai-schema/src/main/resources/oxm/aai_oxm_v12.xml10
-rw-r--r--aai-schema/src/main/resources/oxm/aai_oxm_v13.xml10
2 files changed, 10 insertions, 10 deletions
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>