VX-97 Add check IP Address format #31
Conversation
chenyunchen
force-pushed
the
alex/CheckIPFormat
branch
2 times, most recently
from
b1059df to
c6b3c8c
Compare
chenyunchen
force-pushed
the
alex/CheckIPFormat
branch
from
c6b3c8c to
6e94e08
Compare
Codecov Report
@@ Coverage Diff @@
## master #31 +/- ##
==========================================
+ Coverage 86.44% 86.81% +0.37%
==========================================
Files 7 7
Lines 177 182 +5
==========================================
+ Hits 153 158 +5
Misses 15 15
Partials 9 9
Continue to review full report at Codecov.
|
utils/utils.go
Outdated
| @@ -18,3 +19,12 @@ func GenerateVethName(podUUID, containerVethName string) string { | |||
| str := sha256String(podUUID + containerVethName) | |||
| return fmt.Sprintf("veth%s", str[0:8]) | |||
| } | |||
|
|
|||
| func VerifyIP(str string) bool { | |||
There was a problem hiding this comment.
I would like to propose using IsValidIP as function name
func IsValidIP(ip string) bool
utils/utils.go
Outdated
| return net.ParseIP(str) != nil | ||
| } | ||
|
|
||
| func VerifyCIDR(str string) bool { |
There was a problem hiding this comment.
I would like to propose using IsValidCIDR as function name
func IsValidCIDR(cidr string) bool
client/main.go
Outdated
| @@ -45,6 +46,16 @@ func main() { | |||
| os.Exit(1) | |||
| } | |||
|
|
|||
| // Verify IP address | |||
| if utils.VerifyIP(options.Interface.IP) { | |||
There was a problem hiding this comment.
This function should parse input string for IP address validity not options.Interface.IP
The options.Interface.IP isn't only has IP address. it contains mask.
if utils.VerifyIP(options.Interface.Gateway)
client/main.go
Outdated
| } | ||
|
|
||
| // Verify gateway address | ||
| if utils.VerifyCIDR(options.Interface.Gateway) { |
There was a problem hiding this comment.
This function should parse input string for CIDR address validity not options.Interface.Gateway
The options.Interface.Gateway only has a IP address.
if utils.VerifyCIDR(options.Interface.IP)
utils/utils_test.go
Outdated
| @@ -10,3 +10,13 @@ func TestGenerateVethName(t *testing.T) { | |||
| o := GenerateVethName("12345678", "12345678") | |||
| assert.Equal(t, "veth33cdbc38", o) | |||
| } | |||
|
|
|||
| func TestVerifyIP(t *testing.T) { | |||
utils/utils_test.go
Outdated
| assert.Equal(t, true, o) | ||
| } | ||
|
|
||
| func TestVerifyCIDR(t *testing.T) { |
chenyunchen
force-pushed
the
alex/CheckIPFormat
branch
from
2761229 to
d0e605d
Compare
chenyunchen
changed the title
chenyunchen
force-pushed
the
alex/CheckIPFormat
branch
from
d931633 to
2deb06b
Compare
No description provided.