mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Fix issue where network inspect does not show Created time in swarm scope
This fix tries to address the issue raised in 36083 where `network inspect` does not show Created time if the network is created in swarm scope. The issue was that Created was not converted from swarm api. This fix addresses the issue. An unit test has been added. This fix fixes 36083. Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
This commit is contained in:
parent
99cfb5f31a
commit
090c439fb8
2 changed files with 35 additions and 0 deletions
|
@ -168,6 +168,7 @@ func BasicNetworkFromGRPC(n swarmapi.Network) basictypes.NetworkResource {
|
|||
Ingress: IsIngressNetwork(&n),
|
||||
Labels: n.Spec.Annotations.Labels,
|
||||
}
|
||||
nr.Created, _ = gogotypes.TimestampFromProto(n.Meta.CreatedAt)
|
||||
|
||||
if n.Spec.GetNetwork() != "" {
|
||||
nr.ConfigFrom = networktypes.ConfigReference{
|
||||
|
|
34
daemon/cluster/convert/network_test.go
Normal file
34
daemon/cluster/convert/network_test.go
Normal file
|
@ -0,0 +1,34 @@
|
|||
package convert
|
||||
|
||||
import (
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
swarmapi "github.com/docker/swarmkit/api"
|
||||
gogotypes "github.com/gogo/protobuf/types"
|
||||
)
|
||||
|
||||
func TestNetworkConvertBasicNetworkFromGRPCCreatedAt(t *testing.T) {
|
||||
expected, err := time.Parse("Jan 2, 2006 at 3:04pm (MST)", "Jan 10, 2018 at 7:54pm (PST)")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
createdAt, err := gogotypes.TimestampProto(expected)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
nw := swarmapi.Network{
|
||||
Meta: swarmapi.Meta{
|
||||
Version: swarmapi.Version{
|
||||
Index: 1,
|
||||
},
|
||||
CreatedAt: createdAt,
|
||||
},
|
||||
}
|
||||
|
||||
n := BasicNetworkFromGRPC(nw)
|
||||
if !n.Created.Equal(expected) {
|
||||
t.Fatalf("expected time %s; received %s", expected, n.Created)
|
||||
}
|
||||
}
|
Loading…
Reference in a new issue