global fwd and subnet error msgs fix & test cases #1051
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fixed the error message to indicate correctly the state of vlans and vxlans instead of printing an empty string instead of a number when 0. The test cases are testing too many things in one test case, split out the tests for forward mode and subnet as they are doing more validation. Signed-off-by: Chris Plock <[email protected]>
|
build PR |
|
build PR |
1 similar comment
|
build PR |
dseevr
requested changes
Nov 8, 2017
netmaster/objApi/objapi_test.go
Outdated
| @@ -297,7 +297,7 @@ func checkInspectGlobal(t *testing.T, expError bool, allocedVlans, allocedVxlans | |||
| } | |||
|
|
|||
| // checkGlobalSet sets global state and verifies state | |||
| func checkGlobalSet(t *testing.T, expError bool, fabMode, vlans, vxlans, fwdMode, arpMode, pvtSubnet string) { | |||
| func checkGlobalSet(t *testing.T, expError bool, fabMode, vlans, vxlans, fwdMode, arpMode, pvtSubnet string) *error { | |||
There was a problem hiding this comment.
return error instead of *error here
netmaster/objApi/objapi_test.go
Outdated
| @@ -1318,7 +1320,79 @@ func TestDynamicGlobalVxlanRange(t *testing.T) { | |||
| } | |||
|
|
|||
| // TestGlobalSetting tests global REST api | |||
| func TestGlobalSettingFwdMode(t *testing.T) { | |||
| // set to default values (no-op) | |||
| checkGlobalSet(t, false, "default", "1-4094", "1-10000", "bridge", "proxy", "172.19.0.0/16") | |||
There was a problem hiding this comment.
Since this returns an error, we should probably be asserting that it's nil or some expected value...
If there's a legit reason for skipping error checks on a call, maybe add a comment above the call
There was a problem hiding this comment.
ah, i was just copy pasting that part, but I can make a helper checkGlobalSetNotNil(..) to avoid if block every call
|
build PR |
dseevr
approved these changes
Nov 9, 2017
|
Changes LGTM but let's get a @contiv/reviewers-core-networking review as well because I can't validate the network stuff is correct |
|
#1043 needs to be merged first. |
|
build PR |
dseevr
approved these changes
Nov 21, 2017
tiewei
approved these changes
Nov 21, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixed the error message to indicate correctly the state of vlans and
vxlans instead of printing an empty string instead of a number when 0.
The test cases are testing too many things in one test case, split out
the tests for forward mode and subnet as they are doing more validation.
Signed-off-by: Chris Plock [email protected]