Commit d4c44a00 authored by Christos Tranoris's avatar Christos Tranoris
Browse files

fixed creation and model version

parent 1ef30cc9

pom.xml

+1 −1
Changes for pom.xml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
		<springdoc.security.version>1.7.0</springdoc.security.version>

		<springdoc.openapiui.version>1.7.0</springdoc.openapiui.version>

		<keycloak.version>22.0.1</keycloak.version>

		<org.etsi.osl.model.tmf.version>1.1.0-SNAPSHOT</org.etsi.osl.model.tmf.version>

		<org.etsi.osl.model.tmf.version>1.4.0-SNAPSHOT</org.etsi.osl.model.tmf.version>

	</properties>

src/main/java/org/etsi/osl/example/gc/api/ExampleResourceSpec.java

+0 −3
Changes for src/main/java/org/etsi/osl/example/gc/api/ExampleResourceSpec.java: 0 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -115,9 +115,6 @@ public abstract class ExampleResourceSpec extends DomainModelDefinition 


        defineCharacteristics(rsc);



        addCharacteristic(rsc, "status.infoMessage", infoMessage, EValueType.TEXT);

        addCharacteristic(rsc, "status.Health", healthStatus, EValueType.TEXT);



        return rsc;

    }

src/main/java/org/etsi/osl/example/gc/api/KubernetesCluster.java

+1 −0
Changes for src/main/java/org/etsi/osl/example/gc/api/KubernetesCluster.java: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ public class KubernetesCluster extends ExampleResourceSpec { 
        healthStatus = "Healthy";

        logger.info(infoMessage);



        

        resourceUpdate.addResourceCharacteristicItemShort("status.infoMessage", infoMessage, EValueType.TEXT.getValue());

        resourceUpdate.addResourceCharacteristicItemShort("status.Health", healthStatus, EValueType.TEXT.getValue());

        resourceUpdate.addResourceCharacteristicItemShort("status.UUID", UUID.randomUUID().toString(), EValueType.TEXT.getValue());

src/main/java/org/etsi/osl/example/gc/api/ResourceRepoService.java

+7 −7
Changes for src/main/java/org/etsi/osl/example/gc/api/ResourceRepoService.java: 7 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -98,10 +98,10 @@ public class ResourceRepoService { 
      // `resourceid` is a placeholder OSOM synthesises for the tentative plan (not in the catalog), so

      // there is no real catalog write; the result is reported to OSOM's planning inventory via the

      // PLANNING.RESOURCE.CREATEORUPDATE callback queue.

      spec.resourceLogic(resourceRequested, resourceid, true);

      ResourceUpdate res = spec.resourceLogic(resourceRequested, resourceid, true);



      Resource reported = sendPlanningResourceCallback(headers, resourceid, resourceRequested, spec);

      return reported != null ? reported : toSimulatedResource(resourceid, resourceRequested);

      Resource reported = sendPlanningResourceCallback(headers, resourceid, res, spec);

      return reported != null ? reported : toSimulatedResource(resourceid, res);

    }



    ResourceUpdate resourceUpdate = simpleResourceMapper.resourceCreateToResourceUpdate(resourceRequested);
@@ -299,11 +299,11 @@ public class ResourceRepoService { 
      // `resourceid` is a placeholder OSOM synthesises for the tentative plan (not in the catalog), so

      // there is no real catalog write; the result is reported to OSOM's planning inventory via the

      // PLANNING.RESOURCE.CREATEORUPDATE callback queue.

      spec.resourceLogic(r, resourceid, true);

      ResourceUpdate resourceUpdate = spec.resourceLogic(r, resourceid, true);



      Resource reported = postPlanningResourceCallback(headers, resourceid, r, ResourceStatusType.AVAILABLE,

          "operation", operationPhase(headers, spec, r));

      return reported != null ? reported : toSimulatedResource(resourceid, r);

      Resource reported = postPlanningResourceCallback(headers, resourceid, resourceUpdate, ResourceStatusType.AVAILABLE,

          "operation", operationPhase(headers, spec, resourceUpdate));

      return reported != null ? reported : toSimulatedResource(resourceid, resourceUpdate);

    }



    ResourceUpdate resourceUpdate = spec.resourceLogic(r, resourceid, false);

src/main/java/org/etsi/osl/example/gc/api/config/CatalogClient.java

+2 −2
Changes for src/main/java/org/etsi/osl/example/gc/api/config/CatalogClient.java: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ public class CatalogClient extends RouteBuilder{ 
	}

	



	public LogicalResourceSpecification createOrUpdateResourceSpecByNameCategoryVersion( ResourceSpecificationCreate s) {

	public ResourceSpecification createOrUpdateResourceSpecByNameCategoryVersion( ResourceSpecificationCreate s) {

      logger.debug("will createOrUpdateResourceSpecByNameCategoryVersion "  );

      logger.debug("s= " + s  );

		try {
@@ -148,7 +148,7 @@ public class CatalogClient extends RouteBuilder{ 
				logger.error("ResourceSpecification  object is wrong.");

			}



			LogicalResourceSpecification rs = toJsonObj( (String)response, LogicalResourceSpecification.class); 

			ResourceSpecification rs = toJsonObj( (String)response, ResourceSpecification.class); 

			return rs;