From 315ac8db2585e2df5b608fb699b23754a80f764c Mon Sep 17 00:00:00 2001 From: krishnaa96 Date: Fri, 17 Sep 2021 14:01:07 +0530 Subject: Add feature to Support NSMF based TN slices Issue-ID: SO-3764 Signed-off-by: krishnaa96 Change-Id: I57f6db8fab6cbd0032f58ca8254d3f93d7a78147 --- .../onap/so/beans/nsmf/SliceProfileAdapter.java | 2 +- .../onap/so/beans/nsmf/SliceTaskParamsAdapter.java | 146 +-------------------- .../org/onap/so/beans/nsmf/oof/SubnetType.java | 2 + 3 files changed, 5 insertions(+), 145 deletions(-) (limited to 'common/src/main/java') diff --git a/common/src/main/java/org/onap/so/beans/nsmf/SliceProfileAdapter.java b/common/src/main/java/org/onap/so/beans/nsmf/SliceProfileAdapter.java index 81d64b592d..7cc940ddde 100644 --- a/common/src/main/java/org/onap/so/beans/nsmf/SliceProfileAdapter.java +++ b/common/src/main/java/org/onap/so/beans/nsmf/SliceProfileAdapter.java @@ -63,7 +63,7 @@ public class SliceProfileAdapter implements Serializable { private int maxBandwidth; @JsonProperty(value = "sST") - private String sST; + private String sST = "embb"; @JsonProperty(value = "activityFactor") private int activityFactor; diff --git a/common/src/main/java/org/onap/so/beans/nsmf/SliceTaskParamsAdapter.java b/common/src/main/java/org/onap/so/beans/nsmf/SliceTaskParamsAdapter.java index bfd4627b47..15dd2f791c 100644 --- a/common/src/main/java/org/onap/so/beans/nsmf/SliceTaskParamsAdapter.java +++ b/common/src/main/java/org/onap/so/beans/nsmf/SliceTaskParamsAdapter.java @@ -67,150 +67,7 @@ public class SliceTaskParamsAdapter implements Serializable { private SliceTaskInfo anSliceTaskInfo = new SliceTaskInfo<>(); - @SuppressWarnings("unchecked") - public void convertFromJson(String jsonString) throws IOException { - ObjectMapper mapper = new ObjectMapper(); - Map paramMap = (Map) mapper.readValue(jsonString, Map.class); - - this.setServiceName(paramMap.get("ServiceName")); - this.setServiceId(paramMap.get("ServiceId")); - this.setNstId(paramMap.get("NSTId")); - this.setNstName(paramMap.get("NSTName")); - this.setSuggestNsiId(paramMap.get("suggestNSIId")); - this.setSuggestNsiName(paramMap.get("suggestNSIName")); - - this.setServiceProfile(replaceHeader(paramMap, "ServiceProfile.")); - - SliceProfileAdapter tnBHSliceProfile = mapper.readValue( - mapper.writeValueAsString(replaceHeader(paramMap, "SliceProfile.TN.BH.")), SliceProfileAdapter.class); - this.tnBHSliceTaskInfo.setSliceProfile(tnBHSliceProfile); - - SliceProfileAdapter tnMHSliceProfile = mapper.readValue( - mapper.writeValueAsString(replaceHeader(paramMap, "SliceProfile.TN.MH.")), SliceProfileAdapter.class); - this.tnMHSliceTaskInfo.setSliceProfile(tnMHSliceProfile); - - SliceProfileAdapter tnFHSliceProfile = mapper.readValue( - mapper.writeValueAsString(replaceHeader(paramMap, "SliceProfile.TN.FH.")), SliceProfileAdapter.class); - this.tnFHSliceTaskInfo.setSliceProfile(tnFHSliceProfile); - - SliceProfileAdapter cnSliceProfile = mapper.readValue( - mapper.writeValueAsString(replaceHeader(paramMap, "SliceProfile.CN.")), SliceProfileAdapter.class); - this.cnSliceTaskInfo.setSliceProfile(cnSliceProfile); - - SliceProfileAdapter anSliceProfile = mapper.readValue( - mapper.writeValueAsString(replaceHeader(paramMap, "SliceProfile.AN.")), SliceProfileAdapter.class); - this.anSliceTaskInfo.setSliceProfile(anSliceProfile); - - this.tnBHSliceTaskInfo.setSuggestNssiId(paramMap.get("TN.BH.SuggestNSSIId")); - this.tnBHSliceTaskInfo.setSuggestNssiName(paramMap.get("TN.BH.SuggestNSSIName")); - this.tnBHSliceTaskInfo.setProgress(paramMap.get("TN.BH.progress")); - this.tnBHSliceTaskInfo.setStatus(paramMap.get("TN.BH.status")); - this.tnBHSliceTaskInfo.setStatusDescription(paramMap.get("TN.BH.statusDescription")); - this.tnBHSliceTaskInfo.setScriptName(paramMap.get("TN.BH.ScriptName")); - - this.tnMHSliceTaskInfo.setSuggestNssiId(paramMap.get("TN.MH.SuggestNSSIId")); - this.tnMHSliceTaskInfo.setSuggestNssiName(paramMap.get("TN.MH.SuggestNSSIName")); - this.tnMHSliceTaskInfo.setProgress(paramMap.get("TN.MH.progress")); - this.tnMHSliceTaskInfo.setStatus(paramMap.get("TN.MH.status")); - this.tnMHSliceTaskInfo.setStatusDescription(paramMap.get("TN.MH.statusDescription")); - this.tnMHSliceTaskInfo.setScriptName(paramMap.get("TN.MH.ScriptName")); - - this.tnFHSliceTaskInfo.setSuggestNssiId(paramMap.get("TN.FH.SuggestNSSIId")); - this.tnFHSliceTaskInfo.setSuggestNssiName(paramMap.get("TN.FH.SuggestNSSIName")); - this.tnFHSliceTaskInfo.setProgress(paramMap.get("TN.FH.progress")); - this.tnFHSliceTaskInfo.setStatus(paramMap.get("TN.FH.status")); - this.tnFHSliceTaskInfo.setStatusDescription(paramMap.get("TN.FH.statusDescription")); - this.tnFHSliceTaskInfo.setScriptName(paramMap.get("TN.FH.ScriptName")); - - this.cnSliceTaskInfo.setSuggestNssiId(paramMap.get("CN.SuggestNSSIId")); - this.cnSliceTaskInfo.setSuggestNssiName(paramMap.get("CN.SuggestNSSIName")); - this.cnSliceTaskInfo.setProgress(paramMap.get("CN.progress")); - this.cnSliceTaskInfo.setStatus(paramMap.get("CN.status")); - this.cnSliceTaskInfo.setStatusDescription(paramMap.get("CN.statusDescription")); - this.cnSliceTaskInfo.setScriptName(paramMap.get("CN.ScriptName")); - - this.anSliceTaskInfo.setSuggestNssiId(paramMap.get("AN.SuggestNSSIId")); - this.anSliceTaskInfo.setSuggestNssiName(paramMap.get("AN.SuggestNSSIName")); - this.anSliceTaskInfo.setProgress(paramMap.get("AN.progress")); - this.anSliceTaskInfo.setStatus(paramMap.get("AN.status")); - this.anSliceTaskInfo.setStatusDescription(paramMap.get("AN.statusDescription")); - this.anSliceTaskInfo.setScriptName(paramMap.get("AN.ScriptName")); - } - - public String convertToJson() { - JsonObject jsonObject = new JsonObject(); - jsonObject.addProperty("ServiceId", serviceId); - jsonObject.addProperty("ServiceName", serviceName); - jsonObject.addProperty("NSTId", nstId); - jsonObject.addProperty("NSTName", nstName); - jsonObject.addProperty("suggestNSIId", suggestNsiId); - jsonObject.addProperty("suggestNSIName", suggestNsiName); - - for (Map.Entry entry : serviceProfile.entrySet()) { - jsonObject.addProperty("ServiceProfile." + entry.getKey(), entry.getValue().toString()); - } - Map sliceProfileAn = bean2Map(anSliceTaskInfo.getSliceProfile()); - for (Map.Entry entry : sliceProfileAn.entrySet()) { - String value = entry.getValue() == null ? "" : entry.getValue().toString(); - jsonObject.addProperty("SliceProfile.AN." + entry.getKey(), value); - } - Map sliceProfileCn = bean2Map(cnSliceTaskInfo.getSliceProfile()); - for (Map.Entry entry : sliceProfileCn.entrySet()) { - String value = entry.getValue() == null ? "" : entry.getValue().toString(); - jsonObject.addProperty("SliceProfile.CN." + entry.getKey(), value); - } - Map sliceProfileTnBH = bean2Map(tnBHSliceTaskInfo.getSliceProfile()); - for (Map.Entry entry : sliceProfileTnBH.entrySet()) { - String value = entry.getValue() == null ? "" : entry.getValue().toString(); - jsonObject.addProperty("SliceProfile.TN.BH." + entry.getKey(), value); - } - Map sliceProfileTnMH = bean2Map(tnMHSliceTaskInfo.getSliceProfile()); - for (Map.Entry entry : sliceProfileTnMH.entrySet()) { - String value = entry.getValue() == null ? "" : entry.getValue().toString(); - jsonObject.addProperty("SliceProfile.TN.MH." + entry.getKey(), value); - } - Map sliceProfileTnFH = bean2Map(tnFHSliceTaskInfo.getSliceProfile()); - for (Map.Entry entry : sliceProfileTnFH.entrySet()) { - String value = entry.getValue() == null ? "" : entry.getValue().toString(); - jsonObject.addProperty("SliceProfile.TN.FH." + entry.getKey(), value); - } - jsonObject.addProperty("TN.BH.SuggestNSSIId", tnBHSliceTaskInfo.getSuggestNssiId()); - jsonObject.addProperty("TN.BH.SuggestNSSIName", tnBHSliceTaskInfo.getSuggestNssiName()); - jsonObject.addProperty("TN.BH.progress", tnBHSliceTaskInfo.getProgress()); - jsonObject.addProperty("TN.BH.status", tnBHSliceTaskInfo.getStatus()); - jsonObject.addProperty("TN.BH.statusDescription", tnBHSliceTaskInfo.getStatusDescription()); - jsonObject.addProperty("TN.BH.ScriptName", tnBHSliceTaskInfo.getScriptName()); - - jsonObject.addProperty("TN.MH.SuggestNSSIId", tnMHSliceTaskInfo.getSuggestNssiId()); - jsonObject.addProperty("TN.MH.SuggestNSSIName", tnMHSliceTaskInfo.getSuggestNssiName()); - jsonObject.addProperty("TN.MH.progress", tnMHSliceTaskInfo.getProgress()); - jsonObject.addProperty("TN.MH.status", tnMHSliceTaskInfo.getStatus()); - jsonObject.addProperty("TN.MH.statusDescription", tnMHSliceTaskInfo.getStatusDescription()); - jsonObject.addProperty("TN.MH.ScriptName", tnMHSliceTaskInfo.getScriptName()); - - jsonObject.addProperty("TN.FH.SuggestNSSIId", tnFHSliceTaskInfo.getSuggestNssiId()); - jsonObject.addProperty("TN.FH.SuggestNSSIName", tnFHSliceTaskInfo.getSuggestNssiName()); - jsonObject.addProperty("TN.FH.progress", tnFHSliceTaskInfo.getProgress()); - jsonObject.addProperty("TN.FH.status", tnFHSliceTaskInfo.getStatus()); - jsonObject.addProperty("TN.FH.statusDescription", tnFHSliceTaskInfo.getStatusDescription()); - jsonObject.addProperty("TN.FH.ScriptName", tnFHSliceTaskInfo.getScriptName()); - - jsonObject.addProperty("CN.SuggestNSSIId", cnSliceTaskInfo.getSuggestNssiId()); - jsonObject.addProperty("CN.SuggestNSSIName", cnSliceTaskInfo.getSuggestNssiName()); - jsonObject.addProperty("CN.progress", cnSliceTaskInfo.getProgress()); - jsonObject.addProperty("CN.status", cnSliceTaskInfo.getStatus()); - jsonObject.addProperty("CN.statusDescription", cnSliceTaskInfo.getStatusDescription()); - jsonObject.addProperty("CN.ScriptName", cnSliceTaskInfo.getScriptName()); - - jsonObject.addProperty("AN.SuggestNSSIId", anSliceTaskInfo.getSuggestNssiId()); - jsonObject.addProperty("AN.SuggestNSSIName", anSliceTaskInfo.getSuggestNssiName()); - jsonObject.addProperty("AN.progress", anSliceTaskInfo.getProgress()); - jsonObject.addProperty("AN.status", anSliceTaskInfo.getStatus()); - jsonObject.addProperty("AN.statusDescription", anSliceTaskInfo.getStatusDescription()); - jsonObject.addProperty("AN.ScriptName", anSliceTaskInfo.getScriptName()); - - return jsonObject.toString(); - } + private SliceTaskInfo anNFSliceTaskInfo = new SliceTaskInfo<>(); /** * change T t to {@link Map} @@ -266,3 +123,4 @@ public class SliceTaskParamsAdapter implements Serializable { return sliceProfileMap; } } + diff --git a/common/src/main/java/org/onap/so/beans/nsmf/oof/SubnetType.java b/common/src/main/java/org/onap/so/beans/nsmf/oof/SubnetType.java index 536bb04fce..6f56a72632 100644 --- a/common/src/main/java/org/onap/so/beans/nsmf/oof/SubnetType.java +++ b/common/src/main/java/org/onap/so/beans/nsmf/oof/SubnetType.java @@ -26,6 +26,8 @@ import org.onap.so.beans.nsmf.NetworkType; public enum SubnetType { AN("AN", NetworkType.ACCESS), + AN_NF("AN_NF", NetworkType.ACCESS), + CN("CN", NetworkType.CORE), TN_FH("TN_FH", NetworkType.TRANSPORT), -- cgit 1.2.3-korg