This commit consists of:
1) Fixing the core tests
2) Fix an error in the logger where the runtime stack trace behaved
differently in go 1.10 vs go 1.9.
3) Minor other fixes
Change-Id: I1263df38ffcd733174f776a0901583cfb59c616e
diff --git a/rw_core/core/adapter_request_handler.go b/rw_core/core/adapter_request_handler.go
index 95ad69d..bfc4ee4 100644
--- a/rw_core/core/adapter_request_handler.go
+++ b/rw_core/core/adapter_request_handler.go
@@ -118,15 +118,15 @@
err := errors.New("invalid-number-of-args")
return nil, err
}
- pID := &ca.StrType{}
+ 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("GetChildDevice", log.Fields{"deviceId": pID.Val})
+ log.Debugw("GetChildDevice", log.Fields{"deviceId": pID.Id})
if rhp.TestMode { // Execute only for test cases
- return &voltha.Device{Id: pID.Val}, nil
+ return &voltha.Device{Id: pID.Id}, nil
}
return nil, nil
}
@@ -137,7 +137,7 @@
err := errors.New("invalid-number-of-args")
return nil, err
}
- pID := &ca.StrType{}
+ 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
@@ -149,7 +149,7 @@
return nil, err
}
- log.Debugw("GetPorts", log.Fields{"deviceID": pID.Val, "portype": pt.Val})
+ log.Debugw("GetPorts", log.Fields{"deviceID": pID.Id, "portype": pt.Val})
if rhp.TestMode { // Execute only for test cases
aPort := &voltha.Port{Label: "test_port"}
@@ -167,15 +167,15 @@
err := errors.New("invalid-number-of-args")
return nil, err
}
- pID := &ca.StrType{}
+ 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("GetChildDevice", log.Fields{"deviceId": pID.Val})
+ log.Debugw("GetChildDevice", log.Fields{"deviceId": pID.Id})
if rhp.TestMode { // Execute only for test cases
- return &voltha.Device{Id: pID.Val}, nil
+ return &voltha.Device{Id: pID.Id}, nil
}
//TODO: Complete
return nil, nil