Update API from Demo feedback

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

8 files changed, 22 insertions, 39 deletions

diff --git a/src/main/java/org/onap/pomba/common/datatypes/Attribute.java b/src/main/java/org/onap/pomba/common/datatypes/Attribute.java
index 6a1f7b3..1bf32bc 100644
--- a/src/main/java/org/onap/pomba/common/datatypes/Attribute.java
+++ b/src/main/java/org/onap/pomba/common/datatypes/Attribute.java
@@ -30,7 +30,7 @@ public class Attribute {
     private String value;

     @Expose

     @SerializedName("dataQuality")

-    private DataQuality dataQuality = new DataQuality();

+    private DataQuality dataQuality = DataQuality.ok();

 

     public enum Name {

         adminState,

@@ -43,7 +43,8 @@ public class Attribute {
         physicalNetworkName,

         sharedNetworkBoolean,

         networkRole,

-        routerExternalBoolean

+        routerExternalBoolean,

+        imageId

     }

     public Name getName() {

         return name;

diff --git a/src/main/java/org/onap/pomba/common/datatypes/ModelContext.java b/src/main/java/org/onap/pomba/common/datatypes/ModelContext.java
index 592d68a..1fc8118 100644
--- a/src/main/java/org/onap/pomba/common/datatypes/ModelContext.java
+++ b/src/main/java/org/onap/pomba/common/datatypes/ModelContext.java
@@ -30,7 +30,7 @@ public class ModelContext {
     private Service service;

     @Expose

     @SerializedName("dataQuality")

-    private DataQuality dataQuality = new DataQuality();

+    private DataQuality dataQuality = DataQuality.ok();

     @Expose

     @SerializedName("attributeList")

     private List<Attribute> attributeList = new ArrayList<>();

diff --git a/src/main/java/org/onap/pomba/common/datatypes/Network.java b/src/main/java/org/onap/pomba/common/datatypes/Network.java
index 19c286c..171c6a5 100644
--- a/src/main/java/org/onap/pomba/common/datatypes/Network.java
+++ b/src/main/java/org/onap/pomba/common/datatypes/Network.java
@@ -34,11 +34,11 @@ public class Network {
     @SerializedName("uuid")

     private String uuid;

     @Expose

-    @SerializedName("nfNamingCode")

-    private String nfcNamingCode;

+    @SerializedName("type")

+    private String type;

     @Expose

     @SerializedName("dataQuality")

-    private DataQuality dataQuality = new DataQuality();

+    private DataQuality dataQuality = DataQuality.ok();

     @Expose

     @SerializedName("attributeList")

     private List<Attribute> attributeList = new ArrayList<>();

@@ -61,11 +61,11 @@ public class Network {
     public void setUuid(String uuid) {

         this.uuid = uuid;

     }

-    public String getNfcNamingCode() {

-        return nfcNamingCode;

+    public String getType() {

+        return type;

     }

-    public void setNfcNamingCode(String nfcType) {

-        this.nfcNamingCode = nfcType;

+    public void setType(String type) {

+        this.type = type;

     }

     public List<Attribute> getAttributes() {

         return attributeList;

diff --git a/src/main/java/org/onap/pomba/common/datatypes/Service.java b/src/main/java/org/onap/pomba/common/datatypes/Service.java
index b225b6a..1579434 100644
--- a/src/main/java/org/onap/pomba/common/datatypes/Service.java
+++ b/src/main/java/org/onap/pomba/common/datatypes/Service.java
@@ -36,7 +36,7 @@ public class Service {
     private String uuid;

     @Expose

     @SerializedName("dataQuality")

-    private DataQuality dataQuality = new DataQuality();

+    private DataQuality dataQuality = DataQuality.ok();

     @Expose

     @SerializedName("attributeList")

     private List<Attribute> attributeList = new ArrayList<>();

diff --git a/src/main/java/org/onap/pomba/common/datatypes/VF.java b/src/main/java/org/onap/pomba/common/datatypes/VF.java
index 7bbb962..ded7ae2 100644
--- a/src/main/java/org/onap/pomba/common/datatypes/VF.java
+++ b/src/main/java/org/onap/pomba/common/datatypes/VF.java
@@ -39,11 +39,8 @@ public class VF {
     @SerializedName("uuid")

     private String uuid;

     @Expose

-    @SerializedName("nfNamingCode")

-    private String nfNamingCode;

-    @Expose

     @SerializedName("dataQuality")

-    private DataQuality dataQuality = new DataQuality();

+    private DataQuality dataQuality = DataQuality.ok();

     @Expose

     @SerializedName("attributeList")

     private List<Attribute> attributeList = new ArrayList<>();

@@ -78,12 +75,6 @@ public class VF {
     public void setUuid(String uuid) {

         this.uuid = uuid;

     }

-    public String getNfNamingCode() {

-        return nfNamingCode;

-    }

-    public void setNfNamingCode(String nfNamingCode) {

-        this.nfNamingCode = nfNamingCode;

-    }

     public List<VFModule> getVfModules() {

         return vfModules;

     }

diff --git a/src/main/java/org/onap/pomba/common/datatypes/VFModule.java b/src/main/java/org/onap/pomba/common/datatypes/VFModule.java
index 876f6b2..9d19dc0 100644
--- a/src/main/java/org/onap/pomba/common/datatypes/VFModule.java
+++ b/src/main/java/org/onap/pomba/common/datatypes/VFModule.java
@@ -35,9 +35,6 @@ public class VFModule {
     @SerializedName("uuid")

     private String uuid;

     @Expose

-    @SerializedName("nfNamingCode")

-    private String nfNamingCode;

-    @Expose

     @SerializedName("maxInstances")

     private int maxInstances;

     @Expose

@@ -45,7 +42,7 @@ public class VFModule {
     private int minInstances;

     @Expose

     @SerializedName("dataQuality")

-    private DataQuality dataQuality = new DataQuality();

+    private DataQuality dataQuality = DataQuality.ok();

     @Expose

     @SerializedName("attributeList")

     private List<Attribute> attributeList = new ArrayList<>();

@@ -75,12 +72,6 @@ public class VFModule {
     public void setUuid(String uuid) {

         this.uuid = uuid;

     }

-    public String getNfNamingCode() {

-        return nfNamingCode;

-    }

-    public void setNfNamingCode(String nfNamingCode) {

-        this.nfNamingCode = nfNamingCode;

-    }

     public int getMaxInstances() {

         return maxInstances;

     }

diff --git a/src/main/java/org/onap/pomba/common/datatypes/VM.java b/src/main/java/org/onap/pomba/common/datatypes/VM.java
index 29f4c29..0b4be65 100644
--- a/src/main/java/org/onap/pomba/common/datatypes/VM.java
+++ b/src/main/java/org/onap/pomba/common/datatypes/VM.java
@@ -38,7 +38,7 @@ public class VM {
     private String nfcNamingCode;

     @Expose

     @SerializedName("dataQuality")

-    private DataQuality dataQuality = new DataQuality();

+    private DataQuality dataQuality = DataQuality.ok();

     @Expose

     @SerializedName("attributeList")

     private List<Attribute> attributeList = new ArrayList<>();

diff --git a/src/main/java/org/onap/pomba/common/datatypes/VNFC.java b/src/main/java/org/onap/pomba/common/datatypes/VNFC.java
index 66c852a..dd697d8 100644
--- a/src/main/java/org/onap/pomba/common/datatypes/VNFC.java
+++ b/src/main/java/org/onap/pomba/common/datatypes/VNFC.java
@@ -35,11 +35,11 @@ public class VNFC {
     @SerializedName("uuid")

     private String uuid;

     @Expose

-    @SerializedName("nfNamingCode")

-    private String nfcNamingCode;

+    @SerializedName("type")

+    private String type;

     @Expose

     @SerializedName("dataQuality")

-    private DataQuality dataQuality = new DataQuality();

+    private DataQuality dataQuality = DataQuality.ok();

     @Expose

     @SerializedName("attributeList")

     private List<Attribute> attributeList = new ArrayList<>();

@@ -62,11 +62,11 @@ public class VNFC {
     public void setUuid(String uuid) {

         this.uuid = uuid;

     }

-    public String getNfcNamingCode() {

-        return nfcNamingCode;

+    public String getType() {

+        return type;

     }

-    public void setNfcNamingCode(String nfcType) {

-        this.nfcNamingCode = nfcType;

+    public void setType(String type) {

+        this.type = type;

     }

     public List<Attribute> getAttributes() {

         return attributeList;