Merging 2024Q2_RC into main, creating 2024Q2 Release

###

# ========================LICENSE_START=================================

# org.etsi.osl.model

# %%

# 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==================================

###

/*-

 * ========================LICENSE_START=================================

 * org.etsi.osl.model

 * %%

 * 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 org.etsi.osl.model.nfv.util;

import org.apache.shiro.crypto.hash.Hash;

import org.apache.shiro.crypto.hash.Md5Hash;

/**

 * @author ctranoris

 *

 */

public class EncryptionUtil {

    //secret key

    private static final byte[] key = new byte[]{'d', '3', '2', 't', 'p', 'd', 'M', 'o', 'I', '8', 'x', 'z', 'a', 'P', 'o', 'd'};

    /**

     * return hash value of string

     *

     * @param str unhashed string

     * @return hash value of string

     */

    public static String hash(String str) {

		Hash hash = new Md5Hash(str);

        return hash.toBase64();

    }

    /**

     * return encrypt value

     *

     * @param val unencrypted string

     * @return encrypted string

     */

    public static String encrypt(String val) {

        String retVal = null;

        return retVal;

    }

    /**

     * return decrypted value of an encrypted

     *

     * @param val encrypted string

     * @return decrypted string

     */

    public static String decrypt(String val) {

        String retVal = null;

        return retVal;

    }

}

/*-

 * ========================LICENSE_START=================================

 * org.etsi.osl.model

 * %%

 * 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 org.etsi.osl.model.nfv;

import java.util.ArrayList;

import java.util.HashSet;

import java.util.List;

import java.util.Set;

import jakarta.persistence.Basic;

import jakarta.persistence.CascadeType;

import jakarta.persistence.Entity;

import jakarta.persistence.FetchType;

import jakarta.persistence.GeneratedValue;

import jakarta.persistence.GenerationType;

import jakarta.persistence.Id;

import jakarta.persistence.JoinColumn;

import jakarta.persistence.JoinTable;

import jakarta.persistence.ManyToMany;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;

import com.fasterxml.jackson.annotation.JsonIgnore;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

@Entity(name = "Category")

@JsonIgnoreProperties(value = {  "products" }, ignoreUnknown = true )

public class Category {

	private static final transient Logger logger = LoggerFactory.getLogger(Category.class.getName());

	@Id

	@GeneratedValue(strategy = GenerationType.IDENTITY)

	private long id = 0;

	@Basic()

	private String name=null;

	@ManyToMany(cascade = { CascadeType.ALL })

	 @JoinTable(

		        name = "CATEGORY_PRODUCTS", 

		        joinColumns = { @JoinColumn(name = "CAT_ID") }, 

		        inverseJoinColumns = { @JoinColumn(name = "PROD_ID") }

		    )

	private Set<Product> products = new HashSet<Product>();

	public Set<Product> getProducts() {

		return products;

	}

	public void setProducts(Set<Product> products) {

		this.products = products;

	}

	public String getName() {

		return name;

	}

	public void setName(String name) {

		this.name = name;

	}

	public long getId() {

		return id;

	}

	public void setId(long id) {

		this.id = id;

	}

	public void addProduct(Product product) {

		if (!products.contains(product)) {

			logger.info("ACTUALLY add into category "+ this.getName()+"  product "+product.getId());

			products.add(product);

			//product.addCategory(this);

		}		

	}

	public void removeProduct(Product p) {

		if (products.contains(p)) {

			products.remove(p);

			//p.removeCategory(this);

		}		

	}

	@JsonIgnore

	public int getAppscount() {

		int c = 0;

		for (Product p : products) {

			if ( p  instanceof ExperimentMetadata)

				c++;

		}

		return c;

	}

	@JsonIgnore

	public int getVxFscount() {

		int c = 0;

		for (Product p : products) {

			if ( p  instanceof VxFMetadata)

				c++;

		}

		return c;

	}

	@JsonIgnore

	public int getProductsCount() {

		return products.size();

	}

}

package org.etsi.osl.model.nfv;

public class CompositeExperimentOnBoardDescriptor {

	private ExperimentOnBoardDescriptor obd;

	private String filename;

	private byte[] allBytes;

	public ExperimentOnBoardDescriptor getObd() {

		return obd;

	}

	public void setObd(ExperimentOnBoardDescriptor obd) {

		this.obd = obd;

	}

	public String getFilename() {

		return filename;

	}

	public void setFilename(String filename) {

		this.filename = filename;

	}

	public byte[] getAllBytes() {

		return allBytes;

	}

	public void setAllBytes(byte[] allBytes) {

		this.allBytes = allBytes;

	}

}

package org.etsi.osl.model.nfv;

public class CompositeVxFOnBoardDescriptor {

	private VxFOnBoardedDescriptor obd;

	private String filename;

	private byte[] allBytes;

	public VxFOnBoardedDescriptor getObd() {

		return obd;

	}

	public void setObd(VxFOnBoardedDescriptor obd) {

		this.obd = obd;

	}

	public String getFilename() {

		return filename;

	}

	public void setFilename(String filename) {

		this.filename = filename;

	}

	public byte[] getAllBytes() {

		return allBytes;

	}

	public void setAllBytes(byte[] allBytes) {

		this.allBytes = allBytes;

	}

}