Skip to content
Snippets Groups Projects
Commit 4e8b2397 authored by tranoris's avatar tranoris
Browse files

fix for prefix json

parent 4d7d7c1a
No related branches found
No related tags found
1 merge request!10MR for Release 2024Q4
Pipeline #9694 passed
Stage: build
Hide whitespace changes
Inline Side-by-side
src/main/java/org/etsi/osl/domain/model/kubernetes/KubernetesService.java
+ 5
− 1
View file @ 4e8b2397
...@@ -184,6 +184,10 @@ public class KubernetesService extends DomainModelDefinition ...@@ -184,6 +184,10 @@ public class KubernetesService extends DomainModelDefinition
.resourceSpecification( rSpecRef ) .resourceSpecification( rSpecRef )
.resourceVersion( this.version); .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("clusterMasterURL", this.clusterMasterURL, EValueType.TEXT.getValue());
rs.addResourceCharacteristicItemShort("currentContextCluster", this.currentContextCluster, EValueType.TEXT.getValue()); rs.addResourceCharacteristicItemShort("currentContextCluster", this.currentContextCluster, EValueType.TEXT.getValue());
rs.addResourceCharacteristicItemShort("fullResourceName", this.fullResourceName, EValueType.TEXT.getValue()); rs.addResourceCharacteristicItemShort("fullResourceName", this.fullResourceName, EValueType.TEXT.getValue());
...@@ -192,7 +196,7 @@ public class KubernetesService extends DomainModelDefinition ...@@ -192,7 +196,7 @@ public class KubernetesService extends DomainModelDefinition
rs.addResourceCharacteristicItemShort("UID", this.UID, 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.OBJECT.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()); rs.addResourceCharacteristicItemShort(cprefix + "json", this.json, EValueType.TEXT.getValue());
rs.addResourceCharacteristicItemShort("spec", this.specObj, EValueType.OBJECT.getValue()); rs.addResourceCharacteristicItemShort("spec", this.specObj, EValueType.OBJECT.getValue());
rs.addResourceCharacteristicItemShort("status", this.statusObj, EValueType.OBJECT.getValue()); rs.addResourceCharacteristicItemShort("status", this.statusObj, EValueType.OBJECT.getValue());
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment