Skip to content
This repository was archived by the owner on Nov 24, 2025. It is now read-only.

Servers service interface fix #4828

Merged
mitchell852 merged 2 commits into from
Jun 28, 2020
Merged

Servers service interface fix #4828

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
82b43e8
Fixed not re-filling rows in servers test
ocket8888 Jun 24, 2020
1457bad
Fixed allowing servers with bad MTU or no service addresses
ocket8888 Jun 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion traffic_ops/traffic_ops_golang/server/servers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,7 @@ func validateV3(s *tc.ServerNullable, tx *sql.Tx) (string, error) {
ruleName := fmt.Sprintf("interface '%s' ", iface.Name)
errs = append(errs, tovalidate.ToErrors(validation.Errors{
ruleName + "name": validation.Validate(iface.Name, validation.Required),
ruleName + "mtu": validation.Validate(iface.MaxBandwidth, validation.By(validateMTU)),
ruleName + "mtu": validation.Validate(iface.MTU, validation.By(validateMTU)),
ruleName + "ipAddresses": validation.Validate(iface.IPAddresses, validation.Required),
})...)

Expand Down Expand Up @@ -477,6 +477,10 @@ func validateV3(s *tc.ServerNullable, tx *sql.Tx) (string, error) {
}
}

if !serviceAddrV6Found && !serviceAddrV4Found {
errs = append(errs, errors.New("a server must have at least one service address"))
}

errs = append(errs, validateCommon(&s.CommonServerProperties, tx)...)
return serviceInterface, util.JoinErrs(errs)
}
Expand Down
16 changes: 16 additions & 0 deletions traffic_ops/traffic_ops_golang/server/servers_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -554,6 +554,8 @@ func TestV3Validations(t *testing.T) {

testServer.Interfaces = []tc.ServerInterfaceInfo{}

typeRows = sqlmock.NewRows(typeCols).AddRow("EDGE", "server")
cdnRows = sqlmock.NewRows(cdnCols).AddRow(*testServer.CDNID)
mock.ExpectQuery("SELECT name, use_in_table").WillReturnRows(typeRows)
mock.ExpectQuery("SELECT").WillReturnRows(cdnRows)

Expand All @@ -566,6 +568,8 @@ func TestV3Validations(t *testing.T) {

testServer.Interfaces = nil

typeRows = sqlmock.NewRows(typeCols).AddRow("EDGE", "server")
cdnRows = sqlmock.NewRows(cdnCols).AddRow(*testServer.CDNID)
mock.ExpectQuery("SELECT name, use_in_table").WillReturnRows(typeRows)
mock.ExpectQuery("SELECT").WillReturnRows(cdnRows)

Expand All @@ -581,6 +585,8 @@ func TestV3Validations(t *testing.T) {
badIface.MTU = &badMTU
testServer.Interfaces = []tc.ServerInterfaceInfo{badIface}

typeRows = sqlmock.NewRows(typeCols).AddRow("EDGE", "server")
cdnRows = sqlmock.NewRows(cdnCols).AddRow(*testServer.CDNID)
mock.ExpectQuery("SELECT name, use_in_table").WillReturnRows(typeRows)
mock.ExpectQuery("SELECT").WillReturnRows(cdnRows)

Expand All @@ -595,6 +601,8 @@ func TestV3Validations(t *testing.T) {
badIface.IPAddresses = []tc.ServerIPAddress{}
testServer.Interfaces = []tc.ServerInterfaceInfo{badIface}

typeRows = sqlmock.NewRows(typeCols).AddRow("EDGE", "server")
cdnRows = sqlmock.NewRows(cdnCols).AddRow(*testServer.CDNID)
mock.ExpectQuery("SELECT name, use_in_table").WillReturnRows(typeRows)
mock.ExpectQuery("SELECT").WillReturnRows(cdnRows)

Expand All @@ -608,6 +616,8 @@ func TestV3Validations(t *testing.T) {
badIface.IPAddresses = nil
testServer.Interfaces = []tc.ServerInterfaceInfo{badIface}

typeRows = sqlmock.NewRows(typeCols).AddRow("EDGE", "server")
cdnRows = sqlmock.NewRows(cdnCols).AddRow(*testServer.CDNID)
mock.ExpectQuery("SELECT name, use_in_table").WillReturnRows(typeRows)
mock.ExpectQuery("SELECT").WillReturnRows(cdnRows)

Expand All @@ -627,6 +637,8 @@ func TestV3Validations(t *testing.T) {
badIface.IPAddresses = []tc.ServerIPAddress{badIP}
testServer.Interfaces = []tc.ServerInterfaceInfo{badIface}

typeRows = sqlmock.NewRows(typeCols).AddRow("EDGE", "server")
cdnRows = sqlmock.NewRows(cdnCols).AddRow(*testServer.CDNID)
mock.ExpectQuery("SELECT name, use_in_table").WillReturnRows(typeRows)
mock.ExpectQuery("SELECT").WillReturnRows(cdnRows)

Expand All @@ -639,6 +651,8 @@ func TestV3Validations(t *testing.T) {

testServer.Interfaces = []tc.ServerInterfaceInfo{goodInterface, goodInterface}

typeRows = sqlmock.NewRows(typeCols).AddRow("EDGE", "server")
cdnRows = sqlmock.NewRows(cdnCols).AddRow(*testServer.CDNID)
mock.ExpectQuery("SELECT name, use_in_table").WillReturnRows(typeRows)
mock.ExpectQuery("SELECT").WillReturnRows(cdnRows)

Expand All @@ -657,6 +671,8 @@ func TestV3Validations(t *testing.T) {
})
testServer.Interfaces = []tc.ServerInterfaceInfo{badIface}

typeRows = sqlmock.NewRows(typeCols).AddRow("EDGE", "server")
cdnRows = sqlmock.NewRows(cdnCols).AddRow(*testServer.CDNID)
mock.ExpectQuery("SELECT name, use_in_table").WillReturnRows(typeRows)
mock.ExpectQuery("SELECT").WillReturnRows(cdnRows)

Expand Down