SDI-2081: expand supported types for grpc

intelsdi-x · Nov 16, 2016 · 16a8c93 · 16a8c93
1 parent c63df74
commit 16a8c93
Show file tree

Hide file tree

Showing 8 changed files with 376 additions and 258 deletions.
diff --git a/control/plugin/client/grpc.go b/control/plugin/client/grpc.go
@@ -331,8 +331,11 @@ func ToCoreMetric(mt *rpc.Metric) core.Metric {
 		ret.data = mt.GetInt64Data()
 	case *rpc.Metric_BoolData:
 		ret.data = mt.GetBoolData()
+	case *rpc.Metric_Uint32Data:
+		ret.data = mt.GetUint32Data()
+	case *rpc.Metric_Uint64Data:
+		ret.data = mt.GetUint64Data()
 	}
-
 	return ret
 }
 
@@ -374,6 +377,10 @@ func ToMetric(co core.Metric) *rpc.Metric {
 		cm.Data = &rpc.Metric_Int64Data{int64(t)}
 	case int64:
 		cm.Data = &rpc.Metric_Int64Data{t}
+	case uint32:
+		cm.Data = &rpc.Metric_Uint32Data{t}
+	case uint64:
+		cm.Data = &rpc.Metric_Uint64Data{t}
 	case []byte:
 		cm.Data = &rpc.Metric_BytesData{t}
 	case bool:

diff --git a/control/plugin/rpc/plugin.pb.go b/control/plugin/rpc/plugin.pb.go
diff --git a/control/plugin/rpc/plugin.proto b/control/plugin/rpc/plugin.proto
@@ -83,6 +83,8 @@ message Metric {
         int64 int64_data = 13;
         bytes bytes_data = 14;
         bool bool_data = 15;
+        uint32 uint32_data = 16;
+        uint64 uint64_data = 17;
     }
 }
 

diff --git a/glide.lock b/glide.lock
diff --git a/grpc/common/common.go b/grpc/common/common.go
@@ -63,6 +63,10 @@ func ToMetric(co core.Metric) *Metric {
 		cm.Data = &Metric_Int64Data{int64(t)}
 	case int64:
 		cm.Data = &Metric_Int64Data{t}
+	case uint32:
+		cm.Data = &Metric_Uint32Data{t}
+	case uint64:
+		cm.Data = &Metric_Uint64Data{t}
 	case []byte:
 		cm.Data = &Metric_BytesData{t}
 	case bool:
@@ -161,6 +165,10 @@ func ToCoreMetric(mt *Metric) core.Metric {
 		ret.data = mt.GetInt32Data()
 	case *Metric_Int64Data:
 		ret.data = mt.GetInt64Data()
+	case *Metric_Uint32Data:
+		ret.data = mt.GetUint32Data()
+	case *Metric_Uint64Data:
+		ret.data = mt.GetUint64Data()
 	case *Metric_BoolData:
 		ret.data = mt.GetBoolData()
 	}

diff --git a/grpc/common/common.pb.go b/grpc/common/common.pb.go
diff --git a/grpc/common/common.proto b/grpc/common/common.proto
@@ -55,6 +55,8 @@ message Metric {
 		int64 int64_data = 13;
 		bytes bytes_data = 14;
 		bool bool_data = 15;
+		uint32 uint32_data = 16;
+		uint64 uint64_data = 17;
 	}
 }
 

diff --git a/grpc/controlproxy/rpc/control.pb.go b/grpc/controlproxy/rpc/control.pb.go