devproje/headscale
1
0
Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2024-11-29 18:33:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Renamed sharing function

Browse source
This commit is contained in:
Juan Font 2021-09-06 14:39:52 +02:00
parent 7edd0cd14c
commit 729cd54401
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmd/headscale/cli/nodes.go
View file

@ -203,7 +203,7 @@ var shareNodeCmd = &cobra.Command{
log.Fatalf("Error getting node: %s", err) log.Fatalf("Error getting node: %s", err)
} }
err = h.ShareNodeInNamespace(m, destNs) err = h.AddSharedMachineToNamespace(m, destNs)
if strings.HasPrefix(o, "json") { if strings.HasPrefix(o, "json") {
JsonOutput(map[string]string{"Result": "Node shared"}, err, o) JsonOutput(map[string]string{"Result": "Node shared"}, err, o)
return return

4
sharing_nodes.go
View file

@ -14,8 +14,8 @@ type SharedNode struct {
Namespace Namespace Namespace Namespace
} }
// ShareNodeInNamespace adds a machine as a shared node to a namespace // AddSharedMachineToNamespace adds a machine as a shared node to a namespace
func (h *Headscale) ShareNodeInNamespace(m *Machine, ns *Namespace) error { func (h *Headscale) AddSharedMachineToNamespace(m *Machine, ns *Namespace) error {
if m.NamespaceID == ns.ID { if m.NamespaceID == ns.ID {
return errorSameNamespace return errorSameNamespace
} }

12
sharing_nodes_test.go
View file

@ -59,7 +59,7 @@ func (s *Suite) TestBasicSharedNodesInNamespace(c *check.C) {
c.Assert(err, check.IsNil) c.Assert(err, check.IsNil)
c.Assert(len(*p1s), check.Equals, 0) c.Assert(len(*p1s), check.Equals, 0)
err = h.ShareNodeInNamespace(&m2, n1) err = h.AddSharedMachineToNamespace(&m2, n1)
c.Assert(err, check.IsNil) c.Assert(err, check.IsNil)
p1sAfter, err := h.getPeers(m1) p1sAfter, err := h.getPeers(m1)
@ -122,7 +122,7 @@ func (s *Suite) TestSameNamespace(c *check.C) {
c.Assert(err, check.IsNil) c.Assert(err, check.IsNil)
c.Assert(len(*p1s), check.Equals, 0) c.Assert(len(*p1s), check.Equals, 0)
err = h.ShareNodeInNamespace(&m1, n1) err = h.AddSharedMachineToNamespace(&m1, n1)
c.Assert(err, check.Equals, errorSameNamespace) c.Assert(err, check.Equals, errorSameNamespace)
} }
@ -180,9 +180,9 @@ func (s *Suite) TestAlreadyShared(c *check.C) {
c.Assert(err, check.IsNil) c.Assert(err, check.IsNil)
c.Assert(len(*p1s), check.Equals, 0) c.Assert(len(*p1s), check.Equals, 0)
err = h.ShareNodeInNamespace(&m2, n1) err = h.AddSharedMachineToNamespace(&m2, n1)
c.Assert(err, check.IsNil) c.Assert(err, check.IsNil)
err = h.ShareNodeInNamespace(&m2, n1) err = h.AddSharedMachineToNamespace(&m2, n1)
c.Assert(err, check.Equals, errorNodeAlreadyShared) c.Assert(err, check.Equals, errorNodeAlreadyShared)
} }
@ -240,7 +240,7 @@ func (s *Suite) TestDoNotIncludeRoutesOnShared(c *check.C) {
c.Assert(err, check.IsNil) c.Assert(err, check.IsNil)
c.Assert(len(*p1s), check.Equals, 0) c.Assert(len(*p1s), check.Equals, 0)
err = h.ShareNodeInNamespace(&m2, n1) err = h.AddSharedMachineToNamespace(&m2, n1)
c.Assert(err, check.IsNil) c.Assert(err, check.IsNil)
p1sAfter, err := h.getPeers(m1) p1sAfter, err := h.getPeers(m1)
@ -346,7 +346,7 @@ func (s *Suite) TestComplexSharingAcrossNamespaces(c *check.C) {
c.Assert(err, check.IsNil) c.Assert(err, check.IsNil)
c.Assert(len(*p1s), check.Equals, 1) // nodes 1 and 4 c.Assert(len(*p1s), check.Equals, 1) // nodes 1 and 4
err = h.ShareNodeInNamespace(&m2, n1) err = h.AddSharedMachineToNamespace(&m2, n1)
c.Assert(err, check.IsNil) c.Assert(err, check.IsNil)
p1sAfter, err := h.getPeers(m1) p1sAfter, err := h.getPeers(m1)