diff options
author | 2018-09-14 15:18:06 +0000 | |
---|---|---|
committer | 2018-09-14 15:18:06 +0000 | |
commit | c551fac739389f6eade477dc0cf2682955e3473a (patch) | |
tree | d5e05a5a41fcbc7d5b0379a8d1c3114e51d5975c /aai-schema/src/main | |
parent | 6d285fbc7565709fdef1aedb1f534aae961acc61 (diff) | |
parent | cb57b1a16fcbf3faa2cbb7e8722a058ba76a2969 (diff) |
Merge "HPA Telemetry Schema"
Diffstat (limited to 'aai-schema/src/main')
-rw-r--r-- | aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_hpa_v14.json | 25 | ||||
-rw-r--r-- | aai-schema/src/main/resources/onap/oxm/v14/aai_oxm_v14.xml | 28 |
2 files changed, 53 insertions, 0 deletions
diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_hpa_v14.json b/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_hpa_v14.json index 11ea1b54..a2d44442 100644 --- a/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_hpa_v14.json +++ b/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_hpa_v14.json @@ -38,6 +38,31 @@ "prevent-delete": "NONE", "default": "true", "description":"" + }, + { + "from": "hpa-capacity", + "to": "pserver", + "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":"HPA Capacity KV for given compute node" + }, + { + "from": "flavor", + "to": "pserver", + "label": "org.onap.relationships.inventory.CanBeInstantiatedIn", + "direction": "OUT", + "multiplicity": "MANY2MANY", + "contains-other-v": "NONE", + "delete-other-v": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description":"HPA Capacity getting the compute nodes from given flavor" } ] } diff --git a/aai-schema/src/main/resources/onap/oxm/v14/aai_oxm_v14.xml b/aai-schema/src/main/resources/onap/oxm/v14/aai_oxm_v14.xml index 69bea338..263703b3 100644 --- a/aai-schema/src/main/resources/onap/oxm/v14/aai_oxm_v14.xml +++ b/aai-schema/src/main/resources/onap/oxm/v14/aai_oxm_v14.xml @@ -2111,6 +2111,7 @@ <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList"/> <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v14.PInterfaces"/> <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v14.LagInterfaces"/> + <xml-element container-type="java.util.ArrayList" java-attribute="hpaCapacity" name="hpa-capacity" type="inventory.aai.onap.org.v14.HpaCapacity"/> </java-attributes> <xml-properties> <xml-property name="description" value="Compute host whose hostname must be unique and must exactly match what is sent as a relationship to a vserver."/> @@ -2124,6 +2125,33 @@ </xml-properties> </java-type> + <java-type name="HpaCapacity"> + <xml-root-element name="hpa-capacity"/> + <java-attributes> + <xml-element java-attribute="hpaCapacityKey" name="hpa-capacity-key" required="true" type="java.lang.String" xml-key="true"> + <xml-properties> + <xml-property name="description" value="Composite key formed with hpaFeature and append list of hpaFeatureAttributes needed for capacity check"/> + </xml-properties> + </xml-element> + <xml-element java-attribute="hpaCapacityValue" name="hpa-capacity-value" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="JSON string specifying the capacity (total,free), unit and metadata of the specific HPA attribute"/> + </xml-properties> + </xml-element> + <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete."/> + </xml-properties> + </xml-element> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList"/> + </java-attributes> + <xml-properties> + <xml-property name="description" value="HPA Capacity information for compute node"/> + <xml-property name="indexedProps" value="hpa-capacity-key"/> + <xml-property name="dependentOn" value="hpa-capacity"/> + </xml-properties> + </java-type> + <java-type name="PInterfaces"> <xml-properties> <xml-property name="description" value="Collection of physical interfaces."/> |