Merge branch 'master' of gitlab.ricebook.net:platform/core

cluster/calcium/meta.go

@@ -29,6 +29,10 @@ func (c *calcium) ListPodNodes(podname string) ([]*types.Node, error) {
 	return c.store.GetNodesByPod(podname)
 }
 
+func (c *calcium) ListPodNodeNames(podname string) ([]string, error) {
+	return c.store.GetNodeNamesByPod(podname)
+}
+
 func (c *calcium) GetContainer(id string) (*types.Container, error) {
 	return c.store.GetContainer(id)
 }

cluster/cluster.go

@@ -12,6 +12,7 @@ type Cluster interface {
 	AddNode(nodename, endpoint, podname, cafile, certfile, keyfile string, public bool) (*types.Node, error)
 	GetNode(podname, nodename string) (*types.Node, error)
 	ListPodNodes(podname string) ([]*types.Node, error)
+	ListPodNodeNames(podname string) ([]string, error)
 	GetContainer(id string) (*types.Container, error)
 	GetContainers(ids []string) ([]*types.Container, error)
 

devtools/client.py

@@ -95,6 +95,23 @@ def get_pod_nodes(ctx, name):
         click.echo(node)
 
 
+@cli.command('pod:nodenames')
+@click.argument('name')
+@click.pass_context
+def get_pod_node_names(ctx, name):
+    stub = _get_stub(ctx)
+    opts = pb.ListNodesOptions(podname=name)
+
+    try:
+        r = stub.ListPodNodeNames(opts, 5)
+    except AbortionError as e:
+        click.echo(click.style('abortion error: %s' % e.details, fg='red', bold=True))
+        ctx.exit(-1)
+
+    for name in r.names:
+        click.echo(name)
+
+
 @cli.command('node:get')
 @click.argument('podname')
 @click.argument('nodename')

rpc/gen/core.proto

@@ -10,6 +10,7 @@ service CoreRPC {
     rpc AddNode(AddNodeOptions) returns (Node) {};
     rpc GetNode(GetNodeOptions) returns (Node) {};
     rpc ListPodNodes(ListNodesOptions) returns (Nodes) {};
+    rpc ListPodNodeNames(ListNodesOptions) returns (NodeNames) {};
     rpc GetContainer(ContainerID) returns (Container) {};
     rpc GetContainers(ContainerIDs) returns (Containers) {};
 
@@ -45,6 +46,10 @@ message Nodes {
     repeated Node nodes = 1;
 }
 
+message NodeNames {
+    repeated string names = 1;
+}
+
 message Container {
     string id = 1;
     string podname = 2;

rpc/rpc.go

@@ -89,6 +89,16 @@ func (v *virbranium) ListPodNodes(ctx context.Context, opts *pb.ListNodesOptions
 	return &pb.Nodes{Nodes: nodes}, nil
 }
 
+// ListPodNodes returns a list of node names for pod, only name!
+func (v *virbranium) ListPodNodeNames(ctx context.Context, opts *pb.ListNodesOptions) (*pb.NodeNames, error) {
+	names, err := v.cluster.ListPodNodeNames(opts.Podname)
+	if err != nil {
+		return nil, err
+	}
+
+	return &pb.NodeNames{Names: names}, nil
+}
+
 // GetContainer
 // More information will be shown
 func (v *virbranium) GetContainer(ctx context.Context, id *pb.ContainerID) (*pb.Container, error) {

store/etcd/node.go

@@ -170,6 +170,29 @@ func (k *krypton) GetNodesByPod(podname string) ([]*types.Node, error) {
 	return nodes, err
 }
 
+// only get names
+// storage path in etcd is `/eru-core/pod/:podname/node`
+func (k *krypton) GetNodeNamesByPod(podname string) ([]string, error) {
+	var (
+		names []string
+		err   error
+	)
+
+	key := fmt.Sprintf(podNodesKey, podname)
+	resp, err := k.etcd.Get(context.Background(), key, nil)
+	if err != nil {
+		return names, err
+	}
+	if !resp.Node.Dir {
+		return nil, fmt.Errorf("Node storage path %q in etcd is not a directory", key)
+	}
+
+	for _, node := range resp.Node.Nodes {
+		names = append(names, utils.Tail(node.Key))
+	}
+	return names, err
+}
+
 // update a node, save it to etcd
 // storage path in etcd is `/eru-core/pod/:podname/node/:nodename/info`
 func (k *krypton) UpdateNode(node *types.Node) error {

store/store.go

@@ -15,6 +15,7 @@ type Store interface {
 	AddNode(name, endpoint, podname, cafile, certfile, keyfile string, public bool) (*types.Node, error)
 	GetNode(podname, nodename string) (*types.Node, error)
 	GetNodesByPod(podname string) ([]*types.Node, error)
+	GetNodeNamesByPod(podname string) ([]string, error)
 	GetAllNodes() ([]*types.Node, error)
 	UpdateNode(*types.Node) error
 	UpdateNodeCPU(podname, nodename string, cpu types.CPUMap, action string) error