Merge "minor fixes in GremlinQueryBuilder.java"

diff --git a/aai-core/src/main/java/org/onap/aai/domain/responseMessage/AAIResponseMessageData.java b/aai-core/src/main/java/org/onap/aai/domain/responseMessage/AAIResponseMessageData.java
index 49fb0c1..1f40906 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/domain/responseMessage/AAIResponseMessageData.java
+++ b/aai-core/src/main/java/org/onap/aai/domain/responseMessage/AAIResponseMessageData.java
@@ -4,6 +4,8 @@
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
+ * Modifications Copyright © 2018 IBM.
+ * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -39,39 +41,39 @@ import javax.xml.bind.annotation.XmlType;
 
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "", propOrder = {
-               "aaiResponseMessageDatum",
-               "any"
+        "aaiResponseMessageDatum",
+        "any"
 })
 @XmlRootElement(name = "aai-response-message-data", namespace = "http://org.onap.aai.inventory")
 public class AAIResponseMessageData {
 
-       @XmlElement(name = "aai-response-message-datum")
-       protected List<AAIResponseMessageDatum> aaiResponseMessageDatum;
-       @XmlAnyElement(lax = true)
-       protected List<Object> any;
+    @XmlElement(name = "aai-response-message-datum")
+    protected List<AAIResponseMessageDatum> aaiResponseMessageDatum;
+    @XmlAnyElement(lax = true)
+    protected List<Object> any;
 
-       /**
-        * Gets the AAI response message datum.
-        *
-        * @return the AAI response message datum
-        */
-       public List<AAIResponseMessageDatum> getAAIResponseMessageDatum() {
-               if (aaiResponseMessageDatum == null) {
-                       aaiResponseMessageDatum = new ArrayList<AAIResponseMessageDatum>();
-               }
-               return this.aaiResponseMessageDatum;
-       }
+    /**
+     * Gets the AAI response message datum.
+     *
+     * @return the AAI response message datum
+     */
+    public List<AAIResponseMessageDatum> getAAIResponseMessageDatum() {
+        if (aaiResponseMessageDatum == null) {
+            aaiResponseMessageDatum = new ArrayList<>();
+        }
+        return this.aaiResponseMessageDatum;
+    }
 
-       /**
-        * Gets the any.
-        *
-        * @return the any
-        */
-       public List<Object> getAny() {
-               if (any == null) {
-                       any = new ArrayList<Object>();
-               }
-               return this.any;
-       }
+    /**
+     * Gets the any.
+     *
+     * @return the any
+     */
+    public List<Object> getAny() {
+        if (any == null) {
+            any = new ArrayList<>();
+        }
+        return this.any;
+    }
 
 }

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 11ea1b5..a2d4444 100644 (file)
--- 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 69bea33..263703b 100644 (file)
--- 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."/>