From 95553263e5ea110912e83c93e2b22b4796fe57c6 Mon Sep 17 00:00:00 2001
From: Alexis de Talhouët <adetalhouet89@gmail.com>
Date: Fri, 18 Jan 2019 14:29:38 -0500
Subject: Create module for .proto definition
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

That way 3rd party system can depend on it to create a client

Change-Id: I96e8588251eb0911a7dd7bee270954e966d9fc40
Issue-ID: CCSDK-947
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
---
 .../api-definition/proto/BluePrintManagement.proto | 38 ----------
 .../api-definition/proto/BluePrintProcessing.proto | 49 -------------
 components/model-catalog/proto-definition/pom.xml  | 81 ++++++++++++++++++++++
 .../proto/BluePrintManagement.proto                | 38 ++++++++++
 .../proto/BluePrintProcessing.proto                | 49 +++++++++++++
 components/pom.xml                                 |  4 +-
 6 files changed, 171 insertions(+), 88 deletions(-)
 delete mode 100644 components/model-catalog/api-definition/proto/BluePrintManagement.proto
 delete mode 100644 components/model-catalog/api-definition/proto/BluePrintProcessing.proto
 create mode 100644 components/model-catalog/proto-definition/pom.xml
 create mode 100644 components/model-catalog/proto-definition/proto/BluePrintManagement.proto
 create mode 100644 components/model-catalog/proto-definition/proto/BluePrintProcessing.proto

diff --git a/components/model-catalog/api-definition/proto/BluePrintManagement.proto b/components/model-catalog/api-definition/proto/BluePrintManagement.proto
deleted file mode 100644
index dc0680d57..000000000
--- a/components/model-catalog/api-definition/proto/BluePrintManagement.proto
+++ /dev/null
@@ -1,38 +0,0 @@
-syntax = "proto3";
-option java_multiple_files = true;
-package org.onap.ccsdk.apps.controllerblueprints.management.api;
-
-message BluePrintManagementInput {
-  CommonHeader commonHeader = 1;
-  string blueprintName = 2;
-  string blueprintVersion = 3;
-  FileChunk fileChunk = 4;
-}
-
-message BluePrintManagementOutput {
-  CommonHeader commonHeader = 1;
-  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/api-definition/proto/BluePrintProcessing.proto b/components/model-catalog/api-definition/proto/BluePrintProcessing.proto
deleted file mode 100644
index 8fa4a13fa..000000000
--- a/components/model-catalog/api-definition/proto/BluePrintProcessing.proto
+++ /dev/null
@@ -1,49 +0,0 @@
-syntax = "proto3";
-import "google/protobuf/struct.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;
-}
-
-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;
-}
-
-message Status {
-    int32 code = 1;
-    string errorMessage = 2;
-    string message = 3;
-    string eventType = 4;
-    string timestamp = 5;
-}
-
-service BluePrintProcessingService {
-    rpc process (ExecutionServiceInput) returns (stream ExecutionServiceOutput);
-}
diff --git a/components/model-catalog/proto-definition/pom.xml b/components/model-catalog/proto-definition/pom.xml
new file mode 100644
index 000000000..c1f77922c
--- /dev/null
+++ b/components/model-catalog/proto-definition/pom.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Copyright (C) 2019 Bell Canada
+*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.onap.ccsdk.apps.controllerblueprints</groupId>
+        <artifactId>modules</artifactId>
+        <version>0.4.1-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>proto-definition</artifactId>
+    <packaging>jar</packaging>
+
+    <name>Controller Blueprints Proto Definition</name>
+    <description>Controller Blueprints Proto Definition</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.grpc</groupId>
+            <artifactId>grpc-protobuf</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.grpc</groupId>
+            <artifactId>grpc-stub</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.google.protobuf</groupId>
+            <artifactId>protobuf-java-util</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <extensions>
+            <extension>
+                <groupId>kr.motd.maven</groupId>
+                <artifactId>os-maven-plugin</artifactId>
+                <version>1.6.1</version>
+            </extension>
+        </extensions>
+        <plugins>
+            <plugin>
+                <groupId>org.xolstice.maven.plugins</groupId>
+                <artifactId>protobuf-maven-plugin</artifactId>
+                <version>0.6.1</version>
+                <configuration>
+                    <protocArtifact>
+                        com.google.protobuf:protoc:3.5.1-1:exe:${os.detected.classifier}
+                    </protocArtifact>
+                    <pluginId>grpc-java</pluginId>
+                    <pluginArtifact>
+                        io.grpc:protoc-gen-grpc-java:1.16.1:exe:${os.detected.classifier}
+                    </pluginArtifact>
+                    <protoSourceRoot>proto</protoSourceRoot>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>compile</goal>
+                            <goal>compile-custom</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ 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..dc0680d57
--- /dev/null
+++ b/components/model-catalog/proto-definition/proto/BluePrintManagement.proto
@@ -0,0 +1,38 @@
+syntax = "proto3";
+option java_multiple_files = true;
+package org.onap.ccsdk.apps.controllerblueprints.management.api;
+
+message BluePrintManagementInput {
+  CommonHeader commonHeader = 1;
+  string blueprintName = 2;
+  string blueprintVersion = 3;
+  FileChunk fileChunk = 4;
+}
+
+message BluePrintManagementOutput {
+  CommonHeader commonHeader = 1;
+  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
new file mode 100644
index 000000000..8fa4a13fa
--- /dev/null
+++ b/components/model-catalog/proto-definition/proto/BluePrintProcessing.proto
@@ -0,0 +1,49 @@
+syntax = "proto3";
+import "google/protobuf/struct.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;
+}
+
+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;
+}
+
+message Status {
+    int32 code = 1;
+    string errorMessage = 2;
+    string message = 3;
+    string eventType = 4;
+    string timestamp = 5;
+}
+
+service BluePrintProcessingService {
+    rpc process (ExecutionServiceInput) returns (stream ExecutionServiceOutput);
+}
diff --git a/components/pom.xml b/components/pom.xml
index 5b8768cea..95ffd5c02 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -14,7 +14,8 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <parent>
         <groupId>org.onap.ccsdk.apps</groupId>
         <artifactId>ccsdk-apps</artifactId>
@@ -37,5 +38,6 @@
         <module>parent</module>
         <module>core</module>
         <module>resource-dict</module>
+        <module>model-catalog/proto-definition</module>
     </modules>
 </project>
-- 
cgit 1.2.3-korg