From 4e8b2397a3ba9ee8fc454c9e94633d8f441416a1 Mon Sep 17 00:00:00 2001 From: Christos Tranoris <tranoris@ece.upatras.gr> Date: Mon, 4 Nov 2024 13:00:04 +0200 Subject: [PATCH] fix for prefix json --- .../etsi/osl/domain/model/kubernetes/KubernetesService.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 bd380db..421e4f3 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 @@ -184,6 +184,10 @@ public class KubernetesService extends DomainModelDefinition .resourceSpecification( rSpecRef ) .resourceVersion( this.version); + + String firstToken = this.fullResourceName.substring( 0, this.fullResourceName.indexOf('@') ); + String cprefix = this.kind + "." + firstToken + "."; + rs.addResourceCharacteristicItemShort("clusterMasterURL", this.clusterMasterURL, EValueType.TEXT.getValue()); rs.addResourceCharacteristicItemShort("currentContextCluster", this.currentContextCluster, EValueType.TEXT.getValue()); rs.addResourceCharacteristicItemShort("fullResourceName", this.fullResourceName, EValueType.TEXT.getValue()); @@ -192,7 +196,7 @@ public class KubernetesService extends DomainModelDefinition 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("json", this.json, EValueType.TEXT.getValue()); + rs.addResourceCharacteristicItemShort(cprefix + "json", this.json, EValueType.TEXT.getValue()); rs.addResourceCharacteristicItemShort("spec", this.specObj, EValueType.OBJECT.getValue()); rs.addResourceCharacteristicItemShort("status", this.statusObj, EValueType.OBJECT.getValue()); -- GitLab