From 7260fe59246d3d5f30468f34a39616a3be41b605 Mon Sep 17 00:00:00 2001 From: Christos Tranoris Date: Wed, 18 Dec 2024 09:18:15 +0200 Subject: [PATCH] fix for #10 --- .../etsi/osl/domain/model/kubernetes/KubernetesCRV1.java | 4 ++-- .../osl/domain/model/kubernetes/KubernetesConfigMap.java | 8 ++++---- .../osl/domain/model/kubernetes/KubernetesSecret.java | 6 +++--- .../osl/domain/model/kubernetes/KubernetesService.java | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/etsi/osl/domain/model/kubernetes/KubernetesCRV1.java b/src/main/java/org/etsi/osl/domain/model/kubernetes/KubernetesCRV1.java index c550be8..d634df0 100644 --- a/src/main/java/org/etsi/osl/domain/model/kubernetes/KubernetesCRV1.java +++ b/src/main/java/org/etsi/osl/domain/model/kubernetes/KubernetesCRV1.java @@ -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()); diff --git a/src/main/java/org/etsi/osl/domain/model/kubernetes/KubernetesConfigMap.java b/src/main/java/org/etsi/osl/domain/model/kubernetes/KubernetesConfigMap.java index a604507..2e4457a 100644 --- a/src/main/java/org/etsi/osl/domain/model/kubernetes/KubernetesConfigMap.java +++ b/src/main/java/org/etsi/osl/domain/model/kubernetes/KubernetesConfigMap.java @@ -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,9 +183,9 @@ 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("data", this.dataObj, EValueType.OBJECT.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()); if (this.properties != null) diff --git a/src/main/java/org/etsi/osl/domain/model/kubernetes/KubernetesSecret.java b/src/main/java/org/etsi/osl/domain/model/kubernetes/KubernetesSecret.java index 8a0903b..275dceb 100644 --- a/src/main/java/org/etsi/osl/domain/model/kubernetes/KubernetesSecret.java +++ b/src/main/java/org/etsi/osl/domain/model/kubernetes/KubernetesSecret.java @@ -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()); diff --git a/src/main/java/org/etsi/osl/domain/model/kubernetes/KubernetesService.java b/src/main/java/org/etsi/osl/domain/model/kubernetes/KubernetesService.java index 38b0b33..38fa5ce 100644 --- a/src/main/java/org/etsi/osl/domain/model/kubernetes/KubernetesService.java +++ b/src/main/java/org/etsi/osl/domain/model/kubernetes/KubernetesService.java @@ -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()); -- GitLab