summaryrefslogtreecommitdiffstats
path: root/aai-schema
diff options
context:
space:
mode:
authorDileep Ranganathan <dileep.ranganathan@intel.com>2018-03-08 10:38:25 -0800
committerDileep Ranganathan <dileep.ranganathan@intel.com>2018-03-13 05:25:28 -0700
commitd7df2dca953d55fbd808b49bff3278495a85c705 (patch)
tree66c8eca1d5c8d97cdbafff1ff04ea8be6bef24e1 /aai-schema
parent9bfec028ce6f4b0e7e7d59f29bf970d9d8a8024b (diff)
Testing for HpaCapabilities object
Fixed Schema - mismatch in the java attributes and xml attributes Added dependentOn for HpaFeatureAtrributes Added unit test for HPASchema Added sample payload for HPACapabilities inside flavor Issue-ID: AAI-742 Change-Id: I3525376886f10bee99aa0ce3f0a6b2a5efbaa9b1 Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>
Diffstat (limited to 'aai-schema')
-rw-r--r--aai-schema/src/main/resources/oxm/aai_oxm_v12.xml12
-rw-r--r--aai-schema/src/main/resources/oxm/aai_oxm_v13.xml12
2 files changed, 14 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 805d5009..b8fad43e 100644
--- a/aai-schema/src/main/resources/oxm/aai_oxm_v12.xml
+++ b/aai-schema/src/main/resources/oxm/aai_oxm_v12.xml
@@ -513,12 +513,12 @@
<xml-property name="description" value="Name of the HPACapability"/>
</xml-properties>
</xml-element>
- <xml-element java-attribute="version" name="hpa-version" type="java.lang.String">
+ <xml-element java-attribute="hpaVersion" name="hpa-version" type="java.lang.String">
<xml-properties>
<xml-property name="description" value="HPA schema version"/>
</xml-properties>
</xml-element>
- <xml-element java-attribute="hardwareArchitecture" name="hpa-hw-arch" type="java.lang.String">
+ <xml-element java-attribute="architecture" name="architecture" type="java.lang.String">
<xml-properties>
<xml-property name="description" value="Hardware architecture"/>
</xml-properties>
@@ -533,7 +533,7 @@
</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="indexedProps" value="hpa-feature,architecture,hpa-capability-id"/>
<xml-property name="dependentOn" value="flavor,cloud-region"/>
<xml-property name="container" value="hpa-capabilities"/>
</xml-properties>
@@ -542,12 +542,12 @@
<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-element java-attribute="hpaAttributeKey" name="hpa-attribute-key" required="true" type="java.lang.String" xml-key="true">
<xml-properties>
<xml-property name="description" value="name of the specific HPA attribute"/>
</xml-properties>
</xml-element>
- <xml-element java-attribute="hpaAttributeValue" name="hpa-attr-value" type="java.lang.String">
+ <xml-element java-attribute="hpaAttributeValue" name="hpa-attribute-value" type="java.lang.String">
<xml-properties>
<xml-property name="description" value="JSON string specifying the value, unit and type of the specific HPA attribute"/>
</xml-properties>
@@ -561,6 +561,8 @@
</java-attributes>
<xml-properties>
<xml-property name="description" value="HPA Capability Feature attributes"/>
+ <xml-property name="indexedProps" value="hpa-attribute-key"/>
+ <xml-property name="dependentOn" value="hpa-capability"/>
<xml-property name="container" value="hpa-capability"/>
</xml-properties>
</java-type>
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 96f22270..72cf646d 100644
--- a/aai-schema/src/main/resources/oxm/aai_oxm_v13.xml
+++ b/aai-schema/src/main/resources/oxm/aai_oxm_v13.xml
@@ -513,12 +513,12 @@
<xml-property name="description" value="Name of the HPACapability"/>
</xml-properties>
</xml-element>
- <xml-element java-attribute="version" name="hpa-version" type="java.lang.String">
+ <xml-element java-attribute="hpaVersion" name="hpa-version" type="java.lang.String">
<xml-properties>
<xml-property name="description" value="HPA schema version"/>
</xml-properties>
</xml-element>
- <xml-element java-attribute="hardwareArchitecture" name="hpa-hw-arch" type="java.lang.String">
+ <xml-element java-attribute="architecture" name="architecture" type="java.lang.String">
<xml-properties>
<xml-property name="description" value="Hardware architecture"/>
</xml-properties>
@@ -533,7 +533,7 @@
</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="indexedProps" value="hpa-feature,architecture,hpa-capability-id"/>
<xml-property name="dependentOn" value="flavor,cloud-region"/>
<xml-property name="container" value="hpa-capabilities"/>
</xml-properties>
@@ -542,12 +542,12 @@
<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-element java-attribute="hpaAttributeKey" name="hpa-attribute-key" required="true" type="java.lang.String" xml-key="true">
<xml-properties>
<xml-property name="description" value="name of the specific HPA attribute"/>
</xml-properties>
</xml-element>
- <xml-element java-attribute="hpaAttributeValue" name="hpa-attr-value" type="java.lang.String">
+ <xml-element java-attribute="hpaAttributeValue" name="hpa-attribute-value" type="java.lang.String">
<xml-properties>
<xml-property name="description" value="JSON string specifying the value, unit and type of the specific HPA attribute"/>
</xml-properties>
@@ -561,6 +561,8 @@
</java-attributes>
<xml-properties>
<xml-property name="description" value="HPA Capability Feature attributes"/>
+ <xml-property name="indexedProps" value="hpa-attribute-key"/>
+ <xml-property name="dependentOn" value="hpa-capability"/>
<xml-property name="container" value="hpa-capability"/>
</xml-properties>
</java-type>