mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-05 02:09:56 +00:00
Remove obsolete resources package
This commit is contained in:
parent
894a3e6d3f
commit
40d29f4f08
@ -1,18 +0,0 @@
|
||||
/*
|
||||
Copyright 2014 Google Inc. All rights reserved.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
// package resources has constants and utilities for dealing with resources
|
||||
package resources
|
@ -1,75 +0,0 @@
|
||||
/*
|
||||
Copyright 2014 Google Inc. All rights reserved.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
package resources
|
||||
|
||||
import (
|
||||
"strconv"
|
||||
|
||||
"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
|
||||
"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
|
||||
"github.com/golang/glog"
|
||||
)
|
||||
|
||||
const (
|
||||
CPU api.ResourceName = "cpu"
|
||||
Memory api.ResourceName = "memory"
|
||||
)
|
||||
|
||||
// TODO: None of these currently handle SI units
|
||||
|
||||
func GetFloatResource(resources api.ResourceList, name api.ResourceName, def float64) float64 {
|
||||
value, found := resources[name]
|
||||
if !found {
|
||||
return def
|
||||
}
|
||||
if value.Kind == util.IntstrInt {
|
||||
return float64(value.IntVal)
|
||||
}
|
||||
result, err := strconv.ParseFloat(value.StrVal, 64)
|
||||
if err != nil {
|
||||
glog.Errorf("parsing failed for %s: %s", name, value.StrVal)
|
||||
return def
|
||||
}
|
||||
return result
|
||||
}
|
||||
|
||||
func GetIntegerResource(resources api.ResourceList, name api.ResourceName, def int) int {
|
||||
value, found := resources[name]
|
||||
if !found {
|
||||
return def
|
||||
}
|
||||
if value.Kind == util.IntstrInt {
|
||||
return value.IntVal
|
||||
}
|
||||
result, err := strconv.Atoi(value.StrVal)
|
||||
if err != nil {
|
||||
glog.Errorf("parsing failed for %s: %s", name, value.StrVal)
|
||||
return def
|
||||
}
|
||||
return result
|
||||
}
|
||||
|
||||
func GetStringResource(resources api.ResourceList, name api.ResourceName, def string) string {
|
||||
value, found := resources[name]
|
||||
if !found {
|
||||
return def
|
||||
}
|
||||
if value.Kind == util.IntstrInt {
|
||||
return strconv.Itoa(value.IntVal)
|
||||
}
|
||||
return value.StrVal
|
||||
}
|
@ -1,169 +0,0 @@
|
||||
/*
|
||||
Copyright 2014 Google Inc. All rights reserved.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
package resources
|
||||
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
|
||||
"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
|
||||
)
|
||||
|
||||
func TestGetInteger(t *testing.T) {
|
||||
tests := []struct {
|
||||
res api.ResourceList
|
||||
name api.ResourceName
|
||||
expected int
|
||||
def int
|
||||
test string
|
||||
}{
|
||||
{
|
||||
res: api.ResourceList{},
|
||||
name: CPU,
|
||||
expected: 1,
|
||||
def: 1,
|
||||
test: "nothing present",
|
||||
},
|
||||
{
|
||||
res: api.ResourceList{
|
||||
CPU: util.NewIntOrStringFromInt(2),
|
||||
},
|
||||
name: CPU,
|
||||
expected: 2,
|
||||
def: 1,
|
||||
test: "present",
|
||||
},
|
||||
{
|
||||
res: api.ResourceList{
|
||||
Memory: util.NewIntOrStringFromInt(2),
|
||||
},
|
||||
name: CPU,
|
||||
expected: 1,
|
||||
def: 1,
|
||||
test: "not-present",
|
||||
},
|
||||
{
|
||||
res: api.ResourceList{
|
||||
CPU: util.NewIntOrStringFromString("2"),
|
||||
},
|
||||
name: CPU,
|
||||
expected: 2,
|
||||
def: 1,
|
||||
test: "present-string",
|
||||
},
|
||||
{
|
||||
res: api.ResourceList{
|
||||
CPU: util.NewIntOrStringFromString("foo"),
|
||||
},
|
||||
name: CPU,
|
||||
expected: 1,
|
||||
def: 1,
|
||||
test: "present-invalid",
|
||||
},
|
||||
}
|
||||
|
||||
for _, test := range tests {
|
||||
val := GetIntegerResource(test.res, test.name, test.def)
|
||||
if val != test.expected {
|
||||
t.Errorf("expected: %d found %d", test.expected, val)
|
||||
}
|
||||
}
|
||||
}
|
||||
func TestGetFloat(t *testing.T) {
|
||||
tests := []struct {
|
||||
res api.ResourceList
|
||||
name api.ResourceName
|
||||
expected float64
|
||||
def float64
|
||||
test string
|
||||
}{
|
||||
{
|
||||
res: api.ResourceList{},
|
||||
name: CPU,
|
||||
expected: 1.5,
|
||||
def: 1.5,
|
||||
test: "nothing present",
|
||||
},
|
||||
{
|
||||
res: api.ResourceList{
|
||||
CPU: util.NewIntOrStringFromInt(2),
|
||||
},
|
||||
name: CPU,
|
||||
expected: 2.0,
|
||||
def: 1.5,
|
||||
test: "present",
|
||||
},
|
||||
{
|
||||
res: api.ResourceList{
|
||||
CPU: util.NewIntOrStringFromString("2.5"),
|
||||
},
|
||||
name: CPU,
|
||||
expected: 2.5,
|
||||
def: 1,
|
||||
test: "present-string",
|
||||
},
|
||||
{
|
||||
res: api.ResourceList{
|
||||
CPU: util.NewIntOrStringFromString("foo"),
|
||||
},
|
||||
name: CPU,
|
||||
expected: 1,
|
||||
def: 1,
|
||||
test: "present-invalid",
|
||||
},
|
||||
}
|
||||
|
||||
for _, test := range tests {
|
||||
val := GetFloatResource(test.res, test.name, test.def)
|
||||
if val != test.expected {
|
||||
t.Errorf("expected: %f found %f", test.expected, val)
|
||||
}
|
||||
}
|
||||
}
|
||||
func TestGetString(t *testing.T) {
|
||||
tests := []struct {
|
||||
res api.ResourceList
|
||||
name api.ResourceName
|
||||
expected string
|
||||
def string
|
||||
test string
|
||||
}{
|
||||
{
|
||||
res: api.ResourceList{},
|
||||
name: CPU,
|
||||
expected: "foo",
|
||||
def: "foo",
|
||||
test: "nothing present",
|
||||
},
|
||||
{
|
||||
res: api.ResourceList{
|
||||
CPU: util.NewIntOrStringFromString("bar"),
|
||||
},
|
||||
name: CPU,
|
||||
expected: "bar",
|
||||
def: "foo",
|
||||
test: "present",
|
||||
},
|
||||
}
|
||||
|
||||
for _, test := range tests {
|
||||
val := GetStringResource(test.res, test.name, test.def)
|
||||
if val != test.expected {
|
||||
t.Errorf("expected: %s found %s", test.expected, val)
|
||||
}
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue
Block a user