diff options
Diffstat (limited to 'ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/VnfEntity.java')
| -rw-r--r-- | ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/VnfEntity.java | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/VnfEntity.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/VnfEntity.java index 88497fc..2d09546 100644 --- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/VnfEntity.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/VnfEntity.java @@ -95,6 +95,9 @@ public class VnfEntity implements Serializable { /** */ private String name; + /** */ + private String resourceVersion; + private static final long serialVersionUID = 1L; public String getId() { @@ -304,9 +307,41 @@ public class VnfEntity implements Serializable { vnfEntity.setMaxRam(JsonUtil.getJsonFieldInt(jsonObject, "maxRam")); vnfEntity.setMaxShd(JsonUtil.getJsonFieldInt(jsonObject, "maxShd")); vnfEntity.setMaxNet(JsonUtil.getJsonFieldInt(jsonObject, "maxNet")); + vnfEntity.setResourceVersion(JsonUtil.getJsonFieldStr(jsonObject, "resource-version")); + return vnfEntity; + } + + public static VnfEntity toEntityFromAai(JSONObject jsonObject) { + VnfEntity vnfEntity = new VnfEntity(); + vnfEntity.setVnfInstanceId(JsonUtil.getJsonFieldStr(jsonObject, "vnf-id")); + vnfEntity.setVnfInstanceName(JsonUtil.getJsonFieldStr(jsonObject, "vnf-name")); + vnfEntity.setName(JsonUtil.getJsonFieldStr(jsonObject, "vnf-name2")); + vnfEntity.setNsId(JsonUtil.getJsonFieldStr(jsonObject, "service-id")); + vnfEntity.setVnfStatus(JsonUtil.getJsonFieldStr(jsonObject, "orchestration-status")); + vnfEntity.setVnfType(JsonUtil.getJsonFieldStr(jsonObject, "vnf-type")); + vnfEntity.setMaxCpu(JsonUtil.getJsonFieldInt(jsonObject, "vcpu")); + vnfEntity.setMaxDisk(JsonUtil.getJsonFieldInt(jsonObject, "vdisk")); + vnfEntity.setMaxRam(JsonUtil.getJsonFieldInt(jsonObject, "vmemory")); + vnfEntity.setMaxShd(JsonUtil.getJsonFieldInt(jsonObject, "vdisk-units")); + vnfEntity.setResourceVersion(JsonUtil.getJsonFieldStr(jsonObject, "resource-version")); return vnfEntity; } + public String toStringForAai() { + + JSONObject vnfResJson = new JSONObject(); + vnfResJson.put("vnf-id", StringUtils.trimToEmpty(this.getVnfInstanceId())); + vnfResJson.put("vnf-name", StringUtils.trimToEmpty(this.getVnfInstanceName())); + vnfResJson.put("vnf-name2", StringUtils.trimToEmpty(this.getName())); + vnfResJson.put("service-id", StringUtils.trimToEmpty(this.getNsId())); + vnfResJson.put("vnf-type", StringUtils.trimToEmpty(this.getVnfType())); + vnfResJson.put("vcpu", this.getMaxCpu()); + vnfResJson.put("vdisk", this.getMaxDisk()); + vnfResJson.put("vmemory", this.getMaxRam()); + vnfResJson.put("vdisk-units", this.getMaxShd()); + return vnfResJson.toString(); + } + @Override public String toString() { JSONObject vnfResJson = new JSONObject(); @@ -334,4 +369,12 @@ public class VnfEntity implements Serializable { vnfResJson.put("maxNet", StringUtils.trimToEmpty(this.getName())); return vnfResJson.toString(); } + + public String getResourceVersion() { + return resourceVersion; + } + + public void setResourceVersion(String resourceVersion) { + this.resourceVersion = resourceVersion; + } } |