Attributes for GENERIC-RESOURCE-API and VNF-API

Extract Attributes for GENERIC-RESOURCE-API and VNF-API

Issue-ID: LOG-797
Change-Id: I6ae2727bd85069fc89d65c0083167ca69b343895
Signed-off-by: Tait,Trevor(rt0435) <rtait@amdocs.com>

5 files changed, 284 insertions, 4 deletions

diff --git a/src/main/java/org/onap/pomba/contextbuilder/sdnc/handlers/VnfApiHandler.java b/src/main/java/org/onap/pomba/contextbuilder/sdnc/handlers/VnfApiHandler.java
index e16ec40..c7d3971 100644
--- a/src/main/java/org/onap/pomba/contextbuilder/sdnc/handlers/VnfApiHandler.java
+++ b/src/main/java/org/onap/pomba/contextbuilder/sdnc/handlers/VnfApiHandler.java
@@ -23,7 +23,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import javax.ws.rs.client.Client;
-import javax.ws.rs.core.MediaType;
 import org.apache.camel.Exchange;
 import org.json.JSONArray;
 import org.json.JSONException;
diff --git a/src/main/java/org/onap/pomba/contextbuilder/sdnc/model/Image.java b/src/main/java/org/onap/pomba/contextbuilder/sdnc/model/Image.java
new file mode 100644
index 0000000..5ad0529
--- /dev/null
+++ b/src/main/java/org/onap/pomba/contextbuilder/sdnc/model/Image.java
@@ -0,0 +1,92 @@
+/*

+ * ============LICENSE_START===================================================

+ * Copyright (c) 2018 Amdocs

+ * ============================================================================

+ * 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

+ *

+ *        http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing, software

+ * distributed under the License is distributed on an "AS IS" BASIS,

+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+ * See the License for the specific language governing permissions and

+ * limitations under the License.

+ * ============LICENSE_END=====================================================

+ */

+

+package org.onap.pomba.contextbuilder.sdnc.model;

+

+import com.google.gson.annotations.Expose;

+import com.google.gson.annotations.SerializedName;

+

+public class Image {

+

+    @SerializedName("image-name")

+    @Expose

+    private String imageName;

+

+    private final static String NULL_STR = "<null>";

+

+    /**

+     * No args constructor for use in serialization

+     *

+     */

+    public Image() {

+    }

+

+    /**

+     *

+     * @param imageName

+     */

+    public Image(String imageName) {

+        super();

+        this.imageName = imageName;

+    }

+

+    public String getImageName() {

+        return imageName;

+    }

+

+    public void setImageName(String imageName) {

+        this.imageName = imageName;

+    }

+

+

+    @Override

+    public String toString() {

+        StringBuilder sb = new StringBuilder();

+        sb.append(Image.class.getName()).append('@').append(Integer.toHexString(System.identityHashCode(this))).append('[');

+        sb.append("imageName");

+        sb.append('=');

+        sb.append(((this.imageName == null)?NULL_STR:this.imageName));

+        sb.append(',');

+        if (sb.charAt((sb.length()- 1)) == ',') {

+            sb.setCharAt((sb.length()- 1), ']');

+        } else {

+            sb.append(']');

+        }

+        return sb.toString();

+    }

+

+    @Override

+    public int hashCode() {

+        int result = 1;

+        result = ((result* 31)+((this.imageName == null)? 0 :this.imageName.hashCode()));

+        return result;

+    }

+

+    @Override

+    public boolean equals(Object other) {

+        if (other == this) {

+            return true;

+        }

+        if (!(other instanceof Image)) {

+            return false;

+        }

+        Image rhs = ((Image) other);

+        return ((this.imageName == rhs.imageName)||((this.imageName!= null)&&this.imageName.equals(rhs.imageName)));

+    }

+

+}

diff --git a/src/main/java/org/onap/pomba/contextbuilder/sdnc/model/Pserver.java b/src/main/java/org/onap/pomba/contextbuilder/sdnc/model/Pserver.java
new file mode 100644
index 0000000..1c7a832
--- /dev/null
+++ b/src/main/java/org/onap/pomba/contextbuilder/sdnc/model/Pserver.java
@@ -0,0 +1,91 @@
+/*

+ * ============LICENSE_START===================================================

+ * Copyright (c) 2018 Amdocs

+ * ============================================================================

+ * 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

+ *

+ *        http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing, software

+ * distributed under the License is distributed on an "AS IS" BASIS,

+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+ * See the License for the specific language governing permissions and

+ * limitations under the License.

+ * ============LICENSE_END=====================================================

+ */

+

+package org.onap.pomba.contextbuilder.sdnc.model;

+

+import com.google.gson.annotations.Expose;

+import com.google.gson.annotations.SerializedName;

+

+public class Pserver {

+    @SerializedName("hostname")

+    @Expose

+    private String hostname;

+

+    private final static String NULL_STR = "<null>";

+

+    /**

+     * No args constructor for use in serialization

+     *

+     */

+    public Pserver() {

+    }

+

+    /**

+     *

+     * @param hostname

+     */

+    public Pserver(String hostname) {

+        super();

+        this.hostname = hostname;

+    }

+

+    public String getHostname() {

+        return hostname;

+    }

+

+    public void setHostname(String hostname) {

+        this.hostname = hostname;

+    }

+

+

+    @Override

+    public String toString() {

+        StringBuilder sb = new StringBuilder();

+        sb.append(Pserver.class.getName()).append('@').append(Integer.toHexString(System.identityHashCode(this))).append('[');

+        sb.append("hostname");

+        sb.append('=');

+        sb.append(((this.hostname == null)?NULL_STR:this.hostname));

+        sb.append(',');

+        if (sb.charAt((sb.length()- 1)) == ',') {

+            sb.setCharAt((sb.length()- 1), ']');

+        } else {

+            sb.append(']');

+        }

+        return sb.toString();

+    }

+

+    @Override

+    public int hashCode() {

+        int result = 1;

+        result = ((result* 31)+((this.hostname == null)? 0 :this.hostname.hashCode()));

+        return result;

+    }

+

+    @Override

+    public boolean equals(Object other) {

+        if (other == this) {

+            return true;

+        }

+        if (!(other instanceof Pserver)) {

+            return false;

+        }

+        Pserver rhs = ((Pserver) other);

+        return ((this.hostname == rhs.hostname)||((this.hostname!= null)&&this.hostname.equals(rhs.hostname)));

+    }

+

+}

diff --git a/src/main/java/org/onap/pomba/contextbuilder/sdnc/model/VnfTopologyIdentifier.java b/src/main/java/org/onap/pomba/contextbuilder/sdnc/model/VnfTopologyIdentifier.java
index 8dbf0c8..de22373 100644
--- a/src/main/java/org/onap/pomba/contextbuilder/sdnc/model/VnfTopologyIdentifier.java
+++ b/src/main/java/org/onap/pomba/contextbuilder/sdnc/model/VnfTopologyIdentifier.java
@@ -38,6 +38,20 @@ public class VnfTopologyIdentifier {
     @SerializedName("vnf-type")
     @Expose
     private String vnfType;
+    @SerializedName("inMaint")
+    @Expose
+    private String inMaint;
+    @SerializedName("prov-status")
+    @Expose
+    private String provStatus;
+    @SerializedName("pserver")
+    @Expose
+    private Pserver pserver;
+    @SerializedName("image")
+    @Expose
+    private Image image;
+
+
 
     private final static String NULL_STR = "<null>";
 
@@ -56,13 +70,17 @@ public class VnfTopologyIdentifier {
      * @param vnfType
      * @param genericVnfType
      */
-    public VnfTopologyIdentifier(String genericVnfType, String serviceType, String vnfName, String genericVnfName, String vnfType) {
+    public VnfTopologyIdentifier(String genericVnfType, String serviceType, String vnfName, String genericVnfName, String vnfType, String inMaint, String provStatus, Pserver pserver, Image image) {
         super();
         this.genericVnfType = genericVnfType;
         this.serviceType = serviceType;
         this.vnfName = vnfName;
         this.genericVnfName = genericVnfName;
         this.vnfType = vnfType;
+        this.inMaint = inMaint;
+        this.provStatus = provStatus;
+        this.pserver = pserver;
+        this.image = image;
     }
 
     public String getGenericVnfType() {
@@ -105,6 +123,39 @@ public class VnfTopologyIdentifier {
         this.vnfType = vnfType;
     }
 
+    public String getInMaint() {
+        return inMaint;
+    }
+
+    public void setInMaint(String inMaint) {
+        this.inMaint = inMaint;
+    }
+
+    public String getProvStatus() {
+        return provStatus;
+    }
+
+    public void setProvStatus(String provStatus) {
+        this.provStatus = provStatus;
+    }
+
+    public Pserver getPserver() {
+        return pserver;
+    }
+
+    public void setPserver(Pserver pserver) {
+        this.pserver = pserver;
+    }
+
+    public Image getImage() {
+        return image;
+    }
+
+    public void setImage(Image image) {
+        this.image = image;
+    }
+
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -129,6 +180,15 @@ public class VnfTopologyIdentifier {
         sb.append('=');
         sb.append(((this.vnfType == null)?NULL_STR:this.vnfType));
         sb.append(',');
+        sb.append("inMaint");
+        sb.append('=');
+        sb.append(((this.inMaint == null)?NULL_STR:this.inMaint));
+        sb.append(',');
+        sb.append("provStatus");
+        sb.append('=');
+        sb.append(((this.provStatus == null)?NULL_STR:this.provStatus));
+        sb.append(',');
+
         if (sb.charAt((sb.length()- 1)) == ',') {
             sb.setCharAt((sb.length()- 1), ']');
         } else {
@@ -145,6 +205,10 @@ public class VnfTopologyIdentifier {
         result = ((result* 31)+((this.genericVnfName == null)? 0 :this.genericVnfName.hashCode()));
         result = ((result* 31)+((this.vnfType == null)? 0 :this.vnfType.hashCode()));
         result = ((result* 31)+((this.genericVnfType == null)? 0 :this.genericVnfType.hashCode()));
+        result = ((result* 31)+((this.inMaint == null)? 0 :this.inMaint.hashCode()));
+        result = ((result* 31)+((this.provStatus == null)? 0 :this.provStatus.hashCode()));
+        result = ((result* 31)+((this.pserver == null)? 0 :this.pserver.hashCode()));
+        result = ((result* 31)+((this.image == null)? 0 :this.image.hashCode()));
         return result;
     }
 
diff --git a/src/main/java/org/onap/pomba/contextbuilder/sdnc/util/RestUtil.java b/src/main/java/org/onap/pomba/contextbuilder/sdnc/util/RestUtil.java
index 4575230..ad91155 100644
--- a/src/main/java/org/onap/pomba/contextbuilder/sdnc/util/RestUtil.java
+++ b/src/main/java/org/onap/pomba/contextbuilder/sdnc/util/RestUtil.java
@@ -43,6 +43,8 @@ import org.json.JSONException;
 import org.json.JSONObject;
 import org.onap.aai.restclient.client.OperationResult;
 import org.onap.aai.restclient.client.RestClient;
+import org.onap.pomba.common.datatypes.Attribute;
+import org.onap.pomba.common.datatypes.Attribute.Name;
 import org.onap.pomba.common.datatypes.ModelContext;
 import org.onap.pomba.common.datatypes.Service;
 import org.onap.pomba.common.datatypes.VF;
@@ -202,8 +204,8 @@ public class RestUtil {
     }
 
 
-    public static ModelContext transformGenericResource(String sdncResponse, String specPath) {
-        List<Object> jsonSpec = JsonUtils.filepathToList(specPath);
+    public static ModelContext transformGenericResource(String sdncResponse, String SPEC_PATH) {
+        List<Object> jsonSpec = JsonUtils.filepathToList(SPEC_PATH);
         Object jsonInput = JsonUtils.jsonToObject(sdncResponse);
         Chainr chainr = Chainr.fromSpec(jsonSpec);
         Object transObject = chainr.transform(jsonInput);
@@ -249,6 +251,38 @@ public class RestUtil {
                         if (vf.getType().contentEquals("null")) {
                             vf.setType(vnfTopologyId.getGenericVnfType());
                         }
+                        if (vf.getAttributes().isEmpty()) {
+                            if ((null != vnfTopologyId.getInMaint()) &&  !(vnfTopologyId.getInMaint().isEmpty())) {
+                                Attribute  lockedBoolean = new Attribute();
+                                lockedBoolean.setName(Name.lockedBoolean);
+                                lockedBoolean.setValue(vnfTopologyId.getInMaint());
+                                vf.addAttribute(lockedBoolean);
+                            }
+                            if ((null != vnfTopologyId.getProvStatus()) &&  !(vnfTopologyId.getProvStatus().isEmpty())) {
+                                Attribute provStatus = new Attribute();
+                             // attribute.setName(Name.provStatus);
+                                provStatus.setValue(vnfTopologyId.getProvStatus());
+                                vf.addAttribute(provStatus);
+                            }
+                            if (null != vnfTopologyId.getPserver()) {
+                                if ((null != vnfTopologyId.getPserver().getHostname()) && !(vnfTopologyId.getPserver().getHostname().isEmpty())) {
+                                    Attribute  hostname = new Attribute();
+                                    hostname.setName(Name.hostName);
+                                    hostname.setValue(vnfTopologyId.getPserver().getHostname());
+                                    vf.addAttribute(hostname);
+
+                                }
+                            }
+                            if (null != vnfTopologyId.getImage()) {
+                                if ((null != vnfTopologyId.getImage().getImageName()) && !(vnfTopologyId.getImage().getImageName().isEmpty())) {
+                                    Attribute  imageName = new Attribute();
+                                    imageName.setName(Name.imageId);
+                                    imageName.setValue(vnfTopologyId.getImage().getImageName());
+                                    vf.addAttribute(imageName);
+
+                                }
+                            }
+                        }
                     }
                 }
             } catch (Exception e) {