String anScriptName;
@JsonProperty("an_enableNSSISelection")
- String anEnableNSSISelection;
+ Boolean anEnableNSSISelection;
@JsonProperty("sliceProfile_AN_sNSSAI")
String sliceProfile_AN_sNSSAI;
String sliceProfile_TN_sST;
@JsonProperty("tn_enableNSSISelection")
- String tnEnableNSSISelection;
+ Boolean tnEnableNSSISelection;
@JsonProperty("cn_suggest_nssi_id")
String cnSuggestNssiId;
String cnScriptName;
@JsonProperty("cn_enableNSSISelection")
- String cnEnableNSSISelection;
+ Boolean cnEnableNSSISelection;
@JsonProperty("sliceProfile_CN_pLMNIdList")
String sliceProfile_CN_pLMNIdList;
import org.onap.usecaseui.server.bean.nsmf.monitor.UserNumberInfo;
import org.onap.usecaseui.server.constant.nsmf.NsmfParamConstant;
import org.onap.usecaseui.server.service.slicingdomain.kpi.bean.KpiTotalBandwidth;
-import org.onap.usecaseui.server.service.slicingdomain.kpi.bean.KpiTotalBandwidth.TotalBandwidth;
import org.onap.usecaseui.server.service.slicingdomain.kpi.bean.KpiTotalTraffic;
import org.onap.usecaseui.server.service.slicingdomain.kpi.bean.KpiUserNumber;
-import org.onap.usecaseui.server.service.slicingdomain.kpi.bean.KpiUserNumber.UserNumbers;
+import org.onap.usecaseui.server.service.slicingdomain.kpi.bean.TotalBandwidth;
+import org.onap.usecaseui.server.service.slicingdomain.kpi.bean.UserNumbers;
import org.onap.usecaseui.server.util.nsmf.NsmfCommonUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
}
void convertUsageTrafficInfo(UsageTrafficInfo usageTrafficInfo, KpiTotalTraffic kpiTotalTraffic) {
- usageTrafficInfo.setServiceId(kpiTotalTraffic.getId());
- usageTrafficInfo.setTrafficData(String.valueOf(kpiTotalTraffic.getTotalTraffic()));
+ usageTrafficInfo.setServiceId(kpiTotalTraffic.getRequest().getId());
+ usageTrafficInfo.setTrafficData(String.valueOf(kpiTotalTraffic.getResult().get(0)));
}
SlicingKpiReqInfo buildSlicingKpiReqInfo(ServiceInfo serviceInfo, String queryTimestamp, int kpiHours) {
throws InvocationTargetException, IllegalAccessException, ParseException {
List<UserNumberInfo> userNumberInfoList = new ArrayList<>();
- serviceOnlineUserInfo.setId(kpiUserNumber.getId());
+ serviceOnlineUserInfo.setId(kpiUserNumber.getRequest().getId());
- if (kpiUserNumber.getUserNumbers() != null) {
- for (UserNumbers userNumbers : kpiUserNumber.getUserNumbers()) {
+ if (kpiUserNumber.getResult() != null) {
+ for (UserNumbers userNumbers : kpiUserNumber.getResult()) {
String newTimeStamp = NsmfCommonUtil
.timestamp2Time(userNumbers.getTimeStamp().replace("T", NsmfParamConstant.SPACE));
UserNumberInfo userNumberInfo = new UserNumberInfo();
throws InvocationTargetException, IllegalAccessException, ParseException {
List<TotalBandwidthInfo> totalBandwidthInfoList = new ArrayList<>();
- serviceTotalBandwidthInfo.setId(kpiTotalBandwidth.getId());
- if (kpiTotalBandwidth.getTotalBandwidth() != null) {
- for (TotalBandwidth totalBandwidth : kpiTotalBandwidth.getTotalBandwidth()) {
+ serviceTotalBandwidthInfo.setId(kpiTotalBandwidth.getRequest().getId());
+ if (kpiTotalBandwidth.getResult() != null) {
+ for (TotalBandwidth totalBandwidth : kpiTotalBandwidth.getResult()) {
String newTimeStamp = NsmfCommonUtil
.timestamp2Time(totalBandwidth.getTimeStamp().replace("T", NsmfParamConstant.SPACE));
TotalBandwidthInfo totalBandwidthInfo = new TotalBandwidthInfo();
nsiAndSubNssiInfo.setAnCoverageAreaTaList(generalConvert.getAreaTaList(anCoverageAreaTA));
nsiAndSubNssiInfo.setAnLatency(paramsObject.getString("SliceProfile.AN.latency"));
nsiAndSubNssiInfo.setAnScriptName(paramsObject.getString("AN.ScriptName"));
- nsiAndSubNssiInfo.setAnEnableNSSISelection(paramsObject.getString("AN.enableNSSISelection"));
+ nsiAndSubNssiInfo.setAnEnableNSSISelection(paramsObject.getBoolean("AN.enableNSSISelection"));
nsiAndSubNssiInfo.setSliceProfile_AN_sNSSAI(paramsObject.getString("SliceProfile.AN.sNSSAI"));
nsiAndSubNssiInfo.setSliceProfile_AN_maxNumberofUEs(paramsObject.getString("SliceProfile.AN.maxNumberofUEs"));
nsiAndSubNssiInfo.setSliceProfile_AN_maxNumberofPDUSession(paramsObject.getString("SliceProfile.AN.maxNumberofPDUSession"));
nsiAndSubNssiInfo.setTnLatency(paramsObject.getString("SliceProfile.TN.latency"));
nsiAndSubNssiInfo.setTnBandwidth(paramsObject.getString("SliceProfile.TN.maxBandwidth"));
nsiAndSubNssiInfo.setTnScriptName(paramsObject.getString("TN.ScriptName"));
- nsiAndSubNssiInfo.setTnEnableNSSISelection(paramsObject.getString("TN.enableNSSISelection"));
+ nsiAndSubNssiInfo.setTnEnableNSSISelection(paramsObject.getBoolean("TN.enableNSSISelection"));
nsiAndSubNssiInfo.setSliceProfile_TN_jitte(paramsObject.getString("SliceProfile.TN.jitte"));
nsiAndSubNssiInfo.setSliceProfile_TN_pLMNIdList(paramsObject.getString("SliceProfile.TN.pLMNIdList"));
nsiAndSubNssiInfo.setSliceProfile_TN_sNSSAI(paramsObject.getString("SliceProfile.TN.sNSSAI"));
nsiAndSubNssiInfo.setCnAreaTrafficCapDl(paramsObject.getString("SliceProfile.CN.areaTrafficCapDL"));
nsiAndSubNssiInfo.setCnAreaTrafficCapUl(paramsObject.getString("SliceProfile.CN.areaTrafficCapUL"));
nsiAndSubNssiInfo.setCnScriptName(paramsObject.getString("CN.ScriptName"));
- nsiAndSubNssiInfo.setCnEnableNSSISelection(paramsObject.getString("CN.enableNSSISelection"));
+ nsiAndSubNssiInfo.setCnEnableNSSISelection(paramsObject.getBoolean("CN.enableNSSISelection"));
nsiAndSubNssiInfo.setSliceProfile_CN_maxNumberofPDUSession(paramsObject.getString("SliceProfile.CN.maxNumberofPDUSession"));
nsiAndSubNssiInfo.setSliceProfile_CN_overallUserDensity(paramsObject.getString("SliceProfile.CN.overallUserDensity"));
nsiAndSubNssiInfo.setSliceProfile_CN_coverageAreaTAList(paramsObject.getString("SliceProfile.CN.coverageAreaTAList"));
public interface KpiSliceService {
@Headers({"Authorization: Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA==", "Accept: application/json"})
- @POST("/api/kpi-service/v1/userNumber")
+ @POST("/api/datalake/v1/exposure/userNumber")
Call<KpiUserNumber> listUserNumber(@Body RequestBody body);
@Headers({"Authorization: Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA==", "Accept: application/json"})
- @POST("/api/kpi-service/v1/totalBandwidth")
+ @POST("/api/datalake/v1/exposure/totalBandwidth")
Call<KpiTotalBandwidth> listTotalBandwidth(@Body RequestBody body);
@Headers({"Authorization: Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA==", "Accept: application/json"})
- @POST("/api/kpi-service/v1/totalTraffic")
+ @POST("/api/datalake/v1/exposure/totalTraffic")
Call<KpiTotalTraffic> listTotalTraffic(@Body RequestBody body);
}
import java.util.List;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Getter;
+import lombok.Setter;
+import org.onap.usecaseui.server.bean.nsmf.monitor.SlicingKpiReqInfo;
@JsonIgnoreProperties(ignoreUnknown = true)
+@Getter
+@Setter
public class KpiTotalBandwidth {
- private String id;
- private List<TotalBandwidth> totalBandwidth;
-
-
- public static class TotalBandwidth{
- private String timeStamp;
-
- private int bandwidth;
+ private List<TotalBandwidth> result;
- public String getTimeStamp() {
- return timeStamp;
- }
+ private SlicingKpiReqInfo request;
- public void setTimeStamp(String timeStamp) {
- this.timeStamp = timeStamp;
- }
-
- public int getBandwidth() {
- return bandwidth;
- }
-
- public void setBandwidth(int bandwidth) {
- this.bandwidth = bandwidth;
- }
-
-
- }
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public List<TotalBandwidth> getTotalBandwidth() {
- return totalBandwidth;
- }
-
- public void setTotalBandwidth(List<TotalBandwidth> totalBandwidth) {
- this.totalBandwidth = totalBandwidth;
- }
+ private int result_count;
}
package org.onap.usecaseui.server.service.slicingdomain.kpi.bean;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import java.util.List;
+import lombok.Getter;
+import lombok.Setter;
+import org.onap.usecaseui.server.bean.nsmf.monitor.TrafficReqInfo;
+@Getter
+@Setter
@JsonIgnoreProperties(ignoreUnknown=true)
public class KpiTotalTraffic {
- private String id;
-
- private int totalTraffic;
+ private List<TotalTraffic> result;
- public String getId() {
- return id;
- }
+ private TrafficReqInfo request;
- public void setId(String id) {
- this.id = id;
- }
+ private int result_count;
- public int getTotalTraffic() {
- return totalTraffic;
- }
-
- public void setTotalTraffic(int totalTraffic) {
- this.totalTraffic = totalTraffic;
- }
-
-
}
+
+
import java.util.List;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Getter;
+import lombok.Setter;
+import org.onap.usecaseui.server.bean.nsmf.monitor.SlicingKpiReqInfo;
+import org.onap.usecaseui.server.bean.nsmf.monitor.TrafficReqInfo;
@JsonIgnoreProperties(ignoreUnknown = true)
+@Getter
+@Setter
public class KpiUserNumber {
- private String id;
+ private List<UserNumbers> result;
- private List<UserNumbers> userNumbers;
-
- public static class UserNumbers {
-
- private String timeStamp;
-
- private int userNumber;
-
- public String getTimeStamp() {
- return timeStamp;
- }
-
- public void setTimeStamp(String timeStamp) {
- this.timeStamp = timeStamp;
- }
-
- public int getUserNumber() {
- return userNumber;
- }
-
- public void setUserNumber(int userNumber) {
- this.userNumber = userNumber;
- }
-
-
- }
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public List<UserNumbers> getUserNumbers() {
- return userNumbers;
- }
-
- public void setUserNumbers(List<UserNumbers> userNumbers) {
- this.userNumbers = userNumbers;
- }
+ private SlicingKpiReqInfo request;
+ private int result_count;
}
--- /dev/null
+/*
+ * Copyright (C) 2020 CMCC, Inc. and others. All rights reserved.
+ *
+ * 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.
+ */
+package org.onap.usecaseui.server.service.slicingdomain.kpi.bean;
+
+public class TotalBandwidth {
+ private String timeStamp;
+
+ private int bandwidth;
+
+ public String getTimeStamp() {
+ return timeStamp;
+ }
+
+ public void setTimeStamp(String timeStamp) {
+ this.timeStamp = timeStamp;
+ }
+
+ public int getBandwidth() {
+ return bandwidth;
+ }
+
+ public void setBandwidth(int bandwidth) {
+ this.bandwidth = bandwidth;
+ }
+}
--- /dev/null
+/*
+ * Copyright (C) 2020 CMCC, Inc. and others. All rights reserved.
+ *
+ * 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.
+ */
+package org.onap.usecaseui.server.service.slicingdomain.kpi.bean;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class TotalTraffic {
+ private int totalTraffic;
+}
--- /dev/null
+/*
+ * Copyright (C) 2020 CMCC, Inc. and others. All rights reserved.
+ *
+ * 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.
+ */
+package org.onap.usecaseui.server.service.slicingdomain.kpi.bean;
+
+public class UserNumbers {
+
+ private String timeStamp;
+
+ private int userNumber;
+
+ public String getTimeStamp() {
+ return timeStamp;
+ }
+
+ public void setTimeStamp(String timeStamp) {
+ this.timeStamp = timeStamp;
+ }
+
+ public int getUserNumber() {
+ return userNumber;
+ }
+
+ public void setUserNumber(int userNumber) {
+ this.userNumber = userNumber;
+ }
+
+
+}
Code Review / usecase-ui / server.git / commitdiff