From 9ceb63c11b7f60117083c5a5b0ac142d5d561524 Mon Sep 17 00:00:00 2001 From: Christos Tranoris Date: Mon, 22 Jan 2024 09:35:20 +0200 Subject: [PATCH] fixing version to 1.0.0 --- pom.xml | 2 +- .../java/org/etsi/osl/cridge/CatalogClient.java | 4 ++-- .../osl/cridge/KubernetesClientResource.java | 16 ++++++++++++++-- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 1d7afc2..3939768 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.etsi.osl org.etsi.osl.main - 1.2.0-SNAPSHOT + 1.0.0-SNAPSHOT ../org.etsi.osl.main diff --git a/src/main/java/org/etsi/osl/cridge/CatalogClient.java b/src/main/java/org/etsi/osl/cridge/CatalogClient.java index 153284e..a65d4de 100644 --- a/src/main/java/org/etsi/osl/cridge/CatalogClient.java +++ b/src/main/java/org/etsi/osl/cridge/CatalogClient.java @@ -225,7 +225,7 @@ public class CatalogClient extends RouteBuilder{ try { Map map = new HashMap<>(); map.put("resourceId", oslResourceId ); - map.put("propagateToSO", false ); + map.put("triggerServiceActionQueue", false ); Object response = template.requestBodyAndHeaders( CATALOG_UPD_RESOURCE, toJsonString(rs), map); @@ -260,7 +260,7 @@ public class CatalogClient extends RouteBuilder{ // try { // Map map = new HashMap<>(); // map.put("resourceId", oslResourceId ); -// map.put("propagateToSO", false ); +// map.put("triggerServiceActionQueue", false ); // String json = toJsonString(rs); // Object response = template.requestBodyAndHeaders( CATALOG_UPD_RESOURCE, json, map); // diff --git a/src/main/java/org/etsi/osl/cridge/KubernetesClientResource.java b/src/main/java/org/etsi/osl/cridge/KubernetesClientResource.java index 9b2a5ea..5523cab 100644 --- a/src/main/java/org/etsi/osl/cridge/KubernetesClientResource.java +++ b/src/main/java/org/etsi/osl/cridge/KubernetesClientResource.java @@ -490,10 +490,15 @@ public class KubernetesClientResource { } - logger.debug("{}", gkr.toString() ); + logger.debug("Object to deploy:{}", gkr.toString() ); Resource dummyObject = k8s.resource( gkr ); - dummyObject.create(); + + GenericKubernetesResource result = dummyObject.create(); + + logger.debug("============ Create crspec: result {} =============", result.toString() ); + + }catch (Exception e) { e.printStackTrace(); return "FAIL " + e.getMessage(); @@ -613,6 +618,7 @@ public class KubernetesClientResource { })); gkr.getMetadata().setName( (String) headers.get("org.etsi.osl.prefixName")) ; Resource dummyObject = k8s.resource( gkr ); + logger.debug("Object to delete:{}", dummyObject ); List result = dummyObject.delete(); logger.debug("============ DELETE crspec: result {} =============", result.toString() ); @@ -691,4 +697,10 @@ public class KubernetesClientResource { return true; } + + public void setKubernetesClient(KubernetesClient kubernetesClient2) { + this.kubernetesClient = kubernetesClient2; + + } + } -- GitLab