break;
case TRANSPORT:
- AllocateTnNssi tn = nssmiAllocate.getAllocateTnNssi();
- assertObjectNotNull(tn);
- assertObjectNotNull(tn.getNsiInfo());
- assertObjectNotNull(tn.getNsiInfo().getNsiId());
- nsiId = tn.getNsiInfo().getNsiId();
- allocateReq = marshal(tn);
- allocateUrl = AllocateTnNssi.URL;
break;
}
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.validation</groupId>
+ <artifactId>validation-api</artifactId>
+ </dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
--- /dev/null
+package org.onap.so.beans.nsmf;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.Data;
+import java.io.Serializable;
+import java.util.List;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@Data
+public class AdditionalProperties implements Serializable {
+
+ private static final long serialVersionUID = -4020397418955518175L;
+
+ private SliceProfile sliceProfile;
+
+ private List<EndPoint> endPoints;
+
+ private NsiInfo nsiInfo;
+
+ private String scriptName;
+
+ private ModifyAction modifyAction;
+}
@JsonInclude(JsonInclude.Include.NON_NULL)
public class AllocateAnNssi {
+ @Deprecated
public final static String URL = "/api/rest/provMns/v1/an/NSS" + "/SliceProfiles";
private String nsstId;
- private String flavorId;
-
private String nssiId;
private String nssiName;
this.nsstId = nsstId;
}
- public String getFlavorId() {
- return flavorId;
- }
-
- public void setFlavorId(String flavorId) {
- this.flavorId = flavorId;
- }
-
public String getNssiId() {
return nssiId;
}
public class AllocateCnNssi implements Serializable {
public final static String URL = "/api/rest/provMns/v1/NSS/SliceProfiles";
+ private static final long serialVersionUID = 4909074863148869163L;
private String nsstId;
--- /dev/null
+package org.onap.so.beans.nsmf;
+
+public class AllocateNssi {
+}
package org.onap.so.beans.nsmf;
-import com.fasterxml.jackson.annotation.JsonInclude;
-@JsonInclude(JsonInclude.Include.NON_NULL)
-public class AllocateTnNssi {
+import lombok.Data;
+import java.io.Serializable;
+import java.util.List;
- public final static String URL = "/api/rest/provMns/v1/tn/NSS" + "/SliceProfiles";
+@Data
+public class AllocateTnNssi implements Serializable {
- private String nsstId;
+ private static final long serialVersionUID = -7069801712339914746L;
- private String flavorId;
+ private List<NetworkSliceInfo> networkSliceInfos;
- private String nssiId;
-
- private String nssiName;
-
- private TnSliceProfile sliceProfile;
-
- private String scriptName;
-
- private Object extension;
-
- private NsiInfo nsiInfo;
-
- public String getNsstId() {
- return nsstId;
- }
-
- public void setNsstId(String nsstId) {
- this.nsstId = nsstId;
- }
-
- public String getFlavorId() {
- return flavorId;
- }
-
- public void setFlavorId(String flavorId) {
- this.flavorId = flavorId;
- }
-
- public String getNssiId() {
- return nssiId;
- }
-
- public void setNssiId(String nssiId) {
- this.nssiId = nssiId;
- }
-
- public String getNssiName() {
- return nssiName;
- }
-
- public void setNssiName(String nssiName) {
- this.nssiName = nssiName;
- }
-
- public TnSliceProfile getSliceProfile() {
- return sliceProfile;
- }
-
- public void setSliceProfile(TnSliceProfile sliceProfile) {
- this.sliceProfile = sliceProfile;
- }
-
- public String getScriptName() {
- return scriptName;
- }
-
- public void setScriptName(String scriptName) {
- this.scriptName = scriptName;
- }
-
- public Object getExtension() {
- return extension;
- }
-
- public void setExtension(Object extension) {
- this.extension = extension;
- }
-
- public NsiInfo getNsiInfo() {
- return nsiInfo;
- }
-
- public void setNsiInfo(NsiInfo nsiInfo) {
- this.nsiInfo = nsiInfo;
- }
+ private List<TransportSliceNetwork> transportSliceNetworks;
}
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
import java.util.List;
@JsonInclude(JsonInclude.Include.NON_NULL)
+@Data
public class AnSliceProfile {
- @JsonProperty("5QI")
- private String qi;
+ private List<String> sNSSAIList;
+
+ private String sliceProfileId;
private List<String> coverageAreaTAList;
@JsonInclude(JsonInclude.Include.NON_DEFAULT)
private int latency;
- public String getQi() {
- return qi;
- }
+ private List<String> pLMNIdList;
- public void setQi(String qi) {
- this.qi = qi;
- }
+ private PerfReq perfReq;
- public List<String> getCoverageAreaTAList() {
- return coverageAreaTAList;
- }
+ @JsonInclude(JsonInclude.Include.NON_DEFAULT)
+ private int maxNumberofUEs;
- public void setCoverageAreaTAList(List<String> coverageAreaTAList) {
- this.coverageAreaTAList = coverageAreaTAList;
- }
+ private UeMobilityLevel uEMobilityLevel;
- public int getLatency() {
- return latency;
- }
+ private ResourceSharingLevel resourceSharingLevel;
- public void setLatency(int latency) {
- this.latency = latency;
- }
}
--- /dev/null
+package org.onap.so.beans.nsmf;
+
+
+import java.io.Serializable;
+
+
+public class ConnectionLink implements Serializable {
+ private static final long serialVersionUID = -1834584960407180427L;
+
+ private String transportEndpointA;
+
+ private String transportEndpointB;
+
+ public static long getSerialVersionUID() {
+ return serialVersionUID;
+ }
+
+ public String getTransportEndpointA() {
+ return transportEndpointA;
+ }
+
+ public void setTransportEndpointA(String transportEndpointA) {
+ this.transportEndpointA = transportEndpointA;
+ }
+
+ public String getTransportEndpointB() {
+ return transportEndpointB;
+ }
+
+ public void setTransportEndpointB(String transportEndpointB) {
+ this.transportEndpointB = transportEndpointB;
+ }
+}
@JsonInclude(JsonInclude.Include.NON_NULL)
public class DeAllocateNssi {
+ @Deprecated
public final static String URL = "/api/rest/provMns/v1/NSS" + "/SliceProfiles/%s";
private String nsiId;
--- /dev/null
+package org.onap.so.beans.nsmf;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.Data;
+import java.io.Serializable;
+import java.util.Map;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@Data
+public class EndPoint implements Serializable {
+
+ private static final long serialVersionUID = 2479795890807020491L;
+
+ private String nodeId;
+
+ private Map<String, Object> additionalInfo;
+}
@JsonInclude(JsonInclude.Include.NON_NULL)
public class EsrInfo implements Serializable {
+ private static final long serialVersionUID = -7696600990607396263L;
private String vendor;
private NetworkType networkType;
--- /dev/null
+package org.onap.so.beans.nsmf;
+
+public enum ModifyAction {
+ allocate, deallocate
+}
--- /dev/null
+package org.onap.so.beans.nsmf;
+
+
+import lombok.Data;
+import java.io.Serializable;
+
+@Data
+public class NetworkSliceInfo implements Serializable {
+ private static final long serialVersionUID = 4401921718259398587L;
+
+ private String snssai;
+
+ private String customer;
+
+ private String serviceType;
+}
this.nsiName = nsiName;
}
- public void setNsiId(String nsiId) {
- this.nsiId = nsiId;
- }
-
public String getNsiId() {
return nsiId;
}
+
+ public void setNsiId(String nsiId) {
+ this.nsiId = nsiId;
+ }
}
package org.onap.so.beans.nsmf;
import com.fasterxml.jackson.annotation.JsonInclude;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
@JsonInclude(JsonInclude.Include.NON_NULL)
-public class NssiAllocateRequest {
+public class NssiAllocateRequest implements Serializable {
+ private static final long serialVersionUID = -454145891489457960L;
+
+ @NotNull
private EsrInfo esrInfo;
private AllocateCnNssi allocateCnNssi;
private AllocateAnNssi allocateAnNssi;
+ private ServiceInfo serviceInfo;
+
public EsrInfo getEsrInfo() {
return esrInfo;
}
--- /dev/null
+package org.onap.so.beans.nsmf;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.Data;
+import java.io.Serializable;
+
+
+@Data
+public class NssmfAdapterNBIRequest implements Serializable {
+
+ private static final long serialVersionUID = -454145891489457960L;
+
+ @JsonInclude(JsonInclude.Include.NON_NULL)
+ private EsrInfo esrInfo;
+
+ @JsonInclude(JsonInclude.Include.NON_NULL)
+ private ServiceInfo serviceInfo;
+
+ private AllocateCnNssi allocateCnNssi;
+
+ private AllocateTnNssi allocateTnNssi;
+
+ private AllocateAnNssi allocateAnNssi;
+
+ private ActDeActNssi actDeActNssi;
+
+ private DeAllocateNssi deAllocateNssi;
+
+ private String subnetCapabilityQuery;
+
+ private String responseId;
+}
--- /dev/null
+package org.onap.so.beans.nsmf;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.Data;
+import java.io.Serializable;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@Data
+public class NssmfRequest implements Serializable {
+
+ private static final long serialVersionUID = 3313218757241310655L;
+
+ private String name;
+
+ private String modelInvariantUuid;
+
+ private String modelUuid;
+
+ private String globalSubscriberId;
+
+ private String serviceInstanceId;
+
+ private String subscriptionServiceType;
+
+ private NetworkType networkType;
+
+ private Object additionalProperties;
+
+ public NssmfRequest() {}
+
+ public NssmfRequest(ServiceInfo serviceInfo, NetworkType networkType, Object additionalProperties) {
+ this.modelInvariantUuid = serviceInfo.getServiceInvariantUuid();
+ this.modelUuid = serviceInfo.getServiceUuid();
+ this.globalSubscriberId = serviceInfo.getGlobalSubscriberId();
+ this.subscriptionServiceType = serviceInfo.getSubscriptionServiceType();
+ this.networkType = networkType;
+ this.additionalProperties = additionalProperties;
+ this.serviceInstanceId = serviceInfo.getNssiId();
+ this.name = serviceInfo.getNssiName();
+ }
+
+}
+
+
+/**
+ * { "name": "eMBB-001", "modelInvariantUuid": "NSST-C-001-HDBNJ-NSSMF-01-A-ZX", "modelUuid":
+ * "NSST-C-001-HDBNJ-NSSMF-01-A-ZX-UUID", "globalSubscriberId": "5GCustomer", "subscriptionServiceType": "5G",
+ * "networkType": "AN/CN/TN", "additionalProperties": { "sliceProfile": { "snssaiList": [ "001-100001" ],
+ * "sliceProfileId": "ab9af40f13f721b5f13539d87484098", "plmnIdList": [ "460-00", "460-01" ], "perfReq": {
+ * "perfReqEmbbList ": [ { "activityFactor": 50 } ] }, "maxNumberofUEs": 200, "coverageAreaTAList": [ "1", "2", "3", "4"
+ * ], "latency": 2, "resourceSharingLevel": "non-shared" }, "endPoints": [ { "nodeId": "", "additionalInfo": { "xxx":
+ * "xxx" } }, { "nodeId": "", "additionalInfo": { "xxx": "xxx" } } ], "nsiInfo": { "nsiId":
+ * "NSI-M-001-HDBNJ-NSMF-01-A-ZX", "nsiName": "eMBB-001" }, "scriptName": "AN1" } }
+ */
--- /dev/null
+package org.onap.so.beans.nsmf;
+
+import lombok.Data;
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class ServiceInfo implements Serializable {
+
+ private static final long serialVersionUID = 7895110339097615695L;
+
+ private String serviceInvariantUuid;
+
+ private String serviceUuid;
+
+ private String globalSubscriberId;
+
+ private String subscriptionServiceType;
+
+ private String serviceType;
+
+ private String nsiId;
+
+ private String nssiId;
+
+ private String sST;
+
+ private String nssiName;
+
+ private String pLMNIdList;
+}
package org.onap.so.beans.nsmf;
import java.io.Serializable;
+import java.util.HashMap;
import java.util.Map;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
--- /dev/null
+package org.onap.so.beans.nsmf;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.Data;
+import java.io.Serializable;
+import java.util.List;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@Data
+public class SliceProfile implements Serializable {
+
+ private static final long serialVersionUID = 7924389625656716814L;
+
+ private List<String> snssaiList;
+
+ private String sliceProfileId;
+
+ private List<String> plmnIdList;
+
+ private PerfReq perfReq;
+
+ private Integer maxNumberofUEs;
+
+ private List<String> coverageAreaTAList;
+
+ private Integer latency;
+
+ private String resourceSharingLevel;
+
+}
--- /dev/null
+package org.onap.so.beans.nsmf;
+
+import lombok.Data;
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class TransportSliceNetwork implements Serializable {
+ private static final long serialVersionUID = 809947462399806990L;
+
+ private List<ConnectionLink> connectionLinks;
+}
Code Review / so.git / commitdiff