Jakarta changes in slice-analysis-ms for IBN Cloud leased line update and CCVPN closed-loop. This commit contains work in sub-task: 1) AAI monitor thread; 2) bandwidth evaluator; 3) policy notification code.1.1.0-slice-analysis-ms

Issue-ID: DCAEGEN2-3063
Signed-off-by: decheng zhang <decheng.zhang@huawei.com>
Change-Id: I9029ffd7563e65be59f7fd76adc2a749ff624172
Signed-off-by: decheng zhang <decheng.zhang@huawei.com>

4 files changed, 252 insertions, 88 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;
+    }
 }
diff --git a/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/policy/Payload.java b/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/policy/Payload.java
index d96850cb..e3351541 100644
--- a/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/policy/Payload.java
+++ b/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/policy/Payload.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.
@@ -20,64 +21,73 @@
  *******************************************************************************/
 package org.onap.slice.analysis.ms.models.policy;
 
-/** 
- * Model class for the Paylaod Object 
+/**
+ * Model class for the Paylaod Object
  */
 public class Payload {
 
-	private String name;
-	private String serviceInstanceID;
-	private String globalSubscriberId;
-	private String subscriptionServiceType;
-	private String networkType;
-	private AdditionalProperties<?> additionalProperties;
+    private String name;
+    private String serviceInstanceID;
+    private String globalSubscriberId;
+    private String subscriptionServiceType;
+    private String networkType;
+    private AdditionalProperties<?> additionalProperties;
+    private String serviceType;
 
-	public String getName() {
-		return name;
-	}
+    public String getName() {
+        return name;
+    }
 
-	public void setName(String name) {
-		this.name = name;
-	}
+    public void setName(String name) {
+        this.name = name;
+    }
 
-	public String getServiceInstanceID() {
-		return serviceInstanceID;
-	}
+    public String getServiceInstanceID() {
+        return serviceInstanceID;
+    }
 
-	public void setServiceInstanceID(String serviceInstanceId) {
-		this.serviceInstanceID = serviceInstanceId;
-	}
+    public void setServiceInstanceID(String serviceInstanceId) {
+        this.serviceInstanceID = serviceInstanceId;
+    }
 
-	public String getGlobalSubscriberId() {
-		return globalSubscriberId;
-	}
+    public String getGlobalSubscriberId() {
+        return globalSubscriberId;
+    }
 
-	public void setGlobalSubscriberId(String globalSubscriberId) {
-		this.globalSubscriberId = globalSubscriberId;
-	}
+    public void setGlobalSubscriberId(String globalSubscriberId) {
+        this.globalSubscriberId = globalSubscriberId;
+    }
 
-	public String getSubscriptionServiceType() {
-		return subscriptionServiceType;
-	}
+    public String getSubscriptionServiceType() {
+        return subscriptionServiceType;
+    }
 
-	public void setSubscriptionServiceType(String subscriptionServiceType) {
-		this.subscriptionServiceType = subscriptionServiceType;
-	}
+    public void setSubscriptionServiceType(String subscriptionServiceType) {
+        this.subscriptionServiceType = subscriptionServiceType;
+    }
 
-	public String getNetworkType() {
-		return networkType;
-	}
+    public String getNetworkType() {
+        return networkType;
+    }
 
-	public void setNetworkType(String networkType) {
-		this.networkType = networkType;
-	}
+    public void setNetworkType(String networkType) {
+        this.networkType = networkType;
+    }
 
-	public AdditionalProperties<?> getAdditionalProperties() {
-		return additionalProperties;
-	}
+    public AdditionalProperties<?> getAdditionalProperties() {
+        return additionalProperties;
+    }
 
-	public void setAdditionalProperties(AdditionalProperties<?> additionalProperties) {
-		this.additionalProperties = additionalProperties;
-	}
+    public void setAdditionalProperties(AdditionalProperties<?> additionalProperties) {
+        this.additionalProperties = additionalProperties;
+    }
+
+    public String getServiceType() {
+        return serviceType;
+    }
+
+    public void setServiceType(String serviceType) {
+        this.serviceType = serviceType;
+    }
 
 }
diff --git a/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/policy/Sla.java b/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/policy/Sla.java
new file mode 100644
index 00000000..2d6451aa
--- /dev/null
+++ b/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/policy/Sla.java
@@ -0,0 +1,66 @@
+/*******************************************************************************
+ *  ============LICENSE_START=======================================================
+ *  slice-analysis-ms
+ *  ================================================================================
+ *   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.
+ *     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.slice.analysis.ms.models.policy;
+
+/**
+ * Model class for payload.additionalProperties.transportNetworks.sla
+ */
+public class Sla {
+
+    private int latency;
+    private int maxBandwidth;
+
+    /**
+     * No args constructor for use in serialization
+     *
+     */
+    public Sla() {
+    }
+
+    /**
+     *
+     * @param maxBandwidth
+     * @param latency
+     */
+    public Sla(int latency, int maxBandwidth) {
+        super();
+        this.latency = latency;
+        this.maxBandwidth = maxBandwidth;
+    }
+
+    public int getLatency() {
+        return latency;
+    }
+
+    public void setLatency(int latency) {
+        this.latency = latency;
+    }
+
+    public int getMaxBandwidth() {
+        return maxBandwidth;
+    }
+
+    public void setMaxBandwidth(int maxBandwidth) {
+        this.maxBandwidth = maxBandwidth;
+    }
+
+}
diff --git a/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/policy/TransportNetwork.java b/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/policy/TransportNetwork.java
new file mode 100644
index 00000000..46881806
--- /dev/null
+++ b/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/policy/TransportNetwork.java
@@ -0,0 +1,65 @@
+/*******************************************************************************
+ *  ============LICENSE_START=======================================================
+ *  slice-analysis-ms
+ *  ================================================================================
+ *   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.
+ *     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.slice.analysis.ms.models.policy;
+
+/**
+ * Model class TransportNetwork inside payload.additionalProperties for CCVPN closeLoop
+ */
+public class TransportNetwork {
+
+    private String id;
+    private Sla sla;
+
+    /**
+     * No args constructor for use in serialization
+     *
+     */
+    public TransportNetwork() {
+    }
+
+    /**
+     *
+     * @param sla
+     * @param id
+     */
+    public TransportNetwork(String id, Sla sla) {
+        this.id = id;
+        this.sla = sla;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public Sla getSla() {
+        return sla;
+    }
+
+    public void setSla(Sla sla) {
+        this.sla = sla;
+    }
+
+}