Merging 2024Q2_RC into main, creating 2024Q2 Release (!7) · Merge requests · OSL / code / org.etsi.osl.sol005nbi.osm10

src/main/java/OSM10NBIClient/NSActionRequestPayload.java

0 → 100644

+158 −0

Changes for src/main/java/OSM10NBIClient/NSActionRequestPayload.java: 158 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		/*-
		* ========================LICENSE_START=================================
		* org.etsi.osl.sol007nbi.osm
		* %%
		* Copyright (C) 2019 openslice.io
		* %%
		* 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 OSM10NBIClient;

		import java.util.LinkedHashMap;
		import java.util.Map;

		import com.fasterxml.jackson.annotation.JsonAnySetter;
		import com.fasterxml.jackson.annotation.JsonInclude.Include;
		import com.fasterxml.jackson.core.JsonProcessingException;
		import com.fasterxml.jackson.databind.ObjectMapper;


		/**
		* @author ichatzis
		*
		*/
		public class NSActionRequestPayload
		{

		private String nsInstanceId;
		private String member_vnf_index; // Needed for VNFD mapping NSD.constituent-vnfd.member-vnf-index. If missing a NSD is targeting. Example: "member_vnf_index": "1",
		private String vdu_id; // Needed if target is a VDU. Maps VNFD.vdu-id
		private String vdu_count_index; // Needed if the VDU has several replicas (count>1)
		private String primitive; // Mandatory. Maps [NSD.ns-configuration or VNFD.vnf-configuration or VNFD.vdu.vdu-configuration].config-primitive.name. Example: "primitive": "touch"
		private String param;
		private String lcmOperationType; //"lcmOperationType": "action"
		private String vnf_member_index; // TODO for backward compatibility. To remove in future
		private String kdu_name;
		private Integer timeout_ns_action;
		private Map<String, Object> primitive_params = new LinkedHashMap<>();

		public Map<String, Object> getPrimitive_params() {
		return primitive_params;
		}

		@JsonAnySetter
		public void setPrimitive_params(Map<String, Object> primitive_params) {
		this.primitive_params = primitive_params;
		}

		public String getMember_vnf_index() {
		return member_vnf_index;
		}

		public void setMember_vnf_index(String member_vnf_index) {
		this.member_vnf_index = member_vnf_index;
		}

		public String getVdu_id() {
		return vdu_id;
		}

		public void setVdu_id(String vdu_id) {
		this.vdu_id = vdu_id;
		}

		public String getVdu_count_index() {
		return vdu_count_index;
		}

		public void setVdu_count_index(String vdu_count_index) {
		this.vdu_count_index = vdu_count_index;
		}

		public String getPrimitive() {
		return primitive;
		}

		public void setPrimitive(String primitive) {
		this.primitive = primitive;
		}

		public void setPrimitiveParams(String primitive_name, String primitive_value) {
		}

		public String getParam() {
		return param;
		}

		public void setParam(String param) {
		this.param = param;
		}

		public String getLcmOperationType() {
		return lcmOperationType;
		}

		public void setLcmOperationType(String lcmOperationType) {
		this.lcmOperationType = lcmOperationType;
		}

		public String getNsInstanceId() {
		return nsInstanceId;
		}

		public void setNsInstanceId(String nsInstanceId) {
		this.nsInstanceId = nsInstanceId;
		}

		public String getVnf_member_index() {
		return vnf_member_index;
		}

		public void setVnf_member_index(String vnf_member_index) {
		this.vnf_member_index = vnf_member_index;
		}

		public String getKdu_name() {
		return kdu_name;
		}

		public void setKdu_name(String kdu_name) {
		this.kdu_name = kdu_name;
		}

		public Integer getTimeout_ns_action() {
		return timeout_ns_action;
		}

		public void setTimeout_ns_action(Integer timeout_ns_action) {
		this.timeout_ns_action = timeout_ns_action;
		}

		public String toJSON()
		{
		String jsonInString=null;
		ObjectMapper mapper = new ObjectMapper();
		mapper.setSerializationInclusion(Include.NON_NULL);
		try {
		jsonInString = mapper.writerWithDefaultPrettyPrinter().writeValueAsString(this);
		} catch (JsonProcessingException e) {
		// TODO Auto-generated catch block
		e.printStackTrace();
		}
		return jsonInString;
		}
		}

src/main/java/OSM10NBIClient/NSCreateInstanceRequestPayload.java

0 → 100644

+37 −0

Changes for src/main/java/OSM10NBIClient/NSCreateInstanceRequestPayload.java: 37 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		/*-
		* ========================LICENSE_START=================================
		* org.etsi.osl.sol007nbi.osm
		* %%
		* Copyright (C) 2019 openslice.io
		* %%
		* 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 OSM10NBIClient;

		/**
		* @author ctranoris
		*
		*/
		public class NSCreateInstanceRequestPayload extends NSInstantiateInstanceRequestPayload
		{
		private final String notificationType = "NsIdentifierCreationNotification";

		public NSCreateInstanceRequestPayload()
		{
		super();
		}
		}

src/main/java/OSM10NBIClient/NSInstantiateInstanceRequestPayload.java

0 → 100644

+209 −0

Changes for src/main/java/OSM10NBIClient/NSInstantiateInstanceRequestPayload.java: 209 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		/*-
		* ========================LICENSE_START=================================
		* org.etsi.osl.sol005nbi.osm10
		* %%
		* Copyright (C) 2019 openslice.io
		* %%
		* 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 OSM10NBIClient;

		import java.util.ArrayList;
		import java.util.LinkedHashMap;
		import java.util.List;

		import com.fasterxml.jackson.annotation.JsonInclude.Include;
		import com.fasterxml.jackson.annotation.JsonProperty;
		import com.fasterxml.jackson.core.JsonProcessingException;
		import com.fasterxml.jackson.databind.ObjectMapper;

		public class NSInstantiateInstanceRequestPayload
		{
		private String nsName;
		public String getNsName() {
		return nsName;
		}

		public void setNsName(String nsName) {
		this.nsName = nsName;
		}

		private String vimAccountId;
		public String getVimAccountId() {
		return vimAccountId;
		}

		public void setVimAccountId(String vimAccountId) {
		this.vimAccountId = vimAccountId;
		}

		private Boolean wimAccountId;
		public Boolean getWimAccountId() {
		return wimAccountId;
		}

		public void setWimAccountId(Boolean wimAccountId) {
		this.wimAccountId = wimAccountId;
		}


		private String nsdId;
		public String getNsdId() {
		return nsdId;
		}

		public void setNsdId(String nsdId) {
		this.nsdId = nsdId;
		}

		public class VnF
		{
		@JsonProperty("member-vnf-index")
		private String memberVnFIndex;
		public String getMemberVnFIndex() {
		return memberVnFIndex;
		}
		public void setMemberVnFIndex(String memberVnFIndex) {
		this.memberVnFIndex = memberVnFIndex;
		}
		@JsonProperty("vdu")
		private List<Vdu> vdu = null;

		public List<Vdu> getVdu() {
		return vdu;
		}
		public void setVdu(List<Vdu> vdu) {
		this.vdu = vdu;
		}

		@JsonProperty("vimAccountId")
		private String vimAccount;
		public String getVimAccount() {
		return vimAccount;
		}
		public void setVimAccount(String vimAccount) {
		this.vimAccount = vimAccount;
		}

		public VnF()
		{

		};
		}


		public class Vdu
		{
		@JsonProperty("id")
		private String id;
		@JsonProperty("interface")
		private ArrayList<NInterface> interfaceObj = null;

		public ArrayList<NInterface> getInterfaceObj() {
		return interfaceObj;
		}
		public void setInterfaceObj(ArrayList<NInterface> interfaceObj) {
		this.interfaceObj = interfaceObj;
		}
		public String getId() {
		return id;
		}
		public void setId(String id) {
		this.id = id;
		}
		}

		public class NInterface
		{
		@JsonProperty("name")
		private String name;
		@JsonProperty("floating-ip-required")
		private Boolean floating_ip_required;
		public String getName() {
		return name;
		}
		public void setName(String name) {
		this.name = name;
		}
		public Boolean getFloating_ip_required() {
		return floating_ip_required;
		}
		public void setFloating_ip_required(Boolean floating_ip_required) {
		this.floating_ip_required = floating_ip_required;
		}
		}

		class Vld
		{
		@JsonProperty("name")
		private String name;
		@JsonProperty("vim-network-name")
		private LinkedHashMap<String,String> vimNetworkName = new LinkedHashMap<>();

		public String getName() {
		return name;
		}
		public void setName(String name) {
		this.name = name;
		}
		public LinkedHashMap<String, String> getVimNetworkName() {
		return vimNetworkName;
		}
		public void setVimNetworkName(LinkedHashMap<String, String> vimNetworkName) {
		this.vimNetworkName = vimNetworkName;
		}
		// private String vimNetworkName;
		// public String getVimNetworkName() {
		// return vimNetworkName;
		// }
		// public void setVimNetworkName(String vimNetworkName) {
		// this.vimNetworkName = vimNetworkName;
		// }
		}
		private List<VnF> vnf = new ArrayList<>();
		public List<VnF> getVnf() {
		return vnf;
		}

		public void setVnf(List<VnF> vnf) {
		this.vnf = vnf;
		}

		private List<Vld> vld = new ArrayList<>();

		public List<Vld> getVld() {
		return vld;
		}

		public void setVld(List<Vld> vld) {
		this.vld = vld;
		}


		public String toJSON()
		{
		String jsonInString=null;
		ObjectMapper mapper = new ObjectMapper();
		mapper.setSerializationInclusion(Include.NON_NULL);
		try {
		jsonInString = mapper.writerWithDefaultPrettyPrinter().writeValueAsString(this);
		} catch (JsonProcessingException e) {
		// TODO Auto-generated catch block
		e.printStackTrace();
		}
		return jsonInString;
		}

		}

src/main/java/OSM10NBIClient/NSScaleRequestPayload.java

0 → 100644

+158 −0

Changes for src/main/java/OSM10NBIClient/NSScaleRequestPayload.java: 158 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		/*-
		* ========================LICENSE_START=================================
		* org.etsi.osl.sol007nbi.osm
		* %%
		* Copyright (C) 2019 openslice.io
		* %%
		* 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 OSM10NBIClient;

		import com.fasterxml.jackson.annotation.JsonInclude.Include;
		import com.fasterxml.jackson.core.JsonProcessingException;
		import com.fasterxml.jackson.databind.ObjectMapper;

		/**
		* @author Ioannis Chatzis
		*
		*/
		enum ScaleVnfType {SCALE_OUT, SCALE_IN};

		public class NSScaleRequestPayload
		{

		private class ScaleVnfData
		{
		private class ScaleByStepData
		{
		private String scaling_group_descriptor;
		private String member_vnf_index;
		private String scaling_policy;

		public String getScaling_group_descriptor() {
		return scaling_group_descriptor;
		}
		public void setScaling_group_descriptor(String scaling_group_descriptor) {
		this.scaling_group_descriptor = scaling_group_descriptor;
		}
		public String getMember_vnf_index() {
		return member_vnf_index;
		}
		public void setMember_vnf_index(String member_vnf_index) {
		this.member_vnf_index = member_vnf_index;
		}
		public String getScaling_policy() {
		return scaling_policy;
		}
		public void setScaling_policy(String scaling_policy) {
		this.scaling_policy = scaling_policy;
		}
		}

		private ScaleVnfType scaleVnfType;
		private String vnfInstanceId;
		private ScaleByStepData scaleByStepData;

		public String getVnfInstanceId() {
		return vnfInstanceId;
		}
		public ScaleByStepData getScaleByStepData() {
		return scaleByStepData;
		}
		public void setScaleByStepData(ScaleByStepData scaleByStepData) {
		this.scaleByStepData = scaleByStepData;
		}
		public void setVnfInstanceId(String vnfInstanceId) {
		this.vnfInstanceId = vnfInstanceId;
		}
		public ScaleVnfType getScaleVnfType() {
		return scaleVnfType;
		}
		public void setScaleVnfType(ScaleVnfType scaleVnfType) {
		this.scaleVnfType = scaleVnfType;
		}

		}

		private String lcmOperationType; //"lcmOperationType": "scale"
		private String nsInstanceId;
		private String scaleType;
		private String timeout_ns_scale;
		private ScaleVnfData scaleVnfData;
		private String scaleTime;

		public String getLcmOperationType() {
		return lcmOperationType;
		}

		public void setLcmOperationType(String lcmOperationType) {
		this.lcmOperationType = lcmOperationType;
		}

		public String getNsInstanceId() {
		return nsInstanceId;
		}

		public void setNsInstanceId(String nsInstanceId) {
		this.nsInstanceId = nsInstanceId;
		}

		public String toJSON()
		{
		String jsonInString=null;
		ObjectMapper mapper = new ObjectMapper();
		mapper.setSerializationInclusion(Include.NON_NULL);
		try {
		jsonInString = mapper.writerWithDefaultPrettyPrinter().writeValueAsString(this);
		} catch (JsonProcessingException e) {
		// TODO Auto-generated catch block
		e.printStackTrace();
		}
		return jsonInString;
		}

		public String getScaleType() {
		return scaleType;
		}

		public void setScaleType(String scaleType) {
		this.scaleType = scaleType;
		}

		public String getTimeout_ns_scale() {
		return timeout_ns_scale;
		}

		public void setTimeout_ns_scale(String timeout_ns_scale) {
		this.timeout_ns_scale = timeout_ns_scale;
		}

		public ScaleVnfData getScaleVnfData() {
		return scaleVnfData;
		}

		public void setScaleVnfData(ScaleVnfData scaleVnfData) {
		this.scaleVnfData = scaleVnfData;
		}

		public String getScaleTime() {
		return scaleTime;
		}

		public void setScaleTime(String scaleTime) {
		this.scaleTime = scaleTime;
		}
		}

src/main/java/OSM10NBIClient/OSM10Client.java

0 → 100644

+1503 −0

File added.

Preview size limit exceeded, changes collapsed.

Merging 2024Q2_RC into main, creating 2024Q2 Release

Merge request reports