Commit b69e909d authored by Kostis Trantzas's avatar Kostis Trantzas
Browse files

Merge branch 'osl-secret-characteristics' into 'develop' 

Use Secret characteristic value type for `KubernetesSecret` data

See merge request !15
parents d3c531fb ffe9acd8

src/main/java/org/etsi/osl/domain/model/kubernetes/KubernetesSecret.java

+8 −8
Original line number Diff line number Diff line
@@ -112,10 +112,10 @@ public class KubernetesSecret extends DomainModelDefinition 
		rsc.addResourceSpecificationCharacteristicItemShort("Kind", this.kind, EValueType.TEXT.getValue(), "", false);

		rsc.addResourceSpecificationCharacteristicItemShort("apiGroup", this.apiGroup, EValueType.TEXT.getValue(), "", false);

		rsc.addResourceSpecificationCharacteristicItemShort("UID", this.UID, EValueType.TEXT.getValue(), "", false);

		rsc.addResourceSpecificationCharacteristicItemShort("metadata", this.metadata, EValueType.OBJECT.getValue(), "", false);

		rsc.addResourceSpecificationCharacteristicItemShort("metadata", this.metadata, EValueType.SECRET.getValue(), "", false);

//		rsc.addResourceSpecificationCharacteristicItemShort("yaml", this.yaml, EValueType.TEXT.getValue(), "", false);

		rsc.addResourceSpecificationCharacteristicItemShort("json", this.json, EValueType.TEXT.getValue(), "", false);

        rsc.addResourceSpecificationCharacteristicItemShort("data", this.dataObj, EValueType.OBJECT.getValue(), "", false);

		rsc.addResourceSpecificationCharacteristicItemShort("json", this.json, EValueType.SECRET.getValue(), "", false);

		rsc.addResourceSpecificationCharacteristicItemShort("data", this.dataObj, EValueType.SECRET.getValue(), "", false);

        

		if (this.properties != null)

		  this.properties.forEach((kPropName, vProVal) -> {
@@ -127,7 +127,7 @@ public class KubernetesSecret extends DomainModelDefinition 
		if (this.data != null)

		  this.data.forEach((kPropName, vProVal) -> {

		    EValueType etype;        

		    etype = EValueType.TEXT;

		    etype = EValueType.SECRET;

		    rsc.addResourceSpecificationCharacteristicItemShort(kPropName , vProVal, etype.getValue(), "", false);



		  });
@@ -182,10 +182,10 @@ public class KubernetesSecret extends DomainModelDefinition 
		rs.addResourceCharacteristicItemShort("Kind", this.kind, EValueType.TEXT.getValue());

		rs.addResourceCharacteristicItemShort("apiGroup", this.apiGroup, EValueType.TEXT.getValue());

		rs.addResourceCharacteristicItemShort("UID", this.UID, EValueType.TEXT.getValue());

		rs.addResourceCharacteristicItemShort("metadata", this.metadata, EValueType.OBJECT.getValue());

		rs.addResourceCharacteristicItemShort("metadata", this.metadata, EValueType.SECRET.getValue());

//		//rs.addResourceCharacteristicItemShort("yaml", this.yaml, EValueType.TEXT.getValue());

		rs.addResourceCharacteristicItemShort("json", this.json, EValueType.TEXT.getValue());

        rs.addResourceCharacteristicItemShort("data", this.dataObj, EValueType.OBJECT.getValue());

		rs.addResourceCharacteristicItemShort("json", this.json, EValueType.SECRET.getValue());

		rs.addResourceCharacteristicItemShort("data", this.dataObj, EValueType.SECRET.getValue());

		



		if (this.properties != null)
@@ -199,7 +199,7 @@ public class KubernetesSecret extends DomainModelDefinition 
        if (this.data != null)

          this.data.forEach((kPropName, vProVal) -> {

            EValueType etype;        

            etype = EValueType.TEXT;

            etype = EValueType.SECRET;

            rs.addResourceCharacteristicItemShort( kPropName , vProVal, etype.getValue());



          });