X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/458436270ce8fb80d421d55e192236c5ac4a225e..2c0bf8219eb3ff5f978d147bff7ae6c6a73e8188:/lib/cloud/loopback/loopback.go diff --git a/lib/cloud/loopback/loopback.go b/lib/cloud/loopback/loopback.go index ed2a0050f4..41878acd22 100644 --- a/lib/cloud/loopback/loopback.go +++ b/lib/cloud/loopback/loopback.go @@ -21,6 +21,7 @@ import ( "git.arvados.org/arvados.git/lib/cloud" "git.arvados.org/arvados.git/lib/dispatchcloud/test" "git.arvados.org/arvados.git/sdk/go/arvados" + "github.com/prometheus/client_golang/prometheus" "github.com/sirupsen/logrus" "golang.org/x/crypto/ssh" ) @@ -45,7 +46,7 @@ type instanceSet struct { mtx sync.Mutex } -func newInstanceSet(config json.RawMessage, instanceSetID cloud.InstanceSetID, _ cloud.SharedResourceTags, logger logrus.FieldLogger) (cloud.InstanceSet, error) { +func newInstanceSet(config json.RawMessage, instanceSetID cloud.InstanceSetID, _ cloud.SharedResourceTags, logger logrus.FieldLogger, reg *prometheus.Registry) (cloud.InstanceSet, error) { is := &instanceSet{ instanceSetID: instanceSetID, logger: logger, @@ -130,13 +131,13 @@ type instance struct { sshService test.SSHService } -func (i *instance) ID() cloud.InstanceID { return cloud.InstanceID(i.instanceType.ProviderType) } -func (i *instance) String() string { return i.instanceType.ProviderType } -func (i *instance) ProviderType() string { return i.instanceType.ProviderType } -func (i *instance) Address() string { return i.sshService.Address() } -func (i *instance) PriceHistory() []cloud.InstancePrice { return nil } -func (i *instance) RemoteUser() string { return i.adminUser } -func (i *instance) Tags() cloud.InstanceTags { return i.tags } +func (i *instance) ID() cloud.InstanceID { return cloud.InstanceID(i.instanceType.ProviderType) } +func (i *instance) String() string { return i.instanceType.ProviderType } +func (i *instance) ProviderType() string { return i.instanceType.ProviderType } +func (i *instance) Address() string { return i.sshService.Address() } +func (i *instance) PriceHistory(arvados.InstanceType) []cloud.InstancePrice { return nil } +func (i *instance) RemoteUser() string { return i.adminUser } +func (i *instance) Tags() cloud.InstanceTags { return i.tags } func (i *instance) SetTags(tags cloud.InstanceTags) error { i.tags = tags return nil