mirror of
https://github.com/juanfont/headscale.git
synced 2024-12-02 03:33:05 +00:00
Merge branch 'main' into doc-reorg-v1
This commit is contained in:
Juan Font
GitHub
commit
d1ebcb59f1
1 changed files with 29 additions and 351 deletions
380
sharing_test.go
380
sharing_test.go
|
|
@ -35,54 +35,8 @@ func CreateNodeNamespace(c *check.C, namespace, node, key, IP string) (*Namespac
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *Suite) TestBasicSharedNodesInNamespace(c *check.C) {
|
func (s *Suite) TestBasicSharedNodesInNamespace(c *check.C) {
|
||||||
n1, err := h.CreateNamespace("shared1")
|
n1, m1 := CreateNodeNamespace(c, "shared1", "test_get_shared_nodes_1", "686824e749f3b7f2a5927ee6c1e422aee5292592d9179a271ed7b3e659b44a66", "100.64.0.1")
|
||||||
c.Assert(err, check.IsNil)
|
_, m2 := CreateNodeNamespace(c, "shared2", "test_get_shared_nodes_2", "dec46ef9dc45c7d2f03bfcd5a640d9e24e3cc68ce3d9da223867c9bc6d5e9863", "100.64.0.2")
|
||||||
|
|
||||||
n2, err := h.CreateNamespace("shared2")
|
|
||||||
c.Assert(err, check.IsNil)
|
|
||||||
|
|
||||||
pak1, err := h.CreatePreAuthKey(n1.Name, false, false, nil)
|
|
||||||
c.Assert(err, check.IsNil)
|
|
||||||
|
|
||||||
pak2, err := h.CreatePreAuthKey(n2.Name, false, false, nil)
|
|
||||||
c.Assert(err, check.IsNil)
|
|
||||||
|
|
||||||
_, err = h.GetMachine(n1.Name, "test_get_shared_nodes_1")
|
|
||||||
c.Assert(err, check.NotNil)
|
|
||||||
|
|
||||||
m1 := &Machine{
|
|
||||||
ID: 0,
|
|
||||||
MachineKey: "686824e749f3b7f2a5927ee6c1e422aee5292592d9179a271ed7b3e659b44a66",
|
|
||||||
NodeKey: "686824e749f3b7f2a5927ee6c1e422aee5292592d9179a271ed7b3e659b44a66",
|
|
||||||
DiscoKey: "686824e749f3b7f2a5927ee6c1e422aee5292592d9179a271ed7b3e659b44a66",
|
|
||||||
Name: "test_get_shared_nodes_1",
|
|
||||||
NamespaceID: n1.ID,
|
|
||||||
Registered: true,
|
|
||||||
RegisterMethod: "authKey",
|
|
||||||
IPAddress: "100.64.0.1",
|
|
||||||
AuthKeyID: uint(pak1.ID),
|
|
||||||
}
|
|
||||||
h.db.Save(m1)
|
|
||||||
|
|
||||||
_, err = h.GetMachine(n1.Name, m1.Name)
|
|
||||||
c.Assert(err, check.IsNil)
|
|
||||||
|
|
||||||
m2 := &Machine{
|
|
||||||
ID: 1,
|
|
||||||
MachineKey: "dec46ef9dc45c7d2f03bfcd5a640d9e24e3cc68ce3d9da223867c9bc6d5e9863",
|
|
||||||
NodeKey: "dec46ef9dc45c7d2f03bfcd5a640d9e24e3cc68ce3d9da223867c9bc6d5e9863",
|
|
||||||
DiscoKey: "dec46ef9dc45c7d2f03bfcd5a640d9e24e3cc68ce3d9da223867c9bc6d5e9863",
|
|
||||||
Name: "test_get_shared_nodes_2",
|
|
||||||
NamespaceID: n2.ID,
|
|
||||||
Registered: true,
|
|
||||||
RegisterMethod: "authKey",
|
|
||||||
IPAddress: "100.64.0.2",
|
|
||||||
AuthKeyID: uint(pak2.ID),
|
|
||||||
}
|
|
||||||
h.db.Save(m2)
|
|
||||||
|
|
||||||
_, err = h.GetMachine(n2.Name, m2.Name)
|
|
||||||
c.Assert(err, check.IsNil)
|
|
||||||
|
|
||||||
p1s, err := h.getPeers(m1)
|
p1s, err := h.getPeers(m1)
|
||||||
c.Assert(err, check.IsNil)
|
c.Assert(err, check.IsNil)
|
||||||
|
|
@ -98,54 +52,7 @@ func (s *Suite) TestBasicSharedNodesInNamespace(c *check.C) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *Suite) TestSameNamespace(c *check.C) {
|
func (s *Suite) TestSameNamespace(c *check.C) {
|
||||||
n1, err := h.CreateNamespace("shared1")
|
n1, m1 := CreateNodeNamespace(c, "shared1", "test_get_shared_nodes_1", "686824e749f3b7f2a5927ee6c1e422aee5292592d9179a271ed7b3e659b44a66", "100.64.0.1")
|
||||||
c.Assert(err, check.IsNil)
|
|
||||||
|
|
||||||
n2, err := h.CreateNamespace("shared2")
|
|
||||||
c.Assert(err, check.IsNil)
|
|
||||||
|
|
||||||
pak1, err := h.CreatePreAuthKey(n1.Name, false, false, nil)
|
|
||||||
c.Assert(err, check.IsNil)
|
|
||||||
|
|
||||||
pak2, err := h.CreatePreAuthKey(n2.Name, false, false, nil)
|
|
||||||
c.Assert(err, check.IsNil)
|
|
||||||
|
|
||||||
_, err = h.GetMachine(n1.Name, "test_get_shared_nodes_1")
|
|
||||||
c.Assert(err, check.NotNil)
|
|
||||||
|
|
||||||
m1 := &Machine{
|
|
||||||
ID: 0,
|
|
||||||
MachineKey: "686824e749f3b7f2a5927ee6c1e422aee5292592d9179a271ed7b3e659b44a66",
|
|
||||||
NodeKey: "686824e749f3b7f2a5927ee6c1e422aee5292592d9179a271ed7b3e659b44a66",
|
|
||||||
DiscoKey: "686824e749f3b7f2a5927ee6c1e422aee5292592d9179a271ed7b3e659b44a66",
|
|
||||||
Name: "test_get_shared_nodes_1",
|
|
||||||
NamespaceID: n1.ID,
|
|
||||||
Registered: true,
|
|
||||||
RegisterMethod: "authKey",
|
|
||||||
IPAddress: "100.64.0.1",
|
|
||||||
AuthKeyID: uint(pak1.ID),
|
|
||||||
}
|
|
||||||
h.db.Save(m1)
|
|
||||||
|
|
||||||
_, err = h.GetMachine(n1.Name, m1.Name)
|
|
||||||
c.Assert(err, check.IsNil)
|
|
||||||
|
|
||||||
m2 := &Machine{
|
|
||||||
ID: 1,
|
|
||||||
MachineKey: "dec46ef9dc45c7d2f03bfcd5a640d9e24e3cc68ce3d9da223867c9bc6d5e9863",
|
|
||||||
NodeKey: "dec46ef9dc45c7d2f03bfcd5a640d9e24e3cc68ce3d9da223867c9bc6d5e9863",
|
|
||||||
DiscoKey: "dec46ef9dc45c7d2f03bfcd5a640d9e24e3cc68ce3d9da223867c9bc6d5e9863",
|
|
||||||
Name: "test_get_shared_nodes_2",
|
|
||||||
NamespaceID: n2.ID,
|
|
||||||
Registered: true,
|
|
||||||
RegisterMethod: "authKey",
|
|
||||||
IPAddress: "100.64.0.2",
|
|
||||||
AuthKeyID: uint(pak2.ID),
|
|
||||||
}
|
|
||||||
h.db.Save(m2)
|
|
||||||
|
|
||||||
_, err = h.GetMachine(n2.Name, m2.Name)
|
|
||||||
c.Assert(err, check.IsNil)
|
|
||||||
|
|
||||||
p1s, err := h.getPeers(m1)
|
p1s, err := h.getPeers(m1)
|
||||||
c.Assert(err, check.IsNil)
|
c.Assert(err, check.IsNil)
|
||||||
|
|
@ -182,54 +89,8 @@ func (s *Suite) TestUnshare(c *check.C) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *Suite) TestAlreadyShared(c *check.C) {
|
func (s *Suite) TestAlreadyShared(c *check.C) {
|
||||||
n1, err := h.CreateNamespace("shared1")
|
n1, m1 := CreateNodeNamespace(c, "shared1", "test_get_shared_nodes_1", "686824e749f3b7f2a5927ee6c1e422aee5292592d9179a271ed7b3e659b44a66", "100.64.0.1")
|
||||||
c.Assert(err, check.IsNil)
|
_, m2 := CreateNodeNamespace(c, "shared2", "test_get_shared_nodes_2", "dec46ef9dc45c7d2f03bfcd5a640d9e24e3cc68ce3d9da223867c9bc6d5e9863", "100.64.0.2")
|
||||||
|
|
||||||
n2, err := h.CreateNamespace("shared2")
|
|
||||||
c.Assert(err, check.IsNil)
|
|
||||||
|
|
||||||
pak1, err := h.CreatePreAuthKey(n1.Name, false, false, nil)
|
|
||||||
c.Assert(err, check.IsNil)
|
|
||||||
|
|
||||||
pak2, err := h.CreatePreAuthKey(n2.Name, false, false, nil)
|
|
||||||
c.Assert(err, check.IsNil)
|
|
||||||
|
|
||||||
_, err = h.GetMachine(n1.Name, "test_get_shared_nodes_1")
|
|
||||||
c.Assert(err, check.NotNil)
|
|
||||||
|
|
||||||
m1 := &Machine{
|
|
||||||
ID: 0,
|
|
||||||
MachineKey: "686824e749f3b7f2a5927ee6c1e422aee5292592d9179a271ed7b3e659b44a66",
|
|
||||||
NodeKey: "686824e749f3b7f2a5927ee6c1e422aee5292592d9179a271ed7b3e659b44a66",
|
|
||||||
DiscoKey: "686824e749f3b7f2a5927ee6c1e422aee5292592d9179a271ed7b3e659b44a66",
|
|
||||||
Name: "test_get_shared_nodes_1",
|
|
||||||
NamespaceID: n1.ID,
|
|
||||||
Registered: true,
|
|
||||||
RegisterMethod: "authKey",
|
|
||||||
IPAddress: "100.64.0.1",
|
|
||||||
AuthKeyID: uint(pak1.ID),
|
|
||||||
}
|
|
||||||
h.db.Save(m1)
|
|
||||||
|
|
||||||
_, err = h.GetMachine(n1.Name, m1.Name)
|
|
||||||
c.Assert(err, check.IsNil)
|
|
||||||
|
|
||||||
m2 := &Machine{
|
|
||||||
ID: 1,
|
|
||||||
MachineKey: "dec46ef9dc45c7d2f03bfcd5a640d9e24e3cc68ce3d9da223867c9bc6d5e9863",
|
|
||||||
NodeKey: "dec46ef9dc45c7d2f03bfcd5a640d9e24e3cc68ce3d9da223867c9bc6d5e9863",
|
|
||||||
DiscoKey: "dec46ef9dc45c7d2f03bfcd5a640d9e24e3cc68ce3d9da223867c9bc6d5e9863",
|
|
||||||
Name: "test_get_shared_nodes_2",
|
|
||||||
NamespaceID: n2.ID,
|
|
||||||
Registered: true,
|
|
||||||
RegisterMethod: "authKey",
|
|
||||||
IPAddress: "100.64.0.2",
|
|
||||||
AuthKeyID: uint(pak2.ID),
|
|
||||||
}
|
|
||||||
h.db.Save(m2)
|
|
||||||
|
|
||||||
_, err = h.GetMachine(n2.Name, m2.Name)
|
|
||||||
c.Assert(err, check.IsNil)
|
|
||||||
|
|
||||||
p1s, err := h.getPeers(m1)
|
p1s, err := h.getPeers(m1)
|
||||||
c.Assert(err, check.IsNil)
|
c.Assert(err, check.IsNil)
|
||||||
|
|
@ -242,54 +103,8 @@ func (s *Suite) TestAlreadyShared(c *check.C) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *Suite) TestDoNotIncludeRoutesOnShared(c *check.C) {
|
func (s *Suite) TestDoNotIncludeRoutesOnShared(c *check.C) {
|
||||||
n1, err := h.CreateNamespace("shared1")
|
n1, m1 := CreateNodeNamespace(c, "shared1", "test_get_shared_nodes_1", "686824e749f3b7f2a5927ee6c1e422aee5292592d9179a271ed7b3e659b44a66", "100.64.0.1")
|
||||||
c.Assert(err, check.IsNil)
|
_, m2 := CreateNodeNamespace(c, "shared2", "test_get_shared_nodes_2", "dec46ef9dc45c7d2f03bfcd5a640d9e24e3cc68ce3d9da223867c9bc6d5e9863", "100.64.0.2")
|
||||||
|
|
||||||
n2, err := h.CreateNamespace("shared2")
|
|
||||||
c.Assert(err, check.IsNil)
|
|
||||||
|
|
||||||
pak1, err := h.CreatePreAuthKey(n1.Name, false, false, nil)
|
|
||||||
c.Assert(err, check.IsNil)
|
|
||||||
|
|
||||||
pak2, err := h.CreatePreAuthKey(n2.Name, false, false, nil)
|
|
||||||
c.Assert(err, check.IsNil)
|
|
||||||
|
|
||||||
_, err = h.GetMachine(n1.Name, "test_get_shared_nodes_1")
|
|
||||||
c.Assert(err, check.NotNil)
|
|
||||||
|
|
||||||
m1 := &Machine{
|
|
||||||
ID: 0,
|
|
||||||
MachineKey: "686824e749f3b7f2a5927ee6c1e422aee5292592d9179a271ed7b3e659b44a66",
|
|
||||||
NodeKey: "686824e749f3b7f2a5927ee6c1e422aee5292592d9179a271ed7b3e659b44a66",
|
|
||||||
DiscoKey: "686824e749f3b7f2a5927ee6c1e422aee5292592d9179a271ed7b3e659b44a66",
|
|
||||||
Name: "test_get_shared_nodes_1",
|
|
||||||
NamespaceID: n1.ID,
|
|
||||||
Registered: true,
|
|
||||||
RegisterMethod: "authKey",
|
|
||||||
IPAddress: "100.64.0.1",
|
|
||||||
AuthKeyID: uint(pak1.ID),
|
|
||||||
}
|
|
||||||
h.db.Save(m1)
|
|
||||||
|
|
||||||
_, err = h.GetMachine(n1.Name, m1.Name)
|
|
||||||
c.Assert(err, check.IsNil)
|
|
||||||
|
|
||||||
m2 := &Machine{
|
|
||||||
ID: 1,
|
|
||||||
MachineKey: "dec46ef9dc45c7d2f03bfcd5a640d9e24e3cc68ce3d9da223867c9bc6d5e9863",
|
|
||||||
NodeKey: "dec46ef9dc45c7d2f03bfcd5a640d9e24e3cc68ce3d9da223867c9bc6d5e9863",
|
|
||||||
DiscoKey: "dec46ef9dc45c7d2f03bfcd5a640d9e24e3cc68ce3d9da223867c9bc6d5e9863",
|
|
||||||
Name: "test_get_shared_nodes_2",
|
|
||||||
NamespaceID: n2.ID,
|
|
||||||
Registered: true,
|
|
||||||
RegisterMethod: "authKey",
|
|
||||||
IPAddress: "100.64.0.2",
|
|
||||||
AuthKeyID: uint(pak2.ID),
|
|
||||||
}
|
|
||||||
h.db.Save(m2)
|
|
||||||
|
|
||||||
_, err = h.GetMachine(n2.Name, m2.Name)
|
|
||||||
c.Assert(err, check.IsNil)
|
|
||||||
|
|
||||||
p1s, err := h.getPeers(m1)
|
p1s, err := h.getPeers(m1)
|
||||||
c.Assert(err, check.IsNil)
|
c.Assert(err, check.IsNil)
|
||||||
|
|
@ -305,86 +120,18 @@ func (s *Suite) TestDoNotIncludeRoutesOnShared(c *check.C) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *Suite) TestComplexSharingAcrossNamespaces(c *check.C) {
|
func (s *Suite) TestComplexSharingAcrossNamespaces(c *check.C) {
|
||||||
n1, err := h.CreateNamespace("shared1")
|
n1, m1 := CreateNodeNamespace(c, "shared1", "test_get_shared_nodes_1", "686824e749f3b7f2a5927ee6c1e422aee5292592d9179a271ed7b3e659b44a66", "100.64.0.1")
|
||||||
c.Assert(err, check.IsNil)
|
_, m2 := CreateNodeNamespace(c, "shared2", "test_get_shared_nodes_2", "dec46ef9dc45c7d2f03bfcd5a640d9e24e3cc68ce3d9da223867c9bc6d5e9863", "100.64.0.2")
|
||||||
|
_, m3 := CreateNodeNamespace(c, "shared3", "test_get_shared_nodes_3", "6e704bee83eb93db6fc2c417d7882964cd3f8cc87082cbb645982e34020c76c8", "100.64.0.3")
|
||||||
n2, err := h.CreateNamespace("shared2")
|
|
||||||
c.Assert(err, check.IsNil)
|
|
||||||
|
|
||||||
n3, err := h.CreateNamespace("shared3")
|
|
||||||
c.Assert(err, check.IsNil)
|
|
||||||
|
|
||||||
pak1, err := h.CreatePreAuthKey(n1.Name, false, false, nil)
|
|
||||||
c.Assert(err, check.IsNil)
|
|
||||||
|
|
||||||
pak2, err := h.CreatePreAuthKey(n2.Name, false, false, nil)
|
|
||||||
c.Assert(err, check.IsNil)
|
|
||||||
|
|
||||||
pak3, err := h.CreatePreAuthKey(n3.Name, false, false, nil)
|
|
||||||
c.Assert(err, check.IsNil)
|
|
||||||
|
|
||||||
pak4, err := h.CreatePreAuthKey(n1.Name, false, false, nil)
|
pak4, err := h.CreatePreAuthKey(n1.Name, false, false, nil)
|
||||||
c.Assert(err, check.IsNil)
|
c.Assert(err, check.IsNil)
|
||||||
|
|
||||||
_, err = h.GetMachine(n1.Name, "test_get_shared_nodes_1")
|
|
||||||
c.Assert(err, check.NotNil)
|
|
||||||
|
|
||||||
m1 := &Machine{
|
|
||||||
ID: 1,
|
|
||||||
MachineKey: "686824e749f3b7f2a5927ee6c1e422aee5292592d9179a271ed7b3e659b44a66",
|
|
||||||
NodeKey: "686824e749f3b7f2a5927ee6c1e422aee5292592d9179a271ed7b3e659b44a66",
|
|
||||||
DiscoKey: "686824e749f3b7f2a5927ee6c1e422aee5292592d9179a271ed7b3e659b44a66",
|
|
||||||
Name: "test_get_shared_nodes_1",
|
|
||||||
NamespaceID: n1.ID,
|
|
||||||
Registered: true,
|
|
||||||
RegisterMethod: "authKey",
|
|
||||||
IPAddress: "100.64.0.1",
|
|
||||||
AuthKeyID: uint(pak1.ID),
|
|
||||||
}
|
|
||||||
h.db.Save(m1)
|
|
||||||
|
|
||||||
_, err = h.GetMachine(n1.Name, m1.Name)
|
|
||||||
c.Assert(err, check.IsNil)
|
|
||||||
|
|
||||||
m2 := &Machine{
|
|
||||||
ID: 2,
|
|
||||||
MachineKey: "dec46ef9dc45c7d2f03bfcd5a640d9e24e3cc68ce3d9da223867c9bc6d5e9863",
|
|
||||||
NodeKey: "dec46ef9dc45c7d2f03bfcd5a640d9e24e3cc68ce3d9da223867c9bc6d5e9863",
|
|
||||||
DiscoKey: "dec46ef9dc45c7d2f03bfcd5a640d9e24e3cc68ce3d9da223867c9bc6d5e9863",
|
|
||||||
Name: "test_get_shared_nodes_2",
|
|
||||||
NamespaceID: n2.ID,
|
|
||||||
Registered: true,
|
|
||||||
RegisterMethod: "authKey",
|
|
||||||
IPAddress: "100.64.0.2",
|
|
||||||
AuthKeyID: uint(pak2.ID),
|
|
||||||
}
|
|
||||||
h.db.Save(m2)
|
|
||||||
|
|
||||||
_, err = h.GetMachine(n2.Name, m2.Name)
|
|
||||||
c.Assert(err, check.IsNil)
|
|
||||||
|
|
||||||
m3 := &Machine{
|
|
||||||
ID: 3,
|
|
||||||
MachineKey: "dec46ef9dc45c7d2f03bfcd5a640d9e24e3cc68ce3d9da223867c9bc6d5e9863",
|
|
||||||
NodeKey: "dec46ef9dc45c7d2f03bfcd5a640d9e24e3cc68ce3d9da223867c9bc6d5e9863",
|
|
||||||
DiscoKey: "dec46ef9dc45c7d2f03bfcd5a640d9e24e3cc68ce3d9da223867c9bc6d5e9863",
|
|
||||||
Name: "test_get_shared_nodes_3",
|
|
||||||
NamespaceID: n3.ID,
|
|
||||||
Registered: true,
|
|
||||||
RegisterMethod: "authKey",
|
|
||||||
IPAddress: "100.64.0.3",
|
|
||||||
AuthKeyID: uint(pak3.ID),
|
|
||||||
}
|
|
||||||
h.db.Save(m3)
|
|
||||||
|
|
||||||
_, err = h.GetMachine(n3.Name, m3.Name)
|
|
||||||
c.Assert(err, check.IsNil)
|
|
||||||
|
|
||||||
m4 := &Machine{
|
m4 := &Machine{
|
||||||
ID: 4,
|
ID: 4,
|
||||||
MachineKey: "dec46ef9dc45c7d2f03bfcd5a640d9e24e3cc68ce3d9da223867c9bc6d5e9863",
|
MachineKey: "4c3e07c3ecd40e9c945bb6797557c451850691c0409740578325e17009dd298f",
|
||||||
NodeKey: "dec46ef9dc45c7d2f03bfcd5a640d9e24e3cc68ce3d9da223867c9bc6d5e9863",
|
NodeKey: "4c3e07c3ecd40e9c945bb6797557c451850691c0409740578325e17009dd298f",
|
||||||
DiscoKey: "dec46ef9dc45c7d2f03bfcd5a640d9e24e3cc68ce3d9da223867c9bc6d5e9863",
|
DiscoKey: "4c3e07c3ecd40e9c945bb6797557c451850691c0409740578325e17009dd298f",
|
||||||
Name: "test_get_shared_nodes_4",
|
Name: "test_get_shared_nodes_4",
|
||||||
NamespaceID: n1.ID,
|
NamespaceID: n1.ID,
|
||||||
Registered: true,
|
Registered: true,
|
||||||
|
|
@ -400,7 +147,7 @@ func (s *Suite) TestComplexSharingAcrossNamespaces(c *check.C) {
|
||||||
p1s, err := h.getPeers(m1)
|
p1s, err := h.getPeers(m1)
|
||||||
c.Assert(err, check.IsNil)
|
c.Assert(err, check.IsNil)
|
||||||
c.Assert(len(p1s), check.Equals, 1) // node1 can see node4
|
c.Assert(len(p1s), check.Equals, 1) // node1 can see node4
|
||||||
c.Assert(p1s[0].Name, check.Equals, "test_get_shared_nodes_4")
|
c.Assert(p1s[0].Name, check.Equals, m4.Name)
|
||||||
|
|
||||||
err = h.AddSharedMachineToNamespace(m2, n1)
|
err = h.AddSharedMachineToNamespace(m2, n1)
|
||||||
c.Assert(err, check.IsNil)
|
c.Assert(err, check.IsNil)
|
||||||
|
|
@ -408,13 +155,13 @@ func (s *Suite) TestComplexSharingAcrossNamespaces(c *check.C) {
|
||||||
p1sAfter, err := h.getPeers(m1)
|
p1sAfter, err := h.getPeers(m1)
|
||||||
c.Assert(err, check.IsNil)
|
c.Assert(err, check.IsNil)
|
||||||
c.Assert(len(p1sAfter), check.Equals, 2) // node1 can see node2 (shared) and node4 (same namespace)
|
c.Assert(len(p1sAfter), check.Equals, 2) // node1 can see node2 (shared) and node4 (same namespace)
|
||||||
c.Assert(p1sAfter[0].Name, check.Equals, "test_get_shared_nodes_2")
|
c.Assert(p1sAfter[0].Name, check.Equals, m2.Name)
|
||||||
c.Assert(p1sAfter[1].Name, check.Equals, "test_get_shared_nodes_4")
|
c.Assert(p1sAfter[1].Name, check.Equals, m4.Name)
|
||||||
|
|
||||||
node1shared, err := h.getShared(m1)
|
node1shared, err := h.getShared(m1)
|
||||||
c.Assert(err, check.IsNil)
|
c.Assert(err, check.IsNil)
|
||||||
c.Assert(len(node1shared), check.Equals, 1) // node1 can see node2 as shared
|
c.Assert(len(node1shared), check.Equals, 1) // node1 can see node2 as shared
|
||||||
c.Assert(node1shared[0].Name, check.Equals, "test_get_shared_nodes_2")
|
c.Assert(node1shared[0].Name, check.Equals, m2.Name)
|
||||||
|
|
||||||
pAlone, err := h.getPeers(m3)
|
pAlone, err := h.getPeers(m3)
|
||||||
c.Assert(err, check.IsNil)
|
c.Assert(err, check.IsNil)
|
||||||
|
|
@ -423,91 +170,22 @@ func (s *Suite) TestComplexSharingAcrossNamespaces(c *check.C) {
|
||||||
pSharedTo, err := h.getPeers(m2)
|
pSharedTo, err := h.getPeers(m2)
|
||||||
c.Assert(err, check.IsNil)
|
c.Assert(err, check.IsNil)
|
||||||
c.Assert(len(pSharedTo), check.Equals, 2) // node2 should see node1 (sharedTo) and node4 (sharedTo), as is shared in namespace1
|
c.Assert(len(pSharedTo), check.Equals, 2) // node2 should see node1 (sharedTo) and node4 (sharedTo), as is shared in namespace1
|
||||||
c.Assert(pSharedTo[0].Name, check.Equals, "test_get_shared_nodes_1")
|
c.Assert(pSharedTo[0].Name, check.Equals, m1.Name)
|
||||||
c.Assert(pSharedTo[1].Name, check.Equals, "test_get_shared_nodes_4")
|
c.Assert(pSharedTo[1].Name, check.Equals, m4.Name)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *Suite) TestDeleteSharedMachine(c *check.C) {
|
func (s *Suite) TestDeleteSharedMachine(c *check.C) {
|
||||||
n1, err := h.CreateNamespace("shared1")
|
n1, m1 := CreateNodeNamespace(c, "shared1", "test_get_shared_nodes_1", "686824e749f3b7f2a5927ee6c1e422aee5292592d9179a271ed7b3e659b44a66", "100.64.0.1")
|
||||||
c.Assert(err, check.IsNil)
|
_, m2 := CreateNodeNamespace(c, "shared2", "test_get_shared_nodes_2", "dec46ef9dc45c7d2f03bfcd5a640d9e24e3cc68ce3d9da223867c9bc6d5e9863", "100.64.0.2")
|
||||||
|
_, m3 := CreateNodeNamespace(c, "shared3", "test_get_shared_nodes_3", "6e704bee83eb93db6fc2c417d7882964cd3f8cc87082cbb645982e34020c76c8", "100.64.0.3")
|
||||||
n2, err := h.CreateNamespace("shared2")
|
|
||||||
c.Assert(err, check.IsNil)
|
|
||||||
|
|
||||||
n3, err := h.CreateNamespace("shared3")
|
|
||||||
c.Assert(err, check.IsNil)
|
|
||||||
|
|
||||||
pak1n1, err := h.CreatePreAuthKey(n1.Name, false, false, nil)
|
|
||||||
c.Assert(err, check.IsNil)
|
|
||||||
|
|
||||||
pak2n2, err := h.CreatePreAuthKey(n2.Name, false, false, nil)
|
|
||||||
c.Assert(err, check.IsNil)
|
|
||||||
|
|
||||||
pak3n3, err := h.CreatePreAuthKey(n3.Name, false, false, nil)
|
|
||||||
c.Assert(err, check.IsNil)
|
|
||||||
|
|
||||||
pak4n1, err := h.CreatePreAuthKey(n1.Name, false, false, nil)
|
pak4n1, err := h.CreatePreAuthKey(n1.Name, false, false, nil)
|
||||||
c.Assert(err, check.IsNil)
|
c.Assert(err, check.IsNil)
|
||||||
|
|
||||||
_, err = h.GetMachine(n1.Name, "test_get_shared_nodes_1")
|
|
||||||
c.Assert(err, check.NotNil)
|
|
||||||
|
|
||||||
m1 := &Machine{
|
|
||||||
ID: 1,
|
|
||||||
MachineKey: "686824e749f3b7f2a5927ee6c1e422aee5292592d9179a271ed7b3e659b44a66",
|
|
||||||
NodeKey: "686824e749f3b7f2a5927ee6c1e422aee5292592d9179a271ed7b3e659b44a66",
|
|
||||||
DiscoKey: "686824e749f3b7f2a5927ee6c1e422aee5292592d9179a271ed7b3e659b44a66",
|
|
||||||
Name: "test_get_shared_nodes_1",
|
|
||||||
NamespaceID: n1.ID,
|
|
||||||
Registered: true,
|
|
||||||
RegisterMethod: "authKey",
|
|
||||||
IPAddress: "100.64.0.1",
|
|
||||||
AuthKeyID: uint(pak1n1.ID),
|
|
||||||
}
|
|
||||||
h.db.Save(m1)
|
|
||||||
|
|
||||||
_, err = h.GetMachine(n1.Name, m1.Name)
|
|
||||||
c.Assert(err, check.IsNil)
|
|
||||||
|
|
||||||
m2 := &Machine{
|
|
||||||
ID: 2,
|
|
||||||
MachineKey: "dec46ef9dc45c7d2f03bfcd5a640d9e24e3cc68ce3d9da223867c9bc6d5e9863",
|
|
||||||
NodeKey: "dec46ef9dc45c7d2f03bfcd5a640d9e24e3cc68ce3d9da223867c9bc6d5e9863",
|
|
||||||
DiscoKey: "dec46ef9dc45c7d2f03bfcd5a640d9e24e3cc68ce3d9da223867c9bc6d5e9863",
|
|
||||||
Name: "test_get_shared_nodes_2",
|
|
||||||
NamespaceID: n2.ID,
|
|
||||||
Registered: true,
|
|
||||||
RegisterMethod: "authKey",
|
|
||||||
IPAddress: "100.64.0.2",
|
|
||||||
AuthKeyID: uint(pak2n2.ID),
|
|
||||||
}
|
|
||||||
h.db.Save(m2)
|
|
||||||
|
|
||||||
_, err = h.GetMachine(n2.Name, m2.Name)
|
|
||||||
c.Assert(err, check.IsNil)
|
|
||||||
|
|
||||||
m3 := &Machine{
|
|
||||||
ID: 3,
|
|
||||||
MachineKey: "dec46ef9dc45c7d2f03bfcd5a640d9e24e3cc68ce3d9da223867c9bc6d5e9863",
|
|
||||||
NodeKey: "dec46ef9dc45c7d2f03bfcd5a640d9e24e3cc68ce3d9da223867c9bc6d5e9863",
|
|
||||||
DiscoKey: "dec46ef9dc45c7d2f03bfcd5a640d9e24e3cc68ce3d9da223867c9bc6d5e9863",
|
|
||||||
Name: "test_get_shared_nodes_3",
|
|
||||||
NamespaceID: n3.ID,
|
|
||||||
Registered: true,
|
|
||||||
RegisterMethod: "authKey",
|
|
||||||
IPAddress: "100.64.0.3",
|
|
||||||
AuthKeyID: uint(pak3n3.ID),
|
|
||||||
}
|
|
||||||
h.db.Save(m3)
|
|
||||||
|
|
||||||
_, err = h.GetMachine(n3.Name, m3.Name)
|
|
||||||
c.Assert(err, check.IsNil)
|
|
||||||
|
|
||||||
m4 := &Machine{
|
m4 := &Machine{
|
||||||
ID: 4,
|
ID: 4,
|
||||||
MachineKey: "dec46ef9dc45c7d2f03bfcd5a640d9e24e3cc68ce3d9da223867c9bc6d5e9863",
|
MachineKey: "4c3e07c3ecd40e9c945bb6797557c451850691c0409740578325e17009dd298f",
|
||||||
NodeKey: "dec46ef9dc45c7d2f03bfcd5a640d9e24e3cc68ce3d9da223867c9bc6d5e9863",
|
NodeKey: "4c3e07c3ecd40e9c945bb6797557c451850691c0409740578325e17009dd298f",
|
||||||
DiscoKey: "dec46ef9dc45c7d2f03bfcd5a640d9e24e3cc68ce3d9da223867c9bc6d5e9863",
|
DiscoKey: "4c3e07c3ecd40e9c945bb6797557c451850691c0409740578325e17009dd298f",
|
||||||
Name: "test_get_shared_nodes_4",
|
Name: "test_get_shared_nodes_4",
|
||||||
NamespaceID: n1.ID,
|
NamespaceID: n1.ID,
|
||||||
Registered: true,
|
Registered: true,
|
||||||
|
|
@ -523,7 +201,7 @@ func (s *Suite) TestDeleteSharedMachine(c *check.C) {
|
||||||
p1s, err := h.getPeers(m1)
|
p1s, err := h.getPeers(m1)
|
||||||
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
|
||||||
c.Assert(p1s[0].Name, check.Equals, "test_get_shared_nodes_4")
|
c.Assert(p1s[0].Name, check.Equals, m4.Name)
|
||||||
|
|
||||||
err = h.AddSharedMachineToNamespace(m2, n1)
|
err = h.AddSharedMachineToNamespace(m2, n1)
|
||||||
c.Assert(err, check.IsNil)
|
c.Assert(err, check.IsNil)
|
||||||
|
|
@ -531,13 +209,13 @@ func (s *Suite) TestDeleteSharedMachine(c *check.C) {
|
||||||
p1sAfter, err := h.getPeers(m1)
|
p1sAfter, err := h.getPeers(m1)
|
||||||
c.Assert(err, check.IsNil)
|
c.Assert(err, check.IsNil)
|
||||||
c.Assert(len(p1sAfter), check.Equals, 2) // nodes 1, 2, 4
|
c.Assert(len(p1sAfter), check.Equals, 2) // nodes 1, 2, 4
|
||||||
c.Assert(p1sAfter[0].Name, check.Equals, "test_get_shared_nodes_2")
|
c.Assert(p1sAfter[0].Name, check.Equals, m2.Name)
|
||||||
c.Assert(p1sAfter[1].Name, check.Equals, "test_get_shared_nodes_4")
|
c.Assert(p1sAfter[1].Name, check.Equals, m4.Name)
|
||||||
|
|
||||||
node1shared, err := h.getShared(m1)
|
node1shared, err := h.getShared(m1)
|
||||||
c.Assert(err, check.IsNil)
|
c.Assert(err, check.IsNil)
|
||||||
c.Assert(len(node1shared), check.Equals, 1) // nodes 1, 2, 4
|
c.Assert(len(node1shared), check.Equals, 1) // nodes 1, 2, 4
|
||||||
c.Assert(node1shared[0].Name, check.Equals, "test_get_shared_nodes_2")
|
c.Assert(node1shared[0].Name, check.Equals, m2.Name)
|
||||||
|
|
||||||
pAlone, err := h.getPeers(m3)
|
pAlone, err := h.getPeers(m3)
|
||||||
c.Assert(err, check.IsNil)
|
c.Assert(err, check.IsNil)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue