Move to frostfs-node
Signed-off-by: Pavel Karpy <p.karpy@yadro.com>
This commit is contained in:
parent
42554a9298
commit
923f84722a
934 changed files with 3470 additions and 3451 deletions
|
@ -6,9 +6,9 @@ import (
|
|||
"net/url"
|
||||
"strings"
|
||||
|
||||
"github.com/TrueCloudLab/frostfs-api-go/v2/rpc/client"
|
||||
"github.com/multiformats/go-multiaddr"
|
||||
manet "github.com/multiformats/go-multiaddr/net"
|
||||
"github.com/nspcc-dev/neofs-api-go/v2/rpc/client"
|
||||
)
|
||||
|
||||
/*
|
||||
|
|
|
@ -48,7 +48,7 @@ func TestAddress_HostAddrString(t *testing.T) {
|
|||
ma multiaddr.Multiaddr
|
||||
exp string
|
||||
}{
|
||||
{buildMultiaddr("/dns4/neofs.bigcorp.com/tcp/8080", t), "neofs.bigcorp.com:8080"},
|
||||
{buildMultiaddr("/dns4/frostfs.bigcorp.com/tcp/8080", t), "frostfs.bigcorp.com:8080"},
|
||||
{buildMultiaddr("/ip4/172.16.14.1/tcp/8080", t), "172.16.14.1:8080"},
|
||||
{buildMultiaddr("/ip4/192.168.0.1/tcp/8888/tls", t), "grpcs://192.168.0.1:8888"},
|
||||
}
|
||||
|
|
6
pkg/network/cache/client.go
vendored
6
pkg/network/cache/client.go
vendored
|
@ -5,12 +5,12 @@ import (
|
|||
"sync"
|
||||
"time"
|
||||
|
||||
clientcore "github.com/nspcc-dev/neofs-node/pkg/core/client"
|
||||
"github.com/nspcc-dev/neofs-sdk-go/client"
|
||||
clientcore "github.com/TrueCloudLab/frostfs-node/pkg/core/client"
|
||||
"github.com/TrueCloudLab/frostfs-sdk-go/client"
|
||||
)
|
||||
|
||||
type (
|
||||
// ClientCache is a structure around neofs-sdk-go/client to reuse
|
||||
// ClientCache is a structure around frostfs-sdk-go/client to reuse
|
||||
// already created clients.
|
||||
ClientCache struct {
|
||||
mu sync.RWMutex
|
||||
|
|
8
pkg/network/cache/multi.go
vendored
8
pkg/network/cache/multi.go
vendored
|
@ -6,10 +6,10 @@ import (
|
|||
"fmt"
|
||||
"sync"
|
||||
|
||||
rawclient "github.com/nspcc-dev/neofs-api-go/v2/rpc/client"
|
||||
clientcore "github.com/nspcc-dev/neofs-node/pkg/core/client"
|
||||
"github.com/nspcc-dev/neofs-node/pkg/network"
|
||||
"github.com/nspcc-dev/neofs-sdk-go/client"
|
||||
rawclient "github.com/TrueCloudLab/frostfs-api-go/v2/rpc/client"
|
||||
clientcore "github.com/TrueCloudLab/frostfs-node/pkg/core/client"
|
||||
"github.com/TrueCloudLab/frostfs-node/pkg/network"
|
||||
"github.com/TrueCloudLab/frostfs-sdk-go/client"
|
||||
)
|
||||
|
||||
type multiClient struct {
|
||||
|
|
|
@ -5,7 +5,7 @@ import (
|
|||
"fmt"
|
||||
"sort"
|
||||
|
||||
"github.com/nspcc-dev/neofs-sdk-go/netmap"
|
||||
"github.com/TrueCloudLab/frostfs-sdk-go/netmap"
|
||||
)
|
||||
|
||||
// AddressGroup represents list of network addresses of the node.
|
||||
|
|
|
@ -9,8 +9,8 @@ import (
|
|||
|
||||
func TestAddressGroup_FromStringSlice(t *testing.T) {
|
||||
addrs := []string{
|
||||
"/dns4/node1.neofs/tcp/8080",
|
||||
"/dns4/node2.neofs/tcp/1234/tls",
|
||||
"/dns4/node1.frostfs/tcp/8080",
|
||||
"/dns4/node2.frostfs/tcp/1234/tls",
|
||||
}
|
||||
expected := make(AddressGroup, len(addrs))
|
||||
for i := range addrs {
|
||||
|
@ -33,8 +33,8 @@ func TestAddressGroup_FromStringSlice(t *testing.T) {
|
|||
|
||||
func TestAddressGroup_FromIterator(t *testing.T) {
|
||||
addrs := testIterator{
|
||||
"/dns4/node1.neofs/tcp/8080",
|
||||
"/dns4/node2.neofs/tcp/1234/tls",
|
||||
"/dns4/node1.frostfs/tcp/8080",
|
||||
"/dns4/node2.frostfs/tcp/1234/tls",
|
||||
}
|
||||
expected := make(AddressGroup, len(addrs))
|
||||
for i := range addrs {
|
||||
|
|
|
@ -3,9 +3,9 @@ package accounting
|
|||
import (
|
||||
"context"
|
||||
|
||||
"github.com/nspcc-dev/neofs-api-go/v2/accounting"
|
||||
accountingGRPC "github.com/nspcc-dev/neofs-api-go/v2/accounting/grpc"
|
||||
accountingsvc "github.com/nspcc-dev/neofs-node/pkg/services/accounting"
|
||||
"github.com/TrueCloudLab/frostfs-api-go/v2/accounting"
|
||||
accountingGRPC "github.com/TrueCloudLab/frostfs-api-go/v2/accounting/grpc"
|
||||
accountingsvc "github.com/TrueCloudLab/frostfs-node/pkg/services/accounting"
|
||||
)
|
||||
|
||||
// Server wraps NeoFS API Accounting service and
|
||||
|
|
|
@ -3,9 +3,9 @@ package container
|
|||
import (
|
||||
"context"
|
||||
|
||||
"github.com/nspcc-dev/neofs-api-go/v2/container"
|
||||
containerGRPC "github.com/nspcc-dev/neofs-api-go/v2/container/grpc"
|
||||
containersvc "github.com/nspcc-dev/neofs-node/pkg/services/container"
|
||||
"github.com/TrueCloudLab/frostfs-api-go/v2/container"
|
||||
containerGRPC "github.com/TrueCloudLab/frostfs-api-go/v2/container/grpc"
|
||||
containersvc "github.com/TrueCloudLab/frostfs-node/pkg/services/container"
|
||||
)
|
||||
|
||||
// Server wraps NeoFS API Container service and
|
||||
|
|
|
@ -3,9 +3,9 @@ package grpc
|
|||
import (
|
||||
"context"
|
||||
|
||||
"github.com/nspcc-dev/neofs-api-go/v2/netmap"
|
||||
netmapGRPC "github.com/nspcc-dev/neofs-api-go/v2/netmap/grpc"
|
||||
netmapsvc "github.com/nspcc-dev/neofs-node/pkg/services/netmap"
|
||||
"github.com/TrueCloudLab/frostfs-api-go/v2/netmap"
|
||||
netmapGRPC "github.com/TrueCloudLab/frostfs-api-go/v2/netmap/grpc"
|
||||
netmapsvc "github.com/TrueCloudLab/frostfs-node/pkg/services/netmap"
|
||||
)
|
||||
|
||||
// Server wraps NeoFS API Netmap service and
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
package object
|
||||
|
||||
import (
|
||||
"github.com/nspcc-dev/neofs-api-go/v2/object"
|
||||
objectGRPC "github.com/nspcc-dev/neofs-api-go/v2/object/grpc"
|
||||
"github.com/TrueCloudLab/frostfs-api-go/v2/object"
|
||||
objectGRPC "github.com/TrueCloudLab/frostfs-api-go/v2/object/grpc"
|
||||
)
|
||||
|
||||
type getStreamerV2 struct {
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
package object
|
||||
|
||||
import (
|
||||
"github.com/nspcc-dev/neofs-api-go/v2/object"
|
||||
objectGRPC "github.com/nspcc-dev/neofs-api-go/v2/object/grpc"
|
||||
"github.com/TrueCloudLab/frostfs-api-go/v2/object"
|
||||
objectGRPC "github.com/TrueCloudLab/frostfs-api-go/v2/object/grpc"
|
||||
)
|
||||
|
||||
type getRangeStreamerV2 struct {
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
package object
|
||||
|
||||
import (
|
||||
"github.com/nspcc-dev/neofs-api-go/v2/object"
|
||||
objectGRPC "github.com/nspcc-dev/neofs-api-go/v2/object/grpc"
|
||||
"github.com/TrueCloudLab/frostfs-api-go/v2/object"
|
||||
objectGRPC "github.com/TrueCloudLab/frostfs-api-go/v2/object/grpc"
|
||||
)
|
||||
|
||||
type searchStreamerV2 struct {
|
||||
|
|
|
@ -5,10 +5,10 @@ import (
|
|||
"errors"
|
||||
"io"
|
||||
|
||||
"github.com/nspcc-dev/neofs-api-go/v2/object"
|
||||
objectGRPC "github.com/nspcc-dev/neofs-api-go/v2/object/grpc"
|
||||
objectSvc "github.com/nspcc-dev/neofs-node/pkg/services/object"
|
||||
"github.com/nspcc-dev/neofs-node/pkg/services/util"
|
||||
"github.com/TrueCloudLab/frostfs-api-go/v2/object"
|
||||
objectGRPC "github.com/TrueCloudLab/frostfs-api-go/v2/object/grpc"
|
||||
objectSvc "github.com/TrueCloudLab/frostfs-node/pkg/services/object"
|
||||
"github.com/TrueCloudLab/frostfs-node/pkg/services/util"
|
||||
)
|
||||
|
||||
// Server wraps NeoFS API Object service and
|
||||
|
|
|
@ -3,9 +3,9 @@ package grpcreputation
|
|||
import (
|
||||
"context"
|
||||
|
||||
"github.com/nspcc-dev/neofs-api-go/v2/reputation"
|
||||
reputation2 "github.com/nspcc-dev/neofs-api-go/v2/reputation/grpc"
|
||||
reputationrpc "github.com/nspcc-dev/neofs-node/pkg/services/reputation/rpc"
|
||||
"github.com/TrueCloudLab/frostfs-api-go/v2/reputation"
|
||||
reputation2 "github.com/TrueCloudLab/frostfs-api-go/v2/reputation/grpc"
|
||||
reputationrpc "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/rpc"
|
||||
)
|
||||
|
||||
// Server wraps NeoFS API v2 Reputation service server
|
||||
|
|
|
@ -3,9 +3,9 @@ package session
|
|||
import (
|
||||
"context"
|
||||
|
||||
"github.com/nspcc-dev/neofs-api-go/v2/session"
|
||||
sessionGRPC "github.com/nspcc-dev/neofs-api-go/v2/session/grpc"
|
||||
sessionsvc "github.com/nspcc-dev/neofs-node/pkg/services/session"
|
||||
"github.com/TrueCloudLab/frostfs-api-go/v2/session"
|
||||
sessionGRPC "github.com/TrueCloudLab/frostfs-api-go/v2/session/grpc"
|
||||
sessionsvc "github.com/TrueCloudLab/frostfs-node/pkg/services/session"
|
||||
)
|
||||
|
||||
// Server wraps NeoFS API Session service and
|
||||
|
|
|
@ -3,7 +3,7 @@ package network
|
|||
import (
|
||||
"errors"
|
||||
|
||||
"github.com/nspcc-dev/neofs-sdk-go/netmap"
|
||||
"github.com/TrueCloudLab/frostfs-sdk-go/netmap"
|
||||
)
|
||||
|
||||
const (
|
||||
|
|
|
@ -3,7 +3,7 @@ package network
|
|||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/nspcc-dev/neofs-sdk-go/netmap"
|
||||
"github.com/TrueCloudLab/frostfs-sdk-go/netmap"
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue