From a42de79292d9541db7865b54e93be2d0b6e6a094 Mon Sep 17 00:00:00 2001
From: "serena.spinoso" <serena.spinoso@polito.it>
Date: Thu, 7 Sep 2017 10:22:39 +0200
Subject: update verigraph

JIRA: PARSER-154

code optimizations about graph manipulation and formula generation.

Change-Id: Idebef19b128281aa2bc40d1aeab6e208c7ddd93d
Signed-off-by: serena.spinoso <serena.spinoso@polito.it>
---
 verigraph/src/main/proto/verigraph.proto | 130 +++++++++++++++----------------
 1 file changed, 65 insertions(+), 65 deletions(-)

(limited to 'verigraph/src/main/proto/verigraph.proto')

diff --git a/verigraph/src/main/proto/verigraph.proto b/verigraph/src/main/proto/verigraph.proto
index 5f77c78..feb8ff0 100644
--- a/verigraph/src/main/proto/verigraph.proto
+++ b/verigraph/src/main/proto/verigraph.proto
@@ -3,7 +3,7 @@ syntax = "proto3";
 package verigraph;
 
 option java_multiple_files = true;
-option java_package = "io.grpc.verigraph";
+option java_package = "it.polito.verigraph.grpc";
 option java_outer_classname = "VerigraphProto";
 
 // The service definition.
@@ -57,98 +57,98 @@ message RequestID {
 }
 
 message Policy{
-	int64 idGraph = 1;
-	string source = 2;
-  	string destination = 3;
-  	enum PolicyType {
-	   	reachability = 0;
-	   	isolation = 1;
-	   	traversal = 2;
-	}
-	PolicyType type = 4;
-	string middlebox = 5;
+int64 idGraph = 1;
+string source = 2;
+  string destination = 3;
+  enum PolicyType {
+   reachability = 0;
+   isolation = 1;
+   traversal = 2;
+}
+PolicyType type = 4;
+string middlebox = 5;
 }
 
 message ConfigurationGrpc{
-	int64 idGraph = 1;
-	int64 idNode = 2;
-	string description = 3;
-	string configuration = 4;
-	string id = 5;
+int64 idGraph = 1;
+int64 idNode = 2;
+string description = 3;
+string configuration = 4;
+string id = 5;
 }
 
 message NodeGrpc{
-	int64 idGraph = 1;
-	string name = 2;
-	int64 id = 3;	//long
-	enum FunctionalType {
-		antispam = 0;
-	   	cache = 1;
-	   	dpi = 2;
-	   	endhost = 3;
-	   	endpoint = 4;
-	   	fieldmodifier = 5;
-	   	firewall = 6;
-	   	mailclient = 7;
-	   	mailserver = 8;
-	   	nat = 9;
-	   	vpnaccess = 10;
-	   	vpnexit = 11;
-	   	webclient = 12;
-	   	webserver = 13;
-	}
-	FunctionalType functional_type = 4;
-	repeated NeighbourGrpc neighbour = 5;
-	ConfigurationGrpc configuration = 6;
-	string errorMessage = 7;
+int64 idGraph = 1;
+string name = 2;
+int64 id = 3;//long
+enum FunctionalType {
+antispam = 0;
+   cache = 1;
+   dpi = 2;
+   endhost = 3;
+   endpoint = 4;
+   fieldmodifier = 5;
+   firewall = 6;
+   mailclient = 7;
+   mailserver = 8;
+   nat = 9;
+   vpnaccess = 10;
+   vpnexit = 11;
+   webclient = 12;
+   webserver = 13;
+}
+FunctionalType functional_type = 4;
+repeated NeighbourGrpc neighbour = 5;
+ConfigurationGrpc configuration = 6;
+string errorMessage = 7;
 }
 
 message GraphGrpc{
-	int64 id = 1;	//long
-	repeated NodeGrpc node = 2;
-	string errorMessage = 3;
+int64 id = 1;//long
+repeated NodeGrpc node = 2;
+string errorMessage = 3;
 }
 
 message NeighbourGrpc{
-	int64 idGraph = 1;
-  	int64 idNode = 2;
-	string name = 3;
-  	int64 id = 4;	//long
-  	string errorMessage = 5;
+int64 idGraph = 1;
+  int64 idNode = 2;
+string name = 3;
+  int64 id = 4;//long
+  string errorMessage = 5;
 }
 
 message NewGraph{
-	bool success = 1;
-	GraphGrpc graph = 2;
-	string errorMessage = 3;
+bool success = 1;
+GraphGrpc graph = 2;
+string errorMessage = 3;
 }
 
 message NewNode{
-	bool success = 1;
-	NodeGrpc node = 2;
-	string errorMessage = 3;
+bool success = 1;
+NodeGrpc node = 2;
+string errorMessage = 3;
 }
 
 message NewNeighbour{
-	bool success = 1;
-	NeighbourGrpc neighbour = 2;
-	string errorMessage = 3;
+bool success = 1;
+NeighbourGrpc neighbour = 2;
+string errorMessage = 3;
 }
 
 message TestGrpc {
-  	repeated NodeGrpc node = 1;
-  	string result = 2;
+  repeated NodeGrpc node = 1;
+  string result = 2;
 }
 
 message VerificationGrpc{
-	bool successOfOperation = 1;
-	string result = 2;
-	string comment = 3;
-	repeated TestGrpc test = 4;
-	string errorMessage = 5;
+bool successOfOperation = 1;
+string result = 2;
+string comment = 3;
+repeated TestGrpc test = 4;
+string errorMessage = 5;
 }
 
 message Status{
-	bool success = 1;
-	string errorMessage = 2;
+bool success = 1;
+string errorMessage = 2;
 }
\ No newline at end of file
-- 
cgit 1.2.3-korg