Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

clientv3: use default client cluster

Browse Source
This commit is contained in:
Anthony Romano 2016-02-24 23:06:40 -08:00
parent 3e57bbf317
commit 8f7d474a6b
2 changed files with 11 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
clientv3/example_cluster_test.go
View File

@ -32,9 +32,7 @@ func ExampleCluster_memberList() {
} }
defer cli.Close() defer cli.Close()
capi := clientv3.NewCluster(cli) resp, err := cli.MemberList(context.Background())
resp, err := capi.MemberList(context.Background())
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }
@ -52,9 +50,7 @@ func ExampleCluster_memberLeader() {
} }
defer cli.Close() defer cli.Close()
capi := clientv3.NewCluster(cli) resp, err := cli.MemberLeader(context.Background())
resp, err := capi.MemberLeader(context.Background())
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }
@ -72,10 +68,8 @@ func ExampleCluster_memberAdd() {
} }
defer cli.Close() defer cli.Close()
capi := clientv3.NewCluster(cli)
peerURLs := endpoints[2:] peerURLs := endpoints[2:]
mresp, err := capi.MemberAdd(context.Background(), peerURLs) mresp, err := cli.MemberAdd(context.Background(), peerURLs)
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }
@ -93,14 +87,12 @@ func ExampleCluster_memberRemove() {
} }
defer cli.Close() defer cli.Close()
capi := clientv3.NewCluster(cli) resp, err := cli.MemberList(context.Background())
resp, err := capi.MemberList(context.Background())
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }
_, err = capi.MemberRemove(context.Background(), resp.Members[0].ID) _, err = cli.MemberRemove(context.Background(), resp.Members[0].ID)
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }
@ -116,15 +108,13 @@ func ExampleCluster_memberUpdate() {
} }
defer cli.Close() defer cli.Close()
capi := clientv3.NewCluster(cli) resp, err := cli.MemberList(context.Background())
resp, err := capi.MemberList(context.Background())
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }
peerURLs := []string{"http://localhost:12378"} peerURLs := []string{"http://localhost:12378"}
_, err = capi.MemberUpdate(context.Background(), resp.Members[0].ID, peerURLs) _, err = cli.MemberUpdate(context.Background(), resp.Members[0].ID, peerURLs)
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }

12
etcdctlv3/command/member_command.go
View File

@ -21,7 +21,6 @@ import (
"github.com/coreos/etcd/Godeps/_workspace/src/github.com/spf13/cobra" "github.com/coreos/etcd/Godeps/_workspace/src/github.com/spf13/cobra"
"github.com/coreos/etcd/Godeps/_workspace/src/golang.org/x/net/context" "github.com/coreos/etcd/Godeps/_workspace/src/golang.org/x/net/context"
pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
) )
var ( var (
@ -108,8 +107,7 @@ func memberAddCommandFunc(cmd *cobra.Command, args []string) {
urls := strings.Split(memberPeerURLs, ",") urls := strings.Split(memberPeerURLs, ",")
req := &pb.MemberAddRequest{PeerURLs: urls} resp, err := mustClientFromCmd(cmd).MemberAdd(context.TODO(), urls)
resp, err := mustClientFromCmd(cmd).Cluster.MemberAdd(context.TODO(), req)
if err != nil { if err != nil {
ExitWithError(ExitError, err) ExitWithError(ExitError, err)
} }
@ -128,8 +126,7 @@ func memberRemoveCommandFunc(cmd *cobra.Command, args []string) {
ExitWithError(ExitBadArgs, fmt.Errorf("bad member ID arg (%v), expecting ID in Hex", err)) ExitWithError(ExitBadArgs, fmt.Errorf("bad member ID arg (%v), expecting ID in Hex", err))
} }
req := &pb.MemberRemoveRequest{ID: uint64(id)} resp, err := mustClientFromCmd(cmd).MemberRemove(context.TODO(), id)
resp, err := mustClientFromCmd(cmd).Cluster.MemberRemove(context.TODO(), req)
if err != nil { if err != nil {
ExitWithError(ExitError, err) ExitWithError(ExitError, err)
} }
@ -154,8 +151,7 @@ func memberUpdateCommandFunc(cmd *cobra.Command, args []string) {
urls := strings.Split(memberPeerURLs, ",") urls := strings.Split(memberPeerURLs, ",")
req := &pb.MemberUpdateRequest{ID: uint64(id), PeerURLs: urls} resp, err := mustClientFromCmd(cmd).MemberUpdate(context.TODO(), id, urls)
resp, err := mustClientFromCmd(cmd).Cluster.MemberUpdate(context.TODO(), req)
if err != nil { if err != nil {
ExitWithError(ExitError, err) ExitWithError(ExitError, err)
} }
@ -165,7 +161,7 @@ func memberUpdateCommandFunc(cmd *cobra.Command, args []string) {
// memberListCommandFunc executes the "member list" command. // memberListCommandFunc executes the "member list" command.
func memberListCommandFunc(cmd *cobra.Command, args []string) { func memberListCommandFunc(cmd *cobra.Command, args []string) {
resp, err := mustClientFromCmd(cmd).Cluster.MemberList(context.TODO(), &pb.MemberListRequest{}) resp, err := mustClientFromCmd(cmd).MemberList(context.TODO())
if err != nil { if err != nil {
ExitWithError(ExitError, err) ExitWithError(ExitError, err)
} }