Commit 2f2913cb authored by Anastasios Poimenidis's avatar Anastasios Poimenidis
Browse files

feat: introduce new models for getting credentials via Registry API

parent 4028f23a

src/main/java/org/etsi/osl/hypo/core/common/ServiceBaseOrganizationObject.java

0 → 100644
+29 −0
Original line number Diff line number Diff line 
package org.etsi.osl.hypo.core.common;



import com.fasterxml.jackson.annotation.JsonInclude;

import com.fasterxml.jackson.annotation.JsonProperty;

import lombok.AllArgsConstructor;

import lombok.Data;

import lombok.NoArgsConstructor;

import lombok.ToString;



import java.io.Serializable;

import java.util.UUID;



@Data

@AllArgsConstructor

@NoArgsConstructor

@JsonInclude(JsonInclude.Include.NON_NULL)

public class ServiceBaseOrganizationObject implements Serializable {

    private UUID serviceOrderId;

    private UUID serviceOrderItemId;

    private UUID serviceId;



    @ToString.Exclude

    private String authHeader;

    @ToString.Exclude

    @JsonProperty("XVaultToken")

    private String xVaultToken;



    private OrganizationCharacteristics organizationCharacteristics;

}

src/main/java/org/etsi/osl/hypo/core/common/oss/client/K8sServiceOrderData.java

+2 −5
Original line number Diff line number Diff line
@@ -3,8 +3,7 @@ package org.etsi.osl.hypo.core.common.oss.client; 
import com.fasterxml.jackson.annotation.JsonInclude;

import com.fasterxml.jackson.databind.annotation.JsonDeserialize;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;

import org.etsi.osl.hypo.core.common.OrganizationCharacteristics;

import org.etsi.osl.hypo.core.common.ServiceBaseObject;

import org.etsi.osl.hypo.core.common.ServiceBaseOrganizationObject;

import org.etsi.osl.hypo.core.common.constants.deserializers.OffsetDateTimeCustomDeserializer;

import org.etsi.osl.hypo.core.common.serializers.OffsetDateTimeCustomSerializer;

import org.etsi.osl.hypo.core.common.tmf.ServiceOrderCharacteristic;
@@ -23,7 +22,7 @@ import java.util.UUID; 
@AllArgsConstructor

@JsonInclude(JsonInclude.Include.NON_NULL)

@EqualsAndHashCode(callSuper = true)

public class K8sServiceOrderData extends ServiceBaseObject implements Serializable {

public class K8sServiceOrderData extends ServiceBaseOrganizationObject implements Serializable {



    private UUID serviceSpecificationId;

    private String serviceSpecificationName;
@@ -36,6 +35,4 @@ public class K8sServiceOrderData extends ServiceBaseObject implements Serializab 
    @JsonDeserialize(using = OffsetDateTimeCustomDeserializer.class)

    @JsonSerialize(using = OffsetDateTimeCustomSerializer.class)

    private OffsetDateTime requestedStartDate;



    private OrganizationCharacteristics organizationCharacteristics;

}
 
 No newline at end of file

src/main/java/org/etsi/osl/hypo/core/common/oss/client/K8sServiceOrderSpecs.java

+2 −5
Original line number Diff line number Diff line
@@ -3,8 +3,7 @@ package org.etsi.osl.hypo.core.common.oss.client; 
import com.fasterxml.jackson.annotation.JsonInclude;

import com.fasterxml.jackson.databind.annotation.JsonDeserialize;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;

import org.etsi.osl.hypo.core.common.OrganizationCharacteristics;

import org.etsi.osl.hypo.core.common.ServiceBaseObject;

import org.etsi.osl.hypo.core.common.ServiceBaseOrganizationObject;

import org.etsi.osl.hypo.core.common.constants.deserializers.OffsetDateTimeCustomDeserializer;

import org.etsi.osl.hypo.core.common.serializers.OffsetDateTimeCustomSerializer;

import lombok.AllArgsConstructor;
@@ -21,7 +20,7 @@ import java.util.UUID; 
@AllArgsConstructor

@JsonInclude(JsonInclude.Include.NON_NULL)

@EqualsAndHashCode(callSuper = true)

public class K8sServiceOrderSpecs extends ServiceBaseObject implements Serializable {

public class K8sServiceOrderSpecs extends ServiceBaseOrganizationObject implements Serializable {

    private UUID locationId;

    private int numberOfK8sNodes;

    private String flavorOfNodes;
@@ -36,8 +35,6 @@ public class K8sServiceOrderSpecs extends ServiceBaseObject implements Serializa 
    private String serviceChar5GCoreRadioNodes;

    private String serviceChar5GCoreUPFIP;



    private OrganizationCharacteristics organizationCharacteristics;







    @JsonDeserialize(using = OffsetDateTimeCustomDeserializer.class)

src/main/java/org/etsi/osl/hypo/core/common/oss/client/SimpleServiceOrderData.java

+2 −5
Original line number Diff line number Diff line
@@ -3,8 +3,7 @@ package org.etsi.osl.hypo.core.common.oss.client; 
import com.fasterxml.jackson.annotation.JsonInclude;

import com.fasterxml.jackson.databind.annotation.JsonDeserialize;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;

import org.etsi.osl.hypo.core.common.OrganizationCharacteristics;

import org.etsi.osl.hypo.core.common.ServiceBaseObject;

import org.etsi.osl.hypo.core.common.ServiceBaseOrganizationObject;

import org.etsi.osl.hypo.core.common.constants.deserializers.OffsetDateTimeCustomDeserializer;

import org.etsi.osl.hypo.core.common.serializers.OffsetDateTimeCustomSerializer;

import org.etsi.osl.hypo.core.common.tmf.ServiceOrderCharacteristic;
@@ -23,7 +22,7 @@ import java.util.UUID; 
@AllArgsConstructor

@JsonInclude(JsonInclude.Include.NON_NULL)

@EqualsAndHashCode(callSuper = true)

public class SimpleServiceOrderData extends ServiceBaseObject implements Serializable{

public class SimpleServiceOrderData extends ServiceBaseOrganizationObject implements Serializable{



    private UUID serviceSpecificationId;

    private String serviceSpecificationName;
@@ -38,6 +37,4 @@ public class SimpleServiceOrderData extends ServiceBaseObject implements Seriali 
    @JsonDeserialize(using = OffsetDateTimeCustomDeserializer.class)

    @JsonSerialize(using = OffsetDateTimeCustomSerializer.class)

    private OffsetDateTime requestedStartDate;



    private OrganizationCharacteristics organizationCharacteristics;

}
 
 No newline at end of file

src/main/java/org/etsi/osl/hypo/core/common/registry/OrganizationCredentials.java

+3 −1
Original line number Diff line number Diff line
@@ -6,11 +6,13 @@ import lombok.Data; 
import lombok.NoArgsConstructor;

import lombok.ToString;



import java.io.Serializable;



@Data

@AllArgsConstructor

@NoArgsConstructor

@JsonInclude(JsonInclude.Include.NON_NULL)

public class OrganizationCredentials {

public class OrganizationCredentials implements Serializable {

  private String organizationId;

  @ToString.Exclude private String username;

  @ToString.Exclude private String password;