Merge "ORAN Alignment - initial config updates and PM data updates for SON usecase"

6 files changed, 263 insertions, 1 deletions

diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/AttributesNRRelation.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/AttributesNRRelation.java
new file mode 100644
index 0000000..791c78d
--- /dev/null
+++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/AttributesNRRelation.java
@@ -0,0 +1,48 @@
+/*
+ * ============LICENSE_START=======================================================
+ * Ran Simulator Controller
+ ** ================================================================================
+ ** Copyright (C) 2022 Wipro 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.ransim.websocket.model;
+
+ import com.fasterxml.jackson.annotation.JsonInclude;
+ import com.fasterxml.jackson.annotation.JsonProperty;
+
+ @JsonInclude(JsonInclude.Include.NON_NULL)
+ public class AttributesNRRelation {
+	
+	 private Integer nRTCI;
+         private boolean isHOAllowed;
+
+	 public Integer getNRTCI() {
+		 return nRTCI;
+	 }
+
+	 public void setNRTCI(Integer nRTCI) {
+		 this.nRTCI = nRTCI;
+	 }
+
+	 public boolean getIsHOAllowed() {
+		 return isHOAllowed;
+	 }
+
+	 public void setIsHoAllowed(boolean isHOAllowed) {
+		 this.isHOAllowed = isHOAllowed;
+	 }
+ }
+
diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/CommonEventHeaderPm.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/CommonEventHeaderPm.java
index e31a62c..a023286 100644
--- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/CommonEventHeaderPm.java
+++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/CommonEventHeaderPm.java
@@ -24,6 +24,7 @@ public class CommonEventHeaderPm {
 
     private String sourceName;
     private String sourceUuid;
+    private String reportingEntityName;
     private long startEpochMicrosec;
     private long lastEpochMicrosec;
 
@@ -58,5 +59,15 @@ public class CommonEventHeaderPm {
     public void setLastEpochMicrosec(long lastEpochMicrosec) {
         this.lastEpochMicrosec = lastEpochMicrosec;
     }
+    public void setReportingEntityName(String reportingEntityName) { this.reportingEntityName = reportingEntityName; }
+
+    public String getReportingEntityName(){ return reportingEntityName; }
+
+    @Override
+	public String toString() {
+		return "CommonEventHeaderPm [sourceName=" + sourceName + ", sourceUuid=" + sourceUuid + ", reportingEntityName="
+				+ reportingEntityName + ", startEpochMicrosec=" + startEpochMicrosec + ", lastEpochMicrosec="
+				+ lastEpochMicrosec + "]";
+	}
 
 }
diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/GNBCUCPFunction.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/GNBCUCPFunction.java
new file mode 100644
index 0000000..2d228e0
--- /dev/null
+++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/GNBCUCPFunction.java
@@ -0,0 +1,71 @@
+/*
+ * =============LICENSE_START=======================================================
+ * Ran Simulator Controller
+ ** ================================================================================
+ ** Copyright (C) 2022 Wipro 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.ransim.websocket.model;
+
+ import com.fasterxml.jackson.annotation.JsonProperty;
+ import com.fasterxml.jackson.annotation.JsonInclude;
+
+ import java.util.List;
+
+ @JsonInclude(JsonInclude.Include.NON_NULL)
+ public class GNBCUCPFunction {
+      
+	 private String idGNBCUCPFunction;
+	 private Attributes attributes;
+
+	 @JsonProperty("NRCellCU")
+	 public List<NRCellCU> nRCellCU;
+
+
+	 public String getIdGNBCUCPFunction() {
+		 return idGNBCUCPFunction;
+	 }
+
+
+	 public void setIdGNBCUCPFunction(String idGNBCUCPFunction) {
+		 this.idGNBCUCPFunction = idGNBCUCPFunction;
+	 }
+
+
+	 public Attributes getAttributes() {
+		 return attributes;
+	 }
+
+
+	 public void setAttributes(Attributes attributes) {
+		 this.attributes = attributes;
+	 }
+
+
+	 public List<NRCellCU> getnRCellCU() {
+		 return nRCellCU;
+	 }
+
+
+	 public void setnRCellCU(List<NRCellCU> nRCellCU) {
+		 this.nRCellCU = nRCellCU;
+	 }
+
+
+	 public GNBCUCPFunction() {
+	 } 
+ }
+
diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/NRCellCU.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/NRCellCU.java
new file mode 100644
index 0000000..9f83f8d
--- /dev/null
+++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/NRCellCU.java
@@ -0,0 +1,73 @@
+/* ==============LICENSE_START=======================================================
+ * Ran Simulator Controller
+ ** ================================================================================
+ ** Copyright (C) 2022 Wipro 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.ransim.websocket.model;
+
+ import com.fasterxml.jackson.annotation.JsonInclude;
+ import com.fasterxml.jackson.annotation.JsonProperty;
+
+ import java.util.List;
+
+ @JsonInclude(JsonInclude.Include.NON_NULL)
+ public class NRCellCU {
+
+       private String idNRCellCU;
+       private Attributes attributes;
+
+       @JsonProperty("NRCellRelation")
+       private List<NRCellRelation> NRCellRelation;
+
+       public NRCellCU() {
+       }
+
+       public String getIdNRCellCU() {
+	       return idNRCellCU;
+       }
+
+       public void setIdNRCellCU(String idNRCellCU) {
+	       this.idNRCellCU = idNRCellCU;
+       }
+
+       public Attributes getAttributes() {
+	       return attributes;
+       }
+
+       public void setAttributes(Attributes attributes) {
+	       this.attributes = attributes;
+       }
+
+       public List<NRCellRelation> getNRCellRelation() {
+	       return NRCellRelation;
+       }
+
+       public void setNRCellRelation(List<NRCellRelation> NRCellRelation) {
+	       this.NRCellRelation = NRCellRelation;
+       }
+
+       public NRCellCU(Attributes attributes) {
+	       super();
+	       this.attributes = attributes;
+       }
+
+       public NRCellCU(List<NRCellRelation> NRCellRelation) {
+	       super();
+	       this.NRCellRelation = NRCellRelation;
+       }
+ }
+
diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/NRCellRelation.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/NRCellRelation.java
new file mode 100644
index 0000000..f419df8
--- /dev/null
+++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/NRCellRelation.java
@@ -0,0 +1,52 @@
+/*
+ * ============LICENSE_START=======================================================
+ * Ran Simulator Controller
+ ** ================================================================================
+ ** Copyright (C) 2022 Wipro 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.ransim.websocket.model;
+
+ import com.fasterxml.jackson.annotation.JsonInclude;
+
+ @JsonInclude(JsonInclude.Include.NON_NULL)
+ public class NRCellRelation {
+
+      private Integer idNRCellRelation;
+      private AttributesNRRelation attributes;
+
+
+      public NRCellRelation() {
+      }
+
+      public Integer getIdNRCellRelation(){ return idNRCellRelation; }
+
+      public void setIdNRCellRelation(Integer idNRCellRelation){ this.idNRCellRelation = idNRCellRelation; }
+
+      public AttributesNRRelation getAttributes() {
+	      return attributes;
+      }
+
+      public void setAttributes(AttributesNRRelation attributes) {
+	      this.attributes = attributes;
+      }
+
+      public NRCellRelation(AttributesNRRelation attributes) {
+	      super();
+	      this.attributes = attributes;
+      }
+ }
+
diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/NearRTRIC.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/NearRTRIC.java
index 0178fa1..439ca8a 100644
--- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/NearRTRIC.java
+++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/NearRTRIC.java
@@ -38,6 +38,9 @@ public class NearRTRIC {
     @JsonProperty("GNBCUUPFunction")
     private List<GNBCUUPFunction> gNBCUUPFunction;
 
+    @JsonProperty("GNBCUCPFunction")
+    private List<GNBCUCPFunction> gNBCUCPFunction;
+
     public String getIdNearRTRIC() {
         return idNearRTRIC;
     }
@@ -71,6 +74,10 @@ public class NearRTRIC {
     }
 
     public NearRTRIC() {
-
     }
+    
+    public void setgNBCUCPFunction(List<GNBCUCPFunction> gNBCUCPFunctionList) { this.gNBCUCPFunction = gNBCUCPFunction;  }
+
+    public List<GNBCUCPFunction> getgNBCUCPFunction(){ return gNBCUCPFunction;}
+    
 }