Skip to content

refactor: reduce repeat validate code #2093

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 14, 2018
Merged

refactor: reduce repeat validate code #2093

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 0 additions & 27 deletions apis/opts/cpu.go
View file
Open in desktop

This file was deleted.

49 changes: 0 additions & 49 deletions apis/opts/cpu_test.go
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions apis/opts/intel_rdt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package opts

// ParseIntelRdt parses inter-rdt params of container
func ParseIntelRdt(intelRdtL3Cbm string) (string, error) {
// FIXME: add Intel RDT L3 Cbm validation
// FIXME(ningzhuo): add Intel RDT L3 Cbm validation
return intelRdtL3Cbm, nil
}

// TODO: ValidateInterRdt
// TODO(ningzhuo): ValidateInterRdt
6 changes: 0 additions & 6 deletions apis/opts/memory_swap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,3 @@ func ParseMemorySwap(memorySwap string) (int64, error) {
}
return result, nil
}

// ValidateMemorySwap verifies the correctness of memory-swap.
func ValidateMemorySwap(memorySwap int64) error {
// TODO
return nil
}
13 changes: 0 additions & 13 deletions apis/opts/memory_swappiness.go
View file
Open in desktop

This file was deleted.

47 changes: 0 additions & 47 deletions apis/opts/memory_swappiness_test.go
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions apis/opts/oom_score.go
View file
Open in desktop

This file was deleted.

48 changes: 0 additions & 48 deletions apis/opts/oom_score_test.go
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions apis/opts/spec_annotation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,3 @@ func ParseAnnotation(annotations []string) (map[string]string, error) {

return specAnnotation, nil
}

// ValidateAnnotation validate the correctness of spec annotation param of a container.
func ValidateAnnotation(annotations map[string]string) error {
// TODO

return nil
}
16 changes: 0 additions & 16 deletions cli/container.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,6 @@ func (c *container) config() (*types.ContainerCreateConfig, error) {
return nil, err
}

if err := opts.ValidateMemorySwappiness(c.memorySwappiness); err != nil {
return nil, err
}

memory, err := opts.ParseMemory(c.memory)
if err != nil {
return nil, err
Expand Down Expand Up @@ -147,18 +143,6 @@ func (c *container) config() (*types.ContainerCreateConfig, error) {
return nil, err
}

if err := opts.ValidateOOMScore(c.oomScoreAdj); err != nil {
return nil, err
}

if err := opts.ValidateCPUPeriod(c.cpuperiod); err != nil {
return nil, err
}

if err := opts.ValidateCPUQuota(c.cpuquota); err != nil {
return nil, err
}

networkingConfig, networkMode, err := opts.ParseNetworks(c.networks)
if err != nil {
return nil, err
Expand Down