Skip to content

Migrate zosbase -> zos_base module (v1.1.0) #2695

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ashraffouda wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Migrate zosbase -> zos_base module (v1.1.0) #2695

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions cmds/identityd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,19 @@ import (
"time"

"github.com/pkg/errors"
"github.com/threefoldtech/zosbase/pkg/app"
"github.com/threefoldtech/zosbase/pkg/stubs"
"github.com/threefoldtech/zosbase/pkg/upgrade"
"github.com/threefoldtech/zos_base/pkg/app"
"github.com/threefoldtech/zos_base/pkg/stubs"
"github.com/threefoldtech/zos_base/pkg/upgrade"

"github.com/threefoldtech/zosbase/pkg"
"github.com/threefoldtech/zosbase/pkg/environment"
"github.com/threefoldtech/zosbase/pkg/identity"
"github.com/threefoldtech/zos_base/pkg"
"github.com/threefoldtech/zos_base/pkg/environment"
"github.com/threefoldtech/zos_base/pkg/identity"

"github.com/rs/zerolog"
"github.com/rs/zerolog/log"
"github.com/threefoldtech/zbus"
"github.com/threefoldtech/zosbase/pkg/utils"
"github.com/threefoldtech/zosbase/pkg/version"
"github.com/threefoldtech/zos_base/pkg/utils"
"github.com/threefoldtech/zos_base/pkg/version"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion cmds/identityd/monitor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"time"

"github.com/blang/semver"
"github.com/threefoldtech/zosbase/pkg"
"github.com/threefoldtech/zos_base/pkg"
)

type monitorStream struct {
Expand Down
6 changes: 3 additions & 3 deletions cmds/identityd/ssh.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import (
"github.com/cenkalti/backoff"
"github.com/hashicorp/go-retryablehttp"
"github.com/rs/zerolog/log"
"github.com/threefoldtech/zosbase/pkg"
"github.com/threefoldtech/zosbase/pkg/environment"
"github.com/threefoldtech/zosbase/pkg/kernel"
"github.com/threefoldtech/zos_base/pkg"
"github.com/threefoldtech/zos_base/pkg/environment"
"github.com/threefoldtech/zos_base/pkg/kernel"
)

var (
Expand Down
22 changes: 11 additions & 11 deletions cmds/internet/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@ import (
"github.com/rs/zerolog/log"
"github.com/vishvananda/netlink"

"github.com/threefoldtech/zosbase/pkg/app"
"github.com/threefoldtech/zosbase/pkg/environment"
"github.com/threefoldtech/zosbase/pkg/network/bootstrap"
"github.com/threefoldtech/zosbase/pkg/network/bridge"
"github.com/threefoldtech/zosbase/pkg/network/dhcp"
"github.com/threefoldtech/zosbase/pkg/network/ifaceutil"
"github.com/threefoldtech/zosbase/pkg/network/options"
"github.com/threefoldtech/zosbase/pkg/network/types"
"github.com/threefoldtech/zosbase/pkg/zinit"

"github.com/threefoldtech/zosbase/pkg/version"
"github.com/threefoldtech/zos_base/pkg/app"
"github.com/threefoldtech/zos_base/pkg/environment"
"github.com/threefoldtech/zos_base/pkg/network/bootstrap"
"github.com/threefoldtech/zos_base/pkg/network/bridge"
"github.com/threefoldtech/zos_base/pkg/network/dhcp"
"github.com/threefoldtech/zos_base/pkg/network/ifaceutil"
"github.com/threefoldtech/zos_base/pkg/network/options"
"github.com/threefoldtech/zos_base/pkg/network/types"
"github.com/threefoldtech/zos_base/pkg/zinit"

"github.com/threefoldtech/zos_base/pkg/version"
)

func main() {
Expand Down
10 changes: 5 additions & 5 deletions cmds/modules/api_gateway/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ import (
substrate "github.com/threefoldtech/tfchain/clients/tfchain-client-go"
"github.com/threefoldtech/tfgrid-sdk-go/rmb-sdk-go/peer"
"github.com/threefoldtech/zbus"
"github.com/threefoldtech/zosbase/pkg/environment"
"github.com/threefoldtech/zosbase/pkg/stubs"
substrategw "github.com/threefoldtech/zosbase/pkg/substrate_gateway"
"github.com/threefoldtech/zosbase/pkg/utils"
zosapi "github.com/threefoldtech/zosbase/pkg/zos_api"
"github.com/threefoldtech/zos_base/pkg/environment"
"github.com/threefoldtech/zos_base/pkg/stubs"
substrategw "github.com/threefoldtech/zos_base/pkg/substrate_gateway"
"github.com/threefoldtech/zos_base/pkg/utils"
zosapi "github.com/threefoldtech/zos_base/pkg/zos_api"
"github.com/urfave/cli/v2"
)

Expand Down
4 changes: 2 additions & 2 deletions cmds/modules/contd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
"github.com/urfave/cli/v2"

"github.com/threefoldtech/zbus"
"github.com/threefoldtech/zosbase/pkg/container"
"github.com/threefoldtech/zosbase/pkg/utils"
"github.com/threefoldtech/zos_base/pkg/container"
"github.com/threefoldtech/zos_base/pkg/utils"
)

const module = "container"
Expand Down
6 changes: 3 additions & 3 deletions cmds/modules/flistd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ import (
"time"

"github.com/pkg/errors"
"github.com/threefoldtech/zosbase/pkg/stubs"
"github.com/threefoldtech/zosbase/pkg/utils"
"github.com/threefoldtech/zos_base/pkg/stubs"
"github.com/threefoldtech/zos_base/pkg/utils"
"github.com/urfave/cli/v2"

"github.com/rs/zerolog/log"

"github.com/threefoldtech/zbus"
"github.com/threefoldtech/zosbase/pkg/flist"
"github.com/threefoldtech/zos_base/pkg/flist"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions cmds/modules/gateway/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"context"

"github.com/pkg/errors"
"github.com/threefoldtech/zosbase/pkg/gateway"
"github.com/threefoldtech/zosbase/pkg/utils"
"github.com/threefoldtech/zos_base/pkg/gateway"
"github.com/threefoldtech/zos_base/pkg/utils"
"github.com/urfave/cli/v2"

"github.com/rs/zerolog/log"
Expand Down
26 changes: 13 additions & 13 deletions cmds/modules/networkd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,24 @@ import (
"time"

"github.com/pkg/errors"
"github.com/threefoldtech/zosbase/pkg/environment"
"github.com/threefoldtech/zosbase/pkg/network/dhcp"
"github.com/threefoldtech/zosbase/pkg/network/mycelium"
"github.com/threefoldtech/zosbase/pkg/network/public"
"github.com/threefoldtech/zosbase/pkg/network/types"
"github.com/threefoldtech/zosbase/pkg/zinit"
"github.com/threefoldtech/zos_base/pkg/environment"
"github.com/threefoldtech/zos_base/pkg/network/dhcp"
"github.com/threefoldtech/zos_base/pkg/network/mycelium"
"github.com/threefoldtech/zos_base/pkg/network/public"
"github.com/threefoldtech/zos_base/pkg/network/types"
"github.com/threefoldtech/zos_base/pkg/zinit"
"github.com/urfave/cli/v2"

"github.com/cenkalti/backoff/v3"
"github.com/rs/zerolog/log"
"github.com/threefoldtech/zbus"
"github.com/threefoldtech/zosbase/pkg"
"github.com/threefoldtech/zosbase/pkg/network"
"github.com/threefoldtech/zosbase/pkg/network/bootstrap"
"github.com/threefoldtech/zosbase/pkg/network/ndmz"
"github.com/threefoldtech/zosbase/pkg/network/yggdrasil"
"github.com/threefoldtech/zosbase/pkg/stubs"
"github.com/threefoldtech/zosbase/pkg/utils"
"github.com/threefoldtech/zos_base/pkg"
"github.com/threefoldtech/zos_base/pkg/network"
"github.com/threefoldtech/zos_base/pkg/network/bootstrap"
"github.com/threefoldtech/zos_base/pkg/network/ndmz"
"github.com/threefoldtech/zos_base/pkg/network/yggdrasil"
"github.com/threefoldtech/zos_base/pkg/stubs"
"github.com/threefoldtech/zos_base/pkg/utils"
)

const (
Expand Down
28 changes: 14 additions & 14 deletions cmds/modules/noded/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,20 @@ import (
"github.com/urfave/cli/v2"

substrate "github.com/threefoldtech/tfchain/clients/tfchain-client-go"
"github.com/threefoldtech/zosbase/pkg/app"
"github.com/threefoldtech/zosbase/pkg/capacity"
"github.com/threefoldtech/zosbase/pkg/environment"
"github.com/threefoldtech/zosbase/pkg/events"
"github.com/threefoldtech/zosbase/pkg/monitord"
"github.com/threefoldtech/zosbase/pkg/perf"
"github.com/threefoldtech/zosbase/pkg/perf/cpubench"
"github.com/threefoldtech/zosbase/pkg/perf/healthcheck"
"github.com/threefoldtech/zosbase/pkg/perf/iperf"
"github.com/threefoldtech/zosbase/pkg/perf/provisiontest"
"github.com/threefoldtech/zosbase/pkg/perf/publicip"
"github.com/threefoldtech/zosbase/pkg/registrar"
"github.com/threefoldtech/zosbase/pkg/stubs"
"github.com/threefoldtech/zosbase/pkg/utils"
"github.com/threefoldtech/zos_base/pkg/app"
"github.com/threefoldtech/zos_base/pkg/capacity"
"github.com/threefoldtech/zos_base/pkg/environment"
"github.com/threefoldtech/zos_base/pkg/events"
"github.com/threefoldtech/zos_base/pkg/monitord"
"github.com/threefoldtech/zos_base/pkg/perf"
"github.com/threefoldtech/zos_base/pkg/perf/cpubench"
"github.com/threefoldtech/zos_base/pkg/perf/healthcheck"
"github.com/threefoldtech/zos_base/pkg/perf/iperf"
"github.com/threefoldtech/zos_base/pkg/perf/provisiontest"
"github.com/threefoldtech/zos_base/pkg/perf/publicip"
"github.com/threefoldtech/zos_base/pkg/registrar"
"github.com/threefoldtech/zos_base/pkg/stubs"
"github.com/threefoldtech/zos_base/pkg/utils"

"github.com/rs/zerolog/log"

Expand Down
6 changes: 3 additions & 3 deletions cmds/modules/noded/public.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"github.com/rs/zerolog/log"
substrate "github.com/threefoldtech/tfchain/clients/tfchain-client-go"
"github.com/threefoldtech/zbus"
"github.com/threefoldtech/zosbase/pkg"
"github.com/threefoldtech/zosbase/pkg/events"
"github.com/threefoldtech/zosbase/pkg/stubs"
"github.com/threefoldtech/zos_base/pkg"
"github.com/threefoldtech/zos_base/pkg/events"
"github.com/threefoldtech/zos_base/pkg/stubs"
)

func setPublicConfig(ctx context.Context, cl zbus.Client, cfg *substrate.PublicConfig) error {
Expand Down
10 changes: 5 additions & 5 deletions cmds/modules/powerd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ import (
"github.com/rs/zerolog/log"
substrate "github.com/threefoldtech/tfchain/clients/tfchain-client-go"
"github.com/threefoldtech/zbus"
"github.com/threefoldtech/zosbase/pkg/environment"
"github.com/threefoldtech/zosbase/pkg/events"
"github.com/threefoldtech/zosbase/pkg/power"
"github.com/threefoldtech/zosbase/pkg/stubs"
"github.com/threefoldtech/zosbase/pkg/utils"
"github.com/threefoldtech/zos_base/pkg/environment"
"github.com/threefoldtech/zos_base/pkg/events"
"github.com/threefoldtech/zos_base/pkg/power"
"github.com/threefoldtech/zos_base/pkg/stubs"
"github.com/threefoldtech/zos_base/pkg/utils"
"github.com/urfave/cli/v2"
)

Expand Down
6 changes: 3 additions & 3 deletions cmds/modules/provisiond/cap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"github.com/centrifuge/go-substrate-rpc-client/v4/types"
"github.com/rs/zerolog/log"
substrate "github.com/threefoldtech/tfchain/clients/tfchain-client-go"
"github.com/threefoldtech/zosbase/pkg/gridtypes"
"github.com/threefoldtech/zosbase/pkg/provision"
"github.com/threefoldtech/zosbase/pkg/stubs"
"github.com/threefoldtech/zos_base/pkg/gridtypes"
"github.com/threefoldtech/zos_base/pkg/provision"
"github.com/threefoldtech/zos_base/pkg/stubs"
)

type DeploymentID struct {
Expand Down
8 changes: 4 additions & 4 deletions cmds/modules/provisiond/events.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import (

"github.com/pkg/errors"
"github.com/rs/zerolog/log"
"github.com/threefoldtech/zosbase/pkg/events"
"github.com/threefoldtech/zosbase/pkg/gridtypes"
"github.com/threefoldtech/zosbase/pkg/provision"
"github.com/threefoldtech/zosbase/pkg/stubs"
"github.com/threefoldtech/zos_base/pkg/events"
"github.com/threefoldtech/zos_base/pkg/gridtypes"
"github.com/threefoldtech/zos_base/pkg/provision"
"github.com/threefoldtech/zos_base/pkg/stubs"
)

type ContractEventHandler struct {
Expand Down
26 changes: 13 additions & 13 deletions cmds/modules/provisiond/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,25 +13,25 @@ import (
"github.com/cenkalti/backoff/v3"
"github.com/pkg/errors"
substrate "github.com/threefoldtech/tfchain/clients/tfchain-client-go"
"github.com/threefoldtech/zosbase/pkg"
"github.com/threefoldtech/zosbase/pkg/app"
"github.com/threefoldtech/zosbase/pkg/capacity"
"github.com/threefoldtech/zosbase/pkg/environment"
"github.com/threefoldtech/zosbase/pkg/events"
"github.com/threefoldtech/zosbase/pkg/gridtypes"
"github.com/threefoldtech/zosbase/pkg/gridtypes/zos"
"github.com/threefoldtech/zosbase/pkg/primitives"
"github.com/threefoldtech/zosbase/pkg/provision/storage"
fsStorage "github.com/threefoldtech/zosbase/pkg/provision/storage.fs"
"github.com/threefoldtech/zos_base/pkg"
"github.com/threefoldtech/zos_base/pkg/app"
"github.com/threefoldtech/zos_base/pkg/capacity"
"github.com/threefoldtech/zos_base/pkg/environment"
"github.com/threefoldtech/zos_base/pkg/events"
"github.com/threefoldtech/zos_base/pkg/gridtypes"
"github.com/threefoldtech/zos_base/pkg/gridtypes/zos"
"github.com/threefoldtech/zos_base/pkg/primitives"
"github.com/threefoldtech/zos_base/pkg/provision/storage"
fsStorage "github.com/threefoldtech/zos_base/pkg/provision/storage.fs"
"github.com/urfave/cli/v2"

"github.com/threefoldtech/zosbase/pkg/stubs"
"github.com/threefoldtech/zosbase/pkg/utils"
"github.com/threefoldtech/zos_base/pkg/stubs"
"github.com/threefoldtech/zos_base/pkg/utils"

"github.com/rs/zerolog/log"

"github.com/threefoldtech/zbus"
"github.com/threefoldtech/zosbase/pkg/provision"
"github.com/threefoldtech/zos_base/pkg/provision"
)

const (
Expand Down
8 changes: 4 additions & 4 deletions cmds/modules/provisiond/migration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (

"github.com/pkg/errors"
"github.com/rs/zerolog/log"
"github.com/threefoldtech/zosbase/pkg/gridtypes"
"github.com/threefoldtech/zosbase/pkg/gridtypes/zos"
"github.com/threefoldtech/zosbase/pkg/provision/storage"
fsStorage "github.com/threefoldtech/zosbase/pkg/provision/storage.fs"
"github.com/threefoldtech/zos_base/pkg/gridtypes"
"github.com/threefoldtech/zos_base/pkg/gridtypes/zos"
"github.com/threefoldtech/zos_base/pkg/provision/storage"
fsStorage "github.com/threefoldtech/zos_base/pkg/provision/storage.fs"
)

func storageMigration(db *storage.BoltStorage, fs *fsStorage.Fs) error {
Expand Down
8 changes: 4 additions & 4 deletions cmds/modules/provisiond/reporter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ import (
"github.com/rs/zerolog/log"
substrate "github.com/threefoldtech/tfchain/clients/tfchain-client-go"
"github.com/threefoldtech/zbus"
"github.com/threefoldtech/zosbase/pkg"
"github.com/threefoldtech/zosbase/pkg/gridtypes"
"github.com/threefoldtech/zosbase/pkg/rrd"
"github.com/threefoldtech/zosbase/pkg/stubs"
"github.com/threefoldtech/zos_base/pkg"
"github.com/threefoldtech/zos_base/pkg/gridtypes"
"github.com/threefoldtech/zos_base/pkg/rrd"
"github.com/threefoldtech/zos_base/pkg/stubs"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions cmds/modules/qsfsd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"context"

"github.com/pkg/errors"
"github.com/threefoldtech/zosbase/pkg/qsfsd"
"github.com/threefoldtech/zosbase/pkg/utils"
"github.com/threefoldtech/zos_base/pkg/qsfsd"
"github.com/threefoldtech/zos_base/pkg/utils"
"github.com/urfave/cli/v2"

"github.com/rs/zerolog/log"
Expand Down
4 changes: 2 additions & 2 deletions cmds/modules/storaged/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"github.com/urfave/cli/v2"

"github.com/threefoldtech/zbus"
"github.com/threefoldtech/zosbase/pkg/storage"
"github.com/threefoldtech/zosbase/pkg/utils"
"github.com/threefoldtech/zos_base/pkg/storage"
"github.com/threefoldtech/zos_base/pkg/utils"
)

const (
Expand Down
6 changes: 3 additions & 3 deletions cmds/modules/vmd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"path/filepath"

"github.com/pkg/errors"
"github.com/threefoldtech/zosbase/pkg/cache"
"github.com/threefoldtech/zosbase/pkg/utils"
"github.com/threefoldtech/zosbase/pkg/vm"
"github.com/threefoldtech/zos_base/pkg/cache"
"github.com/threefoldtech/zos_base/pkg/utils"
"github.com/threefoldtech/zos_base/pkg/vm"
"github.com/urfave/cli/v2"

"github.com/rs/zerolog/log"
Expand Down
2 changes: 1 addition & 1 deletion cmds/modules/zlf/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

"github.com/go-redis/redis"
"github.com/rs/zerolog/log"
"github.com/threefoldtech/zosbase/pkg/app"
"github.com/threefoldtech/zos_base/pkg/app"
)

func reader(c io.Reader, r *redis.Client, channel string) {
Expand Down
2 changes: 1 addition & 1 deletion cmds/modules/zui/disk.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/gizak/termui/v3/widgets"
"github.com/pkg/errors"
"github.com/threefoldtech/zbus"
"github.com/threefoldtech/zosbase/pkg/stubs"
"github.com/threefoldtech/zos_base/pkg/stubs"
)

func diskRender(client zbus.Client, grid *ui.Grid, render *signalFlag) error {
Expand Down
Loading
Loading