Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
56364b94
Commit
56364b94
authored
Jun 05, 2018
by
hangaoshuai
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add unit test for func PodRequestsAndLimits and ExtractContainerResourceValue
parent
50178d3e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
186 additions
and
0 deletions
+186
-0
BUILD
pkg/api/resource/BUILD
+2
-0
helpers_test.go
pkg/api/resource/helpers_test.go
+184
-0
No files found.
pkg/api/resource/BUILD
View file @
56364b94
...
...
@@ -36,5 +36,7 @@ go_test(
deps = [
"//pkg/apis/core:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/util/uuid:go_default_library",
],
)
pkg/api/resource/helpers_test.go
View file @
56364b94
...
...
@@ -17,9 +17,12 @@ limitations under the License.
package
resource
import
(
"strings"
"testing"
"k8s.io/apimachinery/pkg/api/resource"
metav1
"k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/uuid"
api
"k8s.io/kubernetes/pkg/apis/core"
)
...
...
@@ -60,3 +63,184 @@ func TestDefaultResourceHelpers(t *testing.T) {
t
.
Errorf
(
"expected %v, actual %v"
,
resource
.
BinarySI
,
resourceList
.
Memory
()
.
Format
)
}
}
func
TestPodRequestsAndLimits
(
t
*
testing
.
T
)
{
tests
:=
[]
struct
{
name
string
pod
*
api
.
Pod
expectreqs
map
[
api
.
ResourceName
]
resource
.
Quantity
expectlimits
map
[
api
.
ResourceName
]
resource
.
Quantity
}{
{
name
:
"InitContainers resource < Containers resource"
,
pod
:
&
api
.
Pod
{
ObjectMeta
:
metav1
.
ObjectMeta
{
UID
:
uuid
.
NewUUID
(),
},
Spec
:
api
.
PodSpec
{
InitContainers
:
[]
api
.
Container
{
makeContainer
(
"100m"
,
"200m"
,
"100Mi"
,
"200Mi"
),
},
Containers
:
[]
api
.
Container
{
makeContainer
(
"100m"
,
"400m"
,
"100Mi"
,
"400Mi"
),
makeContainer
(
"100m"
,
"200m"
,
"100Mi"
,
"200Mi"
),
},
},
},
expectreqs
:
map
[
api
.
ResourceName
]
resource
.
Quantity
{
api
.
ResourceCPU
:
resource
.
MustParse
(
"200m"
),
api
.
ResourceMemory
:
resource
.
MustParse
(
"200Mi"
),
},
expectlimits
:
map
[
api
.
ResourceName
]
resource
.
Quantity
{
api
.
ResourceCPU
:
resource
.
MustParse
(
"600m"
),
api
.
ResourceMemory
:
resource
.
MustParse
(
"600Mi"
),
},
},
{
name
:
"InitContainers resource > Containers resource"
,
pod
:
&
api
.
Pod
{
ObjectMeta
:
metav1
.
ObjectMeta
{
UID
:
uuid
.
NewUUID
(),
},
Spec
:
api
.
PodSpec
{
InitContainers
:
[]
api
.
Container
{
makeContainer
(
"500m"
,
"500m"
,
"500Mi"
,
"500Mi"
),
makeContainer
(
"100m"
,
"200m"
,
"100Mi"
,
"200Mi"
),
},
Containers
:
[]
api
.
Container
{
makeContainer
(
"100m"
,
"200m"
,
"100Mi"
,
"200Mi"
),
makeContainer
(
"100m"
,
"200m"
,
"100Mi"
,
"200Mi"
),
},
},
},
expectreqs
:
map
[
api
.
ResourceName
]
resource
.
Quantity
{
api
.
ResourceCPU
:
resource
.
MustParse
(
"500m"
),
api
.
ResourceMemory
:
resource
.
MustParse
(
"500Mi"
),
},
expectlimits
:
map
[
api
.
ResourceName
]
resource
.
Quantity
{
api
.
ResourceCPU
:
resource
.
MustParse
(
"500m"
),
api
.
ResourceMemory
:
resource
.
MustParse
(
"500Mi"
),
},
},
}
for
i
,
test
:=
range
tests
{
t
.
Run
(
test
.
name
,
func
(
t
*
testing
.
T
)
{
requests
,
limits
:=
PodRequestsAndLimits
(
test
.
pod
)
for
name
,
quantity
:=
range
test
.
expectreqs
{
if
value
,
ok
:=
requests
[
name
];
!
ok
{
t
.
Errorf
(
"case[%d]: Error to get value of key=%s from requests result"
,
i
,
name
)
}
else
if
quantity
.
Cmp
(
value
)
!=
0
{
t
.
Errorf
(
"case[%d]: Expected value of key=%s from requests result:%v, Got:%v"
,
i
,
name
,
quantity
,
value
)
}
}
for
name
,
quantity
:=
range
test
.
expectlimits
{
if
value
,
ok
:=
limits
[
name
];
!
ok
{
t
.
Errorf
(
"case[%d]: Error to get value of key=%s from limits result"
,
i
,
name
)
}
else
if
quantity
.
Cmp
(
value
)
!=
0
{
t
.
Errorf
(
"case[%d]: Expected value of key=%s from limits result:%v, Got:%v"
,
i
,
name
,
quantity
,
value
)
}
}
})
}
}
func
TestExtractContainerResourceValue
(
t
*
testing
.
T
)
{
testcontainer
:=
&
api
.
Container
{
Name
:
string
(
uuid
.
NewUUID
()),
Resources
:
api
.
ResourceRequirements
{
Limits
:
api
.
ResourceList
{
api
.
ResourceCPU
:
resource
.
MustParse
(
"200m"
),
api
.
ResourceMemory
:
resource
.
MustParse
(
"200Mi"
),
api
.
ResourceStorage
:
resource
.
MustParse
(
"2G"
),
api
.
ResourceEphemeralStorage
:
resource
.
MustParse
(
"2G"
),
},
Requests
:
api
.
ResourceList
{
api
.
ResourceCPU
:
resource
.
MustParse
(
"100m"
),
api
.
ResourceMemory
:
resource
.
MustParse
(
"100Mi"
),
api
.
ResourceStorage
:
resource
.
MustParse
(
"1G"
),
api
.
ResourceEphemeralStorage
:
resource
.
MustParse
(
"300Mi"
),
},
},
}
tests
:=
[]
struct
{
name
string
filed
*
api
.
ResourceFieldSelector
expectresult
string
expecterr
string
}{
{
name
:
"get limits cpu"
,
filed
:
&
api
.
ResourceFieldSelector
{
Resource
:
"limits.cpu"
,
Divisor
:
resource
.
MustParse
(
"1m"
)},
expectresult
:
"200"
,
expecterr
:
""
,
},
{
name
:
"get limits memory"
,
filed
:
&
api
.
ResourceFieldSelector
{
Resource
:
"limits.memory"
},
expectresult
:
"209715200"
,
expecterr
:
""
,
},
{
name
:
"get limits ephemeral-storage"
,
filed
:
&
api
.
ResourceFieldSelector
{
Resource
:
"limits.ephemeral-storage"
,
Divisor
:
resource
.
MustParse
(
"1G"
)},
expectresult
:
"2"
,
expecterr
:
""
,
},
{
name
:
"get requests cpu"
,
filed
:
&
api
.
ResourceFieldSelector
{
Resource
:
"requests.cpu"
,
Divisor
:
resource
.
MustParse
(
"1m"
)},
expectresult
:
"100"
,
expecterr
:
""
,
},
{
name
:
"get requests memory"
,
filed
:
&
api
.
ResourceFieldSelector
{
Resource
:
"requests.memory"
,
Divisor
:
resource
.
MustParse
(
"1G"
)},
expectresult
:
"1"
,
expecterr
:
""
,
},
{
name
:
"get requests ephemeral-storage"
,
filed
:
&
api
.
ResourceFieldSelector
{
Resource
:
"requests.ephemeral-storage"
},
expectresult
:
"314572800"
,
expecterr
:
""
,
},
{
name
:
"get limits storage"
,
filed
:
&
api
.
ResourceFieldSelector
{
Resource
:
"limits.storage"
,
Divisor
:
resource
.
MustParse
(
"1G"
)},
expectresult
:
""
,
expecterr
:
"unsupported container resource"
,
},
}
for
i
,
test
:=
range
tests
{
t
.
Run
(
test
.
name
,
func
(
t
*
testing
.
T
)
{
result
,
err
:=
ExtractContainerResourceValue
(
test
.
filed
,
testcontainer
)
if
test
.
expecterr
!=
""
{
if
!
strings
.
Contains
(
err
.
Error
(),
test
.
expecterr
)
{
t
.
Errorf
(
"case[%d]:%s Expected err:%s, Got err:%s"
,
i
,
test
.
name
,
test
.
expecterr
,
err
.
Error
())
}
}
else
if
err
!=
nil
{
t
.
Errorf
(
"case[%d]:%s Expected no err, Got err:%s"
,
i
,
test
.
name
,
err
.
Error
())
}
if
result
!=
test
.
expectresult
{
t
.
Errorf
(
"case[%d]:%s Expected result:%s, Got result:%s"
,
i
,
test
.
name
,
test
.
expectresult
,
result
)
}
})
}
}
func
makeContainer
(
cpuReq
,
cpuLim
,
memReq
,
memLim
string
)
api
.
Container
{
return
api
.
Container
{
Name
:
string
(
uuid
.
NewUUID
()),
Resources
:
api
.
ResourceRequirements
{
Limits
:
api
.
ResourceList
{
api
.
ResourceCPU
:
resource
.
MustParse
(
cpuLim
),
api
.
ResourceMemory
:
resource
.
MustParse
(
memLim
),
},
Requests
:
api
.
ResourceList
{
api
.
ResourceCPU
:
resource
.
MustParse
(
cpuReq
),
api
.
ResourceMemory
:
resource
.
MustParse
(
memReq
),
},
},
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment