zishuo/netmaker
1
0
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-10-15 21:32:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixing validation

Browse Source
This commit is contained in:
afeiszli
2021-07-11 10:35:01 -04:00
parent 2178612d60
commit 45895f5f93
2 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
compose/docker-compose.localserver.yml
View File

@@ -21,6 +21,6 @@ services:
ports: ports:
- "80:80" - "80:80"
environment: environment:
BACKEND_URL: "http://localhost:8081" BACKEND_URL: "http://HOST_IP:8081"
volumes: volumes:
mongovol: {} mongovol: {}

21
controllers/nodeHttpController_test.go
View File

@@ -34,7 +34,7 @@ func TestCheckIn(t *testing.T) {
func TestCreateEgressGateway(t *testing.T) { func TestCreateEgressGateway(t *testing.T) {
var gateway models.EgressGatewayRequest var gateway models.EgressGatewayRequest
gateway.Interface = "eth0" gateway.Interface = "eth0"
gateway.RangeString = "10.100.100.0/24" gateway.Ranges = ["10.100.100.0/24"]
deleteNet(t) deleteNet(t)
createNet() createNet()
t.Run("NoNodes", func(t *testing.T) { t.Run("NoNodes", func(t *testing.T) {
@@ -62,18 +62,18 @@ func TestDeleteEgressGateway(t *testing.T) {
createTestNode(t) createTestNode(t)
testnode := createTestNode(t) testnode := createTestNode(t)
gateway.Interface = "eth0" gateway.Interface = "eth0"
gateway.RangeString = "10.100.100.0/24" gateway.Ranges = ["10.100.100.0/24"]
gateway.NetID = "skynet" gateway.NetID = "skynet"
gateway.NodeID = testnode.MacAddress gateway.NodeID = testnode.MacAddress
t.Run("Success", func(t *testing.T) { t.Run("Success", func(t *testing.T) {
node, err := CreateEgressGateway(gateway) node, err := CreateEgressGateway(gateway)
assert.Nil(t, err) assert.Nil(t, err)
assert.Equal(t, true, node.IsEgressGateway) assert.Equal(t, true, node.IsEgressGateway)
assert.Equal(t, "10.100.100.0/24", node.EgressGatewayRange) assert.Equal(t, ["10.100.100.0/24"], node.EgressGatewayRanges)
node, err = DeleteEgressGateway(gateway.NetID, gateway.NodeID) node, err = DeleteEgressGateway(gateway.NetID, gateway.NodeID)
assert.Nil(t, err) assert.Nil(t, err)
assert.Equal(t, false, node.IsEgressGateway) assert.Equal(t, false, node.IsEgressGateway)
assert.Equal(t, "", node.EgressGatewayRange) assert.Equal(t, "", node.EgressGatewayRanges)
assert.Equal(t, "", node.PostUp) assert.Equal(t, "", node.PostUp)
assert.Equal(t, "", node.PostDown) assert.Equal(t, "", node.PostDown)
}) })
@@ -81,7 +81,7 @@ func TestDeleteEgressGateway(t *testing.T) {
node, err := DeleteEgressGateway(gateway.NetID, gateway.NodeID) node, err := DeleteEgressGateway(gateway.NetID, gateway.NodeID)
assert.Nil(t, err) assert.Nil(t, err)
assert.Equal(t, false, node.IsEgressGateway) assert.Equal(t, false, node.IsEgressGateway)
assert.Equal(t, "", node.EgressGatewayRange) assert.Equal(t, "", node.EgressGatewayRanges)
assert.Equal(t, "", node.PostUp) assert.Equal(t, "", node.PostUp)
assert.Equal(t, "", node.PostDown) assert.Equal(t, "", node.PostDown)
}) })
@@ -162,16 +162,9 @@ func TestUncordonNode(t *testing.T) {
} }
func TestValidateEgressGateway(t *testing.T) { func TestValidateEgressGateway(t *testing.T) {
var gateway models.EgressGatewayRequest var gateway models.EgressGatewayRequest
t.Run("InvalidRange", func(t *testing.T) {
gateway.Interface = "eth0"
gateway.RangeString = "helloworld"
err := ValidateEgressGateway(gateway)
assert.NotNil(t, err)
assert.Equal(t, "IP Range Not Valid", err.Error())
})
t.Run("EmptyRange", func(t *testing.T) { t.Run("EmptyRange", func(t *testing.T) {
gateway.Interface = "eth0" gateway.Interface = "eth0"
gateway.RangeString = "" gateway.Ranges = []string{}
err := ValidateEgressGateway(gateway) err := ValidateEgressGateway(gateway)
assert.NotNil(t, err) assert.NotNil(t, err)
assert.Equal(t, "IP Range Not Valid", err.Error()) assert.Equal(t, "IP Range Not Valid", err.Error())
@@ -184,7 +177,7 @@ func TestValidateEgressGateway(t *testing.T) {
}) })
t.Run("Success", func(t *testing.T) { t.Run("Success", func(t *testing.T) {
gateway.Interface = "eth0" gateway.Interface = "eth0"
gateway.RangeString = "10.100.100.0/24" gateway.Ranges = ["10.100.100.0/24"]
err := ValidateEgressGateway(gateway) err := ValidateEgressGateway(gateway)
assert.Nil(t, err) assert.Nil(t, err)
}) })