Merge from ECOMP's repository

[vid.git] / vid-app-common / src / main / java / org / onap / vid / aai / model / Properties.java

diff --git a/vid-app-common/src/main/java/org/onap/vid/aai/model/Properties.java b/vid-app-common/src/main/java/org/onap/vid/aai/model/Properties.java
index 6fecbed..dec632e 100644 (file)
--- a/vid-app-common/src/main/java/org/onap/vid/aai/model/Properties.java
+++ b/vid-app-common/src/main/java/org/onap/vid/aai/model/Properties.java
@@ -1,23 +1,38 @@
 package org.onap.vid.aai.model;
 
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.HashMap;
+import java.util.Map;
 
-@JsonIgnoreProperties(ignoreUnknown = true)
 public class Properties {
 
-    private final String interfaceName;
-    private final String interfaceId;
-    private final Boolean isPortMirrored;
+    //properties for l-interface node-type
+    @JsonProperty("interface-name")
+    private String interfaceName;
 
-    public Properties(
-            @JsonProperty("interface-name") String interfaceName,
-            @JsonProperty("interface-id") String interfaceId,
-            @JsonProperty("is-port-mirrored") Boolean isPortMirrored) {
-        this.interfaceName = interfaceName;
-        this.interfaceId = interfaceId;
-        this.isPortMirrored = isPortMirrored;
-    }
+    @JsonProperty("interface-id")
+    private String interfaceId;
+
+    @JsonProperty("is-port-mirrored")
+    private Boolean isPortMirrored;
+
+    //properties for tenant node-type
+    @JsonProperty("tenant-id")
+    private String tenantId;
+
+    @JsonProperty("tenant-name")
+    private String tenantName;
+
+    //properties for cloud-region node-type
+    @JsonProperty("cloud-region-id")
+    private String cloudRegionId;
+
+    private Map<String, String> additionalProperties = new HashMap<>();
+
+    public Properties(){}
 
     public String getInterfaceName() {
         return interfaceName;
@@ -30,4 +45,38 @@ public class Properties {
     public Boolean getIsPortMirrored() {
         return isPortMirrored;
     }
+
+    public String getTenantId() {
+        return tenantId;
+    }
+
+    public void setTenantId(String tenantId) {
+        this.tenantId = tenantId;
+    }
+
+    public String getTenantName() {
+        return tenantName;
+    }
+
+    public void setTenantName(String tenantName) {
+        this.tenantName = tenantName;
+    }
+
+    public String getCloudRegionId() {
+        return cloudRegionId;
+    }
+
+    public void setCloudRegionId(String cloudRegionId) {
+        this.cloudRegionId = cloudRegionId;
+    }
+
+    @JsonAnyGetter
+    public Map<String, String> getAdditionalProperties() {
+        return additionalProperties;
+    }
+
+    @JsonAnySetter
+    public void setAdditionalProperties(String name, String value) {
+        additionalProperties.put(name, value);
+    }
 }