VOL-2927 convert to static protos
Change-Id: If08aec0b1fb84fc54f7f62d5e4ede8ad4a9db80f
diff --git a/internal/pkg/commands/logicaldevices.go b/internal/pkg/commands/logicaldevices.go
index a42ef9c..e59f69d 100644
--- a/internal/pkg/commands/logicaldevices.go
+++ b/internal/pkg/commands/logicaldevices.go
@@ -18,21 +18,20 @@
import (
"context"
"fmt"
- "github.com/fullstorydev/grpcurl"
+ "github.com/golang/protobuf/ptypes/empty"
flags "github.com/jessevdk/go-flags"
- "github.com/jhump/protoreflect/dynamic"
"github.com/opencord/voltctl/pkg/format"
- "github.com/opencord/voltctl/pkg/model"
+ "github.com/opencord/voltha-protos/v3/go/voltha"
"strings"
)
const (
- DEFAULT_LOGICAL_DEVICE_FORMAT = "table{{ .Id }}\t{{.DatapathId}}\t{{.RootDeviceId}}\t{{.SerialNumber}}\t{{.Features.NBuffers}}\t{{.Features.NTables}}\t{{.Features.Capabilities}}"
+ DEFAULT_LOGICAL_DEVICE_FORMAT = "table{{ .Id }}\t{{printf \"%016x\" .DatapathId}}\t{{.RootDeviceId}}\t{{.Desc.SerialNum}}\t{{.SwitchFeatures.NBuffers}}\t{{.SwitchFeatures.NTables}}\t{{printf \"0x%08x\" .SwitchFeatures.Capabilities}}"
DEFAULT_LOGICAL_DEVICE_PORT_FORMAT = "table{{.Id}}\t{{.DeviceId}}\t{{.DevicePortNo}}\t{{.RootPort}}\t{{.Openflow.PortNo}}\t{{.Openflow.HwAddr}}\t{{.Openflow.Name}}\t{{.Openflow.State}}\t{{.Openflow.Features.Current}}\t{{.Openflow.Bitrate.Current}}"
DEFAULT_LOGICAL_DEVICE_INSPECT_FORMAT = `ID: {{.Id}}
DATAPATHID: {{.DatapathId}}
ROOTDEVICEID: {{.RootDeviceId}}
- SERIALNUMNER: {{.SerialNumber}}`
+ SERIALNUMNER: {{.Desc.SerialNum}}`
)
type LogicalDeviceId string
@@ -86,40 +85,20 @@
}
defer conn.Close()
- descriptor, method, err := GetMethod("logical-device-list")
- if err != nil {
- return nil
- }
+ client := voltha.NewVolthaServiceClient(conn)
ctx, cancel := context.WithTimeout(context.Background(), GlobalConfig.Grpc.Timeout)
defer cancel()
- h := &RpcEventHandler{}
- err = grpcurl.InvokeRPC(ctx, descriptor, conn, method, []string{}, h, h.GetParams)
- if err != nil {
- return nil
- }
-
- if h.Status != nil && h.Status.Err() != nil {
- return nil
- }
-
- d, err := dynamic.AsDynamicMessage(h.Response)
- if err != nil {
- return nil
- }
-
- items, err := d.TryGetFieldByName("items")
+ logicalDevices, err := client.ListLogicalDevices(ctx, &empty.Empty{})
if err != nil {
return nil
}
list := make([]flags.Completion, 0)
- for _, item := range items.([]interface{}) {
- val := item.(*dynamic.Message)
- id := val.GetFieldByName("id").(string)
- if strings.HasPrefix(id, match) {
- list = append(list, flags.Completion{Item: id})
+ for _, item := range logicalDevices.Items {
+ if strings.HasPrefix(item.Id, match) {
+ list = append(list, flags.Completion{Item: item.Id})
}
}
@@ -134,32 +113,19 @@
}
defer conn.Close()
- descriptor, method, err := GetMethod("logical-device-list")
- if err != nil {
- return err
- }
+ client := voltha.NewVolthaServiceClient(conn)
ctx, cancel := context.WithTimeout(context.Background(), GlobalConfig.Grpc.Timeout)
defer cancel()
- h := &RpcEventHandler{}
- err = grpcurl.InvokeRPC(ctx, descriptor, conn, method, []string{}, h, h.GetParams)
+ logicalDevices, err := client.ListLogicalDevices(ctx, &empty.Empty{})
if err != nil {
return err
}
- if h.Status != nil && h.Status.Err() != nil {
- return h.Status.Err()
- }
-
- d, err := dynamic.AsDynamicMessage(h.Response)
- if err != nil {
- return err
- }
-
- items, err := d.TryGetFieldByName("items")
- if err != nil {
- return err
+ // Make sure json output prints an empty list, not "null"
+ if logicalDevices.Items == nil {
+ logicalDevices.Items = make([]*voltha.LogicalDevice, 0)
}
outputFormat := CharReplacer.Replace(options.Format)
@@ -174,18 +140,13 @@
orderBy = GetCommandOptionWithDefault("local-device-list", "order", "")
}
- data := make([]model.LogicalDevice, len(items.([]interface{})))
- for i, item := range items.([]interface{}) {
- data[i].PopulateFrom(item.(*dynamic.Message))
- }
-
result := CommandResult{
Format: format.Format(outputFormat),
Filter: options.Filter,
OrderBy: orderBy,
OutputAs: toOutputType(options.OutputAs),
NameLimit: options.NameLimit,
- Data: data,
+ Data: logicalDevices.Items,
}
GenerateOutput(&result)
@@ -200,32 +161,14 @@
}
defer conn.Close()
- descriptor, method, err := GetMethod("logical-device-ports")
- if err != nil {
- return err
- }
+ client := voltha.NewVolthaServiceClient(conn)
ctx, cancel := context.WithTimeout(context.Background(), GlobalConfig.Grpc.Timeout)
defer cancel()
- h := &RpcEventHandler{
- Fields: map[string]map[string]interface{}{ParamNames[GlobalConfig.ApiVersion]["ID"]: {"id": options.Args.Id}},
- }
- err = grpcurl.InvokeRPC(ctx, descriptor, conn, method, []string{}, h, h.GetParams)
- if err != nil {
- return err
- }
+ id := voltha.ID{Id: string(options.Args.Id)}
- if h.Status != nil && h.Status.Err() != nil {
- return h.Status.Err()
- }
-
- d, err := dynamic.AsDynamicMessage(h.Response)
- if err != nil {
- return err
- }
-
- items, err := d.TryGetFieldByName("items")
+ ports, err := client.ListLogicalDevicePorts(ctx, &id)
if err != nil {
return err
}
@@ -242,18 +185,13 @@
orderBy = GetCommandOptionWithDefault("logical-device-ports", "order", "")
}
- data := make([]model.LogicalPort, len(items.([]interface{})))
- for i, item := range items.([]interface{}) {
- data[i].PopulateFrom(item.(*dynamic.Message))
- }
-
result := CommandResult{
Format: format.Format(outputFormat),
Filter: options.Filter,
OrderBy: orderBy,
OutputAs: toOutputType(options.OutputAs),
NameLimit: options.NameLimit,
- Data: data,
+ Data: ports.Items,
}
GenerateOutput(&result)
@@ -279,32 +217,18 @@
}
defer conn.Close()
- descriptor, method, err := GetMethod("logical-device-inspect")
- if err != nil {
- return err
- }
+ client := voltha.NewVolthaServiceClient(conn)
ctx, cancel := context.WithTimeout(context.Background(), GlobalConfig.Grpc.Timeout)
defer cancel()
- h := &RpcEventHandler{
- Fields: map[string]map[string]interface{}{ParamNames[GlobalConfig.ApiVersion]["ID"]: {"id": options.Args.Id}},
- }
- err = grpcurl.InvokeRPC(ctx, descriptor, conn, method, []string{"Get-Depth: 2"}, h, h.GetParams)
- if err != nil {
- return err
- } else if h.Status != nil && h.Status.Err() != nil {
- return h.Status.Err()
- }
+ id := voltha.ID{Id: string(options.Args.Id)}
- d, err := dynamic.AsDynamicMessage(h.Response)
+ logicalDevice, err := client.GetLogicalDevice(ctx, &id)
if err != nil {
return err
}
- device := &model.LogicalDevice{}
- device.PopulateFrom(d)
-
outputFormat := CharReplacer.Replace(options.Format)
if outputFormat == "" {
outputFormat = GetCommandOptionWithDefault("logical-device-inspect", "format", DEFAULT_LOGICAL_DEVICE_INSPECT_FORMAT)
@@ -317,7 +241,7 @@
Format: format.Format(outputFormat),
OutputAs: toOutputType(options.OutputAs),
NameLimit: options.NameLimit,
- Data: device,
+ Data: logicalDevice,
}
GenerateOutput(&result)
return nil