diff --git a/provider/provider.go b/provider/provider.go index 5111222..8567c5f 100644 --- a/provider/provider.go +++ b/provider/provider.go @@ -34,12 +34,11 @@ const ( poolIDTagName = "garm-pool-id" ) -var statusMap = map[string]string{ - "ACTIVE": "running", - "SHUTOFF": "stopped", - "BUILD": "pending_create", - "ERROR": "error", - "DELETING": "pending_delete", +// GARM reserves pending states for its own lifecycle tracking. +var statusMap = map[string]params.InstanceStatus{ + "ACTIVE": params.InstanceRunning, + "SHUTOFF": params.InstanceStopped, + "ERROR": params.InstanceError, } var addrTypeMap = map[string]params.AddressType{ @@ -110,13 +109,16 @@ func openstackServerToInstance(srv client.ServerWithExt) params.ProviderInstance osType := srv.Metadata["os_type"] osName := srv.Metadata["os_name"] osVersion := srv.Metadata["os_version"] - status := statusMap[srv.Status] + status, ok := statusMap[srv.Status] + if !ok { + status = params.InstanceStatusUnknown + } instance := params.ProviderInstance{ ProviderID: srv.ID, Name: srv.Name, OSArch: params.OSArch(arch), OSType: params.OSType(osType), - Status: params.InstanceStatus(status), + Status: status, OSName: osName, OSVersion: osVersion, Addresses: addresses, diff --git a/provider/provider_test.go b/provider/provider_test.go index ea99b81..2c6a462 100644 --- a/provider/provider_test.go +++ b/provider/provider_test.go @@ -73,6 +73,33 @@ func TestOpenstackServerToInstance(t *testing.T) { assert.Equal(t, expectedInstance, instance) } +func TestOpenstackServerToInstanceStatus(t *testing.T) { + tests := []struct { + name string + status string + want params.InstanceStatus + }{ + {name: "active", status: "ACTIVE", want: params.InstanceRunning}, + {name: "shutoff", status: "SHUTOFF", want: params.InstanceStopped}, + {name: "error", status: "ERROR", want: params.InstanceError}, + {name: "building", status: "BUILD", want: params.InstanceStatusUnknown}, + {name: "deleting", status: "DELETING", want: params.InstanceStatusUnknown}, + {name: "rebuilding", status: "REBUILD", want: params.InstanceStatusUnknown}, + {name: "paused", status: "PAUSED", want: params.InstanceStatusUnknown}, + {name: "unrecognized", status: "UNRECOGNIZED", want: params.InstanceStatusUnknown}, + {name: "empty", want: params.InstanceStatusUnknown}, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + srv := client.ServerWithExt{ + Server: servers.Server{Status: tt.status}, + } + instance := openstackServerToInstance(srv) + assert.Equal(t, tt.want, instance.Status) + }) + } +} + func TestCreateInstance(t *testing.T) { ctx := context.Background() fakeServer := testhelper.SetupHTTP() @@ -448,6 +475,16 @@ func TestListInstances(t *testing.T) { "tags": ["garm-controller-id=my-controller-id", "garm-pool-id=test-pool"], "status": "ACTIVE" + }, + { + "id": "f7856621-573c-478b-b4ad-5554f6227501", + "name": "building-instance", + "status": "BUILD" + }, + { + "id": "ec7f18e9-3d03-4dc7-a838-98f13c3189c6", + "name": "deleting-instance", + "status": "DELETING" } ] }`) @@ -469,6 +506,18 @@ func TestListInstances(t *testing.T) { }, }, }, + { + ProviderID: "f7856621-573c-478b-b4ad-5554f6227501", + Name: "building-instance", + Status: params.InstanceStatusUnknown, + Addresses: []params.Address{}, + }, + { + ProviderID: "ec7f18e9-3d03-4dc7-a838-98f13c3189c6", + Name: "deleting-instance", + Status: params.InstanceStatusUnknown, + Addresses: []params.Address{}, + }, } instances, err := provider.ListInstances(ctx, "test-pool")