1 files changed, 67 insertions, 44 deletions
diff --git a/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/policy/AdditionalProperties.java b/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/policy/AdditionalProperties.java
index 24c1dd2f..30d1b357 100644
--- a/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/policy/AdditionalProperties.java
+++ b/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/policy/AdditionalProperties.java
@@ -3,6 +3,7 @@
  *  slice-analysis-ms
  *  ================================================================================
  *   Copyright (C) 2020 Wipro Limited.
+ *   Copyright (C) 2022 Huawei Canada Limited.
  *   ==============================================================================
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
@@ -21,54 +22,76 @@
 
 package org.onap.slice.analysis.ms.models.policy;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-/** 
- * Model class for the AdditionalProperties Object 
+/**
+ * Model class for the AdditionalProperties Object
  */
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class AdditionalProperties<T> {
-	private String modifyAction;
-	private List<String> snssaiList;
-	private String sliceProfileId;
-	private T resourceConfig;
-	private Map<String, String> nsiInfo;
-	private String scriptName;
-	public String getModifyAction() {
-		return modifyAction;
-	}
-	public void setModifyAction(String modifyAction) {
-		this.modifyAction = modifyAction;
-	}
-	public List<String> getSnssaiList() {
-		return snssaiList;
-	}
-	public void setSnssaiList(List<String> snssaiList) {
-		this.snssaiList = snssaiList;
-	}
-	public String getSliceProfileId() {
-		return sliceProfileId;
-	}
-	public void setSliceProfileId(String sliceProfileId) {
-		this.sliceProfileId = sliceProfileId;
-	}
-	public T getResourceConfig() {
-		return resourceConfig;
-	}
-	public void setResourceConfig(T resourceConfig) {
-		this.resourceConfig = resourceConfig;
-	}
-	public Map<String, String> getNsiInfo() {
-		return nsiInfo;
-	}
-	public void setNsiInfo(Map<String, String> nsiInfo) {
-		this.nsiInfo = nsiInfo;
-	}
-	public String getScriptName() {
-		return scriptName;
-	}
-	public void setScriptName(String scriptName) {
-		this.scriptName = scriptName;
-	}
+    private String modifyAction;
+    private List<String> snssaiList;
+    private String sliceProfileId;
+    private T resourceConfig;
+    private Map<String, String> nsiInfo;
+    private String scriptName;
+    // Extra attributes for CCVPN CloseLoop
+    private String enableSdnc;
+    private List<TransportNetwork> transportNetworks;
 
+    public String getModifyAction() {
+        return modifyAction;
+    }
+    public void setModifyAction(String modifyAction) {
+        this.modifyAction = modifyAction;
+    }
+    public List<String> getSnssaiList() {
+        return snssaiList;
+    }
+    public void setSnssaiList(List<String> snssaiList) {
+        this.snssaiList = snssaiList;
+    }
+    public String getSliceProfileId() {
+        return sliceProfileId;
+    }
+    public void setSliceProfileId(String sliceProfileId) {
+        this.sliceProfileId = sliceProfileId;
+    }
+    public T getResourceConfig() {
+        return resourceConfig;
+    }
+    public void setResourceConfig(T resourceConfig) {
+        this.resourceConfig = resourceConfig;
+    }
+    public Map<String, String> getNsiInfo() {
+        return nsiInfo;
+    }
+    public void setNsiInfo(Map<String, String> nsiInfo) {
+        this.nsiInfo = nsiInfo;
+    }
+    public String getScriptName() {
+        return scriptName;
+    }
+    public void setScriptName(String scriptName) {
+        this.scriptName = scriptName;
+    }
+    // Extra attributes setter/getter for CCVPN CloseLoop
+    public String getEnableSdnc() {
+        return enableSdnc;
+    }
+
+    public void setEnableSdnc(String enableSdnc) {
+        this.enableSdnc = enableSdnc;
+    }
+
+    public List<TransportNetwork> getTransportNetworks() {
+        return transportNetworks;
+    }
+
+    public void setTransportNetworks(List<TransportNetwork> transportNetworks) {
+        this.transportNetworks = transportNetworks;
+    }
 }