aboutsummaryrefslogtreecommitdiffstats
path: root/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models
diff options
context:
space:
mode:
Diffstat (limited to 'ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models')
-rw-r--r--ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/FileFooter.java101
-rw-r--r--ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/FileHeader.java193
-rw-r--r--ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/FileSender.java115
-rw-r--r--ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/GranularityPeriod.java127
-rw-r--r--ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/Job.java107
-rw-r--r--ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/ManagedElement.java141
-rw-r--r--ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/MeasCollec.java105
-rw-r--r--ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/MeasCollecEnd.java79
-rw-r--r--ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/MeasCollecFile.java151
-rw-r--r--ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/MeasData.java127
-rw-r--r--ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/MeasInfo.java215
-rw-r--r--ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/MeasResult.java77
-rw-r--r--ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/MeasType.java131
-rw-r--r--ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/MeasValue.java153
-rw-r--r--ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/ReportingPeriod.java101
-rw-r--r--ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/Result.java129
16 files changed, 1018 insertions, 1034 deletions
diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/FileFooter.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/FileFooter.java
index 75c0ea0..97abfbb 100644
--- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/FileFooter.java
+++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/FileFooter.java
@@ -1,51 +1,50 @@
-/*
- * ============LICENSE_START=======================================================
- * Ran Simulator Controller
- * ================================================================================
- * Copyright (C) 2020-2021 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.rest.xml.models;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlRootElement
-public class FileFooter {
- private MeasCollecEnd measCollec;
-
- public FileFooter() {
-
- }
-
- public FileFooter(MeasCollecEnd measCollec) {
- super();
- this.measCollec = measCollec;
- }
-
- public MeasCollecEnd getMeasCollec() {
- return measCollec;
- }
-
- public void setMeasCollec(MeasCollecEnd measCollec) {
- this.measCollec = measCollec;
- }
-
- @Override
- public String toString() {
- return "FileFooter [measCollec=" + measCollec + "]";
- }
-}
-
+/*
+ * ============LICENSE_START=======================================================
+ * Ran Simulator Controller
+ * ================================================================================
+ * Copyright (C) 2020-2021 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.rest.xml.models;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement
+public class FileFooter {
+ private MeasCollecEnd measCollec;
+
+ public FileFooter() {
+
+ }
+
+ public FileFooter(MeasCollecEnd measCollec) {
+ super();
+ this.measCollec = measCollec;
+ }
+
+ public MeasCollecEnd getMeasCollec() {
+ return measCollec;
+ }
+
+ public void setMeasCollec(MeasCollecEnd measCollec) {
+ this.measCollec = measCollec;
+ }
+
+ @Override
+ public String toString() {
+ return "FileFooter [measCollec=" + measCollec + "]";
+ }
+}
diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/FileHeader.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/FileHeader.java
index dd1adac..ef8634f 100644
--- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/FileHeader.java
+++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/FileHeader.java
@@ -1,97 +1,96 @@
-/*
- * ============LICENSE_START=======================================================
- * Ran Simulator Controller
- * ================================================================================
- * Copyright (C) 2020-2021 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.rest.xml.models;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlRootElement
-public class FileHeader {
- private String dnPrefix;
- private String vendorName;
- private String fileFormatVersion;
- private MeasCollec measCollec;
- private FileSender fileSender;
-
- public FileHeader() {
-
- }
-
- public FileHeader(String dnPrefix, String vendorName, String fileFormatVersion, MeasCollec measCollec,
- FileSender fileSender) {
- super();
- this.dnPrefix = dnPrefix;
- this.vendorName = vendorName;
- this.fileFormatVersion = fileFormatVersion;
- this.measCollec = measCollec;
- this.fileSender = fileSender;
- }
-
- public MeasCollec getMeasCollec() {
- return measCollec;
- }
-
- public void setMeasCollec(MeasCollec measCollec) {
- this.measCollec = measCollec;
- }
-
- @XmlAttribute
- public String getDnPrefix() {
- return dnPrefix;
- }
-
- public void setDnPrefix(String dnPrefix) {
- this.dnPrefix = dnPrefix;
- }
-
- @XmlAttribute
- public String getVendorName() {
- return vendorName;
- }
-
- public void setVendorName(String vendorName) {
- this.vendorName = vendorName;
- }
-
- @XmlAttribute
- public String getFileFormatVersion() {
- return fileFormatVersion;
- }
-
- public void setFileFormatVersion(String fileFormatVersion) {
- this.fileFormatVersion = fileFormatVersion;
- }
-
- public FileSender getFileSender() {
- return fileSender;
- }
-
- public void setFileSender(FileSender fileSender) {
- this.fileSender = fileSender;
- }
-
- @Override
- public String toString() {
- return "FileHeader [dnPrefix=" + dnPrefix + ", vendorName=" + vendorName + ", fileFormatVersion="
- + fileFormatVersion + ", measCollec=" + measCollec + ", fileSender=" + fileSender + "]";
- }
-}
-
+/*
+ * ============LICENSE_START=======================================================
+ * Ran Simulator Controller
+ * ================================================================================
+ * Copyright (C) 2020-2021 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.rest.xml.models;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement
+public class FileHeader {
+ private String dnPrefix;
+ private String vendorName;
+ private String fileFormatVersion;
+ private MeasCollec measCollec;
+ private FileSender fileSender;
+
+ public FileHeader() {
+
+ }
+
+ public FileHeader(String dnPrefix, String vendorName, String fileFormatVersion, MeasCollec measCollec,
+ FileSender fileSender) {
+ super();
+ this.dnPrefix = dnPrefix;
+ this.vendorName = vendorName;
+ this.fileFormatVersion = fileFormatVersion;
+ this.measCollec = measCollec;
+ this.fileSender = fileSender;
+ }
+
+ public MeasCollec getMeasCollec() {
+ return measCollec;
+ }
+
+ public void setMeasCollec(MeasCollec measCollec) {
+ this.measCollec = measCollec;
+ }
+
+ @XmlAttribute
+ public String getDnPrefix() {
+ return dnPrefix;
+ }
+
+ public void setDnPrefix(String dnPrefix) {
+ this.dnPrefix = dnPrefix;
+ }
+
+ @XmlAttribute
+ public String getVendorName() {
+ return vendorName;
+ }
+
+ public void setVendorName(String vendorName) {
+ this.vendorName = vendorName;
+ }
+
+ @XmlAttribute
+ public String getFileFormatVersion() {
+ return fileFormatVersion;
+ }
+
+ public void setFileFormatVersion(String fileFormatVersion) {
+ this.fileFormatVersion = fileFormatVersion;
+ }
+
+ public FileSender getFileSender() {
+ return fileSender;
+ }
+
+ public void setFileSender(FileSender fileSender) {
+ this.fileSender = fileSender;
+ }
+
+ @Override
+ public String toString() {
+ return "FileHeader [dnPrefix=" + dnPrefix + ", vendorName=" + vendorName + ", fileFormatVersion="
+ + fileFormatVersion + ", measCollec=" + measCollec + ", fileSender=" + fileSender + "]";
+ }
+}
diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/FileSender.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/FileSender.java
index 55c091d..f5f4fad 100644
--- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/FileSender.java
+++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/FileSender.java
@@ -1,58 +1,57 @@
-/*
- * ============LICENSE_START=======================================================
- * Ran Simulator Controller
- * ================================================================================
- * Copyright (C) 2020-2021 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.rest.xml.models;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlRootElement
-public class FileSender {
- private String localDn;
-
-//private String elementType;
- public FileSender() {
-
- }
-
- public FileSender(String localDn) {
- super();
- this.localDn = localDn;
- }
-
- @XmlAttribute
- public String getLocalDn() {
- return localDn;
- }
-
- public void setLocalDn(String localDn) {
- this.localDn = localDn;
- }
-
- /*
- * @XmlAttribute public String getElementType() { return elementType; } public
- * void setElementType(String elementType) { this.elementType = elementType; }
- */
- @Override
- public String toString() {
- return "FileSender [localDn=" + localDn + "]";
- }
-}
-
+/*
+ * ============LICENSE_START=======================================================
+ * Ran Simulator Controller
+ * ================================================================================
+ * Copyright (C) 2020-2021 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.rest.xml.models;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement
+public class FileSender {
+ private String localDn;
+
+ // private String elementType;
+ public FileSender() {
+
+ }
+
+ public FileSender(String localDn) {
+ super();
+ this.localDn = localDn;
+ }
+
+ @XmlAttribute
+ public String getLocalDn() {
+ return localDn;
+ }
+
+ public void setLocalDn(String localDn) {
+ this.localDn = localDn;
+ }
+
+ /*
+ * @XmlAttribute public String getElementType() { return elementType; } public
+ * void setElementType(String elementType) { this.elementType = elementType; }
+ */
+ @Override
+ public String toString() {
+ return "FileSender [localDn=" + localDn + "]";
+ }
+}
diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/GranularityPeriod.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/GranularityPeriod.java
index 7defc65..ec18cf3 100644
--- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/GranularityPeriod.java
+++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/GranularityPeriod.java
@@ -1,64 +1,63 @@
-/*
- * ============LICENSE_START=======================================================
- * Ran Simulator Controller
- * ================================================================================
- * Copyright (C) 2020-2021 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.rest.xml.models;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlRootElement
-public class GranularityPeriod {
- private String endTime;
- private String duration;
-
- public GranularityPeriod() {
-
- }
-
- public GranularityPeriod(String endTime, String duration) {
- super();
- this.endTime = endTime;
- this.duration = duration;
- }
-
- @XmlAttribute
- public String getEndTime() {
- return endTime;
- }
-
- public void setEndTime(String endTime) {
- this.endTime = endTime;
- }
-
- @XmlAttribute
- public String getDuration() {
- return duration;
- }
-
- public void setDuration(String duration) {
- this.duration = duration;
- }
-
- @Override
- public String toString() {
- return "GranularityPeriod [endTime=" + endTime + ", duration=" + duration + "]";
- }
-}
-
+/*
+ * ============LICENSE_START=======================================================
+ * Ran Simulator Controller
+ * ================================================================================
+ * Copyright (C) 2020-2021 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.rest.xml.models;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement
+public class GranularityPeriod {
+ private String endTime;
+ private String duration;
+
+ public GranularityPeriod() {
+
+ }
+
+ public GranularityPeriod(String endTime, String duration) {
+ super();
+ this.endTime = endTime;
+ this.duration = duration;
+ }
+
+ @XmlAttribute
+ public String getEndTime() {
+ return endTime;
+ }
+
+ public void setEndTime(String endTime) {
+ this.endTime = endTime;
+ }
+
+ @XmlAttribute
+ public String getDuration() {
+ return duration;
+ }
+
+ public void setDuration(String duration) {
+ this.duration = duration;
+ }
+
+ @Override
+ public String toString() {
+ return "GranularityPeriod [endTime=" + endTime + ", duration=" + duration + "]";
+ }
+}
diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/Job.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/Job.java
index 9999933..1f1bfd8 100644
--- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/Job.java
+++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/Job.java
@@ -1,54 +1,53 @@
-/*
- * ============LICENSE_START=======================================================
- * Ran Simulator Controller
- * ================================================================================
- * Copyright (C) 2020-2021 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.rest.xml.models;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlRootElement
-public class Job {
- private String jobId;
-
- public Job() {
-
- }
-
- public Job(String jobId) {
- super();
- this.jobId = jobId;
- }
-
- @XmlAttribute
- public String getJobId() {
- return jobId;
- }
-
- public void setJobId(String jobId) {
- this.jobId = jobId;
- }
-
- @Override
- public String toString() {
- return "Job [jobId=" + jobId + "]";
- }
-
-}
-
+/*
+ * ============LICENSE_START=======================================================
+ * Ran Simulator Controller
+ * ================================================================================
+ * Copyright (C) 2020-2021 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.rest.xml.models;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement
+public class Job {
+ private String jobId;
+
+ public Job() {
+
+ }
+
+ public Job(String jobId) {
+ super();
+ this.jobId = jobId;
+ }
+
+ @XmlAttribute
+ public String getJobId() {
+ return jobId;
+ }
+
+ public void setJobId(String jobId) {
+ this.jobId = jobId;
+ }
+
+ @Override
+ public String toString() {
+ return "Job [jobId=" + jobId + "]";
+ }
+
+}
diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/ManagedElement.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/ManagedElement.java
index f8b43c7..fe43701 100644
--- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/ManagedElement.java
+++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/ManagedElement.java
@@ -1,71 +1,70 @@
-/*
- * ============LICENSE_START=======================================================
- * Ran Simulator Controller
- * ================================================================================
- * Copyright (C) 2020-2021 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.rest.xml.models;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlRootElement
-public class ManagedElement {
- private String swVersion;
- private String localDn;
-// private String userLabel;
-
- public ManagedElement() {
-
- }
-
- public ManagedElement(String swVersion, String localDn) {
- super();
- this.swVersion = swVersion;
- this.localDn = localDn;
-//this.userLabel = userLabel;
- }
-
- @XmlAttribute
- public String getSwVersion() {
- return swVersion;
- }
-
- public void setSwVersion(String swVersion) {
- this.swVersion = swVersion;
- }
-
- @XmlAttribute
- public String getLocalDn() {
- return localDn;
- }
-
- public void setLocalDn(String localDn) {
- this.localDn = localDn;
- }
-
- /*
- * @XmlAttribute public String getUserLabel() { return userLabel; } public void
- * setUserLabel(String userLabel) { this.userLabel = userLabel; }
- */
- @Override
- public String toString() {
- return "ManagedElement [swVersion=" + swVersion + ", localDn=" + localDn + "]";
- }
-
-}
-
+/*
+ * ============LICENSE_START=======================================================
+ * Ran Simulator Controller
+ * ================================================================================
+ * Copyright (C) 2020-2021 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.rest.xml.models;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement
+public class ManagedElement {
+ private String swVersion;
+ private String localDn;
+ // private String userLabel;
+
+ public ManagedElement() {
+
+ }
+
+ public ManagedElement(String swVersion, String localDn) {
+ super();
+ this.swVersion = swVersion;
+ this.localDn = localDn;
+ // this.userLabel = userLabel;
+ }
+
+ @XmlAttribute
+ public String getSwVersion() {
+ return swVersion;
+ }
+
+ public void setSwVersion(String swVersion) {
+ this.swVersion = swVersion;
+ }
+
+ @XmlAttribute
+ public String getLocalDn() {
+ return localDn;
+ }
+
+ public void setLocalDn(String localDn) {
+ this.localDn = localDn;
+ }
+
+ /*
+ * @XmlAttribute public String getUserLabel() { return userLabel; } public void
+ * setUserLabel(String userLabel) { this.userLabel = userLabel; }
+ */
+ @Override
+ public String toString() {
+ return "ManagedElement [swVersion=" + swVersion + ", localDn=" + localDn + "]";
+ }
+
+}
diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/MeasCollec.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/MeasCollec.java
index c8bb913..5052536 100644
--- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/MeasCollec.java
+++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/MeasCollec.java
@@ -1,53 +1,52 @@
-/*
- * ============LICENSE_START=======================================================
- * Ran Simulator Controller
- * ================================================================================
- * Copyright (C) 2020-2021 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.rest.xml.models;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlRootElement
-public class MeasCollec {
- private String beginTime;
-
- public MeasCollec() {
-
- }
-
- public MeasCollec(String beginTime) {
- super();
- this.beginTime = beginTime;
- }
-
- @XmlAttribute
- public String getBeginTime() {
- return beginTime;
- }
-
- public void setBeginTime(String beginTime) {
- this.beginTime = beginTime;
- }
-
- @Override
- public String toString() {
- return "MeasCollec [beginTime=" + beginTime + "]";
- }
-}
-
+/*
+ * ============LICENSE_START=======================================================
+ * Ran Simulator Controller
+ * ================================================================================
+ * Copyright (C) 2020-2021 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.rest.xml.models;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement
+public class MeasCollec {
+ private String beginTime;
+
+ public MeasCollec() {
+
+ }
+
+ public MeasCollec(String beginTime) {
+ super();
+ this.beginTime = beginTime;
+ }
+
+ @XmlAttribute
+ public String getBeginTime() {
+ return beginTime;
+ }
+
+ public void setBeginTime(String beginTime) {
+ this.beginTime = beginTime;
+ }
+
+ @Override
+ public String toString() {
+ return "MeasCollec [beginTime=" + beginTime + "]";
+ }
+}
diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/MeasCollecEnd.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/MeasCollecEnd.java
index f78f9c5..534eaae 100644
--- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/MeasCollecEnd.java
+++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/MeasCollecEnd.java
@@ -1,40 +1,39 @@
-/*
- * ============LICENSE_START=======================================================
- * Ran Simulator Controller
- * ================================================================================
- * Copyright (C) 2020-2021 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.rest.xml.models;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlRootElement
-public class MeasCollecEnd {
- @XmlAttribute
- private String endTime;
-
- public MeasCollecEnd() {
-
- }
-
- public MeasCollecEnd(String endTime) {
- super();
- this.endTime = endTime;
- }
-}
-
+/*
+ * ============LICENSE_START=======================================================
+ * Ran Simulator Controller
+ * ================================================================================
+ * Copyright (C) 2020-2021 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.rest.xml.models;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement
+public class MeasCollecEnd {
+ @XmlAttribute
+ private String endTime;
+
+ public MeasCollecEnd() {
+
+ }
+
+ public MeasCollecEnd(String endTime) {
+ super();
+ this.endTime = endTime;
+ }
+}
diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/MeasCollecFile.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/MeasCollecFile.java
index 5fdc2b2..bfc5c31 100644
--- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/MeasCollecFile.java
+++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/MeasCollecFile.java
@@ -1,76 +1,75 @@
-/*
- * ============LICENSE_START=======================================================
- * Ran Simulator Controller
- * ================================================================================
- * Copyright (C) 2020-2021 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.rest.xml.models;
-
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlRootElement
-public class MeasCollecFile {
- @XmlAttribute
- private String xmlns;
- @XmlElement
- private FileHeader fileHeader;
- @XmlElement
- private List<MeasData> measData;
- @XmlElement
- private FileFooter fileFooter;
-
- public MeasCollecFile() {
-
- }
-
- public MeasCollecFile(FileHeader fileHeader, List<MeasData> measData, FileFooter fileFooter, String xmlns) {
- super();
- this.fileHeader = fileHeader;
- this.measData = measData;
- this.fileFooter = fileFooter;
- this.xmlns = xmlns;
- }
-
-// public FileHeader getFileHeader() {
-// return fileHeader;
-// }
-// public void setFileHeader(FileHeader fileHeader) {
-// this.fileHeader = fileHeader;
-// }
-// public List<MeasData> getMeasData() {
-// return measData;
-// }
-// public void setMeasData(List<MeasData> measData) {
-// this.measData = measData;
-// }
-// public FileFooter getFileFooter() {
-// return fileFooter;
-// }
-// public void setFileFooter(FileFooter fileFooter) {
-// this.fileFooter = fileFooter;
-// }
- @Override
- public String toString() {
- return "MeasCollecFile [fileHeader=" + fileHeader + ", measData=" + measData + ", fileFooter=" + fileFooter
- + "]";
- }
-}
-
+/*
+ * ============LICENSE_START=======================================================
+ * Ran Simulator Controller
+ * ================================================================================
+ * Copyright (C) 2020-2021 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.rest.xml.models;
+
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement
+public class MeasCollecFile {
+ @XmlAttribute
+ private String xmlns;
+ @XmlElement
+ private FileHeader fileHeader;
+ @XmlElement
+ private List<MeasData> measData;
+ @XmlElement
+ private FileFooter fileFooter;
+
+ public MeasCollecFile() {
+
+ }
+
+ public MeasCollecFile(FileHeader fileHeader, List<MeasData> measData, FileFooter fileFooter, String xmlns) {
+ super();
+ this.fileHeader = fileHeader;
+ this.measData = measData;
+ this.fileFooter = fileFooter;
+ this.xmlns = xmlns;
+ }
+
+ // public FileHeader getFileHeader() {
+ // return fileHeader;
+ // }
+ // public void setFileHeader(FileHeader fileHeader) {
+ // this.fileHeader = fileHeader;
+ // }
+ // public List<MeasData> getMeasData() {
+ // return measData;
+ // }
+ // public void setMeasData(List<MeasData> measData) {
+ // this.measData = measData;
+ // }
+ // public FileFooter getFileFooter() {
+ // return fileFooter;
+ // }
+ // public void setFileFooter(FileFooter fileFooter) {
+ // this.fileFooter = fileFooter;
+ // }
+ @Override
+ public String toString() {
+ return "MeasCollecFile [fileHeader=" + fileHeader + ", measData=" + measData + ", fileFooter=" + fileFooter
+ + "]";
+ }
+}
diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/MeasData.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/MeasData.java
index 6eace2d..e57a010 100644
--- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/MeasData.java
+++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/MeasData.java
@@ -1,64 +1,63 @@
-/*
- * ============LICENSE_START=======================================================
- * Ran Simulator Controller
- * ================================================================================
- * Copyright (C) 2020-2021 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.rest.xml.models;
-
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlRootElement
-public class MeasData {
- private ManagedElement managedElement;
- private List<MeasInfo> measInfo;
-
- public MeasData() {
- }
-
- public MeasData(ManagedElement managedElement, List<MeasInfo> measInfo) {
- super();
- this.managedElement = managedElement;
- this.measInfo = measInfo;
- }
-
- public ManagedElement getManagedElement() {
- return managedElement;
- }
-
- public void setManagedElement(ManagedElement managedElement) {
- this.managedElement = managedElement;
- }
-
- public List<MeasInfo> getMeasInfo() {
- return measInfo;
- }
-
- public void setMeasInfo(List<MeasInfo> measInfo) {
- this.measInfo = measInfo;
- }
-
- @Override
- public String toString() {
- return "MeasData [managedElement=" + managedElement + ", measInfo=" + measInfo + "]";
- }
-
-}
-
+/*
+ * ============LICENSE_START=======================================================
+ * Ran Simulator Controller
+ * ================================================================================
+ * Copyright (C) 2020-2021 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.rest.xml.models;
+
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlElementWrapper;
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement
+public class MeasData {
+ private ManagedElement managedElement;
+ private List<MeasInfo> measInfo;
+
+ public MeasData() {
+ }
+
+ public MeasData(ManagedElement managedElement, List<MeasInfo> measInfo) {
+ super();
+ this.managedElement = managedElement;
+ this.measInfo = measInfo;
+ }
+
+ public ManagedElement getManagedElement() {
+ return managedElement;
+ }
+
+ public void setManagedElement(ManagedElement managedElement) {
+ this.managedElement = managedElement;
+ }
+
+ public List<MeasInfo> getMeasInfo() {
+ return measInfo;
+ }
+
+ public void setMeasInfo(List<MeasInfo> measInfo) {
+ this.measInfo = measInfo;
+ }
+
+ @Override
+ public String toString() {
+ return "MeasData [managedElement=" + managedElement + ", measInfo=" + measInfo + "]";
+ }
+
+}
diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/MeasInfo.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/MeasInfo.java
index 9921bdf..54da288 100644
--- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/MeasInfo.java
+++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/MeasInfo.java
@@ -1,108 +1,107 @@
-/*
- * ============LICENSE_START=======================================================
- * Ran Simulator Controller
- * ================================================================================
- * Copyright (C) 2020-2021 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.rest.xml.models;
-
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-@XmlRootElement
-@XmlType(propOrder = { "measInfoId", "job", "granPeriod", "repPeriod", "measType", "measValue" })
-public class MeasInfo {
- private String measInfoId;
- private Job job;
- private GranularityPeriod granPeriod;
- private ReportingPeriod repPeriod;
- private List<MeasType> measType;
- private List<MeasValue> measValue;
-
- public MeasInfo(String measInfoId, Job job, GranularityPeriod granPeriod, ReportingPeriod repPeriod,
- List<MeasType> measType, List<MeasValue> measValue) {
- super();
- this.measInfoId = measInfoId;
- this.job = job;
- this.granPeriod = granPeriod;
- this.repPeriod = repPeriod;
- this.measType = measType;
- this.measValue = measValue;
- }
-
- public MeasInfo() {
- }
-
- @XmlAttribute
- public String getMeasInfoId() {
- return measInfoId;
- }
-
- public void setMeasInfoId(String measInfoId) {
- this.measInfoId = measInfoId;
- }
-
- public Job getJob() {
- return job;
- }
-
- public void setJob(Job job) {
- this.job = job;
- }
-
- public GranularityPeriod getGranPeriod() {
- return granPeriod;
- }
-
- public void setGranPeriod(GranularityPeriod granPeriod) {
- this.granPeriod = granPeriod;
- }
-
- public ReportingPeriod getRepPeriod() {
- return repPeriod;
- }
-
- public void setRepPeriod(ReportingPeriod repPeriod) {
- this.repPeriod = repPeriod;
- }
-
- public List<MeasType> getMeasType() {
- return measType;
- }
-
- public void setMeasType(List<MeasType> measType) {
- this.measType = measType;
- }
-
- public List<MeasValue> getMeasValue() {
- return measValue;
- }
-
- public void setMeasValue(List<MeasValue> measValue) {
- this.measValue = measValue;
- }
-
- @Override
- public String toString() {
- return "MeasInfo [measInfoId=" + measInfoId + ", job=" + job + ", granPeriod=" + granPeriod + ", repPeriod="
- + repPeriod + ", measType=" + measType + ", measValue=" + measValue + "]";
- }
-}
-
+/*
+ * ============LICENSE_START=======================================================
+ * Ran Simulator Controller
+ * ================================================================================
+ * Copyright (C) 2020-2021 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.rest.xml.models;
+
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+@XmlRootElement
+@XmlType(propOrder = {"measInfoId", "job", "granPeriod", "repPeriod", "measType", "measValue"})
+public class MeasInfo {
+ private String measInfoId;
+ private Job job;
+ private GranularityPeriod granPeriod;
+ private ReportingPeriod repPeriod;
+ private List<MeasType> measType;
+ private List<MeasValue> measValue;
+
+ public MeasInfo(String measInfoId, Job job, GranularityPeriod granPeriod, ReportingPeriod repPeriod,
+ List<MeasType> measType, List<MeasValue> measValue) {
+ super();
+ this.measInfoId = measInfoId;
+ this.job = job;
+ this.granPeriod = granPeriod;
+ this.repPeriod = repPeriod;
+ this.measType = measType;
+ this.measValue = measValue;
+ }
+
+ public MeasInfo() {
+ }
+
+ @XmlAttribute
+ public String getMeasInfoId() {
+ return measInfoId;
+ }
+
+ public void setMeasInfoId(String measInfoId) {
+ this.measInfoId = measInfoId;
+ }
+
+ public Job getJob() {
+ return job;
+ }
+
+ public void setJob(Job job) {
+ this.job = job;
+ }
+
+ public GranularityPeriod getGranPeriod() {
+ return granPeriod;
+ }
+
+ public void setGranPeriod(GranularityPeriod granPeriod) {
+ this.granPeriod = granPeriod;
+ }
+
+ public ReportingPeriod getRepPeriod() {
+ return repPeriod;
+ }
+
+ public void setRepPeriod(ReportingPeriod repPeriod) {
+ this.repPeriod = repPeriod;
+ }
+
+ public List<MeasType> getMeasType() {
+ return measType;
+ }
+
+ public void setMeasType(List<MeasType> measType) {
+ this.measType = measType;
+ }
+
+ public List<MeasValue> getMeasValue() {
+ return measValue;
+ }
+
+ public void setMeasValue(List<MeasValue> measValue) {
+ this.measValue = measValue;
+ }
+
+ @Override
+ public String toString() {
+ return "MeasInfo [measInfoId=" + measInfoId + ", job=" + job + ", granPeriod=" + granPeriod + ", repPeriod="
+ + repPeriod + ", measType=" + measType + ", measValue=" + measValue + "]";
+ }
+}
diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/MeasResult.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/MeasResult.java
index addd082..c3983c1 100644
--- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/MeasResult.java
+++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/MeasResult.java
@@ -1,39 +1,38 @@
-/*
- * ============LICENSE_START=======================================================
- * Ran Simulator Controller
- * ================================================================================
- * Copyright (C) 2020-2021 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.rest.xml.models;
-
-import java.util.List;
-
-public class MeasResult {
- private String position;
- private String result;
-
- public MeasResult(String position, String result) {
- super();
- this.position = position;
- this.result = result;
- }
-
- public MeasResult() {
- }
-
-}
-
+/*
+ * ============LICENSE_START=======================================================
+ * Ran Simulator Controller
+ * ================================================================================
+ * Copyright (C) 2020-2021 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.rest.xml.models;
+
+import java.util.List;
+
+public class MeasResult {
+ private String position;
+ private String result;
+
+ public MeasResult(String position, String result) {
+ super();
+ this.position = position;
+ this.result = result;
+ }
+
+ public MeasResult() {
+ }
+
+}
diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/MeasType.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/MeasType.java
index aac1b76..94f8826 100644
--- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/MeasType.java
+++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/MeasType.java
@@ -1,66 +1,65 @@
-/*
- * ============LICENSE_START=======================================================
- * Ran Simulator Controller
- * ================================================================================
- * Copyright (C) 2020-2021 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.rest.xml.models;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlValue;
-
-@XmlRootElement
-public class MeasType {
-
- private String measType;
- private int p;
-
- public MeasType(String measType, int p) {
- super();
- this.measType = measType;
- this.p = p;
- }
-
- public MeasType() {
- }
-
- @XmlValue
- public String getMeasType() {
- return measType;
- }
-
- public void setMeasType(String measType) {
- this.measType = measType;
- }
-
- @XmlAttribute
- public int getP() {
- return p;
- }
-
- public void setP(int p) {
- this.p = p;
- }
-
- @Override
- public String toString() {
- return "MeasType [measType=" + measType + ", p=" + p + "]";
- }
-
-}
-
+/*
+ * ============LICENSE_START=======================================================
+ * Ran Simulator Controller
+ * ================================================================================
+ * Copyright (C) 2020-2021 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.rest.xml.models;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlValue;
+
+@XmlRootElement
+public class MeasType {
+
+ private String measType;
+ private int p;
+
+ public MeasType(String measType, int p) {
+ super();
+ this.measType = measType;
+ this.p = p;
+ }
+
+ public MeasType() {
+ }
+
+ @XmlValue
+ public String getMeasType() {
+ return measType;
+ }
+
+ public void setMeasType(String measType) {
+ this.measType = measType;
+ }
+
+ @XmlAttribute
+ public int getP() {
+ return p;
+ }
+
+ public void setP(int p) {
+ this.p = p;
+ }
+
+ @Override
+ public String toString() {
+ return "MeasType [measType=" + measType + ", p=" + p + "]";
+ }
+
+}
diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/MeasValue.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/MeasValue.java
index 76ddae4..3530dd9 100644
--- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/MeasValue.java
+++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/MeasValue.java
@@ -1,77 +1,76 @@
-/*
- * ============LICENSE_START=======================================================
- * Ran Simulator Controller
- * ================================================================================
- * Copyright (C) 2020-2021 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.rest.xml.models;
-
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlRootElement
-public class MeasValue {
- private Integer measObjLdn;
- private List<Result> r;
-
- public MeasValue() {
-
- }
-
- public MeasValue(Integer measObjLdn, List<Result> r, boolean suspect) {
- super();
- this.measObjLdn = measObjLdn;
- this.r = r;
- this.suspect = suspect;
- }
-
- private boolean suspect;
-
- @XmlAttribute
- public Integer getMeasObjLdn() {
- return measObjLdn;
- }
-
- public void setMeasObjLdn(Integer measObjLdn) {
- this.measObjLdn = measObjLdn;
- }
-
- public List<Result> getR() {
- return r;
- }
-
- public void setR(List<Result> r) {
- this.r = r;
- }
-
- public boolean isSuspect() {
- return suspect;
- }
-
- public void setSuspect(boolean suspect) {
- this.suspect = suspect;
- }
-
- @Override
- public String toString() {
- return "MeasValue [measObjLdn=" + measObjLdn + ", r=" + r + ", suspect=" + suspect + "]";
- }
-
-}
-
+/*
+ * ============LICENSE_START=======================================================
+ * Ran Simulator Controller
+ * ================================================================================
+ * Copyright (C) 2020-2021 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.rest.xml.models;
+
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement
+public class MeasValue {
+ private Integer measObjLdn;
+ private List<Result> r;
+
+ public MeasValue() {
+
+ }
+
+ public MeasValue(Integer measObjLdn, List<Result> r, boolean suspect) {
+ super();
+ this.measObjLdn = measObjLdn;
+ this.r = r;
+ this.suspect = suspect;
+ }
+
+ private boolean suspect;
+
+ @XmlAttribute
+ public Integer getMeasObjLdn() {
+ return measObjLdn;
+ }
+
+ public void setMeasObjLdn(Integer measObjLdn) {
+ this.measObjLdn = measObjLdn;
+ }
+
+ public List<Result> getR() {
+ return r;
+ }
+
+ public void setR(List<Result> r) {
+ this.r = r;
+ }
+
+ public boolean isSuspect() {
+ return suspect;
+ }
+
+ public void setSuspect(boolean suspect) {
+ this.suspect = suspect;
+ }
+
+ @Override
+ public String toString() {
+ return "MeasValue [measObjLdn=" + measObjLdn + ", r=" + r + ", suspect=" + suspect + "]";
+ }
+
+}
diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/ReportingPeriod.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/ReportingPeriod.java
index 9e86e6d..aec88e3 100644
--- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/ReportingPeriod.java
+++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/ReportingPeriod.java
@@ -1,51 +1,50 @@
-/*
- * ============LICENSE_START=======================================================
- * Ran Simulator Controller
- * ================================================================================
- * Copyright (C) 2020-2021 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.rest.xml.models;
-
-import javax.xml.bind.annotation.XmlAttribute;
-
-public class ReportingPeriod {
- @XmlAttribute
- public String getDuration() {
- return duration;
- }
-
- public void setDuration(String duration) {
- this.duration = duration;
- }
-
- private String duration;
-
- public ReportingPeriod() {
- }
-
- public ReportingPeriod(String duration) {
- super();
- this.duration = duration;
- }
-
- @Override
- public String toString() {
- return "ReportingPeriod [duration=" + duration + "]";
- }
-
-}
-
+/*
+ * ============LICENSE_START=======================================================
+ * Ran Simulator Controller
+ * ================================================================================
+ * Copyright (C) 2020-2021 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.rest.xml.models;
+
+import javax.xml.bind.annotation.XmlAttribute;
+
+public class ReportingPeriod {
+ @XmlAttribute
+ public String getDuration() {
+ return duration;
+ }
+
+ public void setDuration(String duration) {
+ this.duration = duration;
+ }
+
+ private String duration;
+
+ public ReportingPeriod() {
+ }
+
+ public ReportingPeriod(String duration) {
+ super();
+ this.duration = duration;
+ }
+
+ @Override
+ public String toString() {
+ return "ReportingPeriod [duration=" + duration + "]";
+ }
+
+}
diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/Result.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/Result.java
index 2e71f5a..cbaf121 100644
--- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/Result.java
+++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/xml/models/Result.java
@@ -1,65 +1,64 @@
-/*
- * ============LICENSE_START=======================================================
- * Ran Simulator Controller
- * ================================================================================
- * Copyright (C) 2020-2021 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.rest.xml.models;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlValue;
-
-@XmlRootElement
-public class Result {
- private int p;
- private int measValue;
-
- public Result() {
- }
-
- public Result(int p, int measValue) {
- super();
- this.p = p;
- this.measValue = measValue;
- }
-
- @XmlAttribute
- public int getP() {
- return p;
- }
-
- public void setP(int p) {
- this.p = p;
- }
-
- @XmlValue
- public double getMeasValue() {
- return measValue;
- }
-
- public void setMeasValue(int measValue) {
- this.measValue = measValue;
- }
-
- @Override
- public String toString() {
- return "Result [p=" + p + ", measValue=" + measValue + "]";
- }
-
-}
-
+/*
+ * ============LICENSE_START=======================================================
+ * Ran Simulator Controller
+ * ================================================================================
+ * Copyright (C) 2020-2021 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.rest.xml.models;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlValue;
+
+@XmlRootElement
+public class Result {
+ private int p;
+ private int measValue;
+
+ public Result() {
+ }
+
+ public Result(int p, int measValue) {
+ super();
+ this.p = p;
+ this.measValue = measValue;
+ }
+
+ @XmlAttribute
+ public int getP() {
+ return p;
+ }
+
+ public void setP(int p) {
+ this.p = p;
+ }
+
+ @XmlValue
+ public double getMeasValue() {
+ return measValue;
+ }
+
+ public void setMeasValue(int measValue) {
+ this.measValue = measValue;
+ }
+
+ @Override
+ public String toString() {
+ return "Result [p=" + p + ", measValue=" + measValue + "]";
+ }
+
+}