From 158443b3109bfba87e63e5e5005a7f24c8cdc9ad Mon Sep 17 00:00:00 2001
From: Christos Tranoris <tranoris@ece.upatras.gr>
Date: Tue, 5 Nov 2024 00:19:13 +0200
Subject: [PATCH] fix for #9
---
.../domain/model/kubernetes/KubernetesConfigMap.java | 11 +++++++++--
.../osl/domain/model/kubernetes/KubernetesSecret.java | 11 +++++++++--
.../domain/model/kubernetes/KubernetesService.java | 2 +-
3 files changed, 19 insertions(+), 5 deletions(-)
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 f5127f7..a604507 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
@@ -169,6 +169,13 @@ public class KubernetesConfigMap extends DomainModelDefinition
.resourceSpecification( rSpecRef )
.resourceVersion( this.version);
+ String cprefix = "";
+ if ( this.name.indexOf('@')>0) {
+ String firstToken = this.name.substring( 0, this.name.indexOf('@') );
+ 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());
@@ -176,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("json", this.json, EValueType.TEXT.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());
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 011790d..8a0903b 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
@@ -169,6 +169,13 @@ public class KubernetesSecret extends DomainModelDefinition
.resourceSpecification( rSpecRef )
.resourceVersion( this.version);
+ String cprefix = "";
+ if ( this.name.indexOf('@')>0) {
+ String firstToken = this.name.substring( 0, this.name.indexOf('@') );
+ 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());
@@ -176,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("json", this.json, EValueType.TEXT.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());
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 9b40f88..38b0b33 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
@@ -197,7 +197,7 @@ 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("yaml", this.yaml, 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