From 45263f50896a7021cd17d78ce83b29365cb19c29 Mon Sep 17 00:00:00 2001 From: Jozsef Csongvai Date: Mon, 26 Jul 2021 12:00:59 -0400 Subject: Revert "Renaming Files having BluePrint to have Blueprint" The renaming in CCSDK-3098 caused breaking changes to the grpc api and compile issues for kotlin scripts. Issue-ID: CCSDK-3385 Change-Id: I0d745cb858371678eabcb2284671c1fd76a1ab6d Signed-off-by: Jozsef Csongvai --- .../proto-definition/proto/BluePrintCommon.proto | 41 ++++++++++++ .../proto/BluePrintManagement.proto | 76 ++++++++++++++++++++++ .../proto/BluePrintProcessing.proto | 24 +++++++ .../proto-definition/proto/BlueprintCommon.proto | 41 ------------ .../proto/BlueprintManagement.proto | 76 ---------------------- .../proto/BlueprintProcessing.proto | 24 ------- 6 files changed, 141 insertions(+), 141 deletions(-) create mode 100644 components/model-catalog/proto-definition/proto/BluePrintCommon.proto create mode 100644 components/model-catalog/proto-definition/proto/BluePrintManagement.proto create mode 100644 components/model-catalog/proto-definition/proto/BluePrintProcessing.proto delete mode 100644 components/model-catalog/proto-definition/proto/BlueprintCommon.proto delete mode 100644 components/model-catalog/proto-definition/proto/BlueprintManagement.proto delete mode 100644 components/model-catalog/proto-definition/proto/BlueprintProcessing.proto (limited to 'components/model-catalog/proto-definition/proto') diff --git a/components/model-catalog/proto-definition/proto/BluePrintCommon.proto b/components/model-catalog/proto-definition/proto/BluePrintCommon.proto new file mode 100644 index 000000000..ce90929dc --- /dev/null +++ b/components/model-catalog/proto-definition/proto/BluePrintCommon.proto @@ -0,0 +1,41 @@ +syntax = "proto3"; +option java_multiple_files = true; +package org.onap.ccsdk.cds.controllerblueprints.common.api; + +message CommonHeader { + string timestamp = 1; + string originatorId = 23; + string requestId = 3; + string subRequestId = 4; + Flag flag = 5; +} + +message Flag { + bool isForce = 1; + int32 ttl = 2; +} + +message ActionIdentifiers { + string blueprintName = 1; + string blueprintVersion = 2; + string actionName = 3; + string mode = 4; +} + +message Status { + int32 code = 1; + // present only if message is failure + string errorMessage = 2; + // This will be success or failure + string message = 3; + EventType eventType = 4; + string timestamp = 5; +} + +enum EventType { + EVENT_COMPONENT_FAILURE = 0; + EVENT_COMPONENT_PROCESSING = 1; + EVENT_COMPONENT_NOTIFICATION = 2; + EVENT_COMPONENT_EXECUTED = 3; + EVENT_COMPONENT_TRACE = 4; +} \ No newline at end of file diff --git a/components/model-catalog/proto-definition/proto/BluePrintManagement.proto b/components/model-catalog/proto-definition/proto/BluePrintManagement.proto new file mode 100644 index 000000000..a363e8ade --- /dev/null +++ b/components/model-catalog/proto-definition/proto/BluePrintManagement.proto @@ -0,0 +1,76 @@ +syntax = "proto3"; +import "google/protobuf/struct.proto"; +import "BluePrintCommon.proto"; +option java_multiple_files = true; +package org.onap.ccsdk.cds.controllerblueprints.management.api; + +message BluePrintUploadInput { + org.onap.ccsdk.cds.controllerblueprints.common.api.CommonHeader commonHeader = 1; + FileChunk fileChunk = 2; + org.onap.ccsdk.cds.controllerblueprints.common.api.ActionIdentifiers actionIdentifiers = 3; + // Extra optional dynamic properties used during upload. + google.protobuf.Struct properties = 4; +} + +message BluePrintDownloadInput { + org.onap.ccsdk.cds.controllerblueprints.common.api.CommonHeader commonHeader = 1; + org.onap.ccsdk.cds.controllerblueprints.common.api.ActionIdentifiers actionIdentifiers = 2; + // Extra optional dynamic properties used to download. + google.protobuf.Struct properties = 3; +} + +message BluePrintRemoveInput { + org.onap.ccsdk.cds.controllerblueprints.common.api.CommonHeader commonHeader = 1; + org.onap.ccsdk.cds.controllerblueprints.common.api.ActionIdentifiers actionIdentifiers = 2; + // Extra optional dynamic properties used to remove. + google.protobuf.Struct properties = 3; +} + +message BluePrintBootstrapInput { + org.onap.ccsdk.cds.controllerblueprints.common.api.CommonHeader commonHeader = 1; + bool loadCBA = 2; + bool loadModelType = 3; + bool loadResourceDictionary = 4; +} + +message BluePrintManagementOutput { + org.onap.ccsdk.cds.controllerblueprints.common.api.CommonHeader commonHeader = 1; + // Optional file chunk sent back to the client for Enrich and Download this is mandatory. + FileChunk fileChunk = 2; + org.onap.ccsdk.cds.controllerblueprints.common.api.Status status = 3; + // Extra optional dynamic properties. + google.protobuf.Struct properties = 4; +} + +message FileChunk { + bytes chunk = 1; +} +// Values used in BluePrintDownloadInput/actionIdentifiers/action +enum DownloadAction { + // Default is SEARCH the cba and download the cba + SEARCH = 0; + // Download the starter cba with corresponding property options + STARTER = 1; + // clone cba with corresponding property options + CLONE = 2; +} + +enum UploadAction { + // Default is DRAFT + DRAFT = 0; + ENRICH = 1; + VALIDATE = 2; + PUBLISH = 3; +} + +enum RemoveAction { + // Delete CBA from database, deploy path and clean cache. + DEFAULT = 0; +} + +service BluePrintManagementService { + rpc downloadBlueprint (BluePrintDownloadInput) returns (BluePrintManagementOutput); + rpc uploadBlueprint (BluePrintUploadInput) returns (BluePrintManagementOutput); + rpc removeBlueprint (BluePrintRemoveInput) returns (BluePrintManagementOutput); + rpc bootstrapBlueprint (BluePrintBootstrapInput) returns (BluePrintManagementOutput); +} diff --git a/components/model-catalog/proto-definition/proto/BluePrintProcessing.proto b/components/model-catalog/proto-definition/proto/BluePrintProcessing.proto new file mode 100644 index 000000000..9622287ab --- /dev/null +++ b/components/model-catalog/proto-definition/proto/BluePrintProcessing.proto @@ -0,0 +1,24 @@ +syntax = "proto3"; +import "google/protobuf/struct.proto"; +import "BluePrintCommon.proto"; +option java_multiple_files = true; +package org.onap.ccsdk.cds.controllerblueprints.processing.api; + + +message ExecutionServiceInput { + org.onap.ccsdk.cds.controllerblueprints.common.api.CommonHeader commonHeader = 1; + org.onap.ccsdk.cds.controllerblueprints.common.api.ActionIdentifiers actionIdentifiers = 2; + google.protobuf.Struct payload = 3; +} + +message ExecutionServiceOutput { + org.onap.ccsdk.cds.controllerblueprints.common.api.CommonHeader commonHeader = 1; + org.onap.ccsdk.cds.controllerblueprints.common.api.ActionIdentifiers actionIdentifiers = 2; + org.onap.ccsdk.cds.controllerblueprints.common.api.Status status = 3; + google.protobuf.Struct payload = 4; +} + + +service BluePrintProcessingService { + rpc process (stream ExecutionServiceInput) returns (stream ExecutionServiceOutput); +} diff --git a/components/model-catalog/proto-definition/proto/BlueprintCommon.proto b/components/model-catalog/proto-definition/proto/BlueprintCommon.proto deleted file mode 100644 index ce90929dc..000000000 --- a/components/model-catalog/proto-definition/proto/BlueprintCommon.proto +++ /dev/null @@ -1,41 +0,0 @@ -syntax = "proto3"; -option java_multiple_files = true; -package org.onap.ccsdk.cds.controllerblueprints.common.api; - -message CommonHeader { - string timestamp = 1; - string originatorId = 23; - string requestId = 3; - string subRequestId = 4; - Flag flag = 5; -} - -message Flag { - bool isForce = 1; - int32 ttl = 2; -} - -message ActionIdentifiers { - string blueprintName = 1; - string blueprintVersion = 2; - string actionName = 3; - string mode = 4; -} - -message Status { - int32 code = 1; - // present only if message is failure - string errorMessage = 2; - // This will be success or failure - string message = 3; - EventType eventType = 4; - string timestamp = 5; -} - -enum EventType { - EVENT_COMPONENT_FAILURE = 0; - EVENT_COMPONENT_PROCESSING = 1; - EVENT_COMPONENT_NOTIFICATION = 2; - EVENT_COMPONENT_EXECUTED = 3; - EVENT_COMPONENT_TRACE = 4; -} \ No newline at end of file diff --git a/components/model-catalog/proto-definition/proto/BlueprintManagement.proto b/components/model-catalog/proto-definition/proto/BlueprintManagement.proto deleted file mode 100644 index 3b6d43f3e..000000000 --- a/components/model-catalog/proto-definition/proto/BlueprintManagement.proto +++ /dev/null @@ -1,76 +0,0 @@ -syntax = "proto3"; -import "google/protobuf/struct.proto"; -import "BlueprintCommon.proto"; -option java_multiple_files = true; -package org.onap.ccsdk.cds.controllerblueprints.management.api; - -message BlueprintUploadInput { - org.onap.ccsdk.cds.controllerblueprints.common.api.CommonHeader commonHeader = 1; - FileChunk fileChunk = 2; - org.onap.ccsdk.cds.controllerblueprints.common.api.ActionIdentifiers actionIdentifiers = 3; - // Extra optional dynamic properties used during upload. - google.protobuf.Struct properties = 4; -} - -message BlueprintDownloadInput { - org.onap.ccsdk.cds.controllerblueprints.common.api.CommonHeader commonHeader = 1; - org.onap.ccsdk.cds.controllerblueprints.common.api.ActionIdentifiers actionIdentifiers = 2; - // Extra optional dynamic properties used to download. - google.protobuf.Struct properties = 3; -} - -message BlueprintRemoveInput { - org.onap.ccsdk.cds.controllerblueprints.common.api.CommonHeader commonHeader = 1; - org.onap.ccsdk.cds.controllerblueprints.common.api.ActionIdentifiers actionIdentifiers = 2; - // Extra optional dynamic properties used to remove. - google.protobuf.Struct properties = 3; -} - -message BlueprintBootstrapInput { - org.onap.ccsdk.cds.controllerblueprints.common.api.CommonHeader commonHeader = 1; - bool loadCBA = 2; - bool loadModelType = 3; - bool loadResourceDictionary = 4; -} - -message BlueprintManagementOutput { - org.onap.ccsdk.cds.controllerblueprints.common.api.CommonHeader commonHeader = 1; - // Optional file chunk sent back to the client for Enrich and Download this is mandatory. - FileChunk fileChunk = 2; - org.onap.ccsdk.cds.controllerblueprints.common.api.Status status = 3; - // Extra optional dynamic properties. - google.protobuf.Struct properties = 4; -} - -message FileChunk { - bytes chunk = 1; -} -// Values used in BlueprintDownloadInput/actionIdentifiers/action -enum DownloadAction { - // Default is SEARCH the cba and download the cba - SEARCH = 0; - // Download the starter cba with corresponding property options - STARTER = 1; - // clone cba with corresponding property options - CLONE = 2; -} - -enum UploadAction { - // Default is DRAFT - DRAFT = 0; - ENRICH = 1; - VALIDATE = 2; - PUBLISH = 3; -} - -enum RemoveAction { - // Delete CBA from database, deploy path and clean cache. - DEFAULT = 0; -} - -service BlueprintManagementService { - rpc downloadBlueprint (BlueprintDownloadInput) returns (BlueprintManagementOutput); - rpc uploadBlueprint (BlueprintUploadInput) returns (BlueprintManagementOutput); - rpc removeBlueprint (BlueprintRemoveInput) returns (BlueprintManagementOutput); - rpc bootstrapBlueprint (BlueprintBootstrapInput) returns (BlueprintManagementOutput); -} diff --git a/components/model-catalog/proto-definition/proto/BlueprintProcessing.proto b/components/model-catalog/proto-definition/proto/BlueprintProcessing.proto deleted file mode 100644 index 3e8bfd8c4..000000000 --- a/components/model-catalog/proto-definition/proto/BlueprintProcessing.proto +++ /dev/null @@ -1,24 +0,0 @@ -syntax = "proto3"; -import "google/protobuf/struct.proto"; -import "BlueprintCommon.proto"; -option java_multiple_files = true; -package org.onap.ccsdk.cds.controllerblueprints.processing.api; - - -message ExecutionServiceInput { - org.onap.ccsdk.cds.controllerblueprints.common.api.CommonHeader commonHeader = 1; - org.onap.ccsdk.cds.controllerblueprints.common.api.ActionIdentifiers actionIdentifiers = 2; - google.protobuf.Struct payload = 3; -} - -message ExecutionServiceOutput { - org.onap.ccsdk.cds.controllerblueprints.common.api.CommonHeader commonHeader = 1; - org.onap.ccsdk.cds.controllerblueprints.common.api.ActionIdentifiers actionIdentifiers = 2; - org.onap.ccsdk.cds.controllerblueprints.common.api.Status status = 3; - google.protobuf.Struct payload = 4; -} - - -service BlueprintProcessingService { - rpc process (stream ExecutionServiceInput) returns (stream ExecutionServiceOutput); -} -- cgit 1.2.3-korg