diff --git a/pom.xml b/pom.xml index 1d7afc22991b524f0abc7cca8b314edeec796e06..3939768ba9c657351a2f08112bbf92a7280221f5 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.etsi.osl</groupId> <artifactId>org.etsi.osl.main</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <relativePath>../org.etsi.osl.main</relativePath> </parent> diff --git a/src/main/java/org/etsi/osl/cridge/CatalogClient.java b/src/main/java/org/etsi/osl/cridge/CatalogClient.java index 153284e57ef12aac9e10fe31bb3a3db3f08c71bf..a65d4debd5a564c57adef6466d9fdaf4bb4fdf12 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<String, Object> 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<String, Object> 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 9b2a5ea2e6a33b5cf4ec0481f37b7042ca3c2afd..5523cab5e598157c02bae1e8939569646823b9c6 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<GenericKubernetesResource> 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<GenericKubernetesResource> dummyObject = k8s.resource( gkr ); + logger.debug("Object to delete:{}", dummyObject ); List<StatusDetails> 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; + + } + }