This commit consists of the following:
1) The kafka messaging proxy in Twisted python for adapters
2) Initial implementation and containerization of ponsim OLT adapter
and ponsim ONU adapter
3) Initial submission of request and response facade in both Twisted
python and Go Language
4) Initial implementation of device management and logical device management
in the Core
5) Update to the log module to allow dynamic setting of log level per
package using the gRPC API
6) Bug fixes and minor changes
Change-Id: Ia8f033da84cfd08275335bae9542802415e7bb0f
diff --git a/rw_core/core/adapter_request_handler.go b/rw_core/core/adapter_request_handler.go
new file mode 100644
index 0000000..95ad69d
--- /dev/null
+++ b/rw_core/core/adapter_request_handler.go
@@ -0,0 +1,355 @@
+/*
+ * Copyright 2018-present Open Networking Foundation
+
+ * 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.
+ */
+package core
+
+import (
+ "errors"
+ "github.com/golang/protobuf/ptypes"
+ "github.com/golang/protobuf/ptypes/empty"
+ "github.com/opencord/voltha-go/common/log"
+ "github.com/opencord/voltha-go/db/model"
+ ca "github.com/opencord/voltha-go/protos/core_adapter"
+ "github.com/opencord/voltha-go/protos/voltha"
+ "google.golang.org/grpc/codes"
+ "google.golang.org/grpc/status"
+)
+
+type AdapterRequestHandlerProxy struct {
+ TestMode bool
+ deviceMgr *DeviceManager
+ lDeviceMgr *LogicalDeviceManager
+ localDataProxy *model.Proxy
+ clusterDataProxy *model.Proxy
+}
+
+func NewAdapterRequestHandlerProxy(dMgr *DeviceManager, ldMgr *LogicalDeviceManager, cdProxy *model.Proxy, ldProxy *model.Proxy) *AdapterRequestHandlerProxy {
+ var proxy AdapterRequestHandlerProxy
+ proxy.deviceMgr = dMgr
+ proxy.lDeviceMgr = ldMgr
+ proxy.clusterDataProxy = cdProxy
+ proxy.localDataProxy = ldProxy
+ return &proxy
+}
+
+func (rhp *AdapterRequestHandlerProxy) Register(args []*ca.Argument) (*voltha.CoreInstance, error) {
+ if len(args) != 1 {
+ log.Warn("invalid-number-of-args", log.Fields{"args": args})
+ err := errors.New("invalid-number-of-args")
+ return nil, err
+ }
+ adapter := &voltha.Adapter{}
+ if err := ptypes.UnmarshalAny(args[0].Value, adapter); err != nil {
+ log.Warnw("cannot-unmarshal-adapter", log.Fields{"error": err})
+ return nil, err
+ }
+ log.Debugw("Register", log.Fields{"Adapter": *adapter})
+ // TODO process the request and store the data in the KV store
+
+ if rhp.TestMode { // Execute only for test cases
+ return &voltha.CoreInstance{InstanceId: "CoreInstance"}, nil
+ }
+ return &voltha.CoreInstance{InstanceId: "CoreInstance"}, nil
+}
+
+func (rhp *AdapterRequestHandlerProxy) GetDevice(args []*ca.Argument) (*voltha.Device, error) {
+ if len(args) != 1 {
+ log.Warn("invalid-number-of-args", log.Fields{"args": args})
+ err := errors.New("invalid-number-of-args")
+ return nil, err
+ }
+ pID := &voltha.ID{}
+ if err := ptypes.UnmarshalAny(args[0].Value, pID); err != nil {
+ log.Warnw("cannot-unmarshal-ID", log.Fields{"error": err})
+ return nil, err
+ }
+ log.Debugw("GetDevice", log.Fields{"deviceId": pID.Id})
+
+ if rhp.TestMode { // Execute only for test cases
+ return &voltha.Device{Id: pID.Id}, nil
+ }
+
+ // Get the device via the device manager
+ if device, err := rhp.deviceMgr.getDevice(pID.Id); err != nil {
+ return nil, status.Errorf(codes.NotFound, "%s", err.Error())
+ } else {
+ return device, nil
+ }
+}
+
+func (rhp *AdapterRequestHandlerProxy) DeviceUpdate(args []*ca.Argument) (*empty.Empty, error) {
+ if len(args) != 1 {
+ log.Warn("invalid-number-of-args", log.Fields{"args": args})
+ err := errors.New("invalid-number-of-args")
+ return nil, err
+ }
+ device := &voltha.Device{}
+ if err := ptypes.UnmarshalAny(args[0].Value, device); err != nil {
+ log.Warnw("cannot-unmarshal-device", log.Fields{"error": err})
+ return nil, err
+ }
+ log.Debugw("DeviceUpdate", log.Fields{"device": device})
+
+ if rhp.TestMode { // Execute only for test cases
+ return new(empty.Empty), nil
+ }
+ if err := rhp.deviceMgr.updateDevice(device); err != nil {
+ log.Debugw("DeviceUpdate-error", log.Fields{"device": device, "error": err})
+ return nil, status.Errorf(codes.Internal, "%s", err.Error())
+ }
+ return new(empty.Empty), nil
+}
+
+func (rhp *AdapterRequestHandlerProxy) GetChildDevice(args []*ca.Argument) (*voltha.Device, error) {
+ if len(args) < 1 {
+ log.Warn("invalid-number-of-args", log.Fields{"args": args})
+ err := errors.New("invalid-number-of-args")
+ return nil, err
+ }
+ pID := &ca.StrType{}
+ if err := ptypes.UnmarshalAny(args[0].Value, pID); err != nil {
+ log.Warnw("cannot-unmarshal-ID", log.Fields{"error": err})
+ return nil, err
+ }
+ log.Debugw("GetChildDevice", log.Fields{"deviceId": pID.Val})
+
+ if rhp.TestMode { // Execute only for test cases
+ return &voltha.Device{Id: pID.Val}, nil
+ }
+ return nil, nil
+}
+
+func (rhp *AdapterRequestHandlerProxy) GetPorts(args []*ca.Argument) (*voltha.Ports, error) {
+ if len(args) != 2 {
+ log.Warn("invalid-number-of-args", log.Fields{"args": args})
+ err := errors.New("invalid-number-of-args")
+ return nil, err
+ }
+ pID := &ca.StrType{}
+ if err := ptypes.UnmarshalAny(args[0].Value, pID); err != nil {
+ log.Warnw("cannot-unmarshal-ID", log.Fields{"error": err})
+ return nil, err
+ }
+ // Porttype is an enum sent as an integer proto
+ pt := &ca.IntType{}
+ if err := ptypes.UnmarshalAny(args[1].Value, pt); err != nil {
+ log.Warnw("cannot-unmarshal-porttype", log.Fields{"error": err})
+ return nil, err
+ }
+
+ log.Debugw("GetPorts", log.Fields{"deviceID": pID.Val, "portype": pt.Val})
+
+ if rhp.TestMode { // Execute only for test cases
+ aPort := &voltha.Port{Label: "test_port"}
+ allPorts := &voltha.Ports{}
+ allPorts.Items = append(allPorts.Items, aPort)
+ return allPorts, nil
+ }
+ return nil, nil
+
+}
+
+func (rhp *AdapterRequestHandlerProxy) GetChildDevices(args []*ca.Argument) (*voltha.Device, error) {
+ if len(args) != 1 {
+ log.Warn("invalid-number-of-args", log.Fields{"args": args})
+ err := errors.New("invalid-number-of-args")
+ return nil, err
+ }
+ pID := &ca.StrType{}
+ if err := ptypes.UnmarshalAny(args[0].Value, pID); err != nil {
+ log.Warnw("cannot-unmarshal-ID", log.Fields{"error": err})
+ return nil, err
+ }
+ log.Debugw("GetChildDevice", log.Fields{"deviceId": pID.Val})
+
+ if rhp.TestMode { // Execute only for test cases
+ return &voltha.Device{Id: pID.Val}, nil
+ }
+ //TODO: Complete
+ return nil, nil
+}
+
+// ChildDeviceDetected is invoked when a child device is detected. The following
+// parameters are expected:
+// {parent_device_id, parent_port_no, child_device_type, proxy_address, admin_state, **kw)
+func (rhp *AdapterRequestHandlerProxy) ChildDeviceDetected(args []*ca.Argument) (*empty.Empty, error) {
+ if len(args) < 4 {
+ log.Warn("invalid-number-of-args", log.Fields{"args": args})
+ err := errors.New("invalid-number-of-args")
+ return nil, err
+ }
+
+ pID := &voltha.ID{}
+ portNo := &ca.IntType{}
+ dt := &ca.StrType{}
+ chnlId := &ca.IntType{}
+ for _, arg := range args {
+ switch arg.Key {
+ case "parent_device_id":
+ if err := ptypes.UnmarshalAny(arg.Value, pID); err != nil {
+ log.Warnw("cannot-unmarshal-parent-device-id", log.Fields{"error": err})
+ return nil, err
+ }
+ case "parent_port_no":
+ if err := ptypes.UnmarshalAny(arg.Value, portNo); err != nil {
+ log.Warnw("cannot-unmarshal-parent-port", log.Fields{"error": err})
+ return nil, err
+ }
+ case "child_device_type":
+ if err := ptypes.UnmarshalAny(arg.Value, dt); err != nil {
+ log.Warnw("cannot-unmarshal-child-device-type", log.Fields{"error": err})
+ return nil, err
+ }
+ case "channel_id":
+ if err := ptypes.UnmarshalAny(arg.Value, chnlId); err != nil {
+ log.Warnw("cannot-unmarshal-channel-id", log.Fields{"error": err})
+ return nil, err
+ }
+ }
+ }
+
+ log.Debugw("ChildDeviceDetected", log.Fields{"parentDeviceId": pID.Id, "parentPortNo": portNo.Val,
+ "deviceType": dt.Val, "channelId": chnlId.Val})
+
+ if rhp.TestMode { // Execute only for test cases
+ return nil, nil
+ }
+
+ // Run child detection in it's own go routine as it can be a lengthy process
+ go rhp.deviceMgr.childDeviceDetected(pID.Id, portNo.Val, dt.Val, chnlId.Val)
+
+ return new(empty.Empty), nil
+}
+
+func (rhp *AdapterRequestHandlerProxy) DeviceStateUpdate(args []*ca.Argument) (*empty.Empty, error) {
+ if len(args) < 2 {
+ log.Warn("invalid-number-of-args", log.Fields{"args": args})
+ err := errors.New("invalid-number-of-args")
+ return nil, err
+ }
+ deviceId := &voltha.ID{}
+ operStatus := &ca.IntType{}
+ connStatus := &ca.IntType{}
+ for _, arg := range args {
+ switch arg.Key {
+ case "device_id":
+ if err := ptypes.UnmarshalAny(arg.Value, deviceId); err != nil {
+ log.Warnw("cannot-unmarshal-device-id", log.Fields{"error": err})
+ return nil, err
+ }
+ case "oper_status":
+ if err := ptypes.UnmarshalAny(arg.Value, operStatus); err != nil {
+ log.Warnw("cannot-unmarshal-operStatus", log.Fields{"error": err})
+ return nil, err
+ }
+ if operStatus.Val == -1 {
+ operStatus = nil
+ }
+ case "connect_status":
+ if err := ptypes.UnmarshalAny(arg.Value, connStatus); err != nil {
+ log.Warnw("cannot-unmarshal-connStatus", log.Fields{"error": err})
+ return nil, err
+ }
+ if connStatus.Val == -1 {
+ connStatus = nil
+ }
+ }
+ }
+
+ log.Debugw("DeviceStateUpdate", log.Fields{"deviceId": deviceId.Id, "oper-status": operStatus, "conn-status": connStatus})
+
+ if rhp.TestMode { // Execute only for test cases
+ return nil, nil
+ }
+ if err := rhp.deviceMgr.updateDeviceState(deviceId.Id, operStatus, connStatus); err != nil {
+ log.Debugw("DeviceUpdate-error", log.Fields{"deviceId": deviceId.Id, "error": err})
+ return nil, status.Errorf(codes.Internal, "%s", err.Error())
+ }
+ return new(empty.Empty), nil
+}
+
+func (rhp *AdapterRequestHandlerProxy) PortCreated(args []*ca.Argument) (*empty.Empty, error) {
+ if len(args) != 2 {
+ log.Warn("invalid-number-of-args", log.Fields{"args": args})
+ err := errors.New("invalid-number-of-args")
+ return nil, err
+ }
+ deviceId := &voltha.ID{}
+ port := &voltha.Port{}
+ for _, arg := range args {
+ switch arg.Key {
+ case "device_id":
+ if err := ptypes.UnmarshalAny(arg.Value, deviceId); err != nil {
+ log.Warnw("cannot-unmarshal-device-id", log.Fields{"error": err})
+ return nil, err
+ }
+ case "port":
+ if err := ptypes.UnmarshalAny(arg.Value, port); err != nil {
+ log.Warnw("cannot-unmarshal-port", log.Fields{"error": err})
+ return nil, err
+ }
+ }
+ }
+
+ log.Debugw("PortCreated", log.Fields{"deviceId": deviceId.Id, "port": port})
+
+ if rhp.TestMode { // Execute only for test cases
+ return nil, nil
+ }
+
+ if err := rhp.deviceMgr.addPort(deviceId.Id, port); err != nil {
+ log.Debugw("addport-error", log.Fields{"deviceId": deviceId.Id, "error": err})
+ return nil, status.Errorf(codes.Internal, "%s", err.Error())
+ }
+ return new(empty.Empty), nil
+}
+
+func (rhp *AdapterRequestHandlerProxy) DevicePMConfigUpdate(args []*ca.Argument) (*empty.Empty, error) {
+ if len(args) != 2 {
+ log.Warn("invalid-number-of-args", log.Fields{"args": args})
+ err := errors.New("invalid-number-of-args")
+ return nil, err
+ }
+ pmConfigs := &voltha.PmConfigs{}
+ init := &ca.BoolType{}
+ for _, arg := range args {
+ switch arg.Key {
+ case "device_pm_config":
+ if err := ptypes.UnmarshalAny(arg.Value, pmConfigs); err != nil {
+ log.Warnw("cannot-unmarshal-pm-config", log.Fields{"error": err})
+ return nil, err
+ }
+ case "init":
+ if err := ptypes.UnmarshalAny(arg.Value, init); err != nil {
+ log.Warnw("cannot-unmarshal-boolean", log.Fields{"error": err})
+ return nil, err
+ }
+ }
+ }
+
+ log.Debugw("DevicePMConfigUpdate", log.Fields{"deviceId": pmConfigs.Id, "configs": pmConfigs,
+ "init": init})
+
+ if rhp.TestMode { // Execute only for test cases
+ return nil, nil
+ }
+
+ if err := rhp.deviceMgr.updatePmConfigs(pmConfigs.Id, pmConfigs); err != nil {
+ log.Debugw("update-pmconfigs-error", log.Fields{"deviceId": pmConfigs.Id, "error": err})
+ return nil, status.Errorf(codes.Internal, "%s", err.Error())
+ }
+ return new(empty.Empty), nil
+
+}