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

Merge branch 'issue_10' into 'develop' 

MR for fixing #10

See merge request !8
parents 158443b3 7260fe59

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

+2 −2
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ public class KubernetesCRV1 extends DomainModelDefinition 
		rsc.addResourceSpecificationCharacteristicItemShort( "UID", "", EValueType.TEXT.getValue(), "", false);

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

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

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

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

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



        rsc.addResourceSpecificationCharacteristicItemShort( "_CR_SPEC", "", EValueType.TEXT.getValue(), "Used for providing the json Custom Resource description to apply", false);
@@ -179,7 +179,7 @@ public class KubernetesCRV1 extends DomainModelDefinition 
		rs.addResourceCharacteristicItemShort("UID", this.UID, EValueType.TEXT.getValue());

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

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

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

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

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

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

+4 −4
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ public class KubernetesConfigMap extends DomainModelDefinition 
		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("yaml", this.yaml, EValueType.TEXT.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);
@@ -183,8 +183,8 @@ public class KubernetesConfigMap extends DomainModelDefinition 
		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("yaml", this.yaml, EValueType.TEXT.getValue());

		rs.addResourceCharacteristicItemShort(cprefix + "json", this.json, EValueType.TEXT.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());

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

+3 −3
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ public class KubernetesSecret extends DomainModelDefinition 
		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("yaml", this.yaml, EValueType.TEXT.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);
@@ -183,8 +183,8 @@ public class KubernetesSecret extends DomainModelDefinition 
		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("yaml", this.yaml, EValueType.TEXT.getValue());

		rs.addResourceCharacteristicItemShort(cprefix + "json", this.json, EValueType.TEXT.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());

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

+3 −3
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ public class KubernetesService extends DomainModelDefinition 
		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("yaml", this.yaml, EValueType.TEXT.getValue(), "", false);

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

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

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

        rsc.addResourceSpecificationCharacteristicItemShort("status", this.statusObj, EValueType.OBJECT.getValue(), "", false);
@@ -197,8 +197,8 @@ public class KubernetesService extends DomainModelDefinition 
		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("yaml", this.yaml, EValueType.TEXT.getValue());

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

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

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

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

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