From: arkadiusz-dawid.mieszczak@t-systems.com Date: Mon, 17 Nov 2025 15:46:31 +0000 (+0000) Subject: Migrate CDS to springboot 3.5 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F72%2F142472%2F1;p=ccsdk%2Fcds.git Migrate CDS to springboot 3.5 Issue-ID: CCSDK-4141 Change-Id: I3d5d039b931867a7892e57a1a9f5dcd2caa348c0 Signed-off-by: PeukerL@telekom.de --- diff --git a/components/model-catalog/blueprint-model/archetype-blueprint/src/main/resources/archetype-resources/Tests/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/uat/base/BaseBlueprintsAcceptanceTest.kt b/components/model-catalog/blueprint-model/archetype-blueprint/src/main/resources/archetype-resources/Tests/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/uat/base/BaseBlueprintsAcceptanceTest.kt index c0c33b6ea..77c04b26c 100644 --- a/components/model-catalog/blueprint-model/archetype-blueprint/src/main/resources/archetype-resources/Tests/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/uat/base/BaseBlueprintsAcceptanceTest.kt +++ b/components/model-catalog/blueprint-model/archetype-blueprint/src/main/resources/archetype-resources/Tests/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/uat/base/BaseBlueprintsAcceptanceTest.kt @@ -23,12 +23,12 @@ import org.springframework.test.context.ContextConfiguration import org.springframework.test.context.TestPropertySource import org.springframework.test.context.junit4.SpringRunner import org.springframework.test.context.support.TestPropertySourceUtils -import org.springframework.util.Base64Utils +import java.util.Base64 import java.io.File import java.io.IOException import java.nio.file.* import java.nio.file.attribute.BasicFileAttributes -import javax.annotation.PreDestroy +import jakarta.annotation.PreDestroy import kotlin.test.BeforeTest import kotlin.test.AfterTest @@ -159,7 +159,7 @@ abstract class BaseBlueprintsAcceptanceTest() { private const val authPassword = "Heisenberg" fun clientAuthToken() = - "Basic " + Base64Utils.encodeToString("$authUsername:$authPassword".toByteArray()) + "Basic " + Base64.getEncoder().encodeToString("$authUsername:$authPassword".toByteArray()) } class ServerContextInitializer : ApplicationContextInitializer { diff --git a/docs/api-reference/media/cds-bp-processor-api-swagger.json b/docs/api-reference/media/cds-bp-processor-api-swagger.json index 8ec4f7127..db1c3381a 100644 --- a/docs/api-reference/media/cds-bp-processor-api-swagger.json +++ b/docs/api-reference/media/cds-bp-processor-api-swagger.json @@ -1,2726 +1,2726 @@ -{ - "swagger" : "2.0", - "info" : { - "description" : "Shows all resources and endpoints which CDS BP processor currently provides with sample requests/responses, parameter description and other information.", - "version" : "v1", - "title" : "CDS Blueprint Processor API Reference", - "termsOfService" : "https://www.onap.org/", - "contact" : { - "name" : "ONAP Community", - "url" : "https://www.onap.org/", - "email" : "onap-discuss@lists.onap.org" - }, - "license" : { - "name" : "Apache 2.0", - "url" : "http://www.apache.org/licenses/LICENSE-2.0.html" - } - }, - "host" : "localhost:8080", - "tags" : [ { - "name" : "Blueprint Model Catalog", - "description" : "Manages all blueprint models which are available in CDS" - }, { - "name" : "Execution Service Catalog", - "description" : "Interaction with CBA which are available in CDS" - }, { - "name" : "Model Type Catalog", - "description" : "Manages data types in CDS" - }, { - "name" : "Resource configuration", - "description" : "Interaction with stored configurations" - }, { - "name" : "Resource Dictionary", - "description" : "Interaction with stored dictionaries" - }, { - "name" : "Resource Template", - "description" : "Interaction with resolved templates" - }, { - "name" : "Resources", - "description" : "Interaction with resolved resources" - } ], - "schemes" : [ "http" ], - "paths" : { - "/api/v1/blueprint-model" : { - "get" : { - "tags" : [ "Blueprint Model Catalog" ], - "summary" : "List all Blueprint Models", - "description" : "Lists all meta-data of blueprint models which are saved in CDS.", - "operationId" : "BlueprintModelController_allBlueprintModel_GET.org.onap.ccsdk.cds.blueprintsprocessor.designer.api", - "produces" : [ "application/json" ], - "responses" : { - "200" : { - "description" : "OK", - "schema" : { - "type" : "array", - "items" : { - "$ref" : "#/definitions/BlueprintModelSearch" - } - } - }, - "500" : { - "description" : "Internal Server Error" - } - } - }, - "post" : { - "tags" : [ "Blueprint Model Catalog" ], - "summary" : "Save a Blueprint Model", - "description" : "Saves a blueprint model by the given CBA zip file input. There is no validation of the attached CBA happening when this API is called.", - "operationId" : "BlueprintModelController_saveBlueprint_POST.org.onap.ccsdk.cds.blueprintsprocessor.designer.api", - "consumes" : [ "multipart/form-data" ], - "produces" : [ "application/json" ], - "parameters" : [ { - "in" : "body", - "name" : "file", - "description" : "CBA file to be uploaded (example: cba.zip)", - "required" : true, - "schema" : { - "$ref" : "#/definitions/FilePart" - } - } ], - "responses" : { - "200" : { - "description" : "OK", - "schema" : { - "$ref" : "#/definitions/BlueprintModelSearch" - } - }, - "500" : { - "description" : "Internal Server Error" - } - } - } - }, - "/api/v1/blueprint-model/bootstrap" : { - "post" : { - "tags" : [ "Blueprint Model Catalog" ], - "summary" : "Bootstrap CDS", - "description" : "Loads all Model Types, Resource Dictionaries and Blueprint Models which are included in CDS by default. Before starting to work with CDS, bootstrap should be called to load all the basic models that each orginization might support. Parameter values can be set as `false` to skip loading e.g. the Resource Dictionaries but this is not recommended.", - "operationId" : "BlueprintModelController_bootstrap_POST.org.onap.ccsdk.cds.blueprintsprocessor.designer.api", - "consumes" : [ "application/json" ], - "produces" : [ "application/json" ], - "parameters" : [ { - "in" : "body", - "name" : "body", - "description" : "Specifies which elements to load", - "required" : true, - "schema" : { - "$ref" : "#/definitions/BootstrapRequest" - } - } ], - "responses" : { - "200" : { - "description" : "OK", - "schema" : { - "type" : "object" - } - }, - "500" : { - "description" : "Internal Server Error" - } - } - } - }, - "/api/v1/blueprint-model/by-name/{name}/version/{version}" : { - "get" : { - "tags" : [ "Blueprint Model Catalog" ], - "summary" : "Get a Blueprint Model by Name and Version", - "description" : "Get Meta-Data of a Blueprint Model by its name and version.", - "operationId" : "BlueprintModelController_getBlueprintByNameAndVersion_GET.org.onap.ccsdk.cds.blueprintsprocessor.designer.api", - "produces" : [ "application/json" ], - "parameters" : [ { - "name" : "name", - "in" : "path", - "description" : "Name of the blueprint model", - "required" : true, - "type" : "string", - "x-example" : "pnf_netconf" - }, { - "name" : "version", - "in" : "path", - "description" : "Version of the blueprint model", - "required" : true, - "type" : "string", - "x-example" : "1.0.0" - } ], - "responses" : { - "200" : { - "description" : "OK", - "schema" : { - "$ref" : "#/definitions/BlueprintModelSearch" - } - }, - "404" : { - "description" : "Not Found" - } - } - } - }, - "/api/v1/blueprint-model/download/by-name/{name}/version/{version}" : { - "get" : { - "tags" : [ "Blueprint Model Catalog" ], - "summary" : "Download a Blueprint Model", - "description" : "Gets the CBA of a blueprint model by its name and version. Response can be saved to a file to download the CBA.", - "operationId" : "BlueprintModelController_downloadBlueprintByNameAndVersion_GET.org.onap.ccsdk.cds.blueprintsprocessor.designer.api", - "produces" : [ "application/json" ], - "parameters" : [ { - "name" : "name", - "in" : "path", - "description" : "Name of the blueprint model", - "required" : true, - "type" : "string", - "x-example" : "pnf_netconf" - }, { - "name" : "version", - "in" : "path", - "description" : "Version of the blueprint model", - "required" : true, - "type" : "string", - "x-example" : "1.0.0" - } ], - "responses" : { - "200" : { - "description" : "OK", - "schema" : { - "type" : "object" - } - }, - "404" : { - "description" : "Not Found" - } - } - } - }, - "/api/v1/blueprint-model/download/{id}" : { - "get" : { - "tags" : [ "Blueprint Model Catalog" ], - "summary" : "Download a Blueprint Model by ID", - "description" : "Gets the CBA of a blueprint model by its ID. Response can be saved to a file to download the CBA.", - "operationId" : "BlueprintModelController_downloadBluePrint_GET.org.onap.ccsdk.cds.blueprintsprocessor.designer.api", - "produces" : [ "application/json" ], - "parameters" : [ { - "name" : "id", - "in" : "path", - "description" : "ID of the blueprint model to download", - "required" : true, - "type" : "string", - "x-example" : "67ec1f96-ab55-4b81-aff9-23ee0ed1d7a4" - } ], - "responses" : { - "200" : { - "description" : "OK", - "schema" : { - "type" : "object" - } - }, - "404" : { - "description" : "Not Found" - } - } - } - }, - "/api/v1/blueprint-model/enrich" : { - "post" : { - "tags" : [ "Blueprint Model Catalog" ], - "summary" : "Enrich a Blueprint Model", - "description" : "Enriches the attached CBA and returns the enriched CBA zip file in the response. The enrichment process will complete the package by providing all the definition of types used.", - "operationId" : "BlueprintModelController_enrichBlueprint_POST.org.onap.ccsdk.cds.blueprintsprocessor.designer.api", - "consumes" : [ "multipart/form-data" ], - "produces" : [ "application/json" ], - "parameters" : [ { - "in" : "body", - "name" : "file", - "description" : "CBA zip file to be uploaded (example: cba_unenriched.zip)", - "required" : true, - "schema" : { - "$ref" : "#/definitions/FilePart" - } - } ], - "responses" : { - "200" : { - "description" : "successful operation", - "schema" : { - "type" : "object" - } - } - } - } - }, - "/api/v1/blueprint-model/enrichandpublish" : { - "post" : { - "tags" : [ "Blueprint Model Catalog" ], - "summary" : "Enrich and publish a Blueprint Model", - "description" : "Enriches the attached CBA, validates it and saves it in CDS if validation was successful.", - "operationId" : "BlueprintModelController_enrichAndPubishlueprint_POST.org.onap.ccsdk.cds.blueprintsprocessor.designer.api", - "consumes" : [ "multipart/form-data" ], - "produces" : [ "application/json" ], - "parameters" : [ { - "in" : "body", - "name" : "file", - "description" : "Unenriched CBA zip file to be uploaded (example: cba_unenriched.zip)", - "required" : true, - "schema" : { - "$ref" : "#/definitions/FilePart" - } - } ], - "responses" : { - "200" : { - "description" : "OK", - "schema" : { - "$ref" : "#/definitions/BlueprintModelSearch" - } - }, - "503" : { - "description" : "Service Unavailable" - } - } - } - }, - "/api/v1/blueprint-model/meta-data/{keyword}" : { - "get" : { - "tags" : [ "Blueprint Model Catalog" ], - "summary" : "Search for Blueprints by a Keyword", - "description" : "Lists all blueprint models by a matching keyword in any of the meta-data of the blueprint models. Blueprint models are just returned if a whole keyword is matching, not just parts of it. Not case-sensitive. Used by CDS UI.", - "operationId" : "BlueprintModelController_allBlueprintModelMetaData_GET.org.onap.ccsdk.cds.blueprintsprocessor.designer.api", - "produces" : [ "application/json" ], - "parameters" : [ { - "name" : "keyword", - "in" : "path", - "description" : "Keyword to search for in blueprint model meta-data", - "required" : true, - "type" : "string", - "x-example" : "pnf_netconf" - } ], - "responses" : { - "200" : { - "description" : "successful operation", - "schema" : { - "type" : "array", - "items" : { - "$ref" : "#/definitions/BlueprintModelSearch" - } - } - } - } - } - }, - "/api/v1/blueprint-model/name/{name}/version/{version}" : { - "delete" : { - "tags" : [ "Blueprint Model Catalog" ], - "summary" : "Delete a Blueprint Model by Name", - "description" : "Deletes a blueprint model identified by its name and version from CDS.", - "operationId" : "BlueprintModelController_deleteBlueprintByName_DELETE.org.onap.ccsdk.cds.blueprintsprocessor.designer.api", - "parameters" : [ { - "name" : "name", - "in" : "path", - "description" : "Name of the blueprint model", - "required" : true, - "type" : "string", - "x-example" : "pnf_netconf" - }, { - "name" : "version", - "in" : "path", - "description" : "Version of the blueprint model", - "required" : true, - "type" : "string", - "x-example" : "1.0.0" - } ], - "responses" : { - "200" : { - "description" : "successful operation", - "schema" : { - "type" : "object" - } - } - } - } - }, - "/api/v1/blueprint-model/paged" : { - "get" : { - "tags" : [ "Blueprint Model Catalog" ], - "summary" : "Get Blueprints ordered", - "description" : "Lists all blueprint models which are saved in CDS in an ordered mode.", - "operationId" : "BlueprintModelController_allBlueprintModelPaged_GET.org.onap.ccsdk.cds.blueprintsprocessor.designer.api", - "produces" : [ "application/json" ], - "parameters" : [ { - "name" : "limit", - "in" : "query", - "description" : "Maximum number of returned blueprint models", - "required" : false, - "type" : "integer", - "default" : 20, - "format" : "int32" - }, { - "name" : "offset", - "in" : "query", - "description" : "Offset", - "required" : false, - "type" : "integer", - "default" : 0, - "format" : "int32" - }, { - "name" : "sort", - "in" : "query", - "description" : "Order of returned blueprint models", - "required" : false, - "type" : "string", - "default" : "DATE", - "enum" : [ "DATE", "NAME", "VERSION" ] - }, { - "name" : "sortType", - "in" : "query", - "description" : "Ascend or descend ordering", - "required" : false, - "type" : "string", - "default" : "ASC" - } ], - "responses" : { - "200" : { - "description" : "successful operation", - "schema" : { - "$ref" : "#/definitions/PageBlueprintModelSearch" - } - } - } - } - }, - "/api/v1/blueprint-model/paged/meta-data/{keyword}" : { - "get" : { - "tags" : [ "Blueprint Model Catalog" ], - "summary" : "Search for Blueprints by a Keyword in an ordered mode", - "description" : "Lists all blueprint models by a matching keyword in any of the meta-data of the blueprint models in an ordered mode. Blueprint models are just returned if a whole keyword is matching, not just parts of it. Not case-sensitive. Used by CDS UI.", - "operationId" : "BlueprintModelController_allBlueprintModelMetaDataPaged_GET.org.onap.ccsdk.cds.blueprintsprocessor.designer.api", - "produces" : [ "application/json" ], - "parameters" : [ { - "name" : "keyword", - "in" : "path", - "description" : "Keyword to search for in blueprint model meta-data", - "required" : true, - "type" : "string", - "x-example" : "pnf_netconf" - }, { - "name" : "limit", - "in" : "query", - "description" : "Maximum number of returned blueprint models", - "required" : false, - "type" : "integer", - "default" : 20, - "format" : "int32" - }, { - "name" : "offset", - "in" : "query", - "description" : "Offset", - "required" : false, - "type" : "integer", - "default" : 0, - "format" : "int32" - }, { - "name" : "sort", - "in" : "query", - "description" : "Order of returned blueprint models", - "required" : false, - "type" : "string", - "default" : "DATE", - "enum" : [ "DATE", "NAME", "VERSION" ] - }, { - "name" : "sortType", - "in" : "query", - "description" : "Ascend or descend ordering", - "required" : false, - "type" : "string", - "default" : "ASC" - } ], - "responses" : { - "200" : { - "description" : "successful operation", - "schema" : { - "$ref" : "#/definitions/PageBlueprintModelSearch" - } - } - } - } - }, - "/api/v1/blueprint-model/publish" : { - "post" : { - "tags" : [ "Blueprint Model Catalog" ], - "summary" : "Publish a Blueprint Model", - "description" : "Validates the attached CBA file and saves it in CDS if validation was successful. CBA needs to be already enriched.", - "operationId" : "BlueprintModelController_publishBlueprint_POST.org.onap.ccsdk.cds.blueprintsprocessor.designer.api", - "consumes" : [ "multipart/form-data" ], - "produces" : [ "application/json" ], - "parameters" : [ { - "in" : "body", - "name" : "file", - "description" : "Enriched CBA zip file to be uploaded (example: cba_enriched.zip)", - "required" : true, - "schema" : { - "$ref" : "#/definitions/FilePart" - } - } ], - "responses" : { - "200" : { - "description" : "successful operation", - "schema" : { - "$ref" : "#/definitions/BlueprintModelSearch" - } - } - } - } - }, - "/api/v1/blueprint-model/search/{tags}" : { - "get" : { - "tags" : [ "Blueprint Model Catalog" ], - "summary" : "Search for a Blueprint by Tag", - "description" : "Searches for all blueprint models which contain the specified input parameter in their tags. Blueprint models which contain just parts of the searched word in their tags are also returned.", - "operationId" : "BlueprintModelController_searchBlueprintModels_GET.org.onap.ccsdk.cds.blueprintsprocessor.designer.api", - "produces" : [ "application/json" ], - "parameters" : [ { - "name" : "tags", - "in" : "path", - "description" : "Tag to search for", - "required" : true, - "type" : "string", - "x-example" : "test" - } ], - "responses" : { - "200" : { - "description" : "successful operation", - "schema" : { - "type" : "array", - "items" : { - "$ref" : "#/definitions/BlueprintModelSearch" - } - } - } - } - } - }, - "/api/v1/blueprint-model/workflow-spec" : { - "post" : { - "tags" : [ "Blueprint Model Catalog" ], - "summary" : "Get Workflow Specification", - "description" : "Get the workflow of a blueprint identified by Blueprint and workflow name. Inputs, outputs and data types of workflow is returned.", - "operationId" : "BlueprintModelController_workflowSpec_POST.org.onap.ccsdk.cds.blueprintsprocessor.designer.api", - "consumes" : [ "application/json" ], - "produces" : [ "application/json" ], - "parameters" : [ { - "in" : "body", - "name" : "body", - "description" : "Blueprint and workflow identification", - "required" : true, - "schema" : { - "$ref" : "#/definitions/WorkFlowSpecRequest" - } - } ], - "responses" : { - "200" : { - "description" : "successful operation", - "schema" : { - "type" : "object" - } - } - } - } - }, - "/api/v1/blueprint-model/workflows/blueprint-name/{name}/version/{version}" : { - "get" : { - "tags" : [ "Blueprint Model Catalog" ], - "summary" : "Get Workflows of a Blueprint", - "description" : "Get all available workflows of a Blueprint identified by its name and version.", - "operationId" : "BlueprintModelController_getWorkflowList_GET.org.onap.ccsdk.cds.blueprintsprocessor.designer.api", - "produces" : [ "application/json" ], - "parameters" : [ { - "name" : "name", - "in" : "path", - "description" : "Name of the blueprint model", - "required" : true, - "type" : "string", - "x-example" : "pnf_netconf" - }, { - "name" : "version", - "in" : "path", - "description" : "Version of the blueprint model", - "required" : true, - "type" : "string", - "x-example" : "1.0.0" - } ], - "responses" : { - "200" : { - "description" : "successful operation", - "schema" : { - "type" : "object" - } - } - } - } - }, - "/api/v1/blueprint-model/{id}" : { - "get" : { - "tags" : [ "Blueprint Model Catalog" ], - "summary" : "Get a Blueprint Model by ID", - "description" : "Get meta-data of a blueprint model by its internally created ID.", - "operationId" : "BlueprintModelController_getBlueprintModel_GET.org.onap.ccsdk.cds.blueprintsprocessor.designer.api", - "produces" : [ "application/json" ], - "parameters" : [ { - "name" : "id", - "in" : "path", - "description" : "ID of the blueprint model to search for", - "required" : true, - "type" : "string", - "x-example" : "67ec1f96-ab55-4b81-aff9-23ee0ed1d7a4" - } ], - "responses" : { - "200" : { - "description" : "OK", - "schema" : { - "$ref" : "#/definitions/BlueprintModelSearch" - } - }, - "404" : { - "description" : "Not Found" - } - } - }, - "delete" : { - "tags" : [ "Blueprint Model Catalog" ], - "summary" : "Delete a Blueprint Model by ID", - "description" : "Delete a blueprint model by its ID. ID is the internally created ID of blueprint, not the name of blueprint.", - "operationId" : "BlueprintModelController_deleteBlueprint_DELETE.org.onap.ccsdk.cds.blueprintsprocessor.designer.api", - "parameters" : [ { - "name" : "id", - "in" : "path", - "description" : "ID of the blueprint model to delete", - "required" : true, - "type" : "string", - "x-example" : "67ec1f96-ab55-4b81-aff9-23ee0ed1d7a4" - } ], - "responses" : { - "200" : { - "description" : "OK", - "schema" : { - "type" : "object" - } - }, - "404" : { - "description" : "RESOURCE_NOT_FOUND" - } - } - } - }, - "/api/v1/configs" : { - "get" : { - "tags" : [ "Resource configuration" ], - "summary" : "Retrieve a resource configuration snapshot", - "description" : "Retrieve a config snapshot, identified by its Resource Id and Type. An extra 'format' parameter can be passed to tell what content-type is expected.", - "operationId" : "ResourceConfigSnapshotController_get_GET.org.onap.ccsdk.cds.blueprintsprocessor.configs.api", - "produces" : [ "text/plain", "application/json", "application/xml" ], - "parameters" : [ { - "name" : "resourceType", - "in" : "query", - "description" : "Resource Type associated of the resource configuration snapshot", - "required" : true, - "type" : "string", - "x-example" : "\"PNF\"" - }, { - "name" : "resourceId", - "in" : "query", - "description" : "Resource Id associated of the resource configuration snapshot", - "required" : true, - "type" : "string", - "x-example" : "\"1\"" - }, { - "name" : "status", - "in" : "query", - "description" : "Status of the snapshot being retrieved", - "required" : false, - "type" : "string", - "default" : "RUNNING" - }, { - "name" : "format", - "in" : "query", - "description" : "Expected format of the snapshot being retrieved", - "required" : false, - "type" : "string", - "default" : "text/plain" - } ], - "responses" : { - "200" : { - "description" : "successful operation", - "schema" : { - "type" : "string" - } - } - } - } - }, - "/api/v1/configs/allByID" : { - "get" : { - "tags" : [ "Resource configuration" ], - "summary" : "Retrieve all resource configuration snapshots identified by a given resource_id", - "description" : "Retrieve all config snapshots, identified by its Resource Id, ordered by most recently created/modified date. ", - "operationId" : "ResourceConfigSnapshotController_getAllByID_GET.org.onap.ccsdk.cds.blueprintsprocessor.configs.api", - "produces" : [ "application/json" ], - "parameters" : [ { - "name" : "resourceId", - "in" : "query", - "description" : "Resource Id associated of the resource configuration snapshots", - "required" : true, - "type" : "string", - "x-example" : "\"1\"" - }, { - "name" : "status", - "in" : "query", - "description" : "Status of the snapshot being retrieved", - "required" : false, - "type" : "string", - "default" : "ANY" - } ], - "responses" : { - "200" : { - "description" : "successful operation", - "schema" : { - "type" : "array", - "items" : { - "$ref" : "#/definitions/ResourceConfigSnapshot" - } - } - } - } - } - }, - "/api/v1/configs/allByType" : { - "get" : { - "tags" : [ "Resource configuration" ], - "summary" : "Retrieve all resource configuration snapshots for a given resource type", - "description" : "Retrieve all config snapshots matching a specified Resource Type, ordered by most recently created/modified date. ", - "operationId" : "ResourceConfigSnapshotController_getAllByType_GET.org.onap.ccsdk.cds.blueprintsprocessor.configs.api", - "produces" : [ "application/json" ], - "parameters" : [ { - "name" : "resourceType", - "in" : "query", - "description" : "Resource Type associated of the resource configuration snapshot", - "required" : true, - "type" : "string", - "x-example" : "\"PNF\"" - }, { - "name" : "status", - "in" : "query", - "description" : "Status of the snapshot being retrieved", - "required" : false, - "type" : "string", - "default" : "ANY" - } ], - "responses" : { - "200" : { - "description" : "successful operation", - "schema" : { - "type" : "array", - "items" : { - "$ref" : "#/definitions/ResourceConfigSnapshot" - } - } - } - } - } - }, - "/api/v1/configs/{resourceType}/{resourceId}/{status}" : { - "post" : { - "tags" : [ "Resource configuration" ], - "summary" : "Store a resource configuration snapshot identified by resourceId, resourceType, status", - "description" : "Store a resource configuration snapshot, identified by its resourceId and resourceType, and optionally its status, either RUNNING or CANDIDATE.", - "operationId" : "ResourceConfigSnapshotController_postWithResourceIdAndResourceType_POST.org.onap.ccsdk.cds.blueprintsprocessor.configs.api", - "produces" : [ "application/json" ], - "parameters" : [ { - "name" : "resourceType", - "in" : "path", - "description" : "Resource Type associated with the resolution", - "required" : true, - "type" : "string", - "x-example" : "\"PNF\"" - }, { - "name" : "resourceId", - "in" : "path", - "description" : "Resource Id associated with the resolution", - "required" : true, - "type" : "string", - "x-example" : "\"1\"" - }, { - "name" : "status", - "in" : "path", - "description" : "Status of the snapshot being retrieved", - "required" : true, - "type" : "string", - "default" : "RUNNING" - }, { - "in" : "body", - "name" : "body", - "description" : "Config snapshot to store", - "required" : true, - "schema" : { - "type" : "string" - } - } ], - "responses" : { - "200" : { - "description" : "successful operation", - "schema" : { - "$ref" : "#/definitions/ResourceConfigSnapshot" - } - } - } - }, - "delete" : { - "tags" : [ "Resource configuration" ], - "summary" : "Delete a resource configuration snapshot identified by resourceId, resourceType, status.", - "description" : "Delete a resource configuration snapshot, identified by its resourceId and resourceType, and optionally its status, either RUNNING or CANDIDATE.", - "operationId" : "ResourceConfigSnapshotController_deleteWithResourceIdAndResourceType_DELETE.org.onap.ccsdk.cds.blueprintsprocessor.configs.api", - "parameters" : [ { - "name" : "resourceType", - "in" : "path", - "description" : "Resource Type associated with the resolution.", - "required" : true, - "type" : "string" - }, { - "name" : "resourceId", - "in" : "path", - "description" : "Resource Id associated with the resolution.", - "required" : true, - "type" : "string" - }, { - "name" : "status", - "in" : "path", - "description" : "Status of the snapshot being deleted.", - "required" : true, - "type" : "string" - } ], - "responses" : { - "200" : { - "description" : "successful operation", - "schema" : { - "type" : "object" - } - } - } - } - }, - "/api/v1/dictionary" : { - "post" : { - "tags" : [ "Resource Dictionary" ], - "summary" : "Save a resource dictionary", - "description" : "Save a resource dictionary by dictionary provided.", - "operationId" : "ResourceDictionaryController_saveResourceDictionary_POST.org.onap.ccsdk.cds.blueprintsprocessor.designer.api", - "consumes" : [ "application/json" ], - "produces" : [ "application/json" ], - "parameters" : [ { - "in" : "body", - "name" : "body", - "description" : "Resource dictionary to store", - "required" : true, - "schema" : { - "$ref" : "#/definitions/ResourceDictionary" - } - } ], - "responses" : { - "200" : { - "description" : "successful operation", - "schema" : { - "$ref" : "#/definitions/ResourceDictionary" - } - } - } - } - }, - "/api/v1/dictionary/by-names" : { - "post" : { - "tags" : [ "Resource Dictionary" ], - "summary" : "Search for a resource dictionary", - "description" : "Search for a resource dictionary by names provided.", - "operationId" : "ResourceDictionaryController_searchResourceDictionaryByNames_POST.org.onap.ccsdk.cds.blueprintsprocessor.designer.api", - "consumes" : [ "application/json" ], - "produces" : [ "application/json" ], - "parameters" : [ { - "in" : "body", - "name" : "body", - "description" : "List of names", - "required" : true, - "schema" : { - "type" : "array", - "items" : { - "type" : "string" - } - } - } ], - "responses" : { - "200" : { - "description" : "successful operation", - "schema" : { - "type" : "array", - "items" : { - "$ref" : "#/definitions/ResourceDictionary" - } - } - } - } - } - }, - "/api/v1/dictionary/definition" : { - "post" : { - "tags" : [ "Resource Dictionary" ], - "summary" : "Save a resource dictionary", - "description" : "Save a resource dictionary by provided resource definition json.", - "operationId" : "ResourceDictionaryController_saveResourceDictionary_1_POST.org.onap.ccsdk.cds.blueprintsprocessor.designer.api", - "consumes" : [ "application/json" ], - "produces" : [ "application/json" ], - "parameters" : [ { - "in" : "body", - "name" : "body", - "description" : "Resource definition to generate Resource Dictionary", - "required" : true, - "schema" : { - "$ref" : "#/definitions/ResourceDefinition" - } - } ], - "responses" : { - "200" : { - "description" : "successful operation", - "schema" : { - "$ref" : "#/definitions/ResourceDictionary" - } - } - } - } - }, - "/api/v1/dictionary/definition-bulk" : { - "post" : { - "tags" : [ "Resource Dictionary" ], - "summary" : "Save multiple resource dictionaries", - "description" : "Save multiple resource dictionaries by provided resource definition json array.", - "operationId" : "ResourceDictionaryController_saveAllResourceDictionary_1_POST.org.onap.ccsdk.cds.blueprintsprocessor.designer.api", - "consumes" : [ "application/json" ], - "produces" : [ "application/json" ], - "parameters" : [ { - "in" : "body", - "name" : "body", - "description" : "Resource definition json array to generate Resource Dictionaries", - "required" : true, - "schema" : { - "type" : "array", - "items" : { - "$ref" : "#/definitions/ResourceDefinition" - } - } - } ], - "responses" : { - "200" : { - "description" : "successful operation", - "schema" : { - "$ref" : "#/definitions/ResourceDictionary" - } - } - } - } - }, - "/api/v1/dictionary/paged" : { - "get" : { - "tags" : [ "Resource Dictionary" ], - "summary" : "Get Blueprints Dictionary ordered", - "description" : "Lists all blueprint Dictionary which are saved in CDS in an ordered mode.", - "operationId" : "BlueprintModelController_allBlueprintDictionaryPaged_GET.org.onap.ccsdk.cds.blueprintsprocessor.designer.api", - "produces" : [ "application/json" ], - "parameters" : [ { - "name" : "limit", - "in" : "query", - "description" : "Maximum number of returned blueprint dictionary", - "required" : false, - "type" : "integer", - "default" : 20, - "format" : "int32" - }, { - "name" : "offset", - "in" : "query", - "description" : "Offset", - "required" : false, - "type" : "integer", - "default" : 0, - "format" : "int32" - }, { - "name" : "sort", - "in" : "query", - "description" : "Order of returned blueprint dictionary", - "required" : false, - "type" : "string", - "default" : "DATE", - "enum" : [ "DATE" ] - }, { - "name" : "sortType", - "in" : "query", - "description" : "Ascend or descend ordering", - "required" : false, - "type" : "string", - "default" : "ASC" - } ], - "responses" : { - "200" : { - "description" : "successful operation", - "schema" : { - "type" : "object" - } - } - } - } - }, - "/api/v1/dictionary/resource_dictionary_group" : { - "get" : { - "tags" : [ "Resource Dictionary" ], - "summary" : "Retrieve all resource dictionary groups", - "description" : "Retrieve all resource dictionary groups.", - "operationId" : "ResourceDictionaryController_getResourceDictionaryDistinct_GET.org.onap.ccsdk.cds.blueprintsprocessor.designer.api", - "produces" : [ "application/json" ], - "responses" : { - "200" : { - "description" : "successful operation", - "schema" : { - "type" : "array", - "items" : { - "type" : "string" - } - } - } - } - } - }, - "/api/v1/dictionary/search/{tags}" : { - "get" : { - "tags" : [ "Resource Dictionary" ], - "summary" : "Search for a resource dictionary", - "description" : "Search for a resource dictionary by tags provided.", - "operationId" : "ResourceDictionaryController_searchResourceDictionaryByTags_GET.org.onap.ccsdk.cds.blueprintsprocessor.designer.api", - "produces" : [ "application/json" ], - "parameters" : [ { - "name" : "tags", - "in" : "path", - "description" : "Tags list", - "required" : true, - "type" : "string", - "x-example" : "\"status\"" - } ], - "responses" : { - "200" : { - "description" : "successful operation", - "schema" : { - "type" : "array", - "items" : { - "$ref" : "#/definitions/ResourceDictionary" - } - } - } - } - } - }, - "/api/v1/dictionary/source-mapping" : { - "get" : { - "tags" : [ "Resource Dictionary" ], - "summary" : "Search for a source mapping", - "description" : "Search for a source mapping.", - "operationId" : "ResourceDictionaryController_getResourceSourceMapping_GET.org.onap.ccsdk.cds.blueprintsprocessor.designer.api", - "produces" : [ "application/json" ], - "responses" : { - "200" : { - "description" : "successful operation", - "schema" : { - "$ref" : "#/definitions/ResourceSourceMapping" - } - } - } - } - }, - "/api/v1/dictionary/{name}" : { - "get" : { - "tags" : [ "Resource Dictionary" ], - "summary" : "Retrieve a resource dictionary", - "description" : "Retrieve a resource dictionary by name provided.", - "operationId" : "ResourceDictionaryController_getResourceDictionaryByName_GET.org.onap.ccsdk.cds.blueprintsprocessor.designer.api", - "produces" : [ "application/json" ], - "parameters" : [ { - "name" : "name", - "in" : "path", - "description" : "Name of the resource", - "required" : true, - "type" : "string", - "x-example" : "\"hostname\"" - } ], - "responses" : { - "200" : { - "description" : "successful operation", - "schema" : { - "$ref" : "#/definitions/ResourceDictionary" - } - } - } - }, - "delete" : { - "tags" : [ "Resource Dictionary" ], - "summary" : "Remove a resource dictionary", - "description" : "Remove a resource dictionary by name provided.", - "operationId" : "ResourceDictionaryController_deleteResourceDictionaryByName_DELETE.org.onap.ccsdk.cds.blueprintsprocessor.designer.api", - "parameters" : [ { - "name" : "name", - "in" : "path", - "description" : "Name of the resource", - "required" : true, - "type" : "string" - } ], - "responses" : { - "200" : { - "description" : "successful operation", - "schema" : { - "type" : "object" - } - } - } - } - }, - "/api/v1/execution-service/process" : { - "post" : { - "tags" : [ "Execution Service Catalog" ], - "summary" : "Execute a CBA workflow (action)", - "description" : "Execute the appropriate CBA's action based on the ExecutionServiceInput object passed as input.", - "operationId" : "ExecutionServiceController_process_POST.org.onap.ccsdk.cds.blueprintsprocessor.selfservice.api", - "produces" : [ "application/json" ], - "parameters" : [ { - "in" : "body", - "name" : "body", - "description" : "ExecutionServiceInput payload.", - "required" : true, - "schema" : { - "$ref" : "#/definitions/ExecutionServiceInput" - } - } ], - "responses" : { - "200" : { - "description" : "successful operation", - "schema" : { - "$ref" : "#/definitions/ExecutionServiceOutput" - } - } - } - } - }, - "/api/v1/model-type/by-definition/{definitionType}" : { - "get" : { - "tags" : [ "Model Type Catalog" ], - "summary" : "Retrieve a list of model types", - "description" : "Retrieve a list of model types by definition type provided.", - "operationId" : "ModelTypeController_getModelTypeByDefinitionType_GET.org.onap.ccsdk.cds.blueprintsprocessor.designer.api", - "produces" : [ "application/json" ], - "parameters" : [ { - "name" : "definitionType", - "in" : "path", - "required" : true, - "type" : "string" - } ], - "responses" : { - "200" : { - "description" : "successful operation", - "schema" : { - "type" : "array", - "items" : { - "$ref" : "#/definitions/ModelType" - } - } - } - } - } - }, - "/api/v1/model-type/search/{tags}" : { - "get" : { - "tags" : [ "Model Type Catalog" ], - "summary" : "Retrieve a list of model types", - "description" : "Retrieve a list of model types by tags provided.", - "operationId" : "ModelTypeController_searchModelTypes_GET.org.onap.ccsdk.cds.blueprintsprocessor.designer.api", - "produces" : [ "application/json" ], - "parameters" : [ { - "name" : "tags", - "in" : "path", - "required" : true, - "type" : "string" - } ], - "responses" : { - "200" : { - "description" : "successful operation", - "schema" : { - "type" : "array", - "items" : { - "$ref" : "#/definitions/ModelType" - } - } - } - } - } - }, - "/api/v1/model-type/{name}" : { - "get" : { - "tags" : [ "Model Type Catalog" ], - "summary" : "Retrieve a model type", - "description" : "Retrieve a model type by name provided.", - "operationId" : "ModelTypeController_getModelTypeByName_GET.org.onap.ccsdk.cds.blueprintsprocessor.designer.api", - "produces" : [ "application/json" ], - "parameters" : [ { - "name" : "name", - "in" : "path", - "required" : true, - "type" : "string" - } ], - "responses" : { - "200" : { - "description" : "successful operation", - "schema" : { - "$ref" : "#/definitions/ModelType" - } - } - } - }, - "delete" : { - "tags" : [ "Model Type Catalog" ], - "summary" : "Remove a model type", - "description" : "Remove a model type by name provided.", - "operationId" : "ModelTypeController_deleteModelTypeByName_DELETE.org.onap.ccsdk.cds.blueprintsprocessor.designer.api", - "parameters" : [ { - "name" : "name", - "in" : "path", - "required" : true, - "type" : "string" - } ], - "responses" : { - "200" : { - "description" : "successful operation", - "schema" : { - "$ref" : "#/definitions/ModelType" - } - } - } - } - }, - "/api/v1/resources" : { - "get" : { - "tags" : [ "Resources" ], - "summary" : "Get all resolved resources using the resolution key", - "description" : "Retrieve all stored resolved resources using the blueprint name, blueprint version, artifact name and the resolution-key.", - "operationId" : "ResourceController_getAllFromResolutionKeyOrFromResourceTypeAndId_GET.org.onap.ccsdk.cds.blueprintsprocessor.resource.api", - "produces" : [ "application/json" ], - "parameters" : [ { - "name" : "bpName", - "in" : "query", - "description" : "Name of the CBA", - "required" : true, - "type" : "string" - }, { - "name" : "bpVersion", - "in" : "query", - "description" : "Version of the CBA", - "required" : true, - "type" : "string" - }, { - "name" : "artifactName", - "in" : "query", - "description" : "Artifact name for which to retrieve a resolved resource", - "required" : true, - "type" : "string" - }, { - "name" : "resolutionKey", - "in" : "query", - "description" : "Resolution Key associated with the resolution", - "required" : false, - "type" : "string" - }, { - "name" : "resourceType", - "in" : "query", - "description" : "Resource Type associated with the resolution", - "required" : false, - "type" : "string" - }, { - "name" : "resourceId", - "in" : "query", - "description" : "Resource Id associated with the resolution", - "required" : false, - "type" : "string" - } ], - "responses" : { - "200" : { - "description" : "successful operation", - "schema" : { - "type" : "array", - "items" : { - "$ref" : "#/definitions/ResourceResolution" - } - } - } - } - }, - "delete" : { - "tags" : [ "Resources" ], - "summary" : "Delete resources using resolution key", - "description" : "Delete all the resources associated to a resolution-key using blueprint metadata, artifact name and the resolution-key.", - "operationId" : "ResourceController_deleteResolutions_DELETE.org.onap.ccsdk.cds.blueprintsprocessor.resource.api", - "produces" : [ "application/json" ], - "parameters" : [ { - "name" : "bpName", - "in" : "query", - "description" : "Name of the CBA", - "required" : true, - "type" : "string" - }, { - "name" : "bpVersion", - "in" : "query", - "description" : "Version of the CBA", - "required" : true, - "type" : "string" - }, { - "name" : "artifactName", - "in" : "query", - "description" : "Artifact name for which to retrieve a resolved resource", - "required" : true, - "type" : "string" - }, { - "name" : "resolutionKey", - "in" : "query", - "description" : "Resolution Key associated with the resolution", - "required" : false, - "type" : "string" - }, { - "name" : "resourceType", - "in" : "query", - "description" : "resourceType associated with the resolution, must be used with resourceId", - "required" : false, - "type" : "string" - }, { - "name" : "resourceId", - "in" : "query", - "description" : "Resolution Key associated with the resolution, must be used with resourceType", - "required" : false, - "type" : "string" - }, { - "name" : "lastN", - "in" : "query", - "description" : "Only delete last N occurrences", - "required" : false, - "type" : "integer", - "format" : "int32" - } ], - "responses" : { - "200" : { - "description" : "successful operation", - "schema" : { - "type" : "object" - } - } - } - } - }, - "/api/v1/resources/occurrences" : { - "get" : { - "tags" : [ "Resources" ], - "summary" : "Get the map of resolved resources with 'occurrence' as the keys to the resolved resources ", - "description" : "With optional 'occurrence' options, subset of stored resolved resources can be retrieved using the blueprint name, blueprint version, artifact name and the resolution-key.", - "operationId" : "ResourceController_getOccurrences_GET.org.onap.ccsdk.cds.blueprintsprocessor.resource.api", - "produces" : [ "application/json" ], - "parameters" : [ { - "name" : "bpName", - "in" : "query", - "description" : "Name of the CBA.", - "required" : true, - "type" : "string" - }, { - "name" : "bpVersion", - "in" : "query", - "description" : "Version of the CBA.", - "required" : true, - "type" : "string" - }, { - "name" : "artifactName", - "in" : "query", - "description" : "Artifact name for which to retrieve a resolved resource.", - "required" : true, - "type" : "string" - }, { - "name" : "resolutionKey", - "in" : "query", - "description" : "Resolution Key associated with the resolution.", - "required" : true, - "type" : "string" - }, { - "name" : "firstN", - "in" : "query", - "description" : "Number of earlier N occurrences of the resolutions.", - "required" : false, - "type" : "integer", - "format" : "int32" - }, { - "name" : "lastN", - "in" : "query", - "description" : "Number of latest N occurrences of the resolutions.", - "required" : false, - "type" : "integer", - "format" : "int32" - }, { - "name" : "begin", - "in" : "query", - "description" : "For Range option - 'begin' is the start occurrence of range of the resolutions.", - "required" : false, - "type" : "integer", - "format" : "int32" - }, { - "name" : "end", - "in" : "query", - "description" : "For Range option - 'end' is the end occurrence of the range of the resolutions.", - "required" : false, - "type" : "integer", - "format" : "int32" - } ], - "responses" : { - "200" : { - "description" : "successful operation", - "schema" : { - "type" : "array", - "items" : { - "$ref" : "#/definitions/ResourceResolution" - } - } - } - } - } - }, - "/api/v1/resources/resource" : { - "get" : { - "tags" : [ "Resources" ], - "summary" : "Fetch a resource value using resolution key", - "description" : "Retrieve a stored resource value using the blueprint metadata, artifact name, resolution-key along with the name of the resource value to retrieve.", - "operationId" : "ResourceController_getOneFromResolutionKey_GET.org.onap.ccsdk.cds.blueprintsprocessor.resource.api", - "produces" : [ "application/json" ], - "parameters" : [ { - "name" : "bpName", - "in" : "query", - "description" : "Name of the CBA", - "required" : true, - "type" : "string" - }, { - "name" : "bpVersion", - "in" : "query", - "description" : "Version of the CBA", - "required" : true, - "type" : "string" - }, { - "name" : "artifactName", - "in" : "query", - "description" : "Artifact name for which to retrieve a resolved resource", - "required" : true, - "type" : "string" - }, { - "name" : "resolutionKey", - "in" : "query", - "description" : "Resolution Key associated with the resolution", - "required" : true, - "type" : "string" - }, { - "name" : "name", - "in" : "query", - "description" : "Name of the resource to retrieve", - "required" : true, - "type" : "string" - } ], - "responses" : { - "200" : { - "description" : "successful operation", - "schema" : { - "type" : "object" - } - } - } - } - }, - "/api/v1/template/occurrences" : { - "get" : { - "tags" : [ "Resource Template" ], - "summary" : "Get the map of resolved templates with 'occurrence' as the keys to the resolved templates ", - "description" : "With optional 'occurrence' options, subset of stored resolved templates can be retrieved using the blueprint name, blueprint version, artifact name and the resolution-key.", - "operationId" : "TemplateController_getOccurrences_GET.org.onap.ccsdk.cds.blueprintsprocessor.resource.api", - "produces" : [ "application/json" ], - "parameters" : [ { - "name" : "bpName", - "in" : "query", - "description" : "Name of the CBA.", - "required" : true, - "type" : "string" - }, { - "name" : "bpVersion", - "in" : "query", - "description" : "Version of the CBA.", - "required" : true, - "type" : "string" - }, { - "name" : "artifactName", - "in" : "query", - "description" : "Artifact name for which to retrieve a resolved resource.", - "required" : true, - "type" : "string" - }, { - "name" : "resolutionKey", - "in" : "query", - "description" : "Resolution Key associated with the resolution.", - "required" : true, - "type" : "string" - }, { - "name" : "firstN", - "in" : "query", - "description" : "Number of earlier N occurrences of the templates.", - "required" : false, - "type" : "integer", - "format" : "int32" - }, { - "name" : "lastN", - "in" : "query", - "description" : "Number of latest N occurrences of the templates.", - "required" : false, - "type" : "integer", - "format" : "int32" - }, { - "name" : "begin", - "in" : "query", - "description" : "For Range option - 'begin' is the start occurrence of range of the templates.", - "required" : false, - "type" : "integer", - "format" : "int32" - }, { - "name" : "end", - "in" : "query", - "description" : "For Range option - 'end' is the end occurrence of the range of the templates.", - "required" : false, - "type" : "integer", - "format" : "int32" - } ], - "responses" : { - "200" : { - "description" : "successful operation", - "schema" : { - "type" : "array", - "items" : { - "$ref" : "#/definitions/TemplateResolution" - } - } - } - } - } - }, - "/api/v1/template/{bpName}/{bpVersion}/{artifactName}/{resolutionKey}" : { - "post" : { - "tags" : [ "Resource Template" ], - "summary" : "Store a resolved template w/ resolution-key", - "description" : "Store a template for a given CBA's action, identified by its blueprint name, blueprint version, artifact name and resolution key.", - "operationId" : "TemplateController_postWithResolutionKey_POST.org.onap.ccsdk.cds.blueprintsprocessor.resource.api", - "produces" : [ "application/json" ], - "parameters" : [ { - "name" : "bpName", - "in" : "path", - "description" : "Name of the CBA", - "required" : true, - "type" : "string" - }, { - "name" : "bpVersion", - "in" : "path", - "description" : "Version of the CBA", - "required" : true, - "type" : "string" - }, { - "name" : "artifactName", - "in" : "path", - "description" : "Artifact name for which to retrieve a resolved resource", - "required" : true, - "type" : "string" - }, { - "name" : "resolutionKey", - "in" : "path", - "description" : "Resolution Key associated with the resolution", - "required" : true, - "type" : "string" - }, { - "in" : "body", - "name" : "body", - "description" : "Template to store", - "required" : true, - "schema" : { - "type" : "string" - } - } ], - "responses" : { - "200" : { - "description" : "successful operation", - "schema" : { - "$ref" : "#/definitions/TemplateResolution" - } - } - } - } - }, - "/api/v1/template/{bpName}/{bpVersion}/{artifactName}/{resourceType}/{resourceId}" : { - "post" : { - "tags" : [ "Resource Template" ], - "summary" : "Store a resolved template w/ resourceId and resourceType", - "description" : "Store a template for a given CBA's action, identified by its blueprint name, blueprint version, artifact name, resourceId and resourceType.", - "operationId" : "TemplateController_postWithResourceIdAndResourceType_POST.org.onap.ccsdk.cds.blueprintsprocessor.resource.api", - "produces" : [ "application/json" ], - "parameters" : [ { - "name" : "bpName", - "in" : "path", - "description" : "Name of the CBA", - "required" : true, - "type" : "string" - }, { - "name" : "bpVersion", - "in" : "path", - "description" : "Version of the CBA", - "required" : true, - "type" : "string" - }, { - "name" : "artifactName", - "in" : "path", - "description" : "Artifact name for which to retrieve a resolved resource", - "required" : true, - "type" : "string" - }, { - "name" : "resourceType", - "in" : "path", - "description" : "Resource Type associated with the resolution", - "required" : true, - "type" : "string" - }, { - "name" : "resourceId", - "in" : "path", - "description" : "Resource Id associated with the resolution", - "required" : true, - "type" : "string" - }, { - "in" : "body", - "name" : "body", - "description" : "Template to store", - "required" : true, - "schema" : { - "type" : "string" - } - } ], - "responses" : { - "200" : { - "description" : "successful operation", - "schema" : { - "$ref" : "#/definitions/TemplateResolution" - } - } - } - } - } - }, - "securityDefinitions" : { - "Basic Auth" : { - "type" : "basic" - } - }, - "definitions" : { - "ActionIdentifiers" : { - "type" : "object", - "required" : [ "actionName", "mode" ], - "properties" : { - "blueprintName" : { - "type" : "string", - "description" : "Name of the CBA." - }, - "blueprintVersion" : { - "type" : "string", - "description" : "Version of the CBA." - }, - "actionName" : { - "type" : "string", - "description" : "Name of the workflow to execute." - }, - "mode" : { - "type" : "string", - "description" : "Async processing is only supported for gRPC client.", - "enum" : [ "sync", "async" ] - } - } - }, - "ArtifactDefinition" : { - "type" : "object", - "properties" : { - "type" : { - "type" : "string" - }, - "file" : { - "type" : "string" - }, - "repository" : { - "type" : "string" - }, - "description" : { - "type" : "string" - }, - "properties" : { - "type" : "object", - "additionalProperties" : { - "$ref" : "#/definitions/JsonNode" - } - }, - "deploy_Path" : { - "type" : "string" - } - } - }, - "BlueprintModelSearch" : { - "type" : "object", - "required" : [ "artifactName", "artifactVersion", "createdDate", "id", "published", "tags", "updatedBy" ], - "properties" : { - "id" : { - "type" : "string", - "example" : "658f9a48-7f54-41ba-ae18-c69f26f3dc94", - "description" : "ID of Blueprint model, is automatically created by CDS" - }, - "artifactUUId" : { - "type" : "string", - "example" : null, - "description" : "Artifact UUID, usually null" - }, - "artifactType" : { - "type" : "string", - "example" : "SDNC_MODEL", - "description" : "Artifact Type, usually null" - }, - "artifactVersion" : { - "type" : "string", - "example" : "1.0.0", - "description" : "Artifact Version, usually 1.0.0" - }, - "artifactDescription" : { - "type" : "string", - "example" : "", - "description" : "Artifact Description, usually empty" - }, - "internalVersion" : { - "type" : "integer", - "format" : "int32", - "example" : null, - "description" : "Internal Version of CBA, usually null" - }, - "createdDate" : { - "type" : "string", - "format" : "date-time", - "example" : "2020-11-19T10:34:56.000Z", - "description" : "Datetime of the creation of CBA in CDS" - }, - "artifactName" : { - "type" : "string", - "example" : "pnf_netconf", - "description" : "Artifact Name, defined in Metadata" - }, - "published" : { - "type" : "string", - "example" : "pnf_netconf", - "description" : "Artifact Name, defined in Metadata" - }, - "updatedBy" : { - "type" : "string", - "example" : "Deutsche Telekom AG", - "description" : "Name of publisher, defined in Metadata" - }, - "tags" : { - "type" : "string", - "example" : "test", - "description" : "Tags to identify the CBA, defined in Metadata" - } - } - }, - "BootstrapRequest" : { - "type" : "object", - "required" : [ "loadCBA", "loadModelType", "loadResourceDictionary" ], - "properties" : { - "loadModelType" : { - "type" : "boolean", - "example" : true, - "description" : "Specifies if default model types should be loaded" - }, - "loadResourceDictionary" : { - "type" : "boolean", - "example" : true, - "description" : "Specifies if default data dictionaries should be loaded" - }, - "loadCBA" : { - "type" : "boolean", - "example" : true, - "description" : "Specifies if default blueprint models should be loaded" - } - } - }, - "CapabilityAssignment" : { - "type" : "object", - "properties" : { - "attributes" : { - "type" : "object", - "additionalProperties" : { - "$ref" : "#/definitions/JsonNode" - } - }, - "properties" : { - "type" : "object", - "additionalProperties" : { - "$ref" : "#/definitions/JsonNode" - } - } - } - }, - "CommonHeader" : { - "type" : "object", - "required" : [ "originatorId", "requestId", "subRequestId", "timestamp" ], - "properties" : { - "timestamp" : { - "type" : "string", - "format" : "date-time", - "example" : 2012-04-23T18:25:43.511Z, - "description" : "Date of the execution" - }, - "originatorId" : { - "type" : "string", - "description" : "Identify the system/person triggering the request." - }, - "requestId" : { - "type" : "string", - "description" : "Uniquely identify a request." - }, - "subRequestId" : { - "type" : "string", - "description" : "Allow for fine-grain request identifier" - } - } - }, - "ConstraintClause" : { - "type" : "object", - "properties" : { - "equal" : { - "$ref" : "#/definitions/JsonNode" - }, - "length" : { - "$ref" : "#/definitions/JsonNode" - }, - "pattern" : { - "type" : "string" - }, - "schema" : { - "type" : "string" - }, - "greater_than" : { - "$ref" : "#/definitions/JsonNode" - }, - "greater_or_equal" : { - "$ref" : "#/definitions/JsonNode" - }, - "less_than" : { - "$ref" : "#/definitions/JsonNode" - }, - "less_or_equal" : { - "$ref" : "#/definitions/JsonNode" - }, - "in_range" : { - "type" : "array", - "items" : { - "$ref" : "#/definitions/JsonNode" - } - }, - "valid_values" : { - "type" : "array", - "items" : { - "$ref" : "#/definitions/JsonNode" - } - }, - "min_length" : { - "$ref" : "#/definitions/JsonNode" - }, - "max_length" : { - "$ref" : "#/definitions/JsonNode" - } - } - }, - "EntrySchema" : { - "type" : "object", - "properties" : { - "type" : { - "type" : "string" - }, - "constraints" : { - "type" : "array", - "items" : { - "$ref" : "#/definitions/ConstraintClause" - } - } - } - }, - "ExecutionServiceInput" : { - "type" : "object", - "required" : [ "actionIdentifiers", "commonHeader", "payload" ], - "properties" : { - "commonHeader" : { - "description" : "Headers providing request context.", - "$ref" : "#/definitions/CommonHeader" - }, - "actionIdentifiers" : { - "description" : "Provide information about the action to execute.", - "$ref" : "#/definitions/ActionIdentifiers" - }, - "payload" : { - "description" : "Contain the information to be passed as input to the action.The payload is constituted of two section: the workflow input which is the higher level block (xxx-request) and the input for resource resolution located within the xxx-request block, contained within xxx-properties", - "$ref" : "#/definitions/ObjectNode" - } - } - }, - "ExecutionServiceOutput" : { - "type" : "object", - "required" : [ "actionIdentifiers", "commonHeader", "payload", "status" ], - "properties" : { - "commonHeader" : { - "description" : "Headers providing request context.", - "$ref" : "#/definitions/CommonHeader" - }, - "actionIdentifiers" : { - "description" : "Provide information about the action to execute.", - "$ref" : "#/definitions/ActionIdentifiers" - }, - "status" : { - "description" : "Status of the request.", - "$ref" : "#/definitions/Status" - }, - "payload" : { - "description" : "Contain the information to be passed as input to the action.The payload is constituted of two section: the workflow input which is the higher level block (xxx-request) and the input for resource resolution located within the xxx-request block, contained within xxx-properties", - "$ref" : "#/definitions/ObjectNode" - } - } - }, - "FilePart" : { - "type" : "object" - }, - "Implementation" : { - "type" : "object", - "properties" : { - "primary" : { - "type" : "string" - }, - "dependencies" : { - "type" : "array", - "items" : { - "type" : "string" - } - }, - "timeout" : { - "type" : "integer", - "format" : "int32" - }, - "lock" : { - "$ref" : "#/definitions/LockAssignment" - }, - "operation_host" : { - "type" : "string" - } - } - }, - "InterfaceAssignment" : { - "type" : "object", - "properties" : { - "operations" : { - "type" : "object", - "additionalProperties" : { - "$ref" : "#/definitions/OperationAssignment" - } - }, - "inputs" : { - "type" : "object", - "additionalProperties" : { - "$ref" : "#/definitions/JsonNode" - } - } - } - }, - "JsonNode" : { - "type" : "object", - "properties" : { - "double" : { - "type" : "boolean" - }, - "int" : { - "type" : "boolean" - }, - "long" : { - "type" : "boolean" - }, - "boolean" : { - "type" : "boolean" - }, - "short" : { - "type" : "boolean" - }, - "nodeType" : { - "type" : "string", - "enum" : [ "ARRAY", "BINARY", "BOOLEAN", "MISSING", "NULL", "NUMBER", "OBJECT", "POJO", "STRING" ] - }, - "object" : { - "type" : "boolean" - }, - "number" : { - "type" : "boolean" - }, - "binary" : { - "type" : "boolean" - }, - "floatingPointNumber" : { - "type" : "boolean" - }, - "containerNode" : { - "type" : "boolean" - }, - "missingNode" : { - "type" : "boolean" - }, - "pojo" : { - "type" : "boolean" - }, - "valueNode" : { - "type" : "boolean" - }, - "bigDecimal" : { - "type" : "boolean" - }, - "textual" : { - "type" : "boolean" - }, - "bigInteger" : { - "type" : "boolean" - }, - "integralNumber" : { - "type" : "boolean" - }, - "array" : { - "type" : "boolean" - }, - "null" : { - "type" : "boolean" - }, - "float" : { - "type" : "boolean" - } - } - }, - "LockAssignment" : { - "type" : "object", - "properties" : { - "key" : { - "$ref" : "#/definitions/JsonNode" - }, - "acquireTimeout" : { - "$ref" : "#/definitions/JsonNode" - } - } - }, - "ModelType" : { - "type" : "object", - "required" : [ "definition", "definitionType", "derivedFrom", "description", "modelName", "tags", "updatedBy", "version" ], - "properties" : { - "modelName" : { - "type" : "string" - }, - "derivedFrom" : { - "type" : "string" - }, - "definitionType" : { - "type" : "string" - }, - "definition" : { - "$ref" : "#/definitions/JsonNode" - }, - "description" : { - "type" : "string" - }, - "version" : { - "type" : "string" - }, - "tags" : { - "type" : "string" - }, - "creationDate" : { - "type" : "string", - "format" : "date-time" - }, - "updatedBy" : { - "type" : "string" - } - } - }, - "NodeFilterDefinition" : { - "type" : "object", - "properties" : { - "properties" : { - "type" : "object", - "additionalProperties" : { - "$ref" : "#/definitions/PropertyDefinition" - } - }, - "capabilities" : { - "type" : "array", - "items" : { - "type" : "string" - } - } - } - }, - "NodeTemplate" : { - "type" : "object", - "properties" : { - "description" : { - "type" : "string" - }, - "type" : { - "type" : "string" - }, - "metadata" : { - "type" : "object", - "additionalProperties" : { - "type" : "string" - } - }, - "directives" : { - "type" : "array", - "items" : { - "type" : "string" - } - }, - "properties" : { - "type" : "object", - "additionalProperties" : { - "$ref" : "#/definitions/JsonNode" - } - }, - "attributes" : { - "type" : "object", - "additionalProperties" : { - "$ref" : "#/definitions/JsonNode" - } - }, - "capabilities" : { - "type" : "object", - "additionalProperties" : { - "$ref" : "#/definitions/CapabilityAssignment" - } - }, - "requirements" : { - "type" : "object", - "additionalProperties" : { - "$ref" : "#/definitions/RequirementAssignment" - } - }, - "interfaces" : { - "type" : "object", - "additionalProperties" : { - "$ref" : "#/definitions/InterfaceAssignment" - } - }, - "artifacts" : { - "type" : "object", - "additionalProperties" : { - "$ref" : "#/definitions/ArtifactDefinition" - } - }, - "copy" : { - "type" : "string" - }, - "node_filter" : { - "$ref" : "#/definitions/NodeFilterDefinition" - } - } - }, - "ObjectNode" : { - "type" : "object", - "properties" : { - "nodeType" : { - "type" : "string", - "enum" : [ "ARRAY", "BINARY", "BOOLEAN", "MISSING", "NULL", "NUMBER", "OBJECT", "POJO", "STRING" ] - }, - "double" : { - "type" : "boolean" - }, - "int" : { - "type" : "boolean" - }, - "long" : { - "type" : "boolean" - }, - "boolean" : { - "type" : "boolean" - }, - "short" : { - "type" : "boolean" - }, - "object" : { - "type" : "boolean" - }, - "number" : { - "type" : "boolean" - }, - "binary" : { - "type" : "boolean" - }, - "floatingPointNumber" : { - "type" : "boolean" - }, - "containerNode" : { - "type" : "boolean" - }, - "missingNode" : { - "type" : "boolean" - }, - "pojo" : { - "type" : "boolean" - }, - "valueNode" : { - "type" : "boolean" - }, - "bigDecimal" : { - "type" : "boolean" - }, - "textual" : { - "type" : "boolean" - }, - "bigInteger" : { - "type" : "boolean" - }, - "integralNumber" : { - "type" : "boolean" - }, - "array" : { - "type" : "boolean" - }, - "null" : { - "type" : "boolean" - }, - "float" : { - "type" : "boolean" - } - } - }, - "OperationAssignment" : { - "type" : "object", - "properties" : { - "description" : { - "type" : "string" - }, - "implementation" : { - "$ref" : "#/definitions/Implementation" - }, - "inputs" : { - "type" : "object", - "additionalProperties" : { - "$ref" : "#/definitions/JsonNode" - } - }, - "outputs" : { - "type" : "object", - "additionalProperties" : { - "$ref" : "#/definitions/JsonNode" - } - } - } - }, - "Page" : { - "type" : "object", - "properties" : { - "totalPages" : { - "type" : "integer", - "format" : "int32" - }, - "totalElements" : { - "type" : "integer", - "format" : "int64" - }, - "pageable" : { - "$ref" : "#/definitions/Pageable" - }, - "first" : { - "type" : "boolean" - }, - "numberOfElements" : { - "type" : "integer", - "format" : "int32" - }, - "size" : { - "type" : "integer", - "format" : "int32" - }, - "content" : { - "type" : "array", - "items" : { - "type" : "object" - } - }, - "number" : { - "type" : "integer", - "format" : "int32" - }, - "sort" : { - "$ref" : "#/definitions/Sort" - }, - "last" : { - "type" : "boolean" - }, - "empty" : { - "type" : "boolean" - } - } - }, - "PageBlueprintModelSearch" : { - "type" : "object", - "properties" : { - "totalPages" : { - "type" : "integer", - "format" : "int32" - }, - "totalElements" : { - "type" : "integer", - "format" : "int64" - }, - "pageable" : { - "$ref" : "#/definitions/Pageable" - }, - "first" : { - "type" : "boolean" - }, - "numberOfElements" : { - "type" : "integer", - "format" : "int32" - }, - "size" : { - "type" : "integer", - "format" : "int32" - }, - "content" : { - "type" : "array", - "items" : { - "$ref" : "#/definitions/BlueprintModelSearch" - } - }, - "number" : { - "type" : "integer", - "format" : "int32" - }, - "sort" : { - "$ref" : "#/definitions/Sort" - }, - "last" : { - "type" : "boolean" - }, - "empty" : { - "type" : "boolean" - } - } - }, - "Pageable" : { - "type" : "object", - "properties" : { - "paged" : { - "type" : "boolean" - }, - "pageNumber" : { - "type" : "integer", - "format" : "int32" - }, - "pageSize" : { - "type" : "integer", - "format" : "int32" - }, - "unpaged" : { - "type" : "boolean" - }, - "offset" : { - "type" : "integer", - "format" : "int64" - }, - "sort" : { - "$ref" : "#/definitions/Sort" - } - } - }, - "PropertyDefinition" : { - "type" : "object", - "properties" : { - "description" : { - "type" : "string" - }, - "required" : { - "type" : "boolean" - }, - "type" : { - "type" : "string" - }, - "status" : { - "type" : "string" - }, - "constraints" : { - "type" : "array", - "items" : { - "$ref" : "#/definitions/ConstraintClause" - } - }, - "metadata" : { - "type" : "object", - "additionalProperties" : { - "type" : "string" - } - }, - "value" : { - "$ref" : "#/definitions/JsonNode" - }, - "input-param" : { - "type" : "boolean" - }, - "default" : { - "$ref" : "#/definitions/JsonNode" - }, - "entry_schema" : { - "$ref" : "#/definitions/EntrySchema" - }, - "external-schema" : { - "type" : "string" - } - } - }, - "RequirementAssignment" : { - "type" : "object", - "properties" : { - "capability" : { - "type" : "string" - }, - "node" : { - "type" : "string" - }, - "relationship" : { - "type" : "string" - } - } - }, - "ResourceConfigSnapshot" : { - "type" : "object", - "required" : [ "config_snapshot", "createdDate", "resourceId", "resourceType", "status" ], - "properties" : { - "resourceType" : { - "type" : "string", - "example" : "ServiceInstance", - "description" : "Resource type." - }, - "resourceId" : { - "type" : "string", - "example" : "1", - "description" : "ID associated with the resource type in the inventory system." - }, - "status" : { - "type" : "string", - "description" : "Status of the snapshot, either running or candidate.", - "enum" : [ "RUNNING", "CANDIDATE" ] - }, - "config_snapshot" : { - "type" : "string", - "example" : "config_snapshot", - "description" : "Snapshot of the resource as retrieved from resource." - }, - "id" : { - "type" : "string" - }, - "createdDate" : { - "type" : "string", - "format" : "date-time", - "description" : "Creation date of the snapshot." - } - } - }, - "ResourceDefinition" : { - "type" : "object", - "required" : [ "group", "name", "property", "sources", "updated-by" ], - "properties" : { - "tags" : { - "type" : "string" - }, - "name" : { - "type" : "string", - "example" : "default-source", - "description" : "Name" - }, - "property" : { - "description" : "Property", - "$ref" : "#/definitions/PropertyDefinition" - }, - "group" : { - "type" : "string", - "example" : "default", - "description" : "Group" - }, - "updated-by" : { - "type" : "string", - "example" : "example@onap.com", - "description" : "Updated by" - }, - "sources" : { - "type" : "object", - "example" : "sources", - "description" : "Sources", - "additionalProperties" : { - "$ref" : "#/definitions/NodeTemplate" - } - } - } - }, - "ResourceDictionary" : { - "type" : "object", - "required" : [ "dataType", "definition", "description", "entrySchema", "name", "resourceDictionaryGroup", "tags", "updatedBy" ], - "properties" : { - "name" : { - "type" : "string", - "example" : "sample-db-source", - "description" : "Name" - }, - "dataType" : { - "type" : "string", - "example" : "string", - "description" : "Data type" - }, - "entrySchema" : { - "type" : "string", - "example" : "dt-license-key", - "description" : "Entry schema" - }, - "resourceDictionaryGroup" : { - "type" : "string", - "example" : "default", - "description" : "Resource dictionary group" - }, - "definition" : { - "description" : "Definition", - "$ref" : "#/definitions/ResourceDefinition" - }, - "description" : { - "type" : "string", - "example" : "demo_artifacts_version", - "description" : "Description" - }, - "tags" : { - "type" : "string", - "example" : "hostname", - "description" : "Tags" - }, - "creationDate" : { - "type" : "string", - "format" : "date-time" - }, - "updatedBy" : { - "type" : "string", - "example" : "username", - "description" : "Updated by" - } - } - }, - "ResourceResolution" : { - "type" : "object", - "required" : [ "artifactName", "blueprintName", "blueprintVersion", "createdDate", "dictionaryName", "dictionarySource", "dictionaryVersion", "name", "occurrence", "resolutionKey", "resourceId", "resourceType", "status", "value" ], - "properties" : { - "blueprintName" : { - "type" : "string", - "description" : "Name of the CBA." - }, - "blueprintVersion" : { - "type" : "string", - "description" : "Version of the CBA." - }, - "artifactName" : { - "type" : "string", - "description" : "Artifact name for which to retrieve a resolved resource." - }, - "name" : { - "type" : "string", - "description" : "Name of the resource." - }, - "value" : { - "type" : "string", - "description" : "Value of the resolution." - }, - "status" : { - "type" : "string", - "description" : "Whether success of failure." - }, - "resolutionKey" : { - "type" : "string", - "description" : "Resolution Key uniquely identifying the resolution of a given artifact within a CBA." - }, - "resourceType" : { - "type" : "string", - "example" : "ServiceInstance", - "description" : "Resolution type." - }, - "resourceId" : { - "type" : "string", - "description" : "ID associated with the resolution type in the inventory system." - }, - "occurrence" : { - "type" : "integer", - "format" : "int32", - "description" : "If resolution occurred multiple time, this field provides the index." - }, - "dictionaryName" : { - "type" : "string", - "description" : "Name of the data dictionary used for the resolution." - }, - "dictionarySource" : { - "type" : "string", - "description" : "Source associated with the data dictionary used for the resolution." - }, - "dictionaryVersion" : { - "type" : "integer", - "format" : "int32", - "description" : "Version of the data dictionary used for the resolution." - }, - "id" : { - "type" : "string" - }, - "createdDate" : { - "type" : "string", - "format" : "date-time", - "description" : "Creation date of the resolution." - } - } - }, - "ResourceSourceMapping" : { - "type" : "object", - "properties" : { - "resourceSourceMappings" : { - "type" : "object", - "additionalProperties" : { - "type" : "string" - } - } - } - }, - "Sort" : { - "type" : "object", - "properties" : { - "sorted" : { - "type" : "boolean" - }, - "unsorted" : { - "type" : "boolean" - }, - "empty" : { - "type" : "boolean" - } - } - }, - "Status" : { - "type" : "object", - "required" : [ "code", "eventType", "message", "timestamp" ], - "properties" : { - "code" : { - "type" : "integer", - "format" : "int32", - "description" : "HTTP status code equivalent." - }, - "eventType" : { - "type" : "string", - "description" : "Type of the event being emitted by CDS." - }, - "timestamp" : { - "type" : "string", - "format" : "date-time", - "example" : 2012-04-23T18:25:43.511Z, - "description" : "Time when the execution ended." - }, - "errorMessage" : { - "type" : "string", - "description" : "Error message when system failed" - }, - "message" : { - "type" : "string", - "description" : "Message providing request status" - } - } - }, - "TemplateResolution" : { - "type" : "object", - "required" : [ "artifactName", "blueprintName", "blueprintVersion", "createdDate", "occurrence", "resolutionKey", "resourceId", "resourceType", "result" ], - "properties" : { - "blueprintName" : { - "type" : "string", - "description" : "Name of the CBA." - }, - "blueprintVersion" : { - "type" : "string", - "description" : "Version of the CBA." - }, - "artifactName" : { - "type" : "string", - "description" : "Artifact name for which to retrieve a resolved resource." - }, - "result" : { - "type" : "string", - "description" : "Rendered template." - }, - "resolutionKey" : { - "type" : "string", - "description" : "Resolution Key uniquely identifying the resolution of a given artifact within a CBA." - }, - "resourceType" : { - "type" : "string", - "example" : "ServiceInstance", - "description" : "Resolution type." - }, - "resourceId" : { - "type" : "string", - "description" : "ID associated with the resolution type in the inventory system." - }, - "occurrence" : { - "type" : "integer", - "format" : "int32", - "description" : "If resolution occurred multiple time, this field provides the index." - }, - "id" : { - "type" : "string" - }, - "createdDate" : { - "type" : "string", - "format" : "date-time", - "description" : "Creation date of the resolution." - } - } - }, - "WorkFlowSpecRequest" : { - "type" : "object", - "required" : [ "blueprintName", "workflowName" ], - "properties" : { - "blueprintName" : { - "type" : "string", - "example" : "pnf_netconf", - "description" : "Name of the BLueprint" - }, - "version" : { - "type" : "string" - }, - "returnContent" : { - "type" : "string" - }, - "workflowName" : { - "type" : "string", - "example" : "config-assign", - "description" : "Name of the Workflow" - }, - "specType" : { - "type" : "string" - } - } - } - } +{ + "swagger" : "2.0", + "info" : { + "description" : "Shows all resources and endpoints which CDS BP processor currently provides with sample requests/responses, parameter description and other information.", + "version" : "v1", + "title" : "CDS Blueprint Processor API Reference", + "termsOfService" : "https://www.onap.org/", + "contact" : { + "name" : "ONAP Community", + "url" : "https://www.onap.org/", + "email" : "onap-discuss@lists.onap.org" + }, + "license" : { + "name" : "Apache 2.0", + "url" : "http://www.apache.org/licenses/LICENSE-2.0.html" + } + }, + "host" : "localhost:8080", + "tags" : [ { + "name" : "Blueprint Model Catalog", + "description" : "Manages all blueprint models which are available in CDS" + }, { + "name" : "Execution Service Catalog", + "description" : "Interaction with CBA which are available in CDS" + }, { + "name" : "Model Type Catalog", + "description" : "Manages data types in CDS" + }, { + "name" : "Resource configuration", + "description" : "Interaction with stored configurations" + }, { + "name" : "Resource Dictionary", + "description" : "Interaction with stored dictionaries" + }, { + "name" : "Resource Template", + "description" : "Interaction with resolved templates" + }, { + "name" : "Resources", + "description" : "Interaction with resolved resources" + } ], + "schemes" : [ "http" ], + "paths" : { + "/api/v1/blueprint-model" : { + "get" : { + "tags" : [ "Blueprint Model Catalog" ], + "summary" : "List all Blueprint Models", + "description" : "Lists all meta-data of blueprint models which are saved in CDS.", + "operationId" : "BlueprintModelController_allBlueprintModel_GET.org.onap.ccsdk.cds.blueprintsprocessor.designer.api", + "produces" : [ "application/json" ], + "responses" : { + "200" : { + "description" : "OK", + "schema" : { + "type" : "array", + "items" : { + "$ref" : "#/definitions/BlueprintModelSearch" + } + } + }, + "500" : { + "description" : "Internal Server Error" + } + } + }, + "post" : { + "tags" : [ "Blueprint Model Catalog" ], + "summary" : "Save a Blueprint Model", + "description" : "Saves a blueprint model by the given CBA zip file input. There is no validation of the attached CBA happening when this API is called.", + "operationId" : "BlueprintModelController_saveBlueprint_POST.org.onap.ccsdk.cds.blueprintsprocessor.designer.api", + "consumes" : [ "multipart/form-data" ], + "produces" : [ "application/json" ], + "parameters" : [ { + "in" : "body", + "name" : "file", + "description" : "CBA file to be uploaded (example: cba.zip)", + "required" : true, + "schema" : { + "$ref" : "#/definitions/FilePart" + } + } ], + "responses" : { + "200" : { + "description" : "OK", + "schema" : { + "$ref" : "#/definitions/BlueprintModelSearch" + } + }, + "500" : { + "description" : "Internal Server Error" + } + } + } + }, + "/api/v1/blueprint-model/bootstrap" : { + "post" : { + "tags" : [ "Blueprint Model Catalog" ], + "summary" : "Bootstrap CDS", + "description" : "Loads all Model Types, Resource Dictionaries and Blueprint Models which are included in CDS by default. Before starting to work with CDS, bootstrap should be called to load all the basic models that each orginization might support. Parameter values can be set as `false` to skip loading e.g. the Resource Dictionaries but this is not recommended.", + "operationId" : "BlueprintModelController_bootstrap_POST.org.onap.ccsdk.cds.blueprintsprocessor.designer.api", + "consumes" : [ "application/json" ], + "produces" : [ "application/json" ], + "parameters" : [ { + "in" : "body", + "name" : "body", + "description" : "Specifies which elements to load", + "required" : true, + "schema" : { + "$ref" : "#/definitions/BootstrapRequest" + } + } ], + "responses" : { + "200" : { + "description" : "OK", + "schema" : { + "type" : "object" + } + }, + "500" : { + "description" : "Internal Server Error" + } + } + } + }, + "/api/v1/blueprint-model/by-name/{name}/version/{version}" : { + "get" : { + "tags" : [ "Blueprint Model Catalog" ], + "summary" : "Get a Blueprint Model by Name and Version", + "description" : "Get Meta-Data of a Blueprint Model by its name and version.", + "operationId" : "BlueprintModelController_getBlueprintByNameAndVersion_GET.org.onap.ccsdk.cds.blueprintsprocessor.designer.api", + "produces" : [ "application/json" ], + "parameters" : [ { + "name" : "name", + "in" : "path", + "description" : "Name of the blueprint model", + "required" : true, + "type" : "string", + "x-example" : "pnf_netconf" + }, { + "name" : "version", + "in" : "path", + "description" : "Version of the blueprint model", + "required" : true, + "type" : "string", + "x-example" : "1.0.0" + } ], + "responses" : { + "200" : { + "description" : "OK", + "schema" : { + "$ref" : "#/definitions/BlueprintModelSearch" + } + }, + "404" : { + "description" : "Not Found" + } + } + } + }, + "/api/v1/blueprint-model/download/by-name/{name}/version/{version}" : { + "get" : { + "tags" : [ "Blueprint Model Catalog" ], + "summary" : "Download a Blueprint Model", + "description" : "Gets the CBA of a blueprint model by its name and version. Response can be saved to a file to download the CBA.", + "operationId" : "BlueprintModelController_downloadBlueprintByNameAndVersion_GET.org.onap.ccsdk.cds.blueprintsprocessor.designer.api", + "produces" : [ "application/json" ], + "parameters" : [ { + "name" : "name", + "in" : "path", + "description" : "Name of the blueprint model", + "required" : true, + "type" : "string", + "x-example" : "pnf_netconf" + }, { + "name" : "version", + "in" : "path", + "description" : "Version of the blueprint model", + "required" : true, + "type" : "string", + "x-example" : "1.0.0" + } ], + "responses" : { + "200" : { + "description" : "OK", + "schema" : { + "type" : "object" + } + }, + "404" : { + "description" : "Not Found" + } + } + } + }, + "/api/v1/blueprint-model/download/{id}" : { + "get" : { + "tags" : [ "Blueprint Model Catalog" ], + "summary" : "Download a Blueprint Model by ID", + "description" : "Gets the CBA of a blueprint model by its ID. Response can be saved to a file to download the CBA.", + "operationId" : "BlueprintModelController_downloadBluePrint_GET.org.onap.ccsdk.cds.blueprintsprocessor.designer.api", + "produces" : [ "application/json" ], + "parameters" : [ { + "name" : "id", + "in" : "path", + "description" : "ID of the blueprint model to download", + "required" : true, + "type" : "string", + "x-example" : "67ec1f96-ab55-4b81-aff9-23ee0ed1d7a4" + } ], + "responses" : { + "200" : { + "description" : "OK", + "schema" : { + "type" : "object" + } + }, + "404" : { + "description" : "Not Found" + } + } + } + }, + "/api/v1/blueprint-model/enrich" : { + "post" : { + "tags" : [ "Blueprint Model Catalog" ], + "summary" : "Enrich a Blueprint Model", + "description" : "Enriches the attached CBA and returns the enriched CBA zip file in the response. The enrichment process will complete the package by providing all the definition of types used.", + "operationId" : "BlueprintModelController_enrichBlueprint_POST.org.onap.ccsdk.cds.blueprintsprocessor.designer.api", + "consumes" : [ "multipart/form-data" ], + "produces" : [ "application/json" ], + "parameters" : [ { + "in" : "body", + "name" : "file", + "description" : "CBA zip file to be uploaded (example: cba_unenriched.zip)", + "required" : true, + "schema" : { + "$ref" : "#/definitions/FilePart" + } + } ], + "responses" : { + "200" : { + "description" : "successful operation", + "schema" : { + "type" : "object" + } + } + } + } + }, + "/api/v1/blueprint-model/enrichandpublish" : { + "post" : { + "tags" : [ "Blueprint Model Catalog" ], + "summary" : "Enrich and publish a Blueprint Model", + "description" : "Enriches the attached CBA, validates it and saves it in CDS if validation was successful.", + "operationId" : "BlueprintModelController_enrichAndPubishlueprint_POST.org.onap.ccsdk.cds.blueprintsprocessor.designer.api", + "consumes" : [ "multipart/form-data" ], + "produces" : [ "application/json" ], + "parameters" : [ { + "in" : "body", + "name" : "file", + "description" : "Unenriched CBA zip file to be uploaded (example: cba_unenriched.zip)", + "required" : true, + "schema" : { + "$ref" : "#/definitions/FilePart" + } + } ], + "responses" : { + "200" : { + "description" : "OK", + "schema" : { + "$ref" : "#/definitions/BlueprintModelSearch" + } + }, + "503" : { + "description" : "Service Unavailable" + } + } + } + }, + "/api/v1/blueprint-model/meta-data/{keyword}" : { + "get" : { + "tags" : [ "Blueprint Model Catalog" ], + "summary" : "Search for Blueprints by a Keyword", + "description" : "Lists all blueprint models by a matching keyword in any of the meta-data of the blueprint models. Blueprint models are just returned if a whole keyword is matching, not just parts of it. Not case-sensitive. Used by CDS UI.", + "operationId" : "BlueprintModelController_allBlueprintModelMetaData_GET.org.onap.ccsdk.cds.blueprintsprocessor.designer.api", + "produces" : [ "application/json" ], + "parameters" : [ { + "name" : "keyword", + "in" : "path", + "description" : "Keyword to search for in blueprint model meta-data", + "required" : true, + "type" : "string", + "x-example" : "pnf_netconf" + } ], + "responses" : { + "200" : { + "description" : "successful operation", + "schema" : { + "type" : "array", + "items" : { + "$ref" : "#/definitions/BlueprintModelSearch" + } + } + } + } + } + }, + "/api/v1/blueprint-model/name/{name}/version/{version}" : { + "delete" : { + "tags" : [ "Blueprint Model Catalog" ], + "summary" : "Delete a Blueprint Model by Name", + "description" : "Deletes a blueprint model identified by its name and version from CDS.", + "operationId" : "BlueprintModelController_deleteBlueprintByName_DELETE.org.onap.ccsdk.cds.blueprintsprocessor.designer.api", + "parameters" : [ { + "name" : "name", + "in" : "path", + "description" : "Name of the blueprint model", + "required" : true, + "type" : "string", + "x-example" : "pnf_netconf" + }, { + "name" : "version", + "in" : "path", + "description" : "Version of the blueprint model", + "required" : true, + "type" : "string", + "x-example" : "1.0.0" + } ], + "responses" : { + "200" : { + "description" : "successful operation", + "schema" : { + "type" : "object" + } + } + } + } + }, + "/api/v1/blueprint-model/paged" : { + "get" : { + "tags" : [ "Blueprint Model Catalog" ], + "summary" : "Get Blueprints ordered", + "description" : "Lists all blueprint models which are saved in CDS in an ordered mode.", + "operationId" : "BlueprintModelController_allBlueprintModelPaged_GET.org.onap.ccsdk.cds.blueprintsprocessor.designer.api", + "produces" : [ "application/json" ], + "parameters" : [ { + "name" : "limit", + "in" : "query", + "description" : "Maximum number of returned blueprint models", + "required" : false, + "type" : "integer", + "default" : 20, + "format" : "int32" + }, { + "name" : "offset", + "in" : "query", + "description" : "Offset", + "required" : false, + "type" : "integer", + "default" : 0, + "format" : "int32" + }, { + "name" : "sort", + "in" : "query", + "description" : "Order of returned blueprint models", + "required" : false, + "type" : "string", + "default" : "DATE", + "enum" : [ "DATE", "NAME", "VERSION" ] + }, { + "name" : "sortType", + "in" : "query", + "description" : "Ascend or descend ordering", + "required" : false, + "type" : "string", + "default" : "ASC" + } ], + "responses" : { + "200" : { + "description" : "successful operation", + "schema" : { + "$ref" : "#/definitions/PageBlueprintModelSearch" + } + } + } + } + }, + "/api/v1/blueprint-model/paged/meta-data/{keyword}" : { + "get" : { + "tags" : [ "Blueprint Model Catalog" ], + "summary" : "Search for Blueprints by a Keyword in an ordered mode", + "description" : "Lists all blueprint models by a matching keyword in any of the meta-data of the blueprint models in an ordered mode. Blueprint models are just returned if a whole keyword is matching, not just parts of it. Not case-sensitive. Used by CDS UI.", + "operationId" : "BlueprintModelController_allBlueprintModelMetaDataPaged_GET.org.onap.ccsdk.cds.blueprintsprocessor.designer.api", + "produces" : [ "application/json" ], + "parameters" : [ { + "name" : "keyword", + "in" : "path", + "description" : "Keyword to search for in blueprint model meta-data", + "required" : true, + "type" : "string", + "x-example" : "pnf_netconf" + }, { + "name" : "limit", + "in" : "query", + "description" : "Maximum number of returned blueprint models", + "required" : false, + "type" : "integer", + "default" : 20, + "format" : "int32" + }, { + "name" : "offset", + "in" : "query", + "description" : "Offset", + "required" : false, + "type" : "integer", + "default" : 0, + "format" : "int32" + }, { + "name" : "sort", + "in" : "query", + "description" : "Order of returned blueprint models", + "required" : false, + "type" : "string", + "default" : "DATE", + "enum" : [ "DATE", "NAME", "VERSION" ] + }, { + "name" : "sortType", + "in" : "query", + "description" : "Ascend or descend ordering", + "required" : false, + "type" : "string", + "default" : "ASC" + } ], + "responses" : { + "200" : { + "description" : "successful operation", + "schema" : { + "$ref" : "#/definitions/PageBlueprintModelSearch" + } + } + } + } + }, + "/api/v1/blueprint-model/publish" : { + "post" : { + "tags" : [ "Blueprint Model Catalog" ], + "summary" : "Publish a Blueprint Model", + "description" : "Validates the attached CBA file and saves it in CDS if validation was successful. CBA needs to be already enriched.", + "operationId" : "BlueprintModelController_publishBlueprint_POST.org.onap.ccsdk.cds.blueprintsprocessor.designer.api", + "consumes" : [ "multipart/form-data" ], + "produces" : [ "application/json" ], + "parameters" : [ { + "in" : "body", + "name" : "file", + "description" : "Enriched CBA zip file to be uploaded (example: cba_enriched.zip)", + "required" : true, + "schema" : { + "$ref" : "#/definitions/FilePart" + } + } ], + "responses" : { + "200" : { + "description" : "successful operation", + "schema" : { + "$ref" : "#/definitions/BlueprintModelSearch" + } + } + } + } + }, + "/api/v1/blueprint-model/search/{tags}" : { + "get" : { + "tags" : [ "Blueprint Model Catalog" ], + "summary" : "Search for a Blueprint by Tag", + "description" : "Searches for all blueprint models which contain the specified input parameter in their tags. Blueprint models which contain just parts of the searched word in their tags are also returned.", + "operationId" : "BlueprintModelController_searchBlueprintModels_GET.org.onap.ccsdk.cds.blueprintsprocessor.designer.api", + "produces" : [ "application/json" ], + "parameters" : [ { + "name" : "tags", + "in" : "path", + "description" : "Tag to search for", + "required" : true, + "type" : "string", + "x-example" : "test" + } ], + "responses" : { + "200" : { + "description" : "successful operation", + "schema" : { + "type" : "array", + "items" : { + "$ref" : "#/definitions/BlueprintModelSearch" + } + } + } + } + } + }, + "/api/v1/blueprint-model/workflow-spec" : { + "post" : { + "tags" : [ "Blueprint Model Catalog" ], + "summary" : "Get Workflow Specification", + "description" : "Get the workflow of a blueprint identified by Blueprint and workflow name. Inputs, outputs and data types of workflow is returned.", + "operationId" : "BlueprintModelController_workflowSpec_POST.org.onap.ccsdk.cds.blueprintsprocessor.designer.api", + "consumes" : [ "application/json" ], + "produces" : [ "application/json" ], + "parameters" : [ { + "in" : "body", + "name" : "body", + "description" : "Blueprint and workflow identification", + "required" : true, + "schema" : { + "$ref" : "#/definitions/WorkFlowSpecRequest" + } + } ], + "responses" : { + "200" : { + "description" : "successful operation", + "schema" : { + "type" : "object" + } + } + } + } + }, + "/api/v1/blueprint-model/workflows/blueprint-name/{name}/version/{version}" : { + "get" : { + "tags" : [ "Blueprint Model Catalog" ], + "summary" : "Get Workflows of a Blueprint", + "description" : "Get all available workflows of a Blueprint identified by its name and version.", + "operationId" : "BlueprintModelController_getWorkflowList_GET.org.onap.ccsdk.cds.blueprintsprocessor.designer.api", + "produces" : [ "application/json" ], + "parameters" : [ { + "name" : "name", + "in" : "path", + "description" : "Name of the blueprint model", + "required" : true, + "type" : "string", + "x-example" : "pnf_netconf" + }, { + "name" : "version", + "in" : "path", + "description" : "Version of the blueprint model", + "required" : true, + "type" : "string", + "x-example" : "1.0.0" + } ], + "responses" : { + "200" : { + "description" : "successful operation", + "schema" : { + "type" : "object" + } + } + } + } + }, + "/api/v1/blueprint-model/{id}" : { + "get" : { + "tags" : [ "Blueprint Model Catalog" ], + "summary" : "Get a Blueprint Model by ID", + "description" : "Get meta-data of a blueprint model by its internally created ID.", + "operationId" : "BlueprintModelController_getBlueprintModel_GET.org.onap.ccsdk.cds.blueprintsprocessor.designer.api", + "produces" : [ "application/json" ], + "parameters" : [ { + "name" : "id", + "in" : "path", + "description" : "ID of the blueprint model to search for", + "required" : true, + "type" : "string", + "x-example" : "67ec1f96-ab55-4b81-aff9-23ee0ed1d7a4" + } ], + "responses" : { + "200" : { + "description" : "OK", + "schema" : { + "$ref" : "#/definitions/BlueprintModelSearch" + } + }, + "404" : { + "description" : "Not Found" + } + } + }, + "delete" : { + "tags" : [ "Blueprint Model Catalog" ], + "summary" : "Delete a Blueprint Model by ID", + "description" : "Delete a blueprint model by its ID. ID is the internally created ID of blueprint, not the name of blueprint.", + "operationId" : "BlueprintModelController_deleteBlueprint_DELETE.org.onap.ccsdk.cds.blueprintsprocessor.designer.api", + "parameters" : [ { + "name" : "id", + "in" : "path", + "description" : "ID of the blueprint model to delete", + "required" : true, + "type" : "string", + "x-example" : "67ec1f96-ab55-4b81-aff9-23ee0ed1d7a4" + } ], + "responses" : { + "200" : { + "description" : "OK", + "schema" : { + "type" : "object" + } + }, + "404" : { + "description" : "RESOURCE_NOT_FOUND" + } + } + } + }, + "/api/v1/configs" : { + "get" : { + "tags" : [ "Resource configuration" ], + "summary" : "Retrieve a resource configuration snapshot", + "description" : "Retrieve a config snapshot, identified by its Resource Id and Type. An extra 'format' parameter can be passed to tell what content-type is expected.", + "operationId" : "ResourceConfigSnapshotController_get_GET.org.onap.ccsdk.cds.blueprintsprocessor.configs.api", + "produces" : [ "text/plain", "application/json", "application/xml" ], + "parameters" : [ { + "name" : "resourceType", + "in" : "query", + "description" : "Resource Type associated of the resource configuration snapshot", + "required" : true, + "type" : "string", + "x-example" : "\"PNF\"" + }, { + "name" : "resourceId", + "in" : "query", + "description" : "Resource Id associated of the resource configuration snapshot", + "required" : true, + "type" : "string", + "x-example" : "\"1\"" + }, { + "name" : "status", + "in" : "query", + "description" : "Status of the snapshot being retrieved", + "required" : false, + "type" : "string", + "default" : "RUNNING" + }, { + "name" : "format", + "in" : "query", + "description" : "Expected format of the snapshot being retrieved", + "required" : false, + "type" : "string", + "default" : "text/plain" + } ], + "responses" : { + "200" : { + "description" : "successful operation", + "schema" : { + "type" : "string" + } + } + } + } + }, + "/api/v1/configs/allByID" : { + "get" : { + "tags" : [ "Resource configuration" ], + "summary" : "Retrieve all resource configuration snapshots identified by a given resource_id", + "description" : "Retrieve all config snapshots, identified by its Resource Id, ordered by most recently created/modified date. ", + "operationId" : "ResourceConfigSnapshotController_getAllByID_GET.org.onap.ccsdk.cds.blueprintsprocessor.configs.api", + "produces" : [ "application/json" ], + "parameters" : [ { + "name" : "resourceId", + "in" : "query", + "description" : "Resource Id associated of the resource configuration snapshots", + "required" : true, + "type" : "string", + "x-example" : "\"1\"" + }, { + "name" : "status", + "in" : "query", + "description" : "Status of the snapshot being retrieved", + "required" : false, + "type" : "string", + "default" : "ANY" + } ], + "responses" : { + "200" : { + "description" : "successful operation", + "schema" : { + "type" : "array", + "items" : { + "$ref" : "#/definitions/ResourceConfigSnapshot" + } + } + } + } + } + }, + "/api/v1/configs/allByType" : { + "get" : { + "tags" : [ "Resource configuration" ], + "summary" : "Retrieve all resource configuration snapshots for a given resource type", + "description" : "Retrieve all config snapshots matching a specified Resource Type, ordered by most recently created/modified date. ", + "operationId" : "ResourceConfigSnapshotController_getAllByType_GET.org.onap.ccsdk.cds.blueprintsprocessor.configs.api", + "produces" : [ "application/json" ], + "parameters" : [ { + "name" : "resourceType", + "in" : "query", + "description" : "Resource Type associated of the resource configuration snapshot", + "required" : true, + "type" : "string", + "x-example" : "\"PNF\"" + }, { + "name" : "status", + "in" : "query", + "description" : "Status of the snapshot being retrieved", + "required" : false, + "type" : "string", + "default" : "ANY" + } ], + "responses" : { + "200" : { + "description" : "successful operation", + "schema" : { + "type" : "array", + "items" : { + "$ref" : "#/definitions/ResourceConfigSnapshot" + } + } + } + } + } + }, + "/api/v1/configs/{resourceType}/{resourceId}/{status}" : { + "post" : { + "tags" : [ "Resource configuration" ], + "summary" : "Store a resource configuration snapshot identified by resourceId, resourceType, status", + "description" : "Store a resource configuration snapshot, identified by its resourceId and resourceType, and optionally its status, either RUNNING or CANDIDATE.", + "operationId" : "ResourceConfigSnapshotController_postWithResourceIdAndResourceType_POST.org.onap.ccsdk.cds.blueprintsprocessor.configs.api", + "produces" : [ "application/json" ], + "parameters" : [ { + "name" : "resourceType", + "in" : "path", + "description" : "Resource Type associated with the resolution", + "required" : true, + "type" : "string", + "x-example" : "\"PNF\"" + }, { + "name" : "resourceId", + "in" : "path", + "description" : "Resource Id associated with the resolution", + "required" : true, + "type" : "string", + "x-example" : "\"1\"" + }, { + "name" : "status", + "in" : "path", + "description" : "Status of the snapshot being retrieved", + "required" : true, + "type" : "string", + "default" : "RUNNING" + }, { + "in" : "body", + "name" : "body", + "description" : "Config snapshot to store", + "required" : true, + "schema" : { + "type" : "string" + } + } ], + "responses" : { + "200" : { + "description" : "successful operation", + "schema" : { + "$ref" : "#/definitions/ResourceConfigSnapshot" + } + } + } + }, + "delete" : { + "tags" : [ "Resource configuration" ], + "summary" : "Delete a resource configuration snapshot identified by resourceId, resourceType, status.", + "description" : "Delete a resource configuration snapshot, identified by its resourceId and resourceType, and optionally its status, either RUNNING or CANDIDATE.", + "operationId" : "ResourceConfigSnapshotController_deleteWithResourceIdAndResourceType_DELETE.org.onap.ccsdk.cds.blueprintsprocessor.configs.api", + "parameters" : [ { + "name" : "resourceType", + "in" : "path", + "description" : "Resource Type associated with the resolution.", + "required" : true, + "type" : "string" + }, { + "name" : "resourceId", + "in" : "path", + "description" : "Resource Id associated with the resolution.", + "required" : true, + "type" : "string" + }, { + "name" : "status", + "in" : "path", + "description" : "Status of the snapshot being deleted.", + "required" : true, + "type" : "string" + } ], + "responses" : { + "200" : { + "description" : "successful operation", + "schema" : { + "type" : "object" + } + } + } + } + }, + "/api/v1/dictionary" : { + "post" : { + "tags" : [ "Resource Dictionary" ], + "summary" : "Save a resource dictionary", + "description" : "Save a resource dictionary by dictionary provided.", + "operationId" : "ResourceDictionaryController_saveResourceDictionary_POST.org.onap.ccsdk.cds.blueprintsprocessor.designer.api", + "consumes" : [ "application/json" ], + "produces" : [ "application/json" ], + "parameters" : [ { + "in" : "body", + "name" : "body", + "description" : "Resource dictionary to store", + "required" : true, + "schema" : { + "$ref" : "#/definitions/ResourceDictionary" + } + } ], + "responses" : { + "200" : { + "description" : "successful operation", + "schema" : { + "$ref" : "#/definitions/ResourceDictionary" + } + } + } + } + }, + "/api/v1/dictionary/by-names" : { + "post" : { + "tags" : [ "Resource Dictionary" ], + "summary" : "Search for a resource dictionary", + "description" : "Search for a resource dictionary by names provided.", + "operationId" : "ResourceDictionaryController_searchResourceDictionaryByNames_POST.org.onap.ccsdk.cds.blueprintsprocessor.designer.api", + "consumes" : [ "application/json" ], + "produces" : [ "application/json" ], + "parameters" : [ { + "in" : "body", + "name" : "body", + "description" : "List of names", + "required" : true, + "schema" : { + "type" : "array", + "items" : { + "type" : "string" + } + } + } ], + "responses" : { + "200" : { + "description" : "successful operation", + "schema" : { + "type" : "array", + "items" : { + "$ref" : "#/definitions/ResourceDictionary" + } + } + } + } + } + }, + "/api/v1/dictionary/definition" : { + "post" : { + "tags" : [ "Resource Dictionary" ], + "summary" : "Save a resource dictionary", + "description" : "Save a resource dictionary by provided resource definition json.", + "operationId" : "ResourceDictionaryController_saveResourceDictionary_1_POST.org.onap.ccsdk.cds.blueprintsprocessor.designer.api", + "consumes" : [ "application/json" ], + "produces" : [ "application/json" ], + "parameters" : [ { + "in" : "body", + "name" : "body", + "description" : "Resource definition to generate Resource Dictionary", + "required" : true, + "schema" : { + "$ref" : "#/definitions/ResourceDefinition" + } + } ], + "responses" : { + "200" : { + "description" : "successful operation", + "schema" : { + "$ref" : "#/definitions/ResourceDictionary" + } + } + } + } + }, + "/api/v1/dictionary/definition-bulk" : { + "post" : { + "tags" : [ "Resource Dictionary" ], + "summary" : "Save multiple resource dictionaries", + "description" : "Save multiple resource dictionaries by provided resource definition json array.", + "operationId" : "ResourceDictionaryController_saveAllResourceDictionary_1_POST.org.onap.ccsdk.cds.blueprintsprocessor.designer.api", + "consumes" : [ "application/json" ], + "produces" : [ "application/json" ], + "parameters" : [ { + "in" : "body", + "name" : "body", + "description" : "Resource definition json array to generate Resource Dictionaries", + "required" : true, + "schema" : { + "type" : "array", + "items" : { + "$ref" : "#/definitions/ResourceDefinition" + } + } + } ], + "responses" : { + "200" : { + "description" : "successful operation", + "schema" : { + "$ref" : "#/definitions/ResourceDictionary" + } + } + } + } + }, + "/api/v1/dictionary/paged" : { + "get" : { + "tags" : [ "Resource Dictionary" ], + "summary" : "Get Blueprints Dictionary ordered", + "description" : "Lists all blueprint Dictionary which are saved in CDS in an ordered mode.", + "operationId" : "BlueprintModelController_allBlueprintDictionaryPaged_GET.org.onap.ccsdk.cds.blueprintsprocessor.designer.api", + "produces" : [ "application/json" ], + "parameters" : [ { + "name" : "limit", + "in" : "query", + "description" : "Maximum number of returned blueprint dictionary", + "required" : false, + "type" : "integer", + "default" : 20, + "format" : "int32" + }, { + "name" : "offset", + "in" : "query", + "description" : "Offset", + "required" : false, + "type" : "integer", + "default" : 0, + "format" : "int32" + }, { + "name" : "sort", + "in" : "query", + "description" : "Order of returned blueprint dictionary", + "required" : false, + "type" : "string", + "default" : "DATE", + "enum" : [ "DATE" ] + }, { + "name" : "sortType", + "in" : "query", + "description" : "Ascend or descend ordering", + "required" : false, + "type" : "string", + "default" : "ASC" + } ], + "responses" : { + "200" : { + "description" : "successful operation", + "schema" : { + "type" : "object" + } + } + } + } + }, + "/api/v1/dictionary/resource_dictionary_group" : { + "get" : { + "tags" : [ "Resource Dictionary" ], + "summary" : "Retrieve all resource dictionary groups", + "description" : "Retrieve all resource dictionary groups.", + "operationId" : "ResourceDictionaryController_getResourceDictionaryDistinct_GET.org.onap.ccsdk.cds.blueprintsprocessor.designer.api", + "produces" : [ "application/json" ], + "responses" : { + "200" : { + "description" : "successful operation", + "schema" : { + "type" : "array", + "items" : { + "type" : "string" + } + } + } + } + } + }, + "/api/v1/dictionary/search/{tags}" : { + "get" : { + "tags" : [ "Resource Dictionary" ], + "summary" : "Search for a resource dictionary", + "description" : "Search for a resource dictionary by tags provided.", + "operationId" : "ResourceDictionaryController_searchResourceDictionaryByTags_GET.org.onap.ccsdk.cds.blueprintsprocessor.designer.api", + "produces" : [ "application/json" ], + "parameters" : [ { + "name" : "tags", + "in" : "path", + "description" : "Tags list", + "required" : true, + "type" : "string", + "x-example" : "\"status\"" + } ], + "responses" : { + "200" : { + "description" : "successful operation", + "schema" : { + "type" : "array", + "items" : { + "$ref" : "#/definitions/ResourceDictionary" + } + } + } + } + } + }, + "/api/v1/dictionary/source-mapping" : { + "get" : { + "tags" : [ "Resource Dictionary" ], + "summary" : "Search for a source mapping", + "description" : "Search for a source mapping.", + "operationId" : "ResourceDictionaryController_getResourceSourceMapping_GET.org.onap.ccsdk.cds.blueprintsprocessor.designer.api", + "produces" : [ "application/json" ], + "responses" : { + "200" : { + "description" : "successful operation", + "schema" : { + "$ref" : "#/definitions/ResourceSourceMapping" + } + } + } + } + }, + "/api/v1/dictionary/{name}" : { + "get" : { + "tags" : [ "Resource Dictionary" ], + "summary" : "Retrieve a resource dictionary", + "description" : "Retrieve a resource dictionary by name provided.", + "operationId" : "ResourceDictionaryController_getResourceDictionaryByName_GET.org.onap.ccsdk.cds.blueprintsprocessor.designer.api", + "produces" : [ "application/json" ], + "parameters" : [ { + "name" : "name", + "in" : "path", + "description" : "Name of the resource", + "required" : true, + "type" : "string", + "x-example" : "\"hostname\"" + } ], + "responses" : { + "200" : { + "description" : "successful operation", + "schema" : { + "$ref" : "#/definitions/ResourceDictionary" + } + } + } + }, + "delete" : { + "tags" : [ "Resource Dictionary" ], + "summary" : "Remove a resource dictionary", + "description" : "Remove a resource dictionary by name provided.", + "operationId" : "ResourceDictionaryController_deleteResourceDictionaryByName_DELETE.org.onap.ccsdk.cds.blueprintsprocessor.designer.api", + "parameters" : [ { + "name" : "name", + "in" : "path", + "description" : "Name of the resource", + "required" : true, + "type" : "string" + } ], + "responses" : { + "200" : { + "description" : "successful operation", + "schema" : { + "type" : "object" + } + } + } + } + }, + "/api/v1/execution-service/process" : { + "post" : { + "tags" : [ "Execution Service Catalog" ], + "summary" : "Execute a CBA workflow (action)", + "description" : "Execute the appropriate CBA's action based on the ExecutionServiceInput object passed as input.", + "operationId" : "ExecutionServiceController_process_POST.org.onap.ccsdk.cds.blueprintsprocessor.selfservice.api", + "produces" : [ "application/json" ], + "parameters" : [ { + "in" : "body", + "name" : "body", + "description" : "ExecutionServiceInput payload.", + "required" : true, + "schema" : { + "$ref" : "#/definitions/ExecutionServiceInput" + } + } ], + "responses" : { + "200" : { + "description" : "successful operation", + "schema" : { + "$ref" : "#/definitions/ExecutionServiceOutput" + } + } + } + } + }, + "/api/v1/model-type/by-definition/{definitionType}" : { + "get" : { + "tags" : [ "Model Type Catalog" ], + "summary" : "Retrieve a list of model types", + "description" : "Retrieve a list of model types by definition type provided.", + "operationId" : "ModelTypeController_getModelTypeByDefinitionType_GET.org.onap.ccsdk.cds.blueprintsprocessor.designer.api", + "produces" : [ "application/json" ], + "parameters" : [ { + "name" : "definitionType", + "in" : "path", + "required" : true, + "type" : "string" + } ], + "responses" : { + "200" : { + "description" : "successful operation", + "schema" : { + "type" : "array", + "items" : { + "$ref" : "#/definitions/ModelType" + } + } + } + } + } + }, + "/api/v1/model-type/search/{tags}" : { + "get" : { + "tags" : [ "Model Type Catalog" ], + "summary" : "Retrieve a list of model types", + "description" : "Retrieve a list of model types by tags provided.", + "operationId" : "ModelTypeController_searchModelTypes_GET.org.onap.ccsdk.cds.blueprintsprocessor.designer.api", + "produces" : [ "application/json" ], + "parameters" : [ { + "name" : "tags", + "in" : "path", + "required" : true, + "type" : "string" + } ], + "responses" : { + "200" : { + "description" : "successful operation", + "schema" : { + "type" : "array", + "items" : { + "$ref" : "#/definitions/ModelType" + } + } + } + } + } + }, + "/api/v1/model-type/{name}" : { + "get" : { + "tags" : [ "Model Type Catalog" ], + "summary" : "Retrieve a model type", + "description" : "Retrieve a model type by name provided.", + "operationId" : "ModelTypeController_getModelTypeByName_GET.org.onap.ccsdk.cds.blueprintsprocessor.designer.api", + "produces" : [ "application/json" ], + "parameters" : [ { + "name" : "name", + "in" : "path", + "required" : true, + "type" : "string" + } ], + "responses" : { + "200" : { + "description" : "successful operation", + "schema" : { + "$ref" : "#/definitions/ModelType" + } + } + } + }, + "delete" : { + "tags" : [ "Model Type Catalog" ], + "summary" : "Remove a model type", + "description" : "Remove a model type by name provided.", + "operationId" : "ModelTypeController_deleteModelTypeByName_DELETE.org.onap.ccsdk.cds.blueprintsprocessor.designer.api", + "parameters" : [ { + "name" : "name", + "in" : "path", + "required" : true, + "type" : "string" + } ], + "responses" : { + "200" : { + "description" : "successful operation", + "schema" : { + "$ref" : "#/definitions/ModelType" + } + } + } + } + }, + "/api/v1/resources" : { + "get" : { + "tags" : [ "Resources" ], + "summary" : "Get all resolved resources using the resolution key", + "description" : "Retrieve all stored resolved resources using the blueprint name, blueprint version, artifact name and the resolution-key.", + "operationId" : "ResourceController_getAllFromResolutionKeyOrFromResourceTypeAndId_GET.org.onap.ccsdk.cds.blueprintsprocessor.resource.api", + "produces" : [ "application/json" ], + "parameters" : [ { + "name" : "bpName", + "in" : "query", + "description" : "Name of the CBA", + "required" : true, + "type" : "string" + }, { + "name" : "bpVersion", + "in" : "query", + "description" : "Version of the CBA", + "required" : true, + "type" : "string" + }, { + "name" : "artifactName", + "in" : "query", + "description" : "Artifact name for which to retrieve a resolved resource", + "required" : true, + "type" : "string" + }, { + "name" : "resolutionKey", + "in" : "query", + "description" : "Resolution Key associated with the resolution", + "required" : false, + "type" : "string" + }, { + "name" : "resourceType", + "in" : "query", + "description" : "Resource Type associated with the resolution", + "required" : false, + "type" : "string" + }, { + "name" : "resourceId", + "in" : "query", + "description" : "Resource Id associated with the resolution", + "required" : false, + "type" : "string" + } ], + "responses" : { + "200" : { + "description" : "successful operation", + "schema" : { + "type" : "array", + "items" : { + "$ref" : "#/definitions/ResourceResolution" + } + } + } + } + }, + "delete" : { + "tags" : [ "Resources" ], + "summary" : "Delete resources using resolution key", + "description" : "Delete all the resources associated to a resolution-key using blueprint metadata, artifact name and the resolution-key.", + "operationId" : "ResourceController_deleteResolutions_DELETE.org.onap.ccsdk.cds.blueprintsprocessor.resource.api", + "produces" : [ "application/json" ], + "parameters" : [ { + "name" : "bpName", + "in" : "query", + "description" : "Name of the CBA", + "required" : true, + "type" : "string" + }, { + "name" : "bpVersion", + "in" : "query", + "description" : "Version of the CBA", + "required" : true, + "type" : "string" + }, { + "name" : "artifactName", + "in" : "query", + "description" : "Artifact name for which to retrieve a resolved resource", + "required" : true, + "type" : "string" + }, { + "name" : "resolutionKey", + "in" : "query", + "description" : "Resolution Key associated with the resolution", + "required" : false, + "type" : "string" + }, { + "name" : "resourceType", + "in" : "query", + "description" : "resourceType associated with the resolution, must be used with resourceId", + "required" : false, + "type" : "string" + }, { + "name" : "resourceId", + "in" : "query", + "description" : "Resolution Key associated with the resolution, must be used with resourceType", + "required" : false, + "type" : "string" + }, { + "name" : "lastN", + "in" : "query", + "description" : "Only delete last N occurrences", + "required" : false, + "type" : "integer", + "format" : "int32" + } ], + "responses" : { + "200" : { + "description" : "successful operation", + "schema" : { + "type" : "object" + } + } + } + } + }, + "/api/v1/resources/occurrences" : { + "get" : { + "tags" : [ "Resources" ], + "summary" : "Get the map of resolved resources with 'occurrence' as the keys to the resolved resources ", + "description" : "With optional 'occurrence' options, subset of stored resolved resources can be retrieved using the blueprint name, blueprint version, artifact name and the resolution-key.", + "operationId" : "ResourceController_getOccurrences_GET.org.onap.ccsdk.cds.blueprintsprocessor.resource.api", + "produces" : [ "application/json" ], + "parameters" : [ { + "name" : "bpName", + "in" : "query", + "description" : "Name of the CBA.", + "required" : true, + "type" : "string" + }, { + "name" : "bpVersion", + "in" : "query", + "description" : "Version of the CBA.", + "required" : true, + "type" : "string" + }, { + "name" : "artifactName", + "in" : "query", + "description" : "Artifact name for which to retrieve a resolved resource.", + "required" : true, + "type" : "string" + }, { + "name" : "resolutionKey", + "in" : "query", + "description" : "Resolution Key associated with the resolution.", + "required" : true, + "type" : "string" + }, { + "name" : "firstN", + "in" : "query", + "description" : "Number of earlier N occurrences of the resolutions.", + "required" : false, + "type" : "integer", + "format" : "int32" + }, { + "name" : "lastN", + "in" : "query", + "description" : "Number of latest N occurrences of the resolutions.", + "required" : false, + "type" : "integer", + "format" : "int32" + }, { + "name" : "begin", + "in" : "query", + "description" : "For Range option - 'begin' is the start occurrence of range of the resolutions.", + "required" : false, + "type" : "integer", + "format" : "int32" + }, { + "name" : "end", + "in" : "query", + "description" : "For Range option - 'end' is the end occurrence of the range of the resolutions.", + "required" : false, + "type" : "integer", + "format" : "int32" + } ], + "responses" : { + "200" : { + "description" : "successful operation", + "schema" : { + "type" : "array", + "items" : { + "$ref" : "#/definitions/ResourceResolution" + } + } + } + } + } + }, + "/api/v1/resources/resource" : { + "get" : { + "tags" : [ "Resources" ], + "summary" : "Fetch a resource value using resolution key", + "description" : "Retrieve a stored resource value using the blueprint metadata, artifact name, resolution-key along with the name of the resource value to retrieve.", + "operationId" : "ResourceController_getOneFromResolutionKey_GET.org.onap.ccsdk.cds.blueprintsprocessor.resource.api", + "produces" : [ "application/json" ], + "parameters" : [ { + "name" : "bpName", + "in" : "query", + "description" : "Name of the CBA", + "required" : true, + "type" : "string" + }, { + "name" : "bpVersion", + "in" : "query", + "description" : "Version of the CBA", + "required" : true, + "type" : "string" + }, { + "name" : "artifactName", + "in" : "query", + "description" : "Artifact name for which to retrieve a resolved resource", + "required" : true, + "type" : "string" + }, { + "name" : "resolutionKey", + "in" : "query", + "description" : "Resolution Key associated with the resolution", + "required" : true, + "type" : "string" + }, { + "name" : "name", + "in" : "query", + "description" : "Name of the resource to retrieve", + "required" : true, + "type" : "string" + } ], + "responses" : { + "200" : { + "description" : "successful operation", + "schema" : { + "type" : "object" + } + } + } + } + }, + "/api/v1/template/occurrences" : { + "get" : { + "tags" : [ "Resource Template" ], + "summary" : "Get the map of resolved templates with 'occurrence' as the keys to the resolved templates ", + "description" : "With optional 'occurrence' options, subset of stored resolved templates can be retrieved using the blueprint name, blueprint version, artifact name and the resolution-key.", + "operationId" : "TemplateController_getOccurrences_GET.org.onap.ccsdk.cds.blueprintsprocessor.resource.api", + "produces" : [ "application/json" ], + "parameters" : [ { + "name" : "bpName", + "in" : "query", + "description" : "Name of the CBA.", + "required" : true, + "type" : "string" + }, { + "name" : "bpVersion", + "in" : "query", + "description" : "Version of the CBA.", + "required" : true, + "type" : "string" + }, { + "name" : "artifactName", + "in" : "query", + "description" : "Artifact name for which to retrieve a resolved resource.", + "required" : true, + "type" : "string" + }, { + "name" : "resolutionKey", + "in" : "query", + "description" : "Resolution Key associated with the resolution.", + "required" : true, + "type" : "string" + }, { + "name" : "firstN", + "in" : "query", + "description" : "Number of earlier N occurrences of the templates.", + "required" : false, + "type" : "integer", + "format" : "int32" + }, { + "name" : "lastN", + "in" : "query", + "description" : "Number of latest N occurrences of the templates.", + "required" : false, + "type" : "integer", + "format" : "int32" + }, { + "name" : "begin", + "in" : "query", + "description" : "For Range option - 'begin' is the start occurrence of range of the templates.", + "required" : false, + "type" : "integer", + "format" : "int32" + }, { + "name" : "end", + "in" : "query", + "description" : "For Range option - 'end' is the end occurrence of the range of the templates.", + "required" : false, + "type" : "integer", + "format" : "int32" + } ], + "responses" : { + "200" : { + "description" : "successful operation", + "schema" : { + "type" : "array", + "items" : { + "$ref" : "#/definitions/TemplateResolution" + } + } + } + } + } + }, + "/api/v1/template/{bpName}/{bpVersion}/{artifactName}/{resolutionKey}" : { + "post" : { + "tags" : [ "Resource Template" ], + "summary" : "Store a resolved template w/ resolution-key", + "description" : "Store a template for a given CBA's action, identified by its blueprint name, blueprint version, artifact name and resolution key.", + "operationId" : "TemplateController_postWithResolutionKey_POST.org.onap.ccsdk.cds.blueprintsprocessor.resource.api", + "produces" : [ "application/json" ], + "parameters" : [ { + "name" : "bpName", + "in" : "path", + "description" : "Name of the CBA", + "required" : true, + "type" : "string" + }, { + "name" : "bpVersion", + "in" : "path", + "description" : "Version of the CBA", + "required" : true, + "type" : "string" + }, { + "name" : "artifactName", + "in" : "path", + "description" : "Artifact name for which to retrieve a resolved resource", + "required" : true, + "type" : "string" + }, { + "name" : "resolutionKey", + "in" : "path", + "description" : "Resolution Key associated with the resolution", + "required" : true, + "type" : "string" + }, { + "in" : "body", + "name" : "body", + "description" : "Template to store", + "required" : true, + "schema" : { + "type" : "string" + } + } ], + "responses" : { + "200" : { + "description" : "successful operation", + "schema" : { + "$ref" : "#/definitions/TemplateResolution" + } + } + } + } + }, + "/api/v1/template/{bpName}/{bpVersion}/{artifactName}/{resourceType}/{resourceId}" : { + "post" : { + "tags" : [ "Resource Template" ], + "summary" : "Store a resolved template w/ resourceId and resourceType", + "description" : "Store a template for a given CBA's action, identified by its blueprint name, blueprint version, artifact name, resourceId and resourceType.", + "operationId" : "TemplateController_postWithResourceIdAndResourceType_POST.org.onap.ccsdk.cds.blueprintsprocessor.resource.api", + "produces" : [ "application/json" ], + "parameters" : [ { + "name" : "bpName", + "in" : "path", + "description" : "Name of the CBA", + "required" : true, + "type" : "string" + }, { + "name" : "bpVersion", + "in" : "path", + "description" : "Version of the CBA", + "required" : true, + "type" : "string" + }, { + "name" : "artifactName", + "in" : "path", + "description" : "Artifact name for which to retrieve a resolved resource", + "required" : true, + "type" : "string" + }, { + "name" : "resourceType", + "in" : "path", + "description" : "Resource Type associated with the resolution", + "required" : true, + "type" : "string" + }, { + "name" : "resourceId", + "in" : "path", + "description" : "Resource Id associated with the resolution", + "required" : true, + "type" : "string" + }, { + "in" : "body", + "name" : "body", + "description" : "Template to store", + "required" : true, + "schema" : { + "type" : "string" + } + } ], + "responses" : { + "200" : { + "description" : "successful operation", + "schema" : { + "$ref" : "#/definitions/TemplateResolution" + } + } + } + } + } + }, + "securityDefinitions" : { + "Basic Auth" : { + "type" : "basic" + } + }, + "definitions" : { + "ActionIdentifiers" : { + "type" : "object", + "required" : [ "actionName", "mode" ], + "properties" : { + "blueprintName" : { + "type" : "string", + "description" : "Name of the CBA." + }, + "blueprintVersion" : { + "type" : "string", + "description" : "Version of the CBA." + }, + "actionName" : { + "type" : "string", + "description" : "Name of the workflow to execute." + }, + "mode" : { + "type" : "string", + "description" : "Async processing is only supported for gRPC client.", + "enum" : [ "sync", "async" ] + } + } + }, + "ArtifactDefinition" : { + "type" : "object", + "properties" : { + "type" : { + "type" : "string" + }, + "file" : { + "type" : "string" + }, + "repository" : { + "type" : "string" + }, + "description" : { + "type" : "string" + }, + "properties" : { + "type" : "object", + "additionalProperties" : { + "$ref" : "#/definitions/JsonNode" + } + }, + "deploy_Path" : { + "type" : "string" + } + } + }, + "BlueprintModelSearch" : { + "type" : "object", + "required" : [ "artifactName", "artifactVersion", "createdDate", "id", "published", "tags", "updatedBy" ], + "properties" : { + "id" : { + "type" : "string", + "example" : "658f9a48-7f54-41ba-ae18-c69f26f3dc94", + "description" : "ID of Blueprint model, is automatically created by CDS" + }, + "artifactUUId" : { + "type" : "string", + "example" : null, + "description" : "Artifact UUID, usually null" + }, + "artifactType" : { + "type" : "string", + "example" : "SDNC_MODEL", + "description" : "Artifact Type, usually null" + }, + "artifactVersion" : { + "type" : "string", + "example" : "1.0.0", + "description" : "Artifact Version, usually 1.0.0" + }, + "artifactDescription" : { + "type" : "string", + "example" : "", + "description" : "Artifact Description, usually empty" + }, + "internalVersion" : { + "type" : "integer", + "format" : "int32", + "example" : null, + "description" : "Internal Version of CBA, usually null" + }, + "createdDate" : { + "type" : "string", + "format" : "date-time", + "example" : "2020-11-19T10:34:56.000Z", + "description" : "Datetime of the creation of CBA in CDS" + }, + "artifactName" : { + "type" : "string", + "example" : "pnf_netconf", + "description" : "Artifact Name, defined in Metadata" + }, + "published" : { + "type" : "string", + "example" : "pnf_netconf", + "description" : "Artifact Name, defined in Metadata" + }, + "updatedBy" : { + "type" : "string", + "example" : "Deutsche Telekom AG", + "description" : "Name of publisher, defined in Metadata" + }, + "tags" : { + "type" : "string", + "example" : "test", + "description" : "Tags to identify the CBA, defined in Metadata" + } + } + }, + "BootstrapRequest" : { + "type" : "object", + "required" : [ "loadCBA", "loadModelType", "loadResourceDictionary" ], + "properties" : { + "loadModelType" : { + "type" : "boolean", + "example" : true, + "description" : "Specifies if default model types should be loaded" + }, + "loadResourceDictionary" : { + "type" : "boolean", + "example" : true, + "description" : "Specifies if default data dictionaries should be loaded" + }, + "loadCBA" : { + "type" : "boolean", + "example" : true, + "description" : "Specifies if default blueprint models should be loaded" + } + } + }, + "CapabilityAssignment" : { + "type" : "object", + "properties" : { + "attributes" : { + "type" : "object", + "additionalProperties" : { + "$ref" : "#/definitions/JsonNode" + } + }, + "properties" : { + "type" : "object", + "additionalProperties" : { + "$ref" : "#/definitions/JsonNode" + } + } + } + }, + "CommonHeader" : { + "type" : "object", + "required" : [ "originatorId", "requestId", "subRequestId", "timestamp" ], + "properties" : { + "timestamp" : { + "type" : "string", + "format" : "date-time", + "example" : 2012-04-23T18:25:43.511Z, + "description" : "Date of the execution" + }, + "originatorId" : { + "type" : "string", + "description" : "Identify the system/person triggering the request." + }, + "requestId" : { + "type" : "string", + "description" : "Uniquely identify a request." + }, + "subRequestId" : { + "type" : "string", + "description" : "Allow for fine-grain request identifier" + } + } + }, + "ConstraintClause" : { + "type" : "object", + "properties" : { + "equal" : { + "$ref" : "#/definitions/JsonNode" + }, + "length" : { + "$ref" : "#/definitions/JsonNode" + }, + "pattern" : { + "type" : "string" + }, + "schema" : { + "type" : "string" + }, + "greater_than" : { + "$ref" : "#/definitions/JsonNode" + }, + "greater_or_equal" : { + "$ref" : "#/definitions/JsonNode" + }, + "less_than" : { + "$ref" : "#/definitions/JsonNode" + }, + "less_or_equal" : { + "$ref" : "#/definitions/JsonNode" + }, + "in_range" : { + "type" : "array", + "items" : { + "$ref" : "#/definitions/JsonNode" + } + }, + "valid_values" : { + "type" : "array", + "items" : { + "$ref" : "#/definitions/JsonNode" + } + }, + "min_length" : { + "$ref" : "#/definitions/JsonNode" + }, + "max_length" : { + "$ref" : "#/definitions/JsonNode" + } + } + }, + "EntrySchema" : { + "type" : "object", + "properties" : { + "type" : { + "type" : "string" + }, + "constraints" : { + "type" : "array", + "items" : { + "$ref" : "#/definitions/ConstraintClause" + } + } + } + }, + "ExecutionServiceInput" : { + "type" : "object", + "required" : [ "actionIdentifiers", "commonHeader", "payload" ], + "properties" : { + "commonHeader" : { + "description" : "Headers providing request context.", + "$ref" : "#/definitions/CommonHeader" + }, + "actionIdentifiers" : { + "description" : "Provide information about the action to execute.", + "$ref" : "#/definitions/ActionIdentifiers" + }, + "payload" : { + "description" : "Contain the information to be passed as input to the action.The payload is constituted of two section: the workflow input which is the higher level block (xxx-request) and the input for resource resolution located within the xxx-request block, contained within xxx-properties", + "$ref" : "#/definitions/ObjectNode" + } + } + }, + "ExecutionServiceOutput" : { + "type" : "object", + "required" : [ "actionIdentifiers", "commonHeader", "payload", "status" ], + "properties" : { + "commonHeader" : { + "description" : "Headers providing request context.", + "$ref" : "#/definitions/CommonHeader" + }, + "actionIdentifiers" : { + "description" : "Provide information about the action to execute.", + "$ref" : "#/definitions/ActionIdentifiers" + }, + "status" : { + "description" : "Status of the request.", + "$ref" : "#/definitions/Status" + }, + "payload" : { + "description" : "Contain the information to be passed as input to the action.The payload is constituted of two section: the workflow input which is the higher level block (xxx-request) and the input for resource resolution located within the xxx-request block, contained within xxx-properties", + "$ref" : "#/definitions/ObjectNode" + } + } + }, + "FilePart" : { + "type" : "object" + }, + "Implementation" : { + "type" : "object", + "properties" : { + "primary" : { + "type" : "string" + }, + "dependencies" : { + "type" : "array", + "items" : { + "type" : "string" + } + }, + "timeout" : { + "type" : "integer", + "format" : "int32" + }, + "lock" : { + "$ref" : "#/definitions/LockAssignment" + }, + "operation_host" : { + "type" : "string" + } + } + }, + "InterfaceAssignment" : { + "type" : "object", + "properties" : { + "operations" : { + "type" : "object", + "additionalProperties" : { + "$ref" : "#/definitions/OperationAssignment" + } + }, + "inputs" : { + "type" : "object", + "additionalProperties" : { + "$ref" : "#/definitions/JsonNode" + } + } + } + }, + "JsonNode" : { + "type" : "object", + "properties" : { + "valueNode" : { + "type" : "boolean" + }, + "containerNode" : { + "type" : "boolean" + }, + "missingNode" : { + "type" : "boolean" + }, + "integralNumber" : { + "type" : "boolean" + }, + "floatingPointNumber" : { + "type" : "boolean" + }, + "bigDecimal" : { + "type" : "boolean" + }, + "bigInteger" : { + "type" : "boolean" + }, + "pojo" : { + "type" : "boolean" + }, + "textual" : { + "type" : "boolean" + }, + "nodeType" : { + "type" : "string", + "enum" : [ "ARRAY", "BINARY", "BOOLEAN", "MISSING", "NULL", "NUMBER", "OBJECT", "POJO", "STRING" ] + }, + "array" : { + "type" : "boolean" + }, + "null" : { + "type" : "boolean" + }, + "float" : { + "type" : "boolean" + }, + "number" : { + "type" : "boolean" + }, + "boolean" : { + "type" : "boolean" + }, + "double" : { + "type" : "boolean" + }, + "int" : { + "type" : "boolean" + }, + "long" : { + "type" : "boolean" + }, + "short" : { + "type" : "boolean" + }, + "binary" : { + "type" : "boolean" + }, + "object" : { + "type" : "boolean" + } + } + }, + "LockAssignment" : { + "type" : "object", + "properties" : { + "key" : { + "$ref" : "#/definitions/JsonNode" + }, + "acquireTimeout" : { + "$ref" : "#/definitions/JsonNode" + } + } + }, + "ModelType" : { + "type" : "object", + "required" : [ "definition", "definitionType", "derivedFrom", "description", "modelName", "tags", "updatedBy", "version" ], + "properties" : { + "modelName" : { + "type" : "string" + }, + "derivedFrom" : { + "type" : "string" + }, + "definitionType" : { + "type" : "string" + }, + "definition" : { + "$ref" : "#/definitions/JsonNode" + }, + "description" : { + "type" : "string" + }, + "version" : { + "type" : "string" + }, + "tags" : { + "type" : "string" + }, + "creationDate" : { + "type" : "string", + "format" : "date-time" + }, + "updatedBy" : { + "type" : "string" + } + } + }, + "NodeFilterDefinition" : { + "type" : "object", + "properties" : { + "properties" : { + "type" : "object", + "additionalProperties" : { + "$ref" : "#/definitions/PropertyDefinition" + } + }, + "capabilities" : { + "type" : "array", + "items" : { + "type" : "string" + } + } + } + }, + "NodeTemplate" : { + "type" : "object", + "properties" : { + "description" : { + "type" : "string" + }, + "type" : { + "type" : "string" + }, + "metadata" : { + "type" : "object", + "additionalProperties" : { + "type" : "string" + } + }, + "directives" : { + "type" : "array", + "items" : { + "type" : "string" + } + }, + "properties" : { + "type" : "object", + "additionalProperties" : { + "$ref" : "#/definitions/JsonNode" + } + }, + "attributes" : { + "type" : "object", + "additionalProperties" : { + "$ref" : "#/definitions/JsonNode" + } + }, + "capabilities" : { + "type" : "object", + "additionalProperties" : { + "$ref" : "#/definitions/CapabilityAssignment" + } + }, + "requirements" : { + "type" : "object", + "additionalProperties" : { + "$ref" : "#/definitions/RequirementAssignment" + } + }, + "interfaces" : { + "type" : "object", + "additionalProperties" : { + "$ref" : "#/definitions/InterfaceAssignment" + } + }, + "artifacts" : { + "type" : "object", + "additionalProperties" : { + "$ref" : "#/definitions/ArtifactDefinition" + } + }, + "copy" : { + "type" : "string" + }, + "node_filter" : { + "$ref" : "#/definitions/NodeFilterDefinition" + } + } + }, + "ObjectNode" : { + "type" : "object", + "properties" : { + "nodeType" : { + "type" : "string", + "enum" : [ "ARRAY", "BINARY", "BOOLEAN", "MISSING", "NULL", "NUMBER", "OBJECT", "POJO", "STRING" ] + }, + "valueNode" : { + "type" : "boolean" + }, + "containerNode" : { + "type" : "boolean" + }, + "missingNode" : { + "type" : "boolean" + }, + "integralNumber" : { + "type" : "boolean" + }, + "floatingPointNumber" : { + "type" : "boolean" + }, + "bigDecimal" : { + "type" : "boolean" + }, + "bigInteger" : { + "type" : "boolean" + }, + "pojo" : { + "type" : "boolean" + }, + "textual" : { + "type" : "boolean" + }, + "array" : { + "type" : "boolean" + }, + "null" : { + "type" : "boolean" + }, + "float" : { + "type" : "boolean" + }, + "number" : { + "type" : "boolean" + }, + "boolean" : { + "type" : "boolean" + }, + "double" : { + "type" : "boolean" + }, + "int" : { + "type" : "boolean" + }, + "long" : { + "type" : "boolean" + }, + "short" : { + "type" : "boolean" + }, + "binary" : { + "type" : "boolean" + }, + "object" : { + "type" : "boolean" + } + } + }, + "OperationAssignment" : { + "type" : "object", + "properties" : { + "description" : { + "type" : "string" + }, + "implementation" : { + "$ref" : "#/definitions/Implementation" + }, + "inputs" : { + "type" : "object", + "additionalProperties" : { + "$ref" : "#/definitions/JsonNode" + } + }, + "outputs" : { + "type" : "object", + "additionalProperties" : { + "$ref" : "#/definitions/JsonNode" + } + } + } + }, + "Page" : { + "type" : "object", + "properties" : { + "totalPages" : { + "type" : "integer", + "format" : "int32" + }, + "totalElements" : { + "type" : "integer", + "format" : "int64" + }, + "pageable" : { + "$ref" : "#/definitions/Pageable" + }, + "numberOfElements" : { + "type" : "integer", + "format" : "int32" + }, + "last" : { + "type" : "boolean" + }, + "size" : { + "type" : "integer", + "format" : "int32" + }, + "content" : { + "type" : "array", + "items" : { + "type" : "object" + } + }, + "number" : { + "type" : "integer", + "format" : "int32" + }, + "sort" : { + "$ref" : "#/definitions/Sort" + }, + "first" : { + "type" : "boolean" + }, + "empty" : { + "type" : "boolean" + } + } + }, + "PageBlueprintModelSearch" : { + "type" : "object", + "properties" : { + "totalPages" : { + "type" : "integer", + "format" : "int32" + }, + "totalElements" : { + "type" : "integer", + "format" : "int64" + }, + "pageable" : { + "$ref" : "#/definitions/Pageable" + }, + "numberOfElements" : { + "type" : "integer", + "format" : "int32" + }, + "last" : { + "type" : "boolean" + }, + "size" : { + "type" : "integer", + "format" : "int32" + }, + "content" : { + "type" : "array", + "items" : { + "$ref" : "#/definitions/BlueprintModelSearch" + } + }, + "number" : { + "type" : "integer", + "format" : "int32" + }, + "sort" : { + "$ref" : "#/definitions/Sort" + }, + "first" : { + "type" : "boolean" + }, + "empty" : { + "type" : "boolean" + } + } + }, + "Pageable" : { + "type" : "object", + "properties" : { + "paged" : { + "type" : "boolean" + }, + "unpaged" : { + "type" : "boolean" + }, + "pageSize" : { + "type" : "integer", + "format" : "int32" + }, + "pageNumber" : { + "type" : "integer", + "format" : "int32" + }, + "offset" : { + "type" : "integer", + "format" : "int64" + }, + "sort" : { + "$ref" : "#/definitions/Sort" + } + } + }, + "PropertyDefinition" : { + "type" : "object", + "properties" : { + "description" : { + "type" : "string" + }, + "required" : { + "type" : "boolean" + }, + "type" : { + "type" : "string" + }, + "status" : { + "type" : "string" + }, + "constraints" : { + "type" : "array", + "items" : { + "$ref" : "#/definitions/ConstraintClause" + } + }, + "metadata" : { + "type" : "object", + "additionalProperties" : { + "type" : "string" + } + }, + "value" : { + "$ref" : "#/definitions/JsonNode" + }, + "input-param" : { + "type" : "boolean" + }, + "default" : { + "$ref" : "#/definitions/JsonNode" + }, + "entry_schema" : { + "$ref" : "#/definitions/EntrySchema" + }, + "external-schema" : { + "type" : "string" + } + } + }, + "RequirementAssignment" : { + "type" : "object", + "properties" : { + "capability" : { + "type" : "string" + }, + "node" : { + "type" : "string" + }, + "relationship" : { + "type" : "string" + } + } + }, + "ResourceConfigSnapshot" : { + "type" : "object", + "required" : [ "config_snapshot", "createdDate", "resourceId", "resourceType", "status" ], + "properties" : { + "resourceType" : { + "type" : "string", + "example" : "ServiceInstance", + "description" : "Resource type." + }, + "resourceId" : { + "type" : "string", + "example" : "1", + "description" : "ID associated with the resource type in the inventory system." + }, + "status" : { + "type" : "string", + "description" : "Status of the snapshot, either running or candidate.", + "enum" : [ "RUNNING", "CANDIDATE" ] + }, + "config_snapshot" : { + "type" : "string", + "example" : "config_snapshot", + "description" : "Snapshot of the resource as retrieved from resource." + }, + "id" : { + "type" : "string" + }, + "createdDate" : { + "type" : "string", + "format" : "date-time", + "description" : "Creation date of the snapshot." + } + } + }, + "ResourceDefinition" : { + "type" : "object", + "required" : [ "group", "name", "property", "sources", "updated-by" ], + "properties" : { + "tags" : { + "type" : "string" + }, + "name" : { + "type" : "string", + "example" : "default-source", + "description" : "Name" + }, + "property" : { + "description" : "Property", + "$ref" : "#/definitions/PropertyDefinition" + }, + "group" : { + "type" : "string", + "example" : "default", + "description" : "Group" + }, + "updated-by" : { + "type" : "string", + "example" : "example@onap.com", + "description" : "Updated by" + }, + "sources" : { + "type" : "object", + "example" : "sources", + "description" : "Sources", + "additionalProperties" : { + "$ref" : "#/definitions/NodeTemplate" + } + } + } + }, + "ResourceDictionary" : { + "type" : "object", + "required" : [ "dataType", "definition", "description", "entrySchema", "name", "resourceDictionaryGroup", "tags", "updatedBy" ], + "properties" : { + "name" : { + "type" : "string", + "example" : "sample-db-source", + "description" : "Name" + }, + "dataType" : { + "type" : "string", + "example" : "string", + "description" : "Data type" + }, + "entrySchema" : { + "type" : "string", + "example" : "dt-license-key", + "description" : "Entry schema" + }, + "resourceDictionaryGroup" : { + "type" : "string", + "example" : "default", + "description" : "Resource dictionary group" + }, + "definition" : { + "description" : "Definition", + "$ref" : "#/definitions/ResourceDefinition" + }, + "description" : { + "type" : "string", + "example" : "demo_artifacts_version", + "description" : "Description" + }, + "tags" : { + "type" : "string", + "example" : "hostname", + "description" : "Tags" + }, + "creationDate" : { + "type" : "string", + "format" : "date-time" + }, + "updatedBy" : { + "type" : "string", + "example" : "username", + "description" : "Updated by" + } + } + }, + "ResourceResolution" : { + "type" : "object", + "required" : [ "artifactName", "blueprintName", "blueprintVersion", "createdDate", "dictionaryName", "dictionarySource", "dictionaryVersion", "name", "occurrence", "resolutionKey", "resourceId", "resourceType", "status", "value" ], + "properties" : { + "blueprintName" : { + "type" : "string", + "description" : "Name of the CBA." + }, + "blueprintVersion" : { + "type" : "string", + "description" : "Version of the CBA." + }, + "artifactName" : { + "type" : "string", + "description" : "Artifact name for which to retrieve a resolved resource." + }, + "name" : { + "type" : "string", + "description" : "Name of the resource." + }, + "value" : { + "type" : "string", + "description" : "Value of the resolution." + }, + "status" : { + "type" : "string", + "description" : "Whether success of failure." + }, + "resolutionKey" : { + "type" : "string", + "description" : "Resolution Key uniquely identifying the resolution of a given artifact within a CBA." + }, + "resourceType" : { + "type" : "string", + "example" : "ServiceInstance", + "description" : "Resolution type." + }, + "resourceId" : { + "type" : "string", + "description" : "ID associated with the resolution type in the inventory system." + }, + "occurrence" : { + "type" : "integer", + "format" : "int32", + "description" : "If resolution occurred multiple time, this field provides the index." + }, + "dictionaryName" : { + "type" : "string", + "description" : "Name of the data dictionary used for the resolution." + }, + "dictionarySource" : { + "type" : "string", + "description" : "Source associated with the data dictionary used for the resolution." + }, + "dictionaryVersion" : { + "type" : "integer", + "format" : "int32", + "description" : "Version of the data dictionary used for the resolution." + }, + "id" : { + "type" : "string" + }, + "createdDate" : { + "type" : "string", + "format" : "date-time", + "description" : "Creation date of the resolution." + } + } + }, + "ResourceSourceMapping" : { + "type" : "object", + "properties" : { + "resourceSourceMappings" : { + "type" : "object", + "additionalProperties" : { + "type" : "string" + } + } + } + }, + "Sort" : { + "type" : "object", + "properties" : { + "sorted" : { + "type" : "boolean" + }, + "unsorted" : { + "type" : "boolean" + }, + "empty" : { + "type" : "boolean" + } + } + }, + "Status" : { + "type" : "object", + "required" : [ "code", "eventType", "message", "timestamp" ], + "properties" : { + "code" : { + "type" : "integer", + "format" : "int32", + "description" : "HTTP status code equivalent." + }, + "eventType" : { + "type" : "string", + "description" : "Type of the event being emitted by CDS." + }, + "timestamp" : { + "type" : "string", + "format" : "date-time", + "example" : 2012-04-23T18:25:43.511Z, + "description" : "Time when the execution ended." + }, + "errorMessage" : { + "type" : "string", + "description" : "Error message when system failed" + }, + "message" : { + "type" : "string", + "description" : "Message providing request status" + } + } + }, + "TemplateResolution" : { + "type" : "object", + "required" : [ "artifactName", "blueprintName", "blueprintVersion", "createdDate", "occurrence", "resolutionKey", "resourceId", "resourceType", "result" ], + "properties" : { + "blueprintName" : { + "type" : "string", + "description" : "Name of the CBA." + }, + "blueprintVersion" : { + "type" : "string", + "description" : "Version of the CBA." + }, + "artifactName" : { + "type" : "string", + "description" : "Artifact name for which to retrieve a resolved resource." + }, + "result" : { + "type" : "string", + "description" : "Rendered template." + }, + "resolutionKey" : { + "type" : "string", + "description" : "Resolution Key uniquely identifying the resolution of a given artifact within a CBA." + }, + "resourceType" : { + "type" : "string", + "example" : "ServiceInstance", + "description" : "Resolution type." + }, + "resourceId" : { + "type" : "string", + "description" : "ID associated with the resolution type in the inventory system." + }, + "occurrence" : { + "type" : "integer", + "format" : "int32", + "description" : "If resolution occurred multiple time, this field provides the index." + }, + "id" : { + "type" : "string" + }, + "createdDate" : { + "type" : "string", + "format" : "date-time", + "description" : "Creation date of the resolution." + } + } + }, + "WorkFlowSpecRequest" : { + "type" : "object", + "required" : [ "blueprintName", "workflowName" ], + "properties" : { + "blueprintName" : { + "type" : "string", + "example" : "pnf_netconf", + "description" : "Name of the BLueprint" + }, + "version" : { + "type" : "string" + }, + "returnContent" : { + "type" : "string" + }, + "workflowName" : { + "type" : "string", + "example" : "config-assign", + "description" : "Name of the Workflow" + }, + "specType" : { + "type" : "string" + } + } + } + } } \ No newline at end of file diff --git a/ms/blueprintsprocessor/application/pom.xml b/ms/blueprintsprocessor/application/pom.xml index daad636df..a826bd67c 100755 --- a/ms/blueprintsprocessor/application/pom.xml +++ b/ms/blueprintsprocessor/application/pom.xml @@ -52,7 +52,7 @@ org.springframework.security spring-security-core - 6.3.0 + 6.4.6 org.eclipse.jetty.http2 @@ -204,8 +204,8 @@ com.github.tomakehurst - wiremock-jre8 - 2.35.1 + wiremock-jre8-standalone + 3.0.1 test @@ -219,12 +219,22 @@ ch.qos.logback logback-classic - 1.2.13 + 1.5.18 + + + ch.qos.logback + logback-core + 1.5.18 + + + net.logstash.logback + logstash-logback-encoder + 7.4 org.springframework.kafka spring-kafka - 2.9.13 + ${spring-kafka.version} org.bitbucket.b_c @@ -234,7 +244,7 @@ org.apache.zookeeper zookeeper - 3.9.2 + 3.9.3 diff --git a/ms/blueprintsprocessor/application/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/uat/utils/UatExecutor.kt b/ms/blueprintsprocessor/application/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/uat/utils/UatExecutor.kt index 357154cb1..0e32cf2d4 100644 --- a/ms/blueprintsprocessor/application/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/uat/utils/UatExecutor.kt +++ b/ms/blueprintsprocessor/application/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/uat/utils/UatExecutor.kt @@ -62,7 +62,7 @@ import org.springframework.core.env.ConfigurableEnvironment import org.springframework.http.HttpMethod import org.springframework.http.MediaType import org.springframework.stereotype.Component -import org.springframework.util.Base64Utils +import java.util.Base64 import java.nio.file.Path import java.util.concurrent.ConcurrentHashMap @@ -322,7 +322,7 @@ open class UatExecutor( ) else -> username } - return "Basic " + Base64Utils.encodeToString("$username:$plainPassword".toByteArray()) + return "Basic " + Base64.getEncoder().encodeToString("$username:$plainPassword".toByteArray()) } open class MockPreInterceptor : BluePrintRestLibPropertyService.PreInterceptor { @@ -408,7 +408,7 @@ open class UatExecutor( override fun uploadBinaryFile(path: String, filePath: Path): WebClientResponse { - val method = HttpMethod.POST.name + val method = HttpMethod.POST.name() val headers = DEFAULT_HEADERS val request = "" val requestDefinition = diff --git a/ms/blueprintsprocessor/application/src/main/resources/application-dev.properties b/ms/blueprintsprocessor/application/src/main/resources/application-dev.properties index 29ea46adf..000f5e8c3 100755 --- a/ms/blueprintsprocessor/application/src/main/resources/application-dev.properties +++ b/ms/blueprintsprocessor/application/src/main/resources/application-dev.properties @@ -82,7 +82,7 @@ blueprintsprocessor.db.driverClassName=org.mariadb.jdbc.Driver blueprintsprocessor.db.hibernateHbm2ddlAuto=update blueprintsprocessor.db.hibernateDDLAuto=update blueprintsprocessor.db.hibernateNamingStrategy=org.hibernate.cfg.ImprovedNamingStrategy -blueprintsprocessor.db.hibernateDialect=org.hibernate.dialect.MySQL5InnoDBDialect +blueprintsprocessor.db.hibernateDialect=org.hibernate.dialect.MariaDBDialect # processor-db endpoint blueprintsprocessor.db.processor-db.type=maria-db diff --git a/ms/blueprintsprocessor/application/src/main/resources/application-local.yml b/ms/blueprintsprocessor/application/src/main/resources/application-local.yml index f2843322c..91fe0ac43 100644 --- a/ms/blueprintsprocessor/application/src/main/resources/application-local.yml +++ b/ms/blueprintsprocessor/application/src/main/resources/application-local.yml @@ -15,7 +15,7 @@ blueprintsprocessor: primary: driverClassName: org.mariadb.jdbc.Driver hibernateDDLAuto: none - hibernateDialect: org.hibernate.dialect.MySQL5InnoDBDialect + hibernateDialect: org.hibernate.dialect.MariaDBDialect hibernateHbm2ddlAuto: update hibernateNamingStrategy: org.hibernate.cfg.ImprovedNamingStrategy password: sdnctl diff --git a/ms/blueprintsprocessor/application/src/main/resources/application.properties b/ms/blueprintsprocessor/application/src/main/resources/application.properties index a93d4d428..6d17a13a4 100755 --- a/ms/blueprintsprocessor/application/src/main/resources/application.properties +++ b/ms/blueprintsprocessor/application/src/main/resources/application.properties @@ -45,7 +45,7 @@ blueprintsprocessor.db.driverClassName=org.mariadb.jdbc.Driver blueprintsprocessor.db.hibernateHbm2ddlAuto=update blueprintsprocessor.db.hibernateDDLAuto=update blueprintsprocessor.db.hibernateNamingStrategy=org.hibernate.cfg.ImprovedNamingStrategy -blueprintsprocessor.db.hibernateDialect=org.hibernate.dialect.MySQL5InnoDBDialect +blueprintsprocessor.db.hibernateDialect=org.hibernate.dialect.MariaDBDialect # processor-db endpoint blueprintsprocessor.db.processor-db.type=maria-db diff --git a/ms/blueprintsprocessor/application/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/uat/UatServicesTest.kt b/ms/blueprintsprocessor/application/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/uat/UatServicesTest.kt index fe2d539e3..39ec2fff5 100644 --- a/ms/blueprintsprocessor/application/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/uat/UatServicesTest.kt +++ b/ms/blueprintsprocessor/application/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/uat/UatServicesTest.kt @@ -54,7 +54,7 @@ import org.onap.ccsdk.cds.controllerblueprints.core.utils.BluePrintArchiveUtils. import org.skyscreamer.jsonassert.JSONAssert import org.skyscreamer.jsonassert.JSONCompareMode import org.springframework.beans.factory.annotation.Autowired -import org.springframework.boot.web.server.LocalServerPort +import org.springframework.boot.test.web.server.LocalServerPort import org.springframework.core.env.ConfigurableEnvironment import org.springframework.core.env.MapPropertySource import org.springframework.test.context.ActiveProfiles diff --git a/ms/blueprintsprocessor/application/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/uat/utils/ExtendedTemporaryFolder.kt b/ms/blueprintsprocessor/application/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/uat/utils/ExtendedTemporaryFolder.kt index dd31c0e8f..5f320a9f5 100644 --- a/ms/blueprintsprocessor/application/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/uat/utils/ExtendedTemporaryFolder.kt +++ b/ms/blueprintsprocessor/application/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/uat/utils/ExtendedTemporaryFolder.kt @@ -26,7 +26,7 @@ import java.nio.file.Files import java.nio.file.Path import java.nio.file.SimpleFileVisitor import java.nio.file.attribute.BasicFileAttributes -import javax.annotation.PreDestroy +import jakarta.annotation.PreDestroy class ExtendedTemporaryFolder { diff --git a/ms/blueprintsprocessor/application/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/uat/utils/TestSecuritySettings.kt b/ms/blueprintsprocessor/application/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/uat/utils/TestSecuritySettings.kt index eec36c88d..3ea5d9333 100644 --- a/ms/blueprintsprocessor/application/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/uat/utils/TestSecuritySettings.kt +++ b/ms/blueprintsprocessor/application/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/uat/utils/TestSecuritySettings.kt @@ -22,7 +22,7 @@ package org.onap.ccsdk.cds.blueprintsprocessor.uat.utils import org.springframework.context.ApplicationContextInitializer import org.springframework.context.ConfigurableApplicationContext import org.springframework.test.context.support.TestPropertySourceUtils -import org.springframework.util.Base64Utils +import java.util.Base64 class TestSecuritySettings { companion object { @@ -31,7 +31,7 @@ class TestSecuritySettings { private const val authPassword = "Heisenberg" fun clientAuthToken() = - "Basic " + Base64Utils.encodeToString("$authUsername:$authPassword".toByteArray()) + "Basic " + Base64.getEncoder().encodeToString("$authUsername:$authPassword".toByteArray()) } class ServerContextInitializer : ApplicationContextInitializer { diff --git a/ms/blueprintsprocessor/functions/ansible-awx-executor/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/ansible/executor/ComponentRemoteAnsibleExecutor.kt b/ms/blueprintsprocessor/functions/ansible-awx-executor/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/ansible/executor/ComponentRemoteAnsibleExecutor.kt index 133e4a52b..5867cd769 100644 --- a/ms/blueprintsprocessor/functions/ansible-awx-executor/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/ansible/executor/ComponentRemoteAnsibleExecutor.kt +++ b/ms/blueprintsprocessor/functions/ansible-awx-executor/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/ansible/executor/ComponentRemoteAnsibleExecutor.kt @@ -62,8 +62,8 @@ open class ComponentRemoteAnsibleExecutor( // HTTP related constants private val HTTP_SUCCESS = 200..202 - private val GET = HttpMethod.GET.name - private val POST = HttpMethod.POST.name + private val GET = HttpMethod.GET.name() + private val POST = HttpMethod.POST.name() private val plainTextHeaders = mapOf("Accept" to "text/plain") var checkDelay: Long = 15_000 diff --git a/ms/blueprintsprocessor/functions/blueprint-audit-status/pom.xml b/ms/blueprintsprocessor/functions/blueprint-audit-status/pom.xml index f5ed365b1..f8480febc 100644 --- a/ms/blueprintsprocessor/functions/blueprint-audit-status/pom.xml +++ b/ms/blueprintsprocessor/functions/blueprint-audit-status/pom.xml @@ -57,6 +57,7 @@ org.hibernate hibernate-testing + 6.2.7.Final test diff --git a/ms/blueprintsprocessor/functions/blueprint-audit-status/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/workflow/audit/NoStoreAuditService.kt b/ms/blueprintsprocessor/functions/blueprint-audit-status/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/workflow/audit/NoStoreAuditService.kt index 230e67852..aa5e01e2a 100644 --- a/ms/blueprintsprocessor/functions/blueprint-audit-status/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/workflow/audit/NoStoreAuditService.kt +++ b/ms/blueprintsprocessor/functions/blueprint-audit-status/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/workflow/audit/NoStoreAuditService.kt @@ -23,7 +23,7 @@ import org.onap.ccsdk.cds.blueprintsprocessor.functions.workflow.audit.db.Bluepr import org.slf4j.LoggerFactory import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty import org.springframework.stereotype.Service -import javax.annotation.PostConstruct +import jakarta.annotation.PostConstruct /** * Workflow request and response details are persisted to database diff --git a/ms/blueprintsprocessor/functions/blueprint-audit-status/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/workflow/audit/db/BlueprintAuditStatusRepository.kt b/ms/blueprintsprocessor/functions/blueprint-audit-status/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/workflow/audit/db/BlueprintAuditStatusRepository.kt index 8e7304654..9b9c80715 100644 --- a/ms/blueprintsprocessor/functions/blueprint-audit-status/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/workflow/audit/db/BlueprintAuditStatusRepository.kt +++ b/ms/blueprintsprocessor/functions/blueprint-audit-status/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/workflow/audit/db/BlueprintAuditStatusRepository.kt @@ -18,7 +18,7 @@ package org.onap.ccsdk.cds.blueprintsprocessor.functions.workflow.audit.db import org.springframework.data.jpa.repository.JpaRepository import org.springframework.stereotype.Repository -import javax.transaction.Transactional +import jakarta.transaction.Transactional /** * JPA repository managing {@link BlueprintWorkflowAuditStatus} table. diff --git a/ms/blueprintsprocessor/functions/blueprint-audit-status/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/workflow/audit/db/BlueprintWorkflowAuditStatus.kt b/ms/blueprintsprocessor/functions/blueprint-audit-status/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/workflow/audit/db/BlueprintWorkflowAuditStatus.kt index d9f0269f1..8c4116aea 100644 --- a/ms/blueprintsprocessor/functions/blueprint-audit-status/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/workflow/audit/db/BlueprintWorkflowAuditStatus.kt +++ b/ms/blueprintsprocessor/functions/blueprint-audit-status/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/workflow/audit/db/BlueprintWorkflowAuditStatus.kt @@ -22,15 +22,15 @@ import org.hibernate.annotations.Proxy import org.springframework.data.annotation.LastModifiedDate import java.io.Serializable import java.util.Date -import javax.persistence.Column -import javax.persistence.Entity -import javax.persistence.GenerationType -import javax.persistence.GeneratedValue -import javax.persistence.Id -import javax.persistence.Lob -import javax.persistence.Table -import javax.persistence.Temporal -import javax.persistence.TemporalType +import jakarta.persistence.Column +import jakarta.persistence.Entity +import jakarta.persistence.GenerationType +import jakarta.persistence.GeneratedValue +import jakarta.persistence.Id +import jakarta.persistence.Lob +import jakarta.persistence.Table +import jakarta.persistence.Temporal +import jakarta.persistence.TemporalType /** * BlueprintWorkflowAuditStatus Model. @@ -47,9 +47,9 @@ class BlueprintWorkflowAuditStatus : Serializable { @Column(name = "workflow_audit_id") var id: Long = 0 - @get:ApiModelProperty(value = "Workflow payload.", required = true) @Lob - @Column(name = "workflow_task_content", nullable = false) + @get:ApiModelProperty(value = "Workflow payload.", required = true) + @Column(name = "workflow_task_content", nullable = false, columnDefinition = "LONGTEXT") @ApiModelProperty(required = true) lateinit var workflowTaskContent: String @@ -123,9 +123,9 @@ class BlueprintWorkflowAuditStatus : Serializable { @ApiModelProperty(required = true) lateinit var requestMode: String - @get:ApiModelProperty(value = "workflow response content", required = false) @Lob - @Column(name = "workflow_response_content", nullable = true) + @get:ApiModelProperty(value = "workflow response content", required = false) + @Column(name = "workflow_response_content", nullable = true, columnDefinition = "LONGTEXT") @ApiModelProperty(required = false) lateinit var workflowResponseContent: String diff --git a/ms/blueprintsprocessor/functions/config-snapshots/pom.xml b/ms/blueprintsprocessor/functions/config-snapshots/pom.xml index 84959f7e4..fc37edc63 100644 --- a/ms/blueprintsprocessor/functions/config-snapshots/pom.xml +++ b/ms/blueprintsprocessor/functions/config-snapshots/pom.xml @@ -54,6 +54,7 @@ org.hibernate hibernate-testing + 6.2.7.Final test diff --git a/ms/blueprintsprocessor/functions/config-snapshots/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/config/snapshots/db/ResourceConfigSnapshot.kt b/ms/blueprintsprocessor/functions/config-snapshots/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/config/snapshots/db/ResourceConfigSnapshot.kt index a260d32bc..bc718f775 100644 --- a/ms/blueprintsprocessor/functions/config-snapshots/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/config/snapshots/db/ResourceConfigSnapshot.kt +++ b/ms/blueprintsprocessor/functions/config-snapshots/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/config/snapshots/db/ResourceConfigSnapshot.kt @@ -23,14 +23,14 @@ import org.springframework.data.annotation.LastModifiedDate import org.springframework.data.jpa.domain.support.AuditingEntityListener import java.io.Serializable import java.util.Date -import javax.persistence.Column -import javax.persistence.Entity -import javax.persistence.EntityListeners -import javax.persistence.Id -import javax.persistence.Lob -import javax.persistence.Table -import javax.persistence.Temporal -import javax.persistence.TemporalType +import jakarta.persistence.Column +import jakarta.persistence.Entity +import jakarta.persistence.EntityListeners +import jakarta.persistence.Id +import jakarta.persistence.Lob +import jakarta.persistence.Table +import jakarta.persistence.Temporal +import jakarta.persistence.TemporalType /** * ResourceConfigSnapshot model @@ -58,9 +58,9 @@ class ResourceConfigSnapshot : Serializable { @Column(name = "status", nullable = false) var status: Status? = null - @get:ApiModelProperty(value = "Snapshot of the resource as retrieved from resource.", required = true, example = "\"config_snapshot\"") @Lob - @Column(name = "config_snapshot", nullable = false) + @get:ApiModelProperty(value = "Snapshot of the resource as retrieved from resource.", required = true, example = "\"config_snapshot\"") + @Column(name = "config_snapshot", nullable = false, columnDefinition = "LONGTEXT") var config_snapshot: String? = null @Id diff --git a/ms/blueprintsprocessor/functions/config-snapshots/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/config/snapshots/db/ResourceConfigSnapshotRepository.kt b/ms/blueprintsprocessor/functions/config-snapshots/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/config/snapshots/db/ResourceConfigSnapshotRepository.kt index 6806ad665..381650308 100644 --- a/ms/blueprintsprocessor/functions/config-snapshots/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/config/snapshots/db/ResourceConfigSnapshotRepository.kt +++ b/ms/blueprintsprocessor/functions/config-snapshots/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/config/snapshots/db/ResourceConfigSnapshotRepository.kt @@ -17,7 +17,7 @@ package org.onap.ccsdk.cds.blueprintsprocessor.functions.config.snapshots.db import org.springframework.data.jpa.repository.JpaRepository import org.springframework.stereotype.Repository -import javax.transaction.Transactional +import jakarta.transaction.Transactional /** * JPA repository managing the underlying ResourceConfigSnapshot table. diff --git a/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/definition/K8sPluginDefinitionApi.kt b/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/definition/K8sPluginDefinitionApi.kt index 86c019aed..9458484b1 100644 --- a/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/definition/K8sPluginDefinitionApi.kt +++ b/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/definition/K8sPluginDefinitionApi.kt @@ -49,7 +49,7 @@ class K8sPluginDefinitionApi( definitionVersion ) val result: BlueprintWebClientService.WebClientResponse = rbDefinitionService.exchangeResource( - GET.name, + GET.name(), "", "" ) @@ -69,7 +69,7 @@ class K8sPluginDefinitionApi( definitionVersion ) val result: BlueprintWebClientService.WebClientResponse = rbDefinitionService.exchangeResource( - GET.name, + GET.name(), "/profile/$profileName", "" ) @@ -89,7 +89,7 @@ class K8sPluginDefinitionApi( definitionVersion ) val result: BlueprintWebClientService.WebClientResponse = rbDefinitionService.exchangeResource( - GET.name, + GET.name(), "/profile/$profileName", "" ) @@ -116,7 +116,7 @@ class K8sPluginDefinitionApi( definitionVersion ) val result: BlueprintWebClientService.WebClientResponse = rbDefinitionService.exchangeResource( - POST.name, + POST.name(), "/profile", profileJsonString ) @@ -138,7 +138,7 @@ class K8sPluginDefinitionApi( profile.rbVersion!! ) val result: BlueprintWebClientService.WebClientResponse = rbDefinitionService.exchangeResource( - PUT.name, + PUT.name(), "/profile/${profile.profileName}", profileJsonString ) @@ -159,7 +159,7 @@ class K8sPluginDefinitionApi( definitionVersion ) val result: BlueprintWebClientService.WebClientResponse = rbDefinitionService.exchangeResource( - DELETE.name, + DELETE.name(), "/profile/$profileName", "" ) @@ -204,7 +204,7 @@ class K8sPluginDefinitionApi( definitionVersion ) val result: BlueprintWebClientService.WebClientResponse = rbDefinitionService.exchangeResource( - POST.name, + POST.name(), "/config-template", templateJsonString ) @@ -247,7 +247,7 @@ class K8sPluginDefinitionApi( definitionVersion ) val result: BlueprintWebClientService.WebClientResponse = rbDefinitionService.exchangeResource( - DELETE.name, + DELETE.name(), "/config-template/$templateName", "" ) @@ -295,7 +295,7 @@ class K8sPluginDefinitionApi( private fun getTemplateRequest(rbDefinitionService: BlueprintWebClientService, templateName: String): BlueprintWebClientService.WebClientResponse { return rbDefinitionService.exchangeResource( - GET.name, + GET.name(), "/config-template/$templateName", "" ) diff --git a/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/instance/K8sPluginInstanceApi.kt b/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/instance/K8sPluginInstanceApi.kt index b58a7eaf4..0230dffaf 100644 --- a/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/instance/K8sPluginInstanceApi.kt +++ b/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/instance/K8sPluginInstanceApi.kt @@ -44,7 +44,7 @@ class K8sPluginInstanceApi( val rbInstanceService = getK8sRbInstanceRestClient(k8sConfiguration) try { val result: BlueprintWebClientService.WebClientResponse = rbInstanceService.exchangeResource( - GET.name, + GET.name(), "", "" ) @@ -67,7 +67,7 @@ class K8sPluginInstanceApi( val rbInstanceService = getK8sRbInstanceRestClient(k8sConfiguration, instanceId) try { val result: BlueprintWebClientService.WebClientResponse = rbInstanceService.exchangeResource( - GET.name, + GET.name(), "", "" ) @@ -89,7 +89,7 @@ class K8sPluginInstanceApi( val rbInstanceService = getK8sRbInstanceRestClient(k8sConfiguration, instanceId) try { val result: BlueprintWebClientService.WebClientResponse = rbInstanceService.exchangeResource( - GET.name, + GET.name(), "?full=true", "" ) @@ -126,7 +126,7 @@ class K8sPluginInstanceApi( val rbInstanceService = getK8sRbInstanceRestClient(k8sConfiguration, instanceId) try { val result: BlueprintWebClientService.WebClientResponse = rbInstanceService.exchangeResource( - GET.name, + GET.name(), "/status", "" ) @@ -165,7 +165,7 @@ class K8sPluginInstanceApi( path = path.trimEnd(',') } val result: BlueprintWebClientService.WebClientResponse = rbInstanceService.exchangeResource( - GET.name, + GET.name(), path, "" ) @@ -189,7 +189,7 @@ class K8sPluginInstanceApi( val rbInstanceService = getK8sRbInstanceRestClient(k8sConfiguration, instanceId) try { val result: BlueprintWebClientService.WebClientResponse = rbInstanceService.exchangeResource( - GET.name, + GET.name(), "/healthcheck", "" ) @@ -214,7 +214,7 @@ class K8sPluginInstanceApi( val rbInstanceService = getK8sRbInstanceRestClient(k8sConfiguration, instanceId) try { val result: BlueprintWebClientService.WebClientResponse = rbInstanceService.exchangeResource( - GET.name, + GET.name(), "/healthcheck/$healthCheckId", "" ) @@ -239,7 +239,7 @@ class K8sPluginInstanceApi( val rbInstanceService = getK8sRbInstanceRestClient(k8sConfiguration, instanceId) try { val result: BlueprintWebClientService.WebClientResponse = rbInstanceService.exchangeResource( - POST.name, + POST.name(), "/healthcheck", "" ) @@ -264,7 +264,7 @@ class K8sPluginInstanceApi( val rbInstanceService = getK8sRbInstanceRestClient(k8sConfiguration, instanceId) try { val result: BlueprintWebClientService.WebClientResponse = rbInstanceService.exchangeResource( - POST.name, + POST.name(), "/config", JacksonUtils.getJson(configValues) ) @@ -286,7 +286,7 @@ class K8sPluginInstanceApi( val rbInstanceService = getK8sRbInstanceRestClient(k8sConfiguration, instanceId) try { val result: BlueprintWebClientService.WebClientResponse = rbInstanceService.exchangeResource( - PUT.name, + PUT.name(), "/config/$configName", JacksonUtils.getJson(configValues) ) @@ -308,7 +308,7 @@ class K8sPluginInstanceApi( val rbInstanceService = getK8sRbInstanceRestClient(k8sConfiguration, instanceId) try { val result: BlueprintWebClientService.WebClientResponse = rbInstanceService.exchangeResource( - POST.name, + POST.name(), "/config/$configName/delete", "" ) @@ -330,7 +330,7 @@ class K8sPluginInstanceApi( val rbInstanceService = getK8sRbInstanceRestClient(k8sConfiguration, instanceId) try { val result: BlueprintWebClientService.WebClientResponse = rbInstanceService.exchangeResource( - GET.name, + GET.name(), "/config/$configName", "" ) @@ -346,7 +346,7 @@ class K8sPluginInstanceApi( val rbInstanceService = getK8sRbInstanceRestClient(k8sConfiguration, instanceId) try { val result: BlueprintWebClientService.WebClientResponse = rbInstanceService.exchangeResource( - GET.name, + GET.name(), "/config/$configName/version/$version", "" ) @@ -362,7 +362,7 @@ class K8sPluginInstanceApi( val rbInstanceService = getK8sRbInstanceRestClient(k8sConfiguration, instanceId) try { val result: BlueprintWebClientService.WebClientResponse = rbInstanceService.exchangeResource( - GET.name, + GET.name(), "/config/$configName", "" ) @@ -384,7 +384,7 @@ class K8sPluginInstanceApi( val rbInstanceService = getK8sRbInstanceRestClient(k8sConfiguration, instanceId) try { val result: BlueprintWebClientService.WebClientResponse = rbInstanceService.exchangeResource( - GET.name, + GET.name(), "/config/$configName/version/$version", "" ) @@ -406,7 +406,7 @@ class K8sPluginInstanceApi( val rbInstanceService = getK8sRbInstanceRestClient(k8sConfiguration, instanceId) try { val result: BlueprintWebClientService.WebClientResponse = rbInstanceService.exchangeResource( - GET.name, + GET.name(), "/config/$configName/tag/$tag", "" ) @@ -428,7 +428,7 @@ class K8sPluginInstanceApi( val rbInstanceService = getK8sRbInstanceRestClient(k8sConfiguration, instanceId) try { val result: BlueprintWebClientService.WebClientResponse = rbInstanceService.exchangeResource( - GET.name, + GET.name(), "/config", "" ) @@ -451,7 +451,7 @@ class K8sPluginInstanceApi( val rbInstanceService = getK8sRbInstanceRestClient(k8sConfiguration, instanceId) try { val result: BlueprintWebClientService.WebClientResponse = rbInstanceService.exchangeResource( - GET.name, + GET.name(), "/config/$configName/version", "" ) @@ -474,7 +474,7 @@ class K8sPluginInstanceApi( val rbInstanceService = getK8sRbInstanceRestClient(k8sConfiguration, instanceId) try { val result: BlueprintWebClientService.WebClientResponse = rbInstanceService.exchangeResource( - GET.name, + GET.name(), "/config/$configName/tag", "" ) @@ -500,7 +500,7 @@ class K8sPluginInstanceApi( if (deleteConfigOnly) path = path.plus("?deleteConfigOnly=true") val result: BlueprintWebClientService.WebClientResponse = rbInstanceService.exchangeResource( - DELETE.name, + DELETE.name(), path, "" ) @@ -522,7 +522,7 @@ class K8sPluginInstanceApi( if (configTag != null) configValues["config-tag"] = configTag val result: BlueprintWebClientService.WebClientResponse = rbInstanceService.exchangeResource( - POST.name, + POST.name(), "/config/$configName/rollback", JacksonUtils.getJson(configValues) ) @@ -541,7 +541,7 @@ class K8sPluginInstanceApi( val configValues = hashMapOf() configValues["tag-name"] = tagName val result: BlueprintWebClientService.WebClientResponse = rbInstanceService.exchangeResource( - POST.name, + POST.name(), "/config/$configName/tagit", JacksonUtils.getJson(configValues) ) @@ -558,7 +558,7 @@ class K8sPluginInstanceApi( val rbInstanceService = getK8sRbInstanceRestClient(k8sConfiguration, instanceId) try { val result: BlueprintWebClientService.WebClientResponse = rbInstanceService.exchangeResource( - DELETE.name, + DELETE.name(), "/healthcheck/$healthCheckId", "" ) diff --git a/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/query/K8sPluginQueryApi.kt b/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/query/K8sPluginQueryApi.kt index 227ed6730..01c7b1cb6 100644 --- a/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/query/K8sPluginQueryApi.kt +++ b/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/query/K8sPluginQueryApi.kt @@ -35,7 +35,7 @@ public class K8sPluginQueryApi( path = path.trimEnd(',') } val result: BlueprintWebClientService.WebClientResponse = rbQueryService.exchangeResource( - GET.name, + GET.name(), path, "" ) diff --git a/ms/blueprintsprocessor/functions/message-prioritization/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/message/prioritization/db/MessagePrioritization.kt b/ms/blueprintsprocessor/functions/message-prioritization/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/message/prioritization/db/MessagePrioritization.kt index ce2085f68..7ce1b9202 100644 --- a/ms/blueprintsprocessor/functions/message-prioritization/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/message/prioritization/db/MessagePrioritization.kt +++ b/ms/blueprintsprocessor/functions/message-prioritization/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/message/prioritization/db/MessagePrioritization.kt @@ -22,14 +22,14 @@ import org.springframework.data.annotation.LastModifiedDate import org.springframework.data.jpa.domain.support.AuditingEntityListener import org.springframework.data.jpa.repository.config.EnableJpaAuditing import java.util.Date -import javax.persistence.Column -import javax.persistence.Entity -import javax.persistence.EntityListeners -import javax.persistence.Id -import javax.persistence.Lob -import javax.persistence.Table -import javax.persistence.Temporal -import javax.persistence.TemporalType +import jakarta.persistence.Column +import jakarta.persistence.Entity +import jakarta.persistence.EntityListeners +import jakarta.persistence.Id +import jakarta.persistence.Lob +import jakarta.persistence.Table +import jakarta.persistence.Temporal +import jakarta.persistence.TemporalType @EnableJpaAuditing @EntityListeners(AuditingEntityListener::class) @@ -56,19 +56,19 @@ open class MessagePrioritization { var priority: Int = 5 @Lob - @Column(name = "message", nullable = false) + @Column(name = "message", nullable = false, columnDefinition = "LONGTEXT") var message: String? = null @Lob - @Column(name = "error", nullable = true) + @Column(name = "error", nullable = true, columnDefinition = "LONGTEXT") var error: String? = null @Lob - @Column(name = "aggregated_message_ids", nullable = true) + @Column(name = "aggregated_message_ids", nullable = true, columnDefinition = "LONGTEXT") var aggregatedMessageIds: String? = null @Lob - @Column(name = "correlation_id", nullable = true) + @Column(name = "correlation_id", nullable = true, columnDefinition = "LONGTEXT") var correlationId: String? = null @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'") diff --git a/ms/blueprintsprocessor/functions/pom.xml b/ms/blueprintsprocessor/functions/pom.xml index f2be8f554..fb446c813 100755 --- a/ms/blueprintsprocessor/functions/pom.xml +++ b/ms/blueprintsprocessor/functions/pom.xml @@ -75,7 +75,7 @@ org.springframework.kafka spring-kafka - 2.9.13 + ${spring-kafka.version} org.powermock diff --git a/ms/blueprintsprocessor/functions/resource-resolution/pom.xml b/ms/blueprintsprocessor/functions/resource-resolution/pom.xml index b31fc9ce0..cdddfddf7 100644 --- a/ms/blueprintsprocessor/functions/resource-resolution/pom.xml +++ b/ms/blueprintsprocessor/functions/resource-resolution/pom.xml @@ -57,6 +57,7 @@ org.hibernate hibernate-testing + 6.2.7.Final test diff --git a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/capabilities/IpAssignResolutionCapability.kt b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/capabilities/IpAssignResolutionCapability.kt index 9388c280a..5ba9ba874 100644 --- a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/capabilities/IpAssignResolutionCapability.kt +++ b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/capabilities/IpAssignResolutionCapability.kt @@ -91,7 +91,7 @@ open class IpAssignResolutionCapability : ResourceAssignmentProcessor() { // Get the Rest Response val response = restClientService.exchangeResource( - HttpMethod.POST.name, + HttpMethod.POST.name(), "/web/service/v1/assign", generatedPayload ) val responseStatusCode = response.status diff --git a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/capabilities/NamingResolutionCapability.kt b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/capabilities/NamingResolutionCapability.kt index bc6983bd1..27cbd08de 100644 --- a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/capabilities/NamingResolutionCapability.kt +++ b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/capabilities/NamingResolutionCapability.kt @@ -92,7 +92,7 @@ open class NamingResolutionCapability : ResourceAssignmentProcessor() { // Get the Rest Response val response = restClientService.exchangeResource( - HttpMethod.POST.name, + HttpMethod.POST.name(), "/web/service/v1/genNetworkElementName/cds", generatedPayload ) diff --git a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/db/ResourceResolution.kt b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/db/ResourceResolution.kt index 8b0f75c96..d93952c83 100644 --- a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/db/ResourceResolution.kt +++ b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/db/ResourceResolution.kt @@ -23,15 +23,15 @@ import org.springframework.data.annotation.LastModifiedDate import org.springframework.data.jpa.domain.support.AuditingEntityListener import java.io.Serializable import java.util.Date -import javax.persistence.Column -import javax.persistence.Entity -import javax.persistence.EntityListeners -import javax.persistence.Id -import javax.persistence.Index -import javax.persistence.Lob -import javax.persistence.Table -import javax.persistence.Temporal -import javax.persistence.TemporalType +import jakarta.persistence.Column +import jakarta.persistence.Entity +import jakarta.persistence.EntityListeners +import jakarta.persistence.Id +import jakarta.persistence.Index +import jakarta.persistence.Lob +import jakarta.persistence.Table +import jakarta.persistence.Temporal +import jakarta.persistence.TemporalType @EntityListeners(AuditingEntityListener::class) @Entity @@ -64,9 +64,9 @@ class ResourceResolution : Serializable { @Column(name = "name", nullable = false) var name: String? = null - @get:ApiModelProperty(value = "Value of the resolution.", required = true) @Lob - @Column(name = "value", nullable = false) + @get:ApiModelProperty(value = "Value of the resolution.", required = true) + @Column(name = "value", nullable = false, columnDefinition = "LONGTEXT") var value: String? = null @get:ApiModelProperty(value = "Whether success of failure.", required = true) diff --git a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/db/ResourceResolutionRepository.kt b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/db/ResourceResolutionRepository.kt index 5861cf8cb..75338270f 100644 --- a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/db/ResourceResolutionRepository.kt +++ b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/db/ResourceResolutionRepository.kt @@ -20,7 +20,7 @@ import org.springframework.data.jpa.repository.Modifying import org.springframework.data.jpa.repository.Query import org.springframework.data.repository.query.Param import org.springframework.stereotype.Repository -import javax.transaction.Transactional +import jakarta.transaction.Transactional @Repository interface ResourceResolutionRepository : JpaRepository { diff --git a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/db/TemplateResolution.kt b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/db/TemplateResolution.kt index 6a7a2cd17..2f17eaf5c 100755 --- a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/db/TemplateResolution.kt +++ b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/db/TemplateResolution.kt @@ -23,15 +23,17 @@ import org.springframework.data.annotation.LastModifiedDate import org.springframework.data.jpa.domain.support.AuditingEntityListener import java.io.Serializable import java.util.Date -import javax.persistence.Column -import javax.persistence.Entity -import javax.persistence.EntityListeners -import javax.persistence.Id -import javax.persistence.Index -import javax.persistence.Lob -import javax.persistence.Table -import javax.persistence.Temporal -import javax.persistence.TemporalType +import jakarta.persistence.Column +import jakarta.persistence.Entity +import jakarta.persistence.EntityListeners +import jakarta.persistence.Id +import jakarta.persistence.Index +import jakarta.persistence.Lob +import jakarta.persistence.Table +import jakarta.persistence.Temporal +import jakarta.persistence.TemporalType +import org.hibernate.annotations.JdbcTypeCode +import java.sql.Types @EntityListeners(AuditingEntityListener::class) @Entity @@ -59,9 +61,10 @@ class TemplateResolution : Serializable { @Column(name = "artifact_name", nullable = false) var artifactName: String? = null - @get:ApiModelProperty(value = "Rendered template.", required = true) @Lob - @Column(name = "result", nullable = false) + @JdbcTypeCode(Types.LONGVARCHAR) + @get:ApiModelProperty(value = "Rendered template.", required = true) + @Column(name = "result", nullable = false, columnDefinition = "LONGTEXT") var result: String? = null @get:ApiModelProperty( diff --git a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/db/TemplateResolutionRepository.kt b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/db/TemplateResolutionRepository.kt index 049e713ce..0cdd5e38b 100644 --- a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/db/TemplateResolutionRepository.kt +++ b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/db/TemplateResolutionRepository.kt @@ -20,7 +20,7 @@ import org.springframework.data.jpa.repository.Modifying import org.springframework.data.jpa.repository.Query import org.springframework.data.repository.query.Param import org.springframework.stereotype.Repository -import javax.transaction.Transactional +import jakarta.transaction.Transactional @Repository interface TemplateResolutionRepository : JpaRepository { diff --git a/ms/blueprintsprocessor/functions/restconf-executor/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/restconf/executor/RestconfExecutorExtensions.kt b/ms/blueprintsprocessor/functions/restconf-executor/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/restconf/executor/RestconfExecutorExtensions.kt index 5892c9f8b..2f19feee7 100644 --- a/ms/blueprintsprocessor/functions/restconf-executor/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/restconf/executor/RestconfExecutorExtensions.kt +++ b/ms/blueprintsprocessor/functions/restconf-executor/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/restconf/executor/RestconfExecutorExtensions.kt @@ -18,7 +18,6 @@ package org.onap.ccsdk.cds.blueprintsprocessor.functions.restconf.executor import com.fasterxml.jackson.databind.JsonNode -import org.hibernate.annotations.common.util.impl.LoggerFactory import org.onap.ccsdk.cds.blueprintsprocessor.functions.restconf.executor.RestconfConstants.Companion.RESTCONF_TOPOLOGY_CONFIG_PATH import org.onap.ccsdk.cds.blueprintsprocessor.functions.restconf.executor.RestconfConstants.Companion.RESTCONF_TOPOLOGY_OPER_PATH import org.onap.ccsdk.cds.blueprintsprocessor.rest.restClientService @@ -27,11 +26,12 @@ import org.onap.ccsdk.cds.blueprintsprocessor.services.execution.AbstractScriptC import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintProcessorException import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintRetryException import org.onap.ccsdk.cds.controllerblueprints.core.service.BluePrintDependencyService +import org.slf4j.LoggerFactory /** * Register the Restconf module exposed dependency */ -val log = LoggerFactory.logger(AbstractScriptComponentFunction::class.java)!! +val log = LoggerFactory.getLogger(AbstractScriptComponentFunction::class.java)!! fun AbstractScriptComponentFunction.restconfClientService(selector: String): BlueprintWebClientService { return BluePrintDependencyService.restClientService(selector) diff --git a/ms/blueprintsprocessor/functions/restful-executor/pom.xml b/ms/blueprintsprocessor/functions/restful-executor/pom.xml index 220bbcaec..53ae27964 100644 --- a/ms/blueprintsprocessor/functions/restful-executor/pom.xml +++ b/ms/blueprintsprocessor/functions/restful-executor/pom.xml @@ -47,7 +47,11 @@ org.springframework spring-web - 5.3.39 + 6.2.8 + + + org.springframework + spring-expression com.h2database diff --git a/ms/blueprintsprocessor/functions/restful-executor/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/restful/executor/function/RestfulServiceClient.kt b/ms/blueprintsprocessor/functions/restful-executor/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/restful/executor/function/RestfulServiceClient.kt index 8b3fd2a5f..d8a7031c9 100644 --- a/ms/blueprintsprocessor/functions/restful-executor/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/restful/executor/function/RestfulServiceClient.kt +++ b/ms/blueprintsprocessor/functions/restful-executor/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/restful/executor/function/RestfulServiceClient.kt @@ -43,7 +43,7 @@ class RestfulServiceClient() { request_object.put("data", request_object_value) val requestBodystr = request_object.toString() log.info("MOI request body: " + requestBodystr) - val response = web_client_service.exchangeResource(HttpMethod.PUT.name, pathStr, requestBodystr) + val response = web_client_service.exchangeResource(HttpMethod.PUT.name(), pathStr, requestBodystr) var response_object = generateResponse(response.status, response.body) log.info("MOI response status: " + response.status) return response_object @@ -58,7 +58,7 @@ class RestfulServiceClient() { pathStr = addQueryParameters(pathStr, "fields", attribute_value.toString().replace("\"", "")) } log.info("MOI Path: " + pathStr) - val response = web_client_service.exchangeResource(HttpMethod.GET.name, pathStr, "") + val response = web_client_service.exchangeResource(HttpMethod.GET.name(), pathStr, "") log.info("MOI response status: " + response.status) var response_object = generateResponse(response.status, response.body) return response_object @@ -74,7 +74,7 @@ class RestfulServiceClient() { request_object.put("data", managed_object_instance.get("data")) val requestBodystr = request_object.toString() log.info("MOI request body: " + requestBodystr) - val response = web_client_service.exchangeResource(HttpMethod.PATCH.name, pathStr, requestBodystr) + val response = web_client_service.exchangeResource(HttpMethod.PATCH.name(), pathStr, requestBodystr) log.info("MOI response status: " + response.status) var response_object = generateResponse(response.status, response.body) return response_object @@ -86,7 +86,7 @@ class RestfulServiceClient() { pathStr = addQueryParameters(pathStr, "scope", managed_object_instance.get("scope").toString().replace("\"", "")) pathStr = addQueryParameters(pathStr, "filter", managed_object_instance.get("filter").toString().replace("\"", "")) log.info("MOI Path: " + pathStr) - val response = web_client_service.exchangeResource(HttpMethod.DELETE.name, pathStr, "") + val response = web_client_service.exchangeResource(HttpMethod.DELETE.name(), pathStr, "") log.info("MOI response status: " + response.status) var response_object = generateResponse(response.status, response.body) return response_object diff --git a/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/utils/BluePrintArchiveUtils.kt b/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/utils/BluePrintArchiveUtils.kt index 4e2271b6d..a8e4d0fa6 100755 --- a/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/utils/BluePrintArchiveUtils.kt +++ b/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/utils/BluePrintArchiveUtils.kt @@ -116,8 +116,8 @@ class BluePrintArchiveUtils { compressionLevel: Int = Deflater.DEFAULT_COMPRESSION, fixedModificationTime: Long? = null ): T - where T : OutputStream { - val stream: ArchiveOutputStream = if (archiveType == ArchiveType.Zip) + where T : OutputStream { + val stream = if (archiveType == ArchiveType.Zip) ZipArchiveOutputStream(output).apply { setLevel(compressionLevel) } else TarArchiveOutputStream(GzipCompressorOutputStream(output)) @@ -129,7 +129,7 @@ class BluePrintArchiveUtils { @Throws(IOException::class) override fun visitFile(file: Path, attrs: BasicFileAttributes): FileVisitResult { if (pathFilter.test(file)) { - var archiveEntry: ArchiveEntry = aos.createArchiveEntry( + val archiveEntry = aos.createArchiveEntry( file.toFile(), baseDir.relativize(file).toString() ) @@ -140,7 +140,9 @@ class BluePrintArchiveUtils { } entry.time = 0 } - aos.putArchiveEntry(archiveEntry) + val aosArchiveEntry = aos as ArchiveOutputStream + aosArchiveEntry.putArchiveEntry(archiveEntry) + Files.copy(file, aos) aos.closeArchiveEntry() } @@ -149,16 +151,16 @@ class BluePrintArchiveUtils { @Throws(IOException::class) override fun preVisitDirectory(dir: Path, attrs: BasicFileAttributes): FileVisitResult { - var archiveEntry: ArchiveEntry? - if (archiveType == ArchiveType.Zip) { - val entry = ZipArchiveEntry(baseDir.relativize(dir).toString() + "/") - fixedModificationTime?.let { - entry.time = it - } - archiveEntry = entry - } else - archiveEntry = TarArchiveEntry(baseDir.relativize(dir).toString() + "/") - aos.putArchiveEntry(archiveEntry) + val archiveEntry: ArchiveEntry = + if (archiveType == ArchiveType.Zip) { + val entry = ZipArchiveEntry(baseDir.relativize(dir).toString() + "/") + fixedModificationTime?.let { + entry.time = it + } + entry + } else + TarArchiveEntry(baseDir.relativize(dir).toString() + "/") + (aos as ArchiveOutputStream).putArchiveEntry(archiveEntry) aos.closeArchiveEntry() return FileVisitResult.CONTINUE } @@ -183,7 +185,7 @@ class BluePrintArchiveUtils { } else { // Tar Gz var tarGzArchiveIs: InputStream = BufferedInputStream(archiveFile.inputStream()) tarGzArchiveIs = GzipCompressorInputStream(tarGzArchiveIs) - val tarGzArchive: ArchiveInputStream = TarArchiveInputStream(tarGzArchiveIs) + val tarGzArchive = TarArchiveInputStream(tarGzArchiveIs) enumeration = ArchiveEnumerator(tarGzArchive) } @@ -219,7 +221,7 @@ class BluePrintArchiveUtils { private val zipArchive: ZipFile? private val zipEnumeration: Enumeration? - private val archiveStream: ArchiveInputStream? + private val archiveStream: ArchiveInputStream? private var nextEntry: ArchiveEntry? = null private val hasSharedEntryInputStream: Boolean @@ -230,8 +232,8 @@ class BluePrintArchiveUtils { hasSharedEntryInputStream = false } - constructor(archiveStream: ArchiveInputStream) { - this.archiveStream = archiveStream + constructor(archiveStream: TarArchiveInputStream) { + this.archiveStream = archiveStream as ArchiveInputStream zipArchive = null zipEnumeration = null hasSharedEntryInputStream = true diff --git a/ms/blueprintsprocessor/modules/commons/db-lib/pom.xml b/ms/blueprintsprocessor/modules/commons/db-lib/pom.xml index 605096024..f69500f74 100644 --- a/ms/blueprintsprocessor/modules/commons/db-lib/pom.xml +++ b/ms/blueprintsprocessor/modules/commons/db-lib/pom.xml @@ -55,8 +55,8 @@ - javax.validation - validation-api + jakarta.validation + jakarta.validation-api com.h2database @@ -69,6 +69,7 @@ org.hibernate hibernate-testing + 6.2.7.Final test diff --git a/ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/db/primary/domain/BlueprintModel.kt b/ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/db/primary/domain/BlueprintModel.kt index 1feac8cd2..c544900a6 100755 --- a/ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/db/primary/domain/BlueprintModel.kt +++ b/ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/db/primary/domain/BlueprintModel.kt @@ -25,21 +25,21 @@ import org.springframework.data.annotation.LastModifiedDate import org.springframework.data.jpa.domain.support.AuditingEntityListener import java.io.Serializable import java.util.Date -import javax.persistence.AttributeConverter -import javax.persistence.CascadeType -import javax.persistence.Column -import javax.persistence.Convert -import javax.persistence.Converter -import javax.persistence.Entity -import javax.persistence.EntityListeners -import javax.persistence.FetchType -import javax.persistence.Id -import javax.persistence.Lob -import javax.persistence.OneToOne -import javax.persistence.Table -import javax.persistence.Temporal -import javax.persistence.TemporalType -import javax.persistence.UniqueConstraint +import jakarta.persistence.AttributeConverter +import jakarta.persistence.CascadeType +import jakarta.persistence.Column +import jakarta.persistence.Convert +import jakarta.persistence.Converter +import jakarta.persistence.Entity +import jakarta.persistence.EntityListeners +import jakarta.persistence.FetchType +import jakarta.persistence.Id +import jakarta.persistence.Lob +import jakarta.persistence.OneToOne +import jakarta.persistence.Table +import jakarta.persistence.Temporal +import jakarta.persistence.TemporalType +import jakarta.persistence.UniqueConstraint /** * Provide BlueprintModel Entity @@ -96,7 +96,7 @@ class BlueprintModel : Serializable { lateinit var artifactVersion: String @Lob - @Column(name = "artifact_description") + @Column(name = "artifact_description", columnDefinition = "LONGTEXT") var artifactDescription: String? = null @Column(name = "internal_version") @@ -120,8 +120,7 @@ class BlueprintModel : Serializable { @ApiModelProperty(required = true) lateinit var updatedBy: String - @Lob - @Column(name = "tags", nullable = false) + @Column(name = "tags", nullable = false, columnDefinition = "LONGTEXT") @ApiModelProperty(required = true) lateinit var tags: String @@ -131,7 +130,7 @@ class BlueprintModel : Serializable { // will be populated with workflow specs for each workflow (JSON object) @Lob @Convert(converter = WorkflowsConverter::class) - @Column(name = "workflows", nullable = false) + @Column(name = "workflows", nullable = false, columnDefinition = "LONGTEXT") lateinit var workflows: Map companion object { @@ -145,9 +144,10 @@ class BlueprintModel : Serializable { return JacksonUtils.getJson(node, true) } - override fun convertToEntityAttribute(dbData: String): Map { - if (dbData == null || "".equals(dbData)) return emptyMap() - return JacksonUtils.getMapFromJson(dbData, Workflow::class.java) + override fun convertToEntityAttribute(dbData: String?): Map { + return dbData?.let { + JacksonUtils.getMapFromJson(it, Workflow::class.java) + } ?: emptyMap() } } } diff --git a/ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/db/primary/domain/BlueprintModelContent.kt b/ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/db/primary/domain/BlueprintModelContent.kt index 08977f6aa..5f847a896 100644 --- a/ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/db/primary/domain/BlueprintModelContent.kt +++ b/ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/db/primary/domain/BlueprintModelContent.kt @@ -23,16 +23,16 @@ import org.springframework.data.jpa.domain.support.AuditingEntityListener import java.io.Serializable import java.util.Date import java.util.Objects -import javax.persistence.Column -import javax.persistence.Entity -import javax.persistence.EntityListeners -import javax.persistence.Id -import javax.persistence.JoinColumn -import javax.persistence.Lob -import javax.persistence.OneToOne -import javax.persistence.Table -import javax.persistence.Temporal -import javax.persistence.TemporalType +import jakarta.persistence.Column +import jakarta.persistence.Entity +import jakarta.persistence.EntityListeners +import jakarta.persistence.Id +import jakarta.persistence.JoinColumn +import jakarta.persistence.Lob +import jakarta.persistence.OneToOne +import jakarta.persistence.Table +import jakarta.persistence.Temporal +import jakarta.persistence.TemporalType /** * Provide Blueprint Model Content Entity @@ -62,11 +62,11 @@ class BlueprintModelContent : Serializable { var blueprintModel: BlueprintModel? = null @Lob - @Column(name = "description") + @Column(name = "description", columnDefinition = "LONGTEXT") var description: String? = null @Lob - @Column(name = "content", nullable = false) + @Column(name = "content", nullable = false, columnDefinition = "LONGBLOB") @ApiModelProperty(required = true) lateinit var content: ByteArray @@ -77,25 +77,13 @@ class BlueprintModelContent : Serializable { var creationDate = Date() override fun toString(): String { - return "[" + "id = " + id + - ", name = " + name + - ", contentType = " + contentType + - "]" + return "BlueprintModelContent(id='$id', name='$name', contentType='$contentType')" } override fun equals(o: Any?): Boolean { - - if (o === this) { - return true - } - if (o !is BlueprintModelContent) { - return false - } - val blueprintModelContent = o as BlueprintModelContent? - return ( - id == blueprintModelContent!!.id && name == blueprintModelContent.name && - contentType == blueprintModelContent.contentType - ) + if (o === this) return true + if (o !is BlueprintModelContent) return false + return id == o.id && name == o.name && contentType == o.contentType } override fun hashCode(): Int { diff --git a/ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/db/primary/domain/BlueprintModelSearch.kt b/ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/db/primary/domain/BlueprintModelSearch.kt index ba9051898..09cbc8613 100644 --- a/ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/db/primary/domain/BlueprintModelSearch.kt +++ b/ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/db/primary/domain/BlueprintModelSearch.kt @@ -25,13 +25,13 @@ import io.swagger.annotations.ApiModelProperty import org.springframework.data.annotation.LastModifiedDate import java.io.Serializable import java.util.Date -import javax.persistence.Column -import javax.persistence.Entity -import javax.persistence.Id -import javax.persistence.Lob -import javax.persistence.Table -import javax.persistence.Temporal -import javax.persistence.TemporalType +import jakarta.persistence.Column +import jakarta.persistence.Entity +import jakarta.persistence.Id +import jakarta.persistence.Lob +import jakarta.persistence.Table +import jakarta.persistence.Temporal +import jakarta.persistence.TemporalType /** * Provide Blueprint Model Search Entity @@ -69,9 +69,9 @@ class BlueprintModelSearch : Serializable { @Column(name = "artifact_version", nullable = false) var artifactVersion: String? = null - @ApiModelProperty(value = "Artifact Description, usually empty", example = "\"\"", required = false) @Lob - @Column(name = "artifact_description") + @ApiModelProperty(value = "Artifact Description, usually empty", example = "\"\"", required = false) + @Column(name = "artifact_description", columnDefinition = "LONGTEXT") var artifactDescription: String? = null @ApiModelProperty(value = "Internal Version of CBA, usually null", example = "null", required = false) @@ -98,8 +98,7 @@ class BlueprintModelSearch : Serializable { var updatedBy: String? = null @ApiModelProperty(value = "Tags to identify the CBA, defined in Metadata", example = "\"test\"", required = true) - @Lob - @Column(name = "tags", nullable = false) + @Column(name = "tags", nullable = false, columnDefinition = "LONGTEXT") var tags: String? = null companion object { diff --git a/ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/db/primary/repository/BlueprintModelRepository.kt b/ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/db/primary/repository/BlueprintModelRepository.kt index 67869d11f..95f4fd5f6 100644 --- a/ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/db/primary/repository/BlueprintModelRepository.kt +++ b/ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/db/primary/repository/BlueprintModelRepository.kt @@ -25,7 +25,7 @@ import org.springframework.data.jpa.repository.Query import org.springframework.data.repository.query.Param import org.springframework.stereotype.Repository import java.util.Optional -import javax.transaction.Transactional +import jakarta.transaction.Transactional /** * @param Model diff --git a/ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/db/primary/service/BlueprintCatalogServiceImpl.kt b/ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/db/primary/service/BlueprintCatalogServiceImpl.kt index 06376346c..2c0fc8e49 100644 --- a/ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/db/primary/service/BlueprintCatalogServiceImpl.kt +++ b/ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/db/primary/service/BlueprintCatalogServiceImpl.kt @@ -32,7 +32,7 @@ import org.onap.ccsdk.cds.controllerblueprints.core.utils.BluePrintMetadataUtils import org.slf4j.LoggerFactory import java.io.File import java.nio.file.Path -import javax.persistence.MappedSuperclass +import jakarta.persistence.MappedSuperclass @MappedSuperclass abstract class BlueprintCatalogServiceImpl( diff --git a/ms/blueprintsprocessor/modules/commons/grpc-lib/pom.xml b/ms/blueprintsprocessor/modules/commons/grpc-lib/pom.xml index 8572dbfd4..e909aa49e 100644 --- a/ms/blueprintsprocessor/modules/commons/grpc-lib/pom.xml +++ b/ms/blueprintsprocessor/modules/commons/grpc-lib/pom.xml @@ -43,6 +43,7 @@ io.grpc grpc-testing + ${grpc.version} diff --git a/ms/blueprintsprocessor/modules/commons/message-lib/pom.xml b/ms/blueprintsprocessor/modules/commons/message-lib/pom.xml index ca5ac14e2..994974448 100644 --- a/ms/blueprintsprocessor/modules/commons/message-lib/pom.xml +++ b/ms/blueprintsprocessor/modules/commons/message-lib/pom.xml @@ -46,7 +46,7 @@ org.springframework.kafka spring-kafka - 2.9.13 + ${spring-kafka.version} org.apache.kafka diff --git a/ms/blueprintsprocessor/modules/commons/pom.xml b/ms/blueprintsprocessor/modules/commons/pom.xml index 2a761d68a..e1a0eca29 100755 --- a/ms/blueprintsprocessor/modules/commons/pom.xml +++ b/ms/blueprintsprocessor/modules/commons/pom.xml @@ -81,7 +81,7 @@ org.springframework.kafka spring-kafka - 2.9.13 + ${spring-kafka.version} org.bitbucket.b_c diff --git a/ms/blueprintsprocessor/modules/commons/processor-core/pom.xml b/ms/blueprintsprocessor/modules/commons/processor-core/pom.xml index 48d8b78c4..06e2f996d 100644 --- a/ms/blueprintsprocessor/modules/commons/processor-core/pom.xml +++ b/ms/blueprintsprocessor/modules/commons/processor-core/pom.xml @@ -36,6 +36,7 @@ com.hazelcast hazelcast-all + ${hazelcast.version} org.onap.ccsdk.cds.blueprintsprocessor.modules diff --git a/ms/blueprintsprocessor/modules/commons/processor-core/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/core/cluster/HazelcastClusterService.kt b/ms/blueprintsprocessor/modules/commons/processor-core/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/core/cluster/HazelcastClusterService.kt index 870e0ed64..b357836e6 100644 --- a/ms/blueprintsprocessor/modules/commons/processor-core/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/core/cluster/HazelcastClusterService.kt +++ b/ms/blueprintsprocessor/modules/commons/processor-core/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/core/cluster/HazelcastClusterService.kt @@ -193,7 +193,7 @@ open class HazelcastClusterService(private val applicationEventPublisher: Applic } } - override suspend fun sendMessage(topic: BlueprintClusterTopic, message: T) { + override suspend fun sendMessage(topic: BlueprintClusterTopic, message: T) { hazelcast.getReliableTopic(topic.name).publish(message) } diff --git a/ms/blueprintsprocessor/modules/commons/processor-core/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/core/service/BluePrintClusterService.kt b/ms/blueprintsprocessor/modules/commons/processor-core/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/core/service/BluePrintClusterService.kt index f7ba6f25f..25edaa31c 100644 --- a/ms/blueprintsprocessor/modules/commons/processor-core/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/core/service/BluePrintClusterService.kt +++ b/ms/blueprintsprocessor/modules/commons/processor-core/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/core/service/BluePrintClusterService.kt @@ -58,7 +58,7 @@ interface BluePrintClusterService { suspend fun shutDown(duration: Duration) /** Send [message] to the listener(s) of a [topic] */ - suspend fun sendMessage(topic: BlueprintClusterTopic, message: T) + suspend fun sendMessage(topic: BlueprintClusterTopic, message: T) /** Register a [listener] to a [topic] and returns his UUID */ fun addBlueprintClusterMessageListener(topic: BlueprintClusterTopic, listener: BlueprintClusterMessageListener): UUID diff --git a/ms/blueprintsprocessor/modules/commons/rest-lib/pom.xml b/ms/blueprintsprocessor/modules/commons/rest-lib/pom.xml index 389a7f45e..8fd111689 100644 --- a/ms/blueprintsprocessor/modules/commons/rest-lib/pom.xml +++ b/ms/blueprintsprocessor/modules/commons/rest-lib/pom.xml @@ -53,7 +53,7 @@ org.springframework spring-web - 5.3.39 + 6.2.8 org.springframework.boot @@ -68,7 +68,11 @@ org.springframework.security spring-security-core - 6.3.0 + 6.4.6 + + + org.springframework + spring-expression org.jetbrains.kotlin diff --git a/ms/blueprintsprocessor/modules/commons/rest-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/rest/filters/RestServerLoggingWebFilter.kt b/ms/blueprintsprocessor/modules/commons/rest-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/rest/filters/RestServerLoggingWebFilter.kt index 4b5c2c4e8..a986cb1ba 100644 --- a/ms/blueprintsprocessor/modules/commons/rest-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/rest/filters/RestServerLoggingWebFilter.kt +++ b/ms/blueprintsprocessor/modules/commons/rest-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/rest/filters/RestServerLoggingWebFilter.kt @@ -30,7 +30,7 @@ open class RestServerLoggingWebFilter : WebFilter { val loggingService = RestLoggerService() loggingService.entering(serverWebExchange.request) - val filterChain = webFilterChain.filter(serverWebExchange).subscriberContext( + val filterChain = webFilterChain.filter(serverWebExchange).contextWrite( Context.of(MDCContext, MDCContext()) ) loggingService.exiting(serverWebExchange.request, serverWebExchange.response) diff --git a/ms/blueprintsprocessor/modules/commons/rest-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/rest/service/BaseBlueprintWebClientService.kt b/ms/blueprintsprocessor/modules/commons/rest-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/rest/service/BaseBlueprintWebClientService.kt index 41426d585..e6b9177e8 100644 --- a/ms/blueprintsprocessor/modules/commons/rest-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/rest/service/BaseBlueprintWebClientService.kt +++ b/ms/blueprintsprocessor/modules/commons/rest-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/rest/service/BaseBlueprintWebClientService.kt @@ -118,7 +118,7 @@ abstract class BaseBlueprintWebClientService : Blu * the difference is in convertToBasicHeaders vs basicHeaders */ val convertedHeaders: Array = convertToBasicHeaders(headers) - return when (HttpMethod.resolve(methodType)) { + return when (HttpMethod.valueOf(methodType)) { HttpMethod.DELETE -> delete(path, convertedHeaders, String::class.java) HttpMethod.GET -> get(path, convertedHeaders, String::class.java) HttpMethod.POST -> post(path, request, convertedHeaders, String::class.java) @@ -324,7 +324,7 @@ abstract class BaseBlueprintWebClientService : Blu // TODO: possible inconsistency // NOTE: this basic headers function is different from non-blocking val convertedHeaders: Array = basicHeaders(additionalHeaders!!) - return when (HttpMethod.resolve(methodType)) { + return when (HttpMethod.valueOf(methodType)) { HttpMethod.GET -> getNB(path, convertedHeaders, responseType) HttpMethod.POST -> postNB(path, request, convertedHeaders, responseType) HttpMethod.DELETE -> deleteNB(path, convertedHeaders, responseType) diff --git a/ms/blueprintsprocessor/modules/commons/rest-lib/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/rest/service/RestClientServiceTest.kt b/ms/blueprintsprocessor/modules/commons/rest-lib/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/rest/service/RestClientServiceTest.kt index e865a0047..bca9dcc22 100644 --- a/ms/blueprintsprocessor/modules/commons/rest-lib/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/rest/service/RestClientServiceTest.kt +++ b/ms/blueprintsprocessor/modules/commons/rest-lib/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/rest/service/RestClientServiceTest.kt @@ -125,7 +125,7 @@ class RestClientServiceTest { val restClientService = bluePrintRestLibPropertyService .blueprintWebClientService("sample") val response = restClientService.exchangeResource( - HttpMethod.GET.name, "/sample/query?id=3", "" + HttpMethod.GET.name(), "/sample/query?id=3", "" ) assertEquals( "query with id:3", response.body, @@ -138,7 +138,7 @@ class RestClientServiceTest { val restClientService = bluePrintRestLibPropertyService .blueprintWebClientService("sample") val response = restClientService.exchangeResource( - HttpMethod.PATCH.name, "/sample/name", "" + HttpMethod.PATCH.name(), "/sample/name", "" ) assertEquals( "Patch request successful", response.body, @@ -153,7 +153,7 @@ class RestClientServiceTest { val headers = mutableMapOf() headers["X-Transaction-Id"] = "1234" val response = restClientService.exchangeResource( - HttpMethod.GET.name, + HttpMethod.GET.name(), "/sample/name", "" ) assertNotNull(response.body, "failed to get response") @@ -175,7 +175,7 @@ class RestClientServiceTest { runBlocking { val get = async(start = CoroutineStart.LAZY) { restClientService.exchangeNB( - HttpMethod.GET.name, + HttpMethod.GET.name(), "/sample/basic", "" ).body } @@ -210,7 +210,7 @@ class RestClientServiceTest { runBlocking { val get1 = async(start = CoroutineStart.LAZY) { restClientService.exchangeNB( - HttpMethod.GET.name, + HttpMethod.GET.name(), "/sample/aai/v22/business/customers", "", headers, Customer::class.java ).body @@ -218,7 +218,7 @@ class RestClientServiceTest { val get2 = async(start = CoroutineStart.LAZY) { restClientService.exchangeNB( - HttpMethod.GET.name, + HttpMethod.GET.name(), "/sample/aai/v22/business/customers", "", headers, Customer::class.java ).body @@ -226,7 +226,7 @@ class RestClientServiceTest { val post = async(start = CoroutineStart.LAZY) { restClientService.exchangeNB( - HttpMethod.POST.name, + HttpMethod.POST.name(), "/sample/aai/v22/business/customers", post1, headers, String::class.java ).body @@ -234,7 +234,7 @@ class RestClientServiceTest { val put = async(start = CoroutineStart.LAZY) { restClientService.exchangeNB( - HttpMethod.PUT.name, + HttpMethod.PUT.name(), "/sample/aai/v22/business/customers", post1, headers, String::class.java ).body @@ -242,7 +242,7 @@ class RestClientServiceTest { val patch = async(start = CoroutineStart.LAZY) { restClientService.exchangeNB( - HttpMethod.PATCH.name, + HttpMethod.PATCH.name(), "/sample/aai/v22/business/customers", post1, headers, String::class.java ).body @@ -250,7 +250,7 @@ class RestClientServiceTest { val delete = async(start = CoroutineStart.LAZY) { restClientService.exchangeNB( - HttpMethod.DELETE.name, + HttpMethod.DELETE.name(), "/sample/aai/v22/business/customers", "", headers, String::class.java ).body @@ -291,7 +291,7 @@ class RestClientServiceTest { val headers = mutableMapOf() headers["X-Transaction-Id"] = "1234" val response = restClientService.exchangeResource( - HttpMethod.DELETE.name, + HttpMethod.DELETE.name(), "/sample/name", "" ) assertEquals(response.status, 204) @@ -306,7 +306,7 @@ class RestClientServiceTest { headers["X-Transaction-Id"] = "1234" runBlocking { val response = restClientService.exchangeNB( - HttpMethod.DELETE.name, + HttpMethod.DELETE.name(), "/sample/customersWithDefaultConstructor", "", headers, CustomerWithDefaultConstructor::class.java ) assertEquals(response.status, 204) @@ -322,7 +322,7 @@ class RestClientServiceTest { headers["X-Transaction-Id"] = "1234" runBlocking { val response = restClientService.exchangeNB( - HttpMethod.DELETE.name, + HttpMethod.DELETE.name(), "/sample/customersWithoutDefaultConstructor", "", headers, CustomerWithoutDefaultConstructor::class.java ) assertEquals(response.status, 204) diff --git a/ms/blueprintsprocessor/modules/commons/ssh-lib/pom.xml b/ms/blueprintsprocessor/modules/commons/ssh-lib/pom.xml index 9e1061d86..1fd26820d 100644 --- a/ms/blueprintsprocessor/modules/commons/ssh-lib/pom.xml +++ b/ms/blueprintsprocessor/modules/commons/ssh-lib/pom.xml @@ -51,7 +51,7 @@ org.apache.zookeeper zookeeper - 3.9.2 + 3.9.3 org.scala-lang diff --git a/ms/blueprintsprocessor/modules/inbounds/configs-api/pom.xml b/ms/blueprintsprocessor/modules/inbounds/configs-api/pom.xml index bd25ace8b..061e5eb99 100644 --- a/ms/blueprintsprocessor/modules/inbounds/configs-api/pom.xml +++ b/ms/blueprintsprocessor/modules/inbounds/configs-api/pom.xml @@ -38,7 +38,7 @@ org.springframework.security spring-security-core - 6.3.0 + 6.4.6 org.onap.ccsdk.cds.blueprintsprocessor.modules diff --git a/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/domain/JpaJsonNodeConverter.kt b/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/domain/JpaJsonNodeConverter.kt index 4779ad340..226431db7 100644 --- a/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/domain/JpaJsonNodeConverter.kt +++ b/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/domain/JpaJsonNodeConverter.kt @@ -18,8 +18,8 @@ package org.onap.ccsdk.cds.blueprintsprocessor.designer.api.domain import com.fasterxml.jackson.databind.JsonNode import org.onap.ccsdk.cds.controllerblueprints.core.utils.JacksonUtils -import javax.persistence.AttributeConverter -import javax.persistence.Converter +import jakarta.persistence.AttributeConverter +import jakarta.persistence.Converter /** * @author Brinda Santh diff --git a/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/domain/JpaResourceDefinitionConverter.kt b/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/domain/JpaResourceDefinitionConverter.kt index f0692cdd9..3c8ab2f86 100644 --- a/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/domain/JpaResourceDefinitionConverter.kt +++ b/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/domain/JpaResourceDefinitionConverter.kt @@ -18,8 +18,8 @@ package org.onap.ccsdk.cds.blueprintsprocessor.designer.api.domain import org.onap.ccsdk.cds.controllerblueprints.core.utils.JacksonUtils import org.onap.ccsdk.cds.controllerblueprints.resource.dict.ResourceDefinition -import javax.persistence.AttributeConverter -import javax.persistence.Converter +import jakarta.persistence.AttributeConverter +import jakarta.persistence.Converter /** * @author Brinda Santh diff --git a/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/domain/ModelType.kt b/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/domain/ModelType.kt index b00e5a0a6..42bcebdfd 100644 --- a/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/domain/ModelType.kt +++ b/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/domain/ModelType.kt @@ -23,15 +23,15 @@ import org.springframework.data.annotation.LastModifiedDate import org.springframework.data.jpa.domain.support.AuditingEntityListener import java.io.Serializable import java.util.Date -import javax.persistence.Column -import javax.persistence.Convert -import javax.persistence.Entity -import javax.persistence.EntityListeners -import javax.persistence.Id -import javax.persistence.Lob -import javax.persistence.Table -import javax.persistence.Temporal -import javax.persistence.TemporalType +import jakarta.persistence.Column +import jakarta.persistence.Convert +import jakarta.persistence.Entity +import jakarta.persistence.EntityListeners +import jakarta.persistence.Id +import jakarta.persistence.Lob +import jakarta.persistence.Table +import jakarta.persistence.Temporal +import jakarta.persistence.TemporalType /** * Provide ModelType Entity @@ -59,12 +59,12 @@ class ModelType : Serializable { @Lob @Convert(converter = JpaJsonNodeConverter::class) - @Column(name = "definition", nullable = false) + @Column(name = "definition", nullable = false, columnDefinition = "LONGTEXT") @ApiModelProperty(required = true) lateinit var definition: JsonNode @Lob - @Column(name = "description", nullable = false) + @Column(name = "description", nullable = false, columnDefinition = "LONGTEXT") @ApiModelProperty(required = true) lateinit var description: String @@ -72,10 +72,9 @@ class ModelType : Serializable { @ApiModelProperty(required = true) lateinit var version: String - @Lob - @Column(name = "tags", nullable = false) + @Column(name = "tags", nullable = false, columnDefinition = "LONGTEXT") @ApiModelProperty(required = true) - lateinit var tags: String + var tags: String? = null @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'") @LastModifiedDate diff --git a/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/domain/ResourceDictionary.kt b/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/domain/ResourceDictionary.kt index 5dac6b5e5..d349ede10 100644 --- a/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/domain/ResourceDictionary.kt +++ b/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/domain/ResourceDictionary.kt @@ -24,15 +24,15 @@ import org.springframework.data.annotation.LastModifiedDate import org.springframework.data.jpa.domain.support.AuditingEntityListener import java.io.Serializable import java.util.Date -import javax.persistence.Column -import javax.persistence.Convert -import javax.persistence.Entity -import javax.persistence.EntityListeners -import javax.persistence.Id -import javax.persistence.Lob -import javax.persistence.Table -import javax.persistence.Temporal -import javax.persistence.TemporalType +import jakarta.persistence.Column +import jakarta.persistence.Convert +import jakarta.persistence.Entity +import jakarta.persistence.EntityListeners +import jakarta.persistence.Id +import jakarta.persistence.Lob +import jakarta.persistence.Table +import jakarta.persistence.Temporal +import jakarta.persistence.TemporalType /** * Provide ResourceDictionary Entity @@ -65,17 +65,16 @@ class ResourceDictionary : Serializable { @Lob @Convert(converter = JpaResourceDefinitionConverter::class) - @Column(name = "definition", nullable = false) + @Column(name = "definition", nullable = false, columnDefinition = "LONGTEXT") @ApiModelProperty(value = "Definition", required = true) lateinit var definition: ResourceDefinition @Lob - @Column(name = "description", nullable = false) + @Column(name = "description", nullable = false, columnDefinition = "LONGTEXT") @ApiModelProperty(value = "Description", required = true, example = "\"demo_artifacts_version\"") lateinit var description: String - @Lob - @Column(name = "tags", nullable = false) + @Column(name = "tags", nullable = false, columnDefinition = "LONGTEXT") @ApiModelProperty(value = "Tags", required = true, example = "\"hostname\"") lateinit var tags: String diff --git a/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/repository/ModelTypeReactRepository.kt b/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/repository/ModelTypeReactRepository.kt index 80aa6b49a..1a6b93635 100644 --- a/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/repository/ModelTypeReactRepository.kt +++ b/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/repository/ModelTypeReactRepository.kt @@ -41,32 +41,32 @@ open class ModelTypeReactRepository(private val modelTypeRepository: ModelTypeRe fun findByModelNameIn(modelNames: List): Flux { return Flux.fromIterable(modelTypeRepository.findByModelNameIn(modelNames)) - .subscribeOn(Schedulers.elastic()) + .subscribeOn(Schedulers.boundedElastic()) } fun findByDerivedFrom(derivedFrom: String): Flux { return Flux.fromIterable(modelTypeRepository.findByDerivedFrom(derivedFrom)) - .subscribeOn(Schedulers.elastic()) + .subscribeOn(Schedulers.boundedElastic()) } fun findByDerivedFromIn(derivedFroms: List): Flux { return Flux.fromIterable(modelTypeRepository.findByDerivedFromIn(derivedFroms)) - .subscribeOn(Schedulers.elastic()) + .subscribeOn(Schedulers.boundedElastic()) } fun findByDefinitionType(definitionType: String): Flux { return Flux.fromIterable(modelTypeRepository.findByDefinitionType(definitionType)) - .subscribeOn(Schedulers.elastic()) + .subscribeOn(Schedulers.boundedElastic()) } fun findByDefinitionTypeIn(definitionTypes: List): Flux { return Flux.fromIterable(modelTypeRepository.findByDefinitionTypeIn(definitionTypes)) - .subscribeOn(Schedulers.elastic()) + .subscribeOn(Schedulers.boundedElastic()) } fun findByTagsContainingIgnoreCase(tags: String): Flux { return Flux.fromIterable(modelTypeRepository.findByTagsContainingIgnoreCase(tags)) - .subscribeOn(Schedulers.elastic()) + .subscribeOn(Schedulers.boundedElastic()) } fun deleteByModelName(modelName: String): Mono { diff --git a/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/repository/ModelTypeRepository.kt b/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/repository/ModelTypeRepository.kt index 8beea7161..827726abc 100644 --- a/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/repository/ModelTypeRepository.kt +++ b/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/repository/ModelTypeRepository.kt @@ -19,7 +19,7 @@ package org.onap.ccsdk.cds.blueprintsprocessor.designer.api.repository import org.onap.ccsdk.cds.blueprintsprocessor.designer.api.domain.ModelType import org.springframework.data.jpa.repository.JpaRepository import org.springframework.stereotype.Repository -import javax.transaction.Transactional +import jakarta.transaction.Transactional @Repository interface ModelTypeRepository : JpaRepository { diff --git a/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/repository/ResourceDictionaryRepository.kt b/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/repository/ResourceDictionaryRepository.kt index e44e4e8c7..0ded74044 100644 --- a/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/repository/ResourceDictionaryRepository.kt +++ b/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/repository/ResourceDictionaryRepository.kt @@ -20,7 +20,7 @@ import org.onap.ccsdk.cds.blueprintsprocessor.designer.api.domain.ResourceDictio import org.springframework.data.jpa.repository.JpaRepository import org.springframework.data.jpa.repository.Query import org.springframework.stereotype.Repository -import javax.transaction.Transactional +import jakarta.transaction.Transactional /** * ResourceMappingRepository.java Purpose: Provide Configuration Generator ResourceMappingRepository diff --git a/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/service/ApplicationRegistrationService.kt b/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/service/ApplicationRegistrationService.kt index 59a80cc02..f9c169a5c 100644 --- a/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/service/ApplicationRegistrationService.kt +++ b/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/service/ApplicationRegistrationService.kt @@ -21,7 +21,7 @@ import org.onap.ccsdk.cds.controllerblueprints.resource.dict.factory.ResourceSou import org.slf4j.LoggerFactory import org.springframework.beans.factory.annotation.Value import org.springframework.stereotype.Component -import javax.annotation.PostConstruct +import jakarta.annotation.PostConstruct @Component class ApplicationRegistrationService { diff --git a/ms/blueprintsprocessor/modules/inbounds/designer-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/BlueprintModelControllerTest.kt b/ms/blueprintsprocessor/modules/inbounds/designer-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/BlueprintModelControllerTest.kt index a42ac05e7..7e37d4f5f 100644 --- a/ms/blueprintsprocessor/modules/inbounds/designer-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/BlueprintModelControllerTest.kt +++ b/ms/blueprintsprocessor/modules/inbounds/designer-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/BlueprintModelControllerTest.kt @@ -45,7 +45,7 @@ import org.springframework.test.context.TestPropertySource import org.springframework.test.context.junit4.SpringRunner import org.springframework.test.web.reactive.server.WebTestClient import org.springframework.test.web.reactive.server.returnResult -import org.springframework.util.Base64Utils +import java.util.Base64 import org.springframework.web.reactive.function.BodyInserters import java.io.File import java.nio.charset.StandardCharsets.UTF_8 @@ -247,7 +247,7 @@ class BlueprintModelControllerTest { webTestClient.delete().uri("/api/v1/blueprint-model/name/${bp!!.artifactName}/version/${bp!!.artifactVersion}") .header( "Authorization", - "Basic " + Base64Utils + "Basic " + Base64.getEncoder() .encodeToString(("ccsdkapps" + ":" + "ccsdkapps").toByteArray(UTF_8)) ) .exchange() @@ -263,12 +263,12 @@ class BlueprintModelControllerTest { setParam: Boolean ) { - log.info("Requesting($uri): Method(${requestMethod.name})") + log.info("Requesting($uri): Method(${requestMethod.name()})") webTestClient.method(requestMethod).uri(uri) .header( "Authorization", - "Basic " + Base64Utils + "Basic " + Base64.getEncoder() .encodeToString(("ccsdkapps" + ":" + "ccsdkapps").toByteArray(UTF_8)) ) .body(body) diff --git a/ms/blueprintsprocessor/modules/inbounds/health-api-common/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/healthapi/service/EndPointExecution.kt b/ms/blueprintsprocessor/modules/inbounds/health-api-common/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/healthapi/service/EndPointExecution.kt index 9f526251e..cfee72507 100644 --- a/ms/blueprintsprocessor/modules/inbounds/health-api-common/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/healthapi/service/EndPointExecution.kt +++ b/ms/blueprintsprocessor/modules/inbounds/health-api-common/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/healthapi/service/EndPointExecution.kt @@ -44,7 +44,7 @@ open class EndPointExecution( open fun retrieveWebClientResponse(serviceEndpoint: ServiceEndpoint): WebClientEnpointResponse? { try { addClientPropertiesConfiguration(serviceEndpoint) - val result = basicAuthRestClientService.exchangeResource(HttpMethod.GET.name, "", "") + val result = basicAuthRestClientService.exchangeResource(HttpMethod.GET.name(), "", "") if (result.status == 200) return WebClientEnpointResponse(result) } catch (e: Exception) { diff --git a/ms/blueprintsprocessor/modules/inbounds/pom.xml b/ms/blueprintsprocessor/modules/inbounds/pom.xml index c02aea3c3..87b55294a 100644 --- a/ms/blueprintsprocessor/modules/inbounds/pom.xml +++ b/ms/blueprintsprocessor/modules/inbounds/pom.xml @@ -44,7 +44,7 @@ org.springframework.security spring-security-core - 6.3.0 + 6.4.6 org.onap.ccsdk.cds.blueprintsprocessor.modules @@ -94,6 +94,7 @@ io.grpc grpc-testing + ${grpc.version} test diff --git a/ms/blueprintsprocessor/modules/inbounds/resource-api/pom.xml b/ms/blueprintsprocessor/modules/inbounds/resource-api/pom.xml index d0a6e15bf..9c313d070 100644 --- a/ms/blueprintsprocessor/modules/inbounds/resource-api/pom.xml +++ b/ms/blueprintsprocessor/modules/inbounds/resource-api/pom.xml @@ -34,7 +34,7 @@ org.springframework.security spring-security-core - 6.3.0 + 6.4.6 org.onap.ccsdk.cds.blueprintsprocessor.modules diff --git a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/pom.xml b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/pom.xml index 2aa17d6b5..cf72243cb 100755 --- a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/pom.xml +++ b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/pom.xml @@ -63,7 +63,7 @@ org.springframework.kafka spring-kafka - 2.9.13 + ${spring-kafka.version} org.slf4j @@ -79,7 +79,7 @@ org.apache.zookeeper zookeeper - 3.9.2 + 3.9.3 org.scala-lang @@ -91,6 +91,11 @@ spring-kafka-test test + + commons-beanutils + commons-beanutils + 1.11.0 + diff --git a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/BluePrintProcessingGRPCHandler.kt b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/BluePrintProcessingGRPCHandler.kt index c722173ec..97d6f0dee 100644 --- a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/BluePrintProcessingGRPCHandler.kt +++ b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/BluePrintProcessingGRPCHandler.kt @@ -35,7 +35,7 @@ import org.slf4j.LoggerFactory import org.springframework.security.access.prepost.PreAuthorize import org.springframework.stereotype.Service import java.util.concurrent.Phaser -import javax.annotation.PreDestroy +import jakarta.annotation.PreDestroy @Service open class BluePrintProcessingGRPCHandler( diff --git a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/BluePrintProcessingKafkaConsumer.kt b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/BluePrintProcessingKafkaConsumer.kt index 0b5d568d4..5ee8082d7 100644 --- a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/BluePrintProcessingKafkaConsumer.kt +++ b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/BluePrintProcessingKafkaConsumer.kt @@ -39,7 +39,7 @@ import org.springframework.stereotype.Service import java.nio.charset.Charset import java.util.UUID import java.util.concurrent.Phaser -import javax.annotation.PreDestroy +import jakarta.annotation.PreDestroy @ConditionalOnProperty( name = ["blueprintsprocessor.messageconsumer.self-service-api.kafkaEnable"], diff --git a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/ExecutionServiceController.kt b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/ExecutionServiceController.kt index 7c0672f65..fe541fea3 100644 --- a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/ExecutionServiceController.kt +++ b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/ExecutionServiceController.kt @@ -45,7 +45,7 @@ import org.springframework.web.bind.annotation.RequestParam import org.springframework.web.bind.annotation.ResponseBody import org.springframework.web.bind.annotation.RestController import java.util.concurrent.Phaser -import javax.annotation.PreDestroy +import jakarta.annotation.PreDestroy @RestController @RequestMapping("/api/v1/execution-service") diff --git a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/KafkaPublishAuditService.kt b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/KafkaPublishAuditService.kt index ce407bc8c..a5025aef2 100644 --- a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/KafkaPublishAuditService.kt +++ b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/KafkaPublishAuditService.kt @@ -38,7 +38,7 @@ import org.onap.ccsdk.cds.controllerblueprints.resource.dict.ResourceAssignment import org.slf4j.LoggerFactory import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty import org.springframework.stereotype.Service -import javax.annotation.PostConstruct +import jakarta.annotation.PostConstruct /** * Audit service used to produce execution service input and output message diff --git a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/NoPublishAuditService.kt b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/NoPublishAuditService.kt index aea9b7bc2..c5fcba165 100644 --- a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/NoPublishAuditService.kt +++ b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/NoPublishAuditService.kt @@ -20,7 +20,7 @@ import org.onap.ccsdk.cds.blueprintsprocessor.core.api.data.ExecutionServiceOutp import org.onap.ccsdk.cds.controllerblueprints.core.logger import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty import org.springframework.stereotype.Service -import javax.annotation.PostConstruct +import jakarta.annotation.PostConstruct /** * Default audit service when no audit publisher is defined, message aren't sent diff --git a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/BluePrintProcessingGRPCHandlerTest.kt b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/BluePrintProcessingGRPCHandlerTest.kt index 0d79368ad..e9480b3d4 100644 --- a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/BluePrintProcessingGRPCHandlerTest.kt +++ b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/BluePrintProcessingGRPCHandlerTest.kt @@ -21,7 +21,7 @@ package org.onap.ccsdk.cds.blueprintsprocessor.selfservice.api import com.google.protobuf.util.JsonFormat import io.grpc.stub.StreamObserver import io.grpc.testing.GrpcServerRule -import io.micrometer.core.instrument.MeterRegistry +import io.micrometer.core.instrument.simple.SimpleMeterRegistry import org.junit.Assert import org.junit.Rule import org.junit.Test @@ -34,7 +34,6 @@ import org.onap.ccsdk.cds.controllerblueprints.processing.api.ExecutionServiceIn import org.onap.ccsdk.cds.controllerblueprints.processing.api.ExecutionServiceOutput import org.slf4j.LoggerFactory import org.springframework.beans.factory.annotation.Autowired -import org.springframework.boot.test.mock.mockito.MockBean import org.springframework.test.annotation.DirtiesContext import org.springframework.test.context.ContextConfiguration import org.springframework.test.context.TestPropertySource @@ -46,7 +45,7 @@ import kotlin.test.BeforeTest @ContextConfiguration( classes = [ SelfServiceApiTestConfiguration::class, TestDatabaseConfiguration::class, - ErrorCatalogTestConfiguration::class + ErrorCatalogTestConfiguration::class, SimpleMeterRegistry::class, ] ) @TestPropertySource(locations = ["classpath:application-test.properties"]) @@ -54,9 +53,6 @@ class BluePrintProcessingGRPCHandlerTest { private val log = LoggerFactory.getLogger(BluePrintProcessingGRPCHandlerTest::class.java) - @MockBean - lateinit var meterRegistry: MeterRegistry - @get:Rule val grpcServerRule = GrpcServerRule().directExecutor() diff --git a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/BluePrintProcessingKafkaConsumerTest.kt b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/BluePrintProcessingKafkaConsumerTest.kt index 9143d7358..cd6e5ff74 100644 --- a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/BluePrintProcessingKafkaConsumerTest.kt +++ b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/BluePrintProcessingKafkaConsumerTest.kt @@ -18,6 +18,7 @@ package org.onap.ccsdk.cds.blueprintsprocessor.selfservice.api import io.micrometer.core.instrument.MeterRegistry +import io.micrometer.core.instrument.simple.SimpleMeterRegistry import io.mockk.coEvery import io.mockk.mockk import kotlinx.coroutines.delay @@ -29,7 +30,6 @@ import org.onap.ccsdk.cds.blueprintsprocessor.core.BluePrintPropertyConfiguratio import org.onap.ccsdk.cds.blueprintsprocessor.message.BluePrintMessageLibConfiguration import org.onap.ccsdk.cds.blueprintsprocessor.message.service.BluePrintMessageLibPropertyService import org.springframework.beans.factory.annotation.Autowired -import org.springframework.boot.test.mock.mockito.MockBean import org.springframework.test.context.ContextConfiguration import org.springframework.test.context.TestPropertySource import org.springframework.test.context.junit4.SpringRunner @@ -40,13 +40,14 @@ import kotlin.test.assertNotNull @ContextConfiguration( classes = [ BluePrintMessageLibConfiguration::class, SelfServiceApiTestConfiguration::class, - BluePrintPropertyConfiguration::class, BluePrintPropertiesService::class, ErrorCatalogTestConfiguration::class + BluePrintPropertyConfiguration::class, BluePrintPropertiesService::class, ErrorCatalogTestConfiguration::class, + SimpleMeterRegistry::class, ] ) @TestPropertySource(locations = ["classpath:application-test.properties"]) class BluePrintProcessingKafkaConsumerTest { - @MockBean + @Autowired lateinit var meterRegistry: MeterRegistry @Autowired diff --git a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/ExecutionServiceHandlerTest.kt b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/ExecutionServiceHandlerTest.kt index af3cbd89a..d18e2388f 100644 --- a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/ExecutionServiceHandlerTest.kt +++ b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/ExecutionServiceHandlerTest.kt @@ -19,10 +19,10 @@ package org.onap.ccsdk.cds.blueprintsprocessor.selfservice.api import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.databind.node.ObjectNode import io.micrometer.core.instrument.MeterRegistry +import io.micrometer.core.instrument.simple.SimpleMeterRegistry import io.mockk.coVerify import io.mockk.Runs import io.mockk.coEvery -import io.mockk.coVerify import io.mockk.every import io.mockk.just import io.mockk.mockk @@ -41,7 +41,6 @@ import org.onap.ccsdk.cds.controllerblueprints.core.jsonAsJsonType import org.onap.ccsdk.cds.controllerblueprints.core.service.BluePrintDependencyService import org.onap.ccsdk.cds.controllerblueprints.core.utils.JacksonUtils import org.springframework.beans.factory.annotation.Autowired -import org.springframework.boot.test.mock.mockito.MockBean import org.springframework.context.ApplicationContext import org.springframework.stereotype.Service import org.springframework.test.context.ContextConfiguration @@ -55,13 +54,13 @@ import kotlin.test.assertTrue @ContextConfiguration( classes = [ MockServiceAction::class, SelfServiceApiTestConfiguration::class, - ErrorCatalogTestConfiguration::class + ErrorCatalogTestConfiguration::class, SimpleMeterRegistry::class ] ) @TestPropertySource(locations = ["classpath:application-test.properties"]) class ExecutionServiceHandlerTest { - @MockBean + @Autowired lateinit var meterRegistry: MeterRegistry @Autowired diff --git a/ms/blueprintsprocessor/modules/inbounds/workflow-api/pom.xml b/ms/blueprintsprocessor/modules/inbounds/workflow-api/pom.xml index 2f56cb94d..99b329f8f 100644 --- a/ms/blueprintsprocessor/modules/inbounds/workflow-api/pom.xml +++ b/ms/blueprintsprocessor/modules/inbounds/workflow-api/pom.xml @@ -34,7 +34,7 @@ org.springframework.security spring-security-core - 6.3.0 + 6.4.6 org.onap.ccsdk.cds.blueprintsprocessor.modules diff --git a/ms/blueprintsprocessor/modules/services/execution-service/pom.xml b/ms/blueprintsprocessor/modules/services/execution-service/pom.xml index 4b0302c10..4c2d96e57 100644 --- a/ms/blueprintsprocessor/modules/services/execution-service/pom.xml +++ b/ms/blueprintsprocessor/modules/services/execution-service/pom.xml @@ -67,6 +67,7 @@ io.grpc grpc-testing + ${grpc.version} diff --git a/ms/blueprintsprocessor/modules/services/workflow-service/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/services/workflow/BlueprintSvcLogicService.kt b/ms/blueprintsprocessor/modules/services/workflow-service/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/services/workflow/BlueprintSvcLogicService.kt index 4efe9f12d..eab588d77 100644 --- a/ms/blueprintsprocessor/modules/services/workflow-service/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/services/workflow/BlueprintSvcLogicService.kt +++ b/ms/blueprintsprocessor/modules/services/workflow-service/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/services/workflow/BlueprintSvcLogicService.kt @@ -37,7 +37,7 @@ import org.springframework.beans.factory.annotation.Autowired import org.springframework.context.ApplicationContext import org.springframework.stereotype.Service import java.util.Properties -import javax.annotation.PostConstruct +import jakarta.annotation.PostConstruct interface BlueprintSvcLogicService : SvcLogicServiceBase { diff --git a/ms/blueprintsprocessor/parent/pom.xml b/ms/blueprintsprocessor/parent/pom.xml index 2bc1f0fa1..6a167633c 100755 --- a/ms/blueprintsprocessor/parent/pom.xml +++ b/ms/blueprintsprocessor/parent/pom.xml @@ -36,14 +36,13 @@ 3.0.0 1.0.0 1.2.2 - 4.2.5 + 5.0-BETA-1 1.4.197 1.7.4 5.13.0 2.8.0 2.6.3 - 1.14.17 2.10.0 0.1.55 @@ -54,8 +53,8 @@ 1.9 2.4.9 - 2.8.0 - 1.24.0 + 2.14.0 + 1.26.0 4.4 @@ -168,7 +167,7 @@ org.jetbrains.kotlin kotlin-script-util - ${kotlin.version} + 1.8.22 org.jetbrains.kotlin @@ -195,11 +194,6 @@ kroto-plus-coroutines ${kroto-plus.version} - - io.netty - netty-tcnative-boringssl-static - ${netty-ssl} - @@ -223,7 +217,7 @@ org.springframework.security spring-security-core - 6.3.0 + 6.4.6 @@ -246,7 +240,7 @@ org.apache.kafka kafka-clients - 3.8.0 + 3.9.1 org.apache.kafka @@ -513,10 +507,6 @@ net.bytebuddy byte-buddy - - net.bytebuddy - byte-buddy - @@ -529,10 +519,6 @@ net.bytebuddy byte-buddy - - net.bytebuddy - byte-buddy - @@ -604,6 +590,7 @@ commons-io commons-io + 2.14.0 com.jayway.jsonpath @@ -630,6 +617,12 @@ io.springfox springfox-boot-starter + + + net.bytebuddy + byte-buddy + + org.jetbrains.kotlin @@ -638,6 +631,7 @@ org.jetbrains.kotlin kotlin-script-util + 1.8.22 org.jetbrains.kotlinx @@ -672,21 +666,30 @@ io.grpc grpc-netty + + io.grpc + grpc-api + ${grpc.version} + io.grpc grpc-protobuf + ${grpc.version} io.grpc grpc-stub + ${grpc.version} io.grpc grpc-netty-shaded + ${grpc.version} io.grpc grpc-grpclb + ${grpc.version} com.google.protobuf @@ -696,16 +699,13 @@ com.google.protobuf protobuf-java-util - - - io.netty - netty-tcnative-boringssl-static + ${protobuff.java.utils.version} - javax.annotation - javax.annotation-api - ${javax-annotation.version} + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation.version} org.onap.ccsdk.cds.error.catalog diff --git a/ms/error-catalog/core/pom.xml b/ms/error-catalog/core/pom.xml index f4a40093a..e97791194 100644 --- a/ms/error-catalog/core/pom.xml +++ b/ms/error-catalog/core/pom.xml @@ -47,8 +47,8 @@ commons-lang3 - javax.persistence - javax.persistence-api + jakarta.persistence + jakarta.persistence-api diff --git a/ms/error-catalog/pom.xml b/ms/error-catalog/pom.xml index 59859a080..f6ab5064c 100644 --- a/ms/error-catalog/pom.xml +++ b/ms/error-catalog/pom.xml @@ -84,6 +84,16 @@ junit-vintage-engine test + + net.bytebuddy + byte-buddy + ${bytebuddy.version} + + + net.bytebuddy + byte-buddy-agent + ${bytebuddy.version} + diff --git a/ms/error-catalog/services/pom.xml b/ms/error-catalog/services/pom.xml index c3fef9448..125574b28 100644 --- a/ms/error-catalog/services/pom.xml +++ b/ms/error-catalog/services/pom.xml @@ -65,6 +65,7 @@ org.jetbrains.kotlin kotlin-script-util + 1.8.22 diff --git a/ms/error-catalog/services/src/main/kotlin/org/onap/ccsdk/cds/error/catalog/services/ErrorCatalogService.kt b/ms/error-catalog/services/src/main/kotlin/org/onap/ccsdk/cds/error/catalog/services/ErrorCatalogService.kt index 298daa6fc..6538859d7 100644 --- a/ms/error-catalog/services/src/main/kotlin/org/onap/ccsdk/cds/error/catalog/services/ErrorCatalogService.kt +++ b/ms/error-catalog/services/src/main/kotlin/org/onap/ccsdk/cds/error/catalog/services/ErrorCatalogService.kt @@ -28,8 +28,7 @@ import org.onap.ccsdk.cds.error.catalog.core.HttpErrorCodes import org.onap.ccsdk.cds.error.catalog.core.utils.ErrorCatalogUtils import org.springframework.boot.autoconfigure.condition.ConditionalOnBean import org.springframework.stereotype.Service -import javax.annotation.PostConstruct - +import jakarta.annotation.PostConstruct @Service @ConditionalOnBean(ErrorCatalogLoadService::class) open class ErrorCatalogService(private var errorCatalogLoadService: ErrorCatalogLoadService) { diff --git a/ms/error-catalog/services/src/main/kotlin/org/onap/ccsdk/cds/error/catalog/services/domain/Domain.kt b/ms/error-catalog/services/src/main/kotlin/org/onap/ccsdk/cds/error/catalog/services/domain/Domain.kt index 7216c0585..b0e836b99 100755 --- a/ms/error-catalog/services/src/main/kotlin/org/onap/ccsdk/cds/error/catalog/services/domain/Domain.kt +++ b/ms/error-catalog/services/src/main/kotlin/org/onap/ccsdk/cds/error/catalog/services/domain/Domain.kt @@ -18,17 +18,17 @@ package org.onap.ccsdk.cds.error.catalog.services.domain import java.io.Serializable import java.util.UUID -import javax.persistence.CascadeType -import javax.persistence.Column -import javax.persistence.Entity -import javax.persistence.FetchType -import javax.persistence.Id -import javax.persistence.JoinColumn -import javax.persistence.JoinTable -import javax.persistence.Lob -import javax.persistence.ManyToMany -import javax.persistence.Table -import javax.persistence.UniqueConstraint +import jakarta.persistence.CascadeType +import jakarta.persistence.Column +import jakarta.persistence.Entity +import jakarta.persistence.FetchType +import jakarta.persistence.Id +import jakarta.persistence.JoinColumn +import jakarta.persistence.JoinTable +import jakarta.persistence.Lob +import jakarta.persistence.ManyToMany +import jakarta.persistence.Table +import jakarta.persistence.UniqueConstraint /** * Provide ErrorCode Entity @@ -51,7 +51,7 @@ class Domain : Serializable { lateinit var applicationId: String @Lob - @Column(name = "description") + @Column(name = "description", columnDefinition = "LONGTEXT") var description: String = "" @ManyToMany(fetch = FetchType.EAGER, cascade = [CascadeType.ALL]) diff --git a/ms/error-catalog/services/src/main/kotlin/org/onap/ccsdk/cds/error/catalog/services/domain/ErrorMessageModel.kt b/ms/error-catalog/services/src/main/kotlin/org/onap/ccsdk/cds/error/catalog/services/domain/ErrorMessageModel.kt index f2556e6c1..2f7f105ab 100644 --- a/ms/error-catalog/services/src/main/kotlin/org/onap/ccsdk/cds/error/catalog/services/domain/ErrorMessageModel.kt +++ b/ms/error-catalog/services/src/main/kotlin/org/onap/ccsdk/cds/error/catalog/services/domain/ErrorMessageModel.kt @@ -18,15 +18,15 @@ package org.onap.ccsdk.cds.error.catalog.services.domain import java.io.Serializable import java.util.UUID -import javax.persistence.CascadeType -import javax.persistence.Column -import javax.persistence.Entity -import javax.persistence.FetchType -import javax.persistence.Id -import javax.persistence.Lob -import javax.persistence.ManyToMany -import javax.persistence.Table -import javax.persistence.UniqueConstraint +import jakarta.persistence.CascadeType +import jakarta.persistence.Column +import jakarta.persistence.Entity +import jakarta.persistence.FetchType +import jakarta.persistence.Id +import jakarta.persistence.Lob +import jakarta.persistence.ManyToMany +import jakarta.persistence.Table +import jakarta.persistence.UniqueConstraint /** * Provide Error Message Model Entity @@ -45,11 +45,11 @@ class ErrorMessageModel : Serializable { lateinit var messageID: String @Lob - @Column(name = "cause") + @Column(name = "cause", columnDefinition = "LONGTEXT") var cause: String = "" @Lob - @Column(name = "action") + @Column(name = "action", columnDefinition = "LONGTEXT") lateinit var action: String @ManyToMany(mappedBy = "errorMessages", fetch = FetchType.EAGER, cascade = [CascadeType.PERSIST]) diff --git a/ms/pom.xml b/ms/pom.xml index 858bae81e..a197d7e3e 100644 --- a/ms/pom.xml +++ b/ms/pom.xml @@ -48,7 +48,7 @@ org.springframework.kafka spring-kafka - 2.9.13 + ${spring-kafka.version} diff --git a/ms/sdclistener/application/pom.xml b/ms/sdclistener/application/pom.xml index 2a7bccb6b..a6224ca88 100644 --- a/ms/sdclistener/application/pom.xml +++ b/ms/sdclistener/application/pom.xml @@ -31,7 +31,7 @@ MS SDC Listener - Application - 3.6.1 + 3.25.8 ${project.parent.version} @@ -91,34 +91,47 @@ io.grpc grpc-netty + ${grpc.version} + + + io.grpc + grpc-api + ${grpc.version} io.grpc grpc-protobuf + ${grpc.version} io.grpc grpc-stub + ${grpc.version} io.grpc grpc-netty-shaded + ${grpc.version} io.grpc grpc-grpclb + ${grpc.version} com.google.protobuf protobuf-java + 3.25.8 com.google.protobuf protobuf-java-util + 3.25.8 io.grpc grpc-testing + ${grpc.version} test @@ -127,8 +140,13 @@ ch.qos.logback - logback-classic - 1.2.13 + logback-core + 1.5.18 + + + net.logstash.logback + logstash-logback-encoder + 7.4 com.github.stefanbirkner diff --git a/ms/sdclistener/parent/pom.xml b/ms/sdclistener/parent/pom.xml index bcfc70d4a..1c5af7878 100755 --- a/ms/sdclistener/parent/pom.xml +++ b/ms/sdclistener/parent/pom.xml @@ -70,17 +70,17 @@ commons-io commons-io - 2.6 + 2.14.0 org.apache.commons commons-compress - 1.24.0 + 1.26.0 org.springframework.security spring-security-core - 6.3.0 + 6.4.6 com.google.guava @@ -99,6 +99,11 @@ grpc-netty ${grpc.version} + + io.grpc + grpc-api + ${grpc.version} + io.grpc grpc-protobuf @@ -169,7 +174,7 @@ org.apache.kafka kafka-clients - 3.8.0 + 3.9.1 org.json @@ -179,7 +184,7 @@ org.springframework.kafka spring-kafka - 2.9.13 + ${spring-kafka.version} org.apache.commons diff --git a/ms/sdclistener/pom.xml b/ms/sdclistener/pom.xml index 2d11e03d9..5dcdc4962 100644 --- a/ms/sdclistener/pom.xml +++ b/ms/sdclistener/pom.xml @@ -40,4 +40,17 @@ sdclistener + + + + net.bytebuddy + byte-buddy + ${bytebuddy.version} + + + net.bytebuddy + byte-buddy-agent + ${bytebuddy.version} + + diff --git a/pom.xml b/pom.xml index 78a6c554a..51c78f0c7 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ limitations under the License. org.onap.ccsdk.parent - spring-boot-27-jdk-17-starter-parent + spring-boot-35-starter-parent 3.2.0 @@ -77,16 +77,17 @@ limitations under the License. 1.5.2 ${project.version} - 1.7.0 - 1.7.0 - 1.7.0 + 1.9.0 + 1.9.0 + 1.9.0 1.11.0 4.5.14 + 1.14.17 1.29.0 - 2.0.66.Final - 3.21.7 - 3.21.7 + 2.0.70.Final + 3.25.8 + 3.25.8 1.13.12 @@ -94,8 +95,13 @@ limitations under the License. ch.qos.logback - logback-classic - 1.2.13 + logback-core + 1.5.18 + + + net.logstash.logback + logstash-logback-encoder + 7.4 com.squareup.okio @@ -115,7 +121,7 @@ limitations under the License. org.apache.kafka kafka-clients - 3.8.0 + 3.9.1 org.jsoup