3 files changed, 45 insertions, 52 deletions

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 00000000..0f17783a
--- /dev/null
+++ b/components/model-catalog/proto-definition/proto/BluePrintCommon.proto
@@ -0,0 +1,31 @@
+syntax = "proto3";
+option java_multiple_files = true;
+package org.onap.ccsdk.apps.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;
+  string errorMessage = 2;
+  string message = 3;
+  string eventType = 4;
+  string timestamp = 5;
+}
\ 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
index dc0680d5..658cbbbd 100644
--- a/components/model-catalog/proto-definition/proto/BluePrintManagement.proto
+++ b/components/model-catalog/proto-definition/proto/BluePrintManagement.proto
@@ -1,37 +1,24 @@
 syntax = "proto3";
+import "BluePrintCommon.proto";
 option java_multiple_files = true;
 package org.onap.ccsdk.apps.controllerblueprints.management.api;
 
 message BluePrintManagementInput {
-  CommonHeader commonHeader = 1;
+  org.onap.ccsdk.apps.controllerblueprints.common.api.CommonHeader commonHeader = 1;
   string blueprintName = 2;
   string blueprintVersion = 3;
   FileChunk fileChunk = 4;
 }
 
 message BluePrintManagementOutput {
-  CommonHeader commonHeader = 1;
-  Status status = 3;
+  org.onap.ccsdk.apps.controllerblueprints.common.api.CommonHeader commonHeader = 1;
+  org.onap.ccsdk.apps.controllerblueprints.common.api.Status status = 3;
 }
 
 message FileChunk {
   bytes chunk = 1;
 }
 
-message CommonHeader {
-  string timestamp = 1;
-  string originatorId = 23;
-  string requestId = 3;
-  string subRequestId = 4;
-}
-
-message Status {
-  string timestamp = 1;
-  int32 code = 2;
-  string message = 3;
-  string errorMessage = 4;
-}
-
 service BluePrintManagementService {
   rpc uploadBlueprint (BluePrintManagementInput) returns (BluePrintManagementOutput);
   rpc removeBlueprint (BluePrintManagementInput) returns (BluePrintManagementOutput);
diff --git a/components/model-catalog/proto-definition/proto/BluePrintProcessing.proto b/components/model-catalog/proto-definition/proto/BluePrintProcessing.proto
index d8ad571b..5b91f46b 100644
--- a/components/model-catalog/proto-definition/proto/BluePrintProcessing.proto
+++ b/components/model-catalog/proto-definition/proto/BluePrintProcessing.proto
@@ -1,49 +1,24 @@
 syntax = "proto3";
 import "google/protobuf/struct.proto";
+import "BluePrintCommon.proto";
 option java_multiple_files = true;
 package org.onap.ccsdk.apps.controllerblueprints.processing.api;
 
+
 message ExecutionServiceInput {
-    CommonHeader commonHeader = 1;
-    ActionIdentifiers actionIdentifiers = 2;
-    google.protobuf.Struct payload = 3;
+  org.onap.ccsdk.apps.controllerblueprints.common.api.CommonHeader commonHeader = 1;
+  org.onap.ccsdk.apps.controllerblueprints.common.api.ActionIdentifiers actionIdentifiers = 2;
+  google.protobuf.Struct payload = 3;
 }
 
 message ExecutionServiceOutput {
-    CommonHeader commonHeader = 1;
-    ActionIdentifiers actionIdentifiers = 2;
-    Status status = 3;
-    google.protobuf.Struct payload = 4;
-}
-
-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;
+  org.onap.ccsdk.apps.controllerblueprints.common.api.CommonHeader commonHeader = 1;
+  org.onap.ccsdk.apps.controllerblueprints.common.api.ActionIdentifiers actionIdentifiers = 2;
+  org.onap.ccsdk.apps.controllerblueprints.common.api.Status status = 3;
+  google.protobuf.Struct payload = 4;
 }
 
-message Status {
-    int32 code = 1;
-    string errorMessage = 2;
-    string message = 3;
-    string eventType = 4;
-    string timestamp = 5;
-}
 
 service BluePrintProcessingService {
-    rpc process (stream ExecutionServiceInput) returns (stream ExecutionServiceOutput);
+  rpc process (stream ExecutionServiceInput) returns (stream ExecutionServiceOutput);
 }