Skip to content

Commit 2e5ee31

Browse files
committed
[resourcemanager] Do not treat empty node config as error
Signed-off-by: Oleksandr Grytsov <oleksandr_grytsov@epam.com>
1 parent cfe1e46 commit 2e5ee31

File tree

2 files changed

+12
-16
lines changed

2 files changed

+12
-16
lines changed

resourcemanager/resourcemanager.go

+7
Original file line numberDiff line numberDiff line change
@@ -381,6 +381,13 @@ func (resourcemanager *ResourceManager) loadNodeConfiguration() (err error) {
381381

382382
byteValue, err := os.ReadFile(resourcemanager.nodeConfigFile)
383383
if err != nil {
384+
if os.IsNotExist(err) {
385+
// Don't treat absent config as an error.
386+
resourcemanager.nodeConfig.Version = "0.0.0"
387+
388+
return nil
389+
}
390+
384391
return aoserrors.Wrap(err)
385392
}
386393

resourcemanager/resourcemanager_internal_test.go

+5-16
Original file line numberDiff line numberDiff line change
@@ -421,23 +421,12 @@ func TestNotExistNodeConfig(t *testing.T) {
421421
t.Fatalf("Can't create resource manager: %v", err)
422422
}
423423

424-
if err = rm.nodeConfigError; err == nil {
425-
t.Error("Node config should be invalid if config is not exits")
426-
}
427-
}
428-
429-
func TestInvalidVersionNodeConfig(t *testing.T) {
430-
if err := writeTestNodeConfigFile(createWrongVersionNodeConfigJSON()); err != nil {
431-
t.Fatalf("Can't write node config: %v", err)
432-
}
433-
434-
rm, err := New(path.Join(tmpDir, "aos_node_wrong_version.cfg"), &alertSender{})
435-
if err != nil {
436-
t.Fatalf("Can't create resource manager: %v", err)
424+
if err = rm.nodeConfigError; err != nil {
425+
t.Error("Node config should be valid if config is not exits")
437426
}
438427

439-
if err = rm.nodeConfigError; err == nil {
440-
t.Errorf("Node config should be invalid in case of version mismatch")
428+
if rm.nodeConfig.Version != "0.0.0" {
429+
t.Error("Wrong node config version")
441430
}
442431
}
443432

@@ -629,7 +618,7 @@ func cleanup() (err error) {
629618
func createWrongVersionNodeConfigJSON() (configJSON string) {
630619
return `{
631620
"formatVersion": 256,
632-
"version": "1.0.0",
621+
"version": "1.0",
633622
"devices": [
634623
{
635624
"name": "random",

0 commit comments

Comments
 (0)