From 32f996ab60e9e67f94a133c2f203eeffd4e1b32f Mon Sep 17 00:00:00 2001 From: Liang Mingqiang Date: Mon, 9 Jul 2018 14:36:32 -0400 Subject: [PATCH] bug-fix (#252) --- providers/mock/mock.go | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/providers/mock/mock.go b/providers/mock/mock.go index 69ab92fc6..5bfab8ac4 100644 --- a/providers/mock/mock.go +++ b/providers/mock/mock.go @@ -3,7 +3,7 @@ package mock import ( "encoding/json" "fmt" - "io" + "io" "io/ioutil" "log" "time" @@ -60,11 +60,16 @@ func NewMockProvider(providerConfig, nodeName, operatingSystem string, internalI // loadConfig loads the given json configuration files. func loadConfig(providerConfig string) (config MockConfig, err error) { - data, err := ioutil.ReadFile(providerConfig) - if err != nil { - return config, err + if providerConfig != "" { + data, err := ioutil.ReadFile(providerConfig) + if err != nil { + return config, err + } + err = json.Unmarshal(data, &config) + if err != nil { + return config, err + } } - err = json.Unmarshal(data, &config) if config.CPU == "" { config.CPU = defaultCPUCapacity } @@ -72,7 +77,7 @@ func loadConfig(providerConfig string) (config MockConfig, err error) { config.Memory = defaultMemoryCapacity } if config.Pods == "" { - config.Memory = defaultPodCapacity + config.Pods = defaultPodCapacity } if _, err = resource.ParseQuantity(config.CPU); err != nil {