Updating aai adapter to v19 model

[ccsdk/sli/adaptors.git] / aai-service / provider / src / main / java / org / onap / ccsdk / sli / adaptors / aai / query / Result.java

diff --git a/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/query/Result.java b/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/query/Result.java
index 0bff860..794effe 100755 (executable)
--- a/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/query/Result.java
+++ b/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/query/Result.java
@@ -30,17 +30,19 @@ import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
-import org.openecomp.aai.inventory.v11.CloudRegion;
-import org.openecomp.aai.inventory.v11.Complex;
-import org.openecomp.aai.inventory.v11.GenericVnf;
-import org.openecomp.aai.inventory.v11.L3InterfaceIpv4AddressList;
-import org.openecomp.aai.inventory.v11.L3InterfaceIpv6AddressList;
-import org.openecomp.aai.inventory.v11.L3Network;
-import org.openecomp.aai.inventory.v11.LInterface;
-import org.openecomp.aai.inventory.v11.Pserver;
-import org.openecomp.aai.inventory.v11.ServiceInstance;
-import org.openecomp.aai.inventory.v11.Vnfc;
-import org.openecomp.aai.inventory.v11.Vserver;
+import org.onap.aai.inventory.v19.CloudRegion;
+import org.onap.aai.inventory.v19.Complex;
+import org.onap.aai.inventory.v19.Configuration;
+import org.onap.aai.inventory.v19.GenericVnf;
+import org.onap.aai.inventory.v19.L3InterfaceIpv4AddressList;
+import org.onap.aai.inventory.v19.L3InterfaceIpv6AddressList;
+import org.onap.aai.inventory.v19.L3Network;
+import org.onap.aai.inventory.v19.LInterface;
+//import org.onap.aai.inventory.v19.OwningEntity;
+import org.onap.aai.inventory.v19.Pserver;
+import org.onap.aai.inventory.v19.ServiceInstance;
+import org.onap.aai.inventory.v19.Vnfc;
+import org.onap.aai.inventory.v19.Vserver;
 
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.fasterxml.jackson.annotation.JsonAnySetter;
@@ -49,8 +51,12 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "", propOrder = {
+    "resource-type",
+    "resource-link",
+    "url",
     "cloud-region",
     "complex",
+    "configuration",
     "generic-vnf",
     "l3-interface-ipv4-address-list",
     "l3-interface-ipv6-address-list",
@@ -65,10 +71,18 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 @XmlRootElement(name = "result")
 public class Result {
 
+    @XmlElement(name = "resource-type")
+    private String resourceType;
+    @XmlElement(name = "resource-link")
+    private String resourceLink;
+    @XmlElement(name = "url")
+    private String url;
     @XmlElement(name = "cloud-region")
     private CloudRegion cloudRegion;
     @XmlElement(name = "complex")
     private Complex complex;
+    @XmlElement(name = "configuration")
+    private Configuration configuration;
     @XmlElement(name = "generic-vnf")
     private GenericVnf genericVnf;
     @XmlElement(name = "l3-interface-ipv4-address-list")
@@ -79,6 +93,8 @@ public class Result {
     private L3Network l3Network;
     @XmlElement(name = "l-interface")
     private LInterface lInterface;
+//    @XmlElement(name = "owning-entity")
+//    private OwningEntity owningEntity;
     @XmlElement(name = "pserver")
     private Pserver pserver;
     @XmlElement(name = "service-instance")
@@ -110,6 +126,16 @@ public class Result {
         this.complex = complex;
     }
 
+    @XmlElement(name = "configuration")
+    public Configuration getConfiguration() {
+        return configuration;
+    }
+
+    @XmlElement(name = "configuration")
+    public void setConfiguration(Configuration configuration) {
+        this.configuration = configuration;
+    }
+
     @XmlElement(name = "generic-vnf")
     public GenericVnf getGenericVnf ()
     {
@@ -161,6 +187,16 @@ public class Result {
         this.lInterface = linterface;
     }
 
+//    @XmlElement(name = "owning-entity")
+//    public OwningEntity getOwningEntity() {
+//        return owningEntity;
+//    }
+
+//    @XmlElement(name = "owning-entity")
+//    public void setOwningEntity(OwningEntity owningEntity) {
+//        this.owningEntity = owningEntity;
+//    }
+
     @XmlElement(name = "pserver")
     public Pserver getPserver() {
         return pserver;
@@ -194,6 +230,7 @@ public class Result {
     public Vserver getVserver() {
         return vserver;
     }
+
     @XmlElement(name = "vserver")
     public void setVserver(Vserver vserver) {
         this.vserver = vserver;
@@ -214,4 +251,28 @@ public class Result {
     public void setAdditionalProperty(String name, Object value) {
         this.additionalProperties.put(name, value);
     }
+    @XmlElement(name = "resource-type")
+    public String getResourceType() {
+        return resourceType;
+    }
+    @XmlElement(name = "resource-type")
+    public void setResourceType(String resourceType) {
+        this.resourceType = resourceType;
+    }
+    @XmlElement(name = "resource-link")
+    public String getResourceLink() {
+        return resourceLink;
+    }
+    @XmlElement(name = "resource-link")
+    public void setResourceLink(String resourceLink) {
+        this.resourceLink = resourceLink;
+    }
+    @XmlElement(name = "url")
+    public String getUrl() {
+        return url;
+    }
+    @XmlElement(name = "url")
+    public void setUrl(String url) {
+        this.url = url;
+    }
 }