fixing validation

compose/docker-compose.localserver.yml

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

controllers/nodeHttpController_test.go

@@ -34,7 +34,7 @@ func TestCheckIn(t *testing.T) {
 func TestCreateEgressGateway(t *testing.T) {
 	var gateway models.EgressGatewayRequest
 	gateway.Interface = "eth0"
-	gateway.RangeString = "10.100.100.0/24"
+	gateway.Ranges = ["10.100.100.0/24"]
 	deleteNet(t)
 	createNet()
 	t.Run("NoNodes", func(t *testing.T) {
@@ -62,18 +62,18 @@ func TestDeleteEgressGateway(t *testing.T) {
 	createTestNode(t)
 	testnode := createTestNode(t)
 	gateway.Interface = "eth0"
-	gateway.RangeString = "10.100.100.0/24"
+	gateway.Ranges = ["10.100.100.0/24"]
 	gateway.NetID = "skynet"
 	gateway.NodeID = testnode.MacAddress
 	t.Run("Success", func(t *testing.T) {
 		node, err := CreateEgressGateway(gateway)
 		assert.Nil(t, err)
 		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)
 		assert.Nil(t, err)
 		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.PostDown)
 	})
@@ -81,7 +81,7 @@ func TestDeleteEgressGateway(t *testing.T) {
 		node, err := DeleteEgressGateway(gateway.NetID, gateway.NodeID)
 		assert.Nil(t, err)
 		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.PostDown)
 	})
@@ -162,16 +162,9 @@ func TestUncordonNode(t *testing.T) {
 }
 func TestValidateEgressGateway(t *testing.T) {
 	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) {
 		gateway.Interface = "eth0"
-		gateway.RangeString = ""
+		gateway.Ranges = []string{}
 		err := ValidateEgressGateway(gateway)
 		assert.NotNil(t, err)
 		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) {
 		gateway.Interface = "eth0"
-		gateway.RangeString = "10.100.100.0/24"
+		gateway.Ranges = ["10.100.100.0/24"]
 		err := ValidateEgressGateway(gateway)
 		assert.Nil(t, err)
 	})