TBR renaming party
MultiPart: 1/10
Change-Id: I9e13f5056ad91602af9041c036f1575946450f73
diff --git a/services/config/lib/config.go b/services/config/lib/config.go
index d2aa0da..c80ffda 100644
--- a/services/config/lib/config.go
+++ b/services/config/lib/config.go
@@ -17,8 +17,8 @@
"strings"
"sync"
- "v.io/core/veyron2/verror"
- "v.io/core/veyron2/vlog"
+ "v.io/v23/verror"
+ "v.io/v23/vlog"
"github.com/presotto/go-mdns-sd"
"github.com/presotto/go-mdns-sd/go_dns"
diff --git a/services/identity/auditor/blessing_auditor.go b/services/identity/auditor/blessing_auditor.go
index d6858ae..631fdbd 100644
--- a/services/identity/auditor/blessing_auditor.go
+++ b/services/identity/auditor/blessing_auditor.go
@@ -7,8 +7,8 @@
"time"
"v.io/core/veyron/security/audit"
- "v.io/core/veyron2/security"
- "v.io/core/veyron2/vom"
+ "v.io/v23/security"
+ "v.io/v23/vom"
)
// BlessingLogReader provides the Read method to read audit logs.
diff --git a/services/identity/auditor/blessing_auditor_test.go b/services/identity/auditor/blessing_auditor_test.go
index ab0dadc..28ba42e 100644
--- a/services/identity/auditor/blessing_auditor_test.go
+++ b/services/identity/auditor/blessing_auditor_test.go
@@ -7,7 +7,7 @@
vsecurity "v.io/core/veyron/security"
"v.io/core/veyron/security/audit"
- "v.io/core/veyron2/security"
+ "v.io/v23/security"
)
func TestBlessingAuditor(t *testing.T) {
diff --git a/services/identity/auditor/sql_database.go b/services/identity/auditor/sql_database.go
index ac7eadd..11bb841 100644
--- a/services/identity/auditor/sql_database.go
+++ b/services/identity/auditor/sql_database.go
@@ -5,7 +5,7 @@
"fmt"
"time"
- "v.io/core/veyron2/vlog"
+ "v.io/v23/vlog"
)
type database interface {
diff --git a/services/identity/blesser/macaroon.go b/services/identity/blesser/macaroon.go
index e7a85be..c31b28f 100644
--- a/services/identity/blesser/macaroon.go
+++ b/services/identity/blesser/macaroon.go
@@ -8,9 +8,9 @@
"v.io/core/veyron/services/identity/oauth"
"v.io/core/veyron/services/identity/util"
- "v.io/core/veyron2/ipc"
- "v.io/core/veyron2/security"
- "v.io/core/veyron2/vom"
+ "v.io/v23/ipc"
+ "v.io/v23/security"
+ "v.io/v23/vom"
)
type macaroonBlesser struct {
diff --git a/services/identity/blesser/macaroon_test.go b/services/identity/blesser/macaroon_test.go
index 910aa66..acbd53b 100644
--- a/services/identity/blesser/macaroon_test.go
+++ b/services/identity/blesser/macaroon_test.go
@@ -9,8 +9,8 @@
"v.io/core/veyron/services/identity/oauth"
"v.io/core/veyron/services/identity/util"
- "v.io/core/veyron2/security"
- "v.io/core/veyron2/vom"
+ "v.io/v23/security"
+ "v.io/v23/vom"
)
func TestMacaroonBlesser(t *testing.T) {
diff --git a/services/identity/blesser/oauth.go b/services/identity/blesser/oauth.go
index 504173a..4329cba 100644
--- a/services/identity/blesser/oauth.go
+++ b/services/identity/blesser/oauth.go
@@ -10,8 +10,8 @@
"v.io/core/veyron/services/identity/revocation"
"v.io/core/veyron/services/identity/util"
- "v.io/core/veyron2/ipc"
- "v.io/core/veyron2/security"
+ "v.io/v23/ipc"
+ "v.io/v23/security"
)
type oauthBlesser struct {
diff --git a/services/identity/blesser/oauth_test.go b/services/identity/blesser/oauth_test.go
index 12c3edc..9add34d 100644
--- a/services/identity/blesser/oauth_test.go
+++ b/services/identity/blesser/oauth_test.go
@@ -7,7 +7,7 @@
"v.io/core/veyron/services/identity/oauth"
- "v.io/core/veyron2/security"
+ "v.io/v23/security"
)
func TestOAuthBlesser(t *testing.T) {
diff --git a/services/identity/blesser/util_test.go b/services/identity/blesser/util_test.go
index b20ef76..4a3590b 100644
--- a/services/identity/blesser/util_test.go
+++ b/services/identity/blesser/util_test.go
@@ -3,8 +3,8 @@
import (
vsecurity "v.io/core/veyron/security"
- "v.io/core/veyron2/ipc"
- "v.io/core/veyron2/security"
+ "v.io/v23/ipc"
+ "v.io/v23/security"
)
type serverCall struct {
diff --git a/services/identity/caveats/caveat_factory.go b/services/identity/caveats/caveat_factory.go
index 79f1c4d..8083dc0 100644
--- a/services/identity/caveats/caveat_factory.go
+++ b/services/identity/caveats/caveat_factory.go
@@ -6,7 +6,7 @@
"v.io/core/veyron/services/identity/revocation"
- "v.io/core/veyron2/security"
+ "v.io/v23/security"
)
type CaveatFactory interface {
diff --git a/services/identity/handlers/blessing_root.go b/services/identity/handlers/blessing_root.go
index 3e5869c..fd0e3b7 100644
--- a/services/identity/handlers/blessing_root.go
+++ b/services/identity/handlers/blessing_root.go
@@ -7,7 +7,7 @@
"net/http"
"v.io/core/veyron/services/identity/util"
- "v.io/core/veyron2/security"
+ "v.io/v23/security"
)
// BlessingRoot is an http.Handler implementation that renders the server's
diff --git a/services/identity/handlers/handlers_test.go b/services/identity/handlers/handlers_test.go
index 2fac754..8ec7577 100644
--- a/services/identity/handlers/handlers_test.go
+++ b/services/identity/handlers/handlers_test.go
@@ -9,7 +9,7 @@
"sort"
"testing"
- "v.io/core/veyron2/security"
+ "v.io/v23/security"
tsecurity "v.io/core/veyron/lib/testutil/security"
)
diff --git a/services/identity/identity.vdl b/services/identity/identity.vdl
index 5c7d16b..8f0a722 100644
--- a/services/identity/identity.vdl
+++ b/services/identity/identity.vdl
@@ -1,7 +1,7 @@
// Package identity defines services for identity providers in the veyron ecosystem.
package identity
-import "v.io/core/veyron2/security"
+import "v.io/v23/security"
// OAuthBlesser exchanges OAuth access tokens for
// an email address from an OAuth-based identity provider and uses the email
diff --git a/services/identity/identity.vdl.go b/services/identity/identity.vdl.go
index 7a3bd45..1333080 100644
--- a/services/identity/identity.vdl.go
+++ b/services/identity/identity.vdl.go
@@ -6,12 +6,12 @@
import (
// VDL system imports
- "v.io/core/veyron2"
- "v.io/core/veyron2/context"
- "v.io/core/veyron2/ipc"
+ "v.io/v23"
+ "v.io/v23/context"
+ "v.io/v23/ipc"
// VDL user imports
- "v.io/core/veyron2/security"
+ "v.io/v23/security"
)
// OAuthBlesserClientMethods is the client interface
@@ -62,7 +62,7 @@
if c.client != nil {
return c.client
}
- return veyron2.GetClient(ctx)
+ return v23.GetClient(ctx)
}
func (c implOAuthBlesserClientStub) BlessUsingAccessToken(ctx *context.T, i0 string, opts ...ipc.CallOpt) (o0 security.WireBlessings, o1 string, err error) {
@@ -202,7 +202,7 @@
if c.client != nil {
return c.client
}
- return veyron2.GetClient(ctx)
+ return v23.GetClient(ctx)
}
func (c implMacaroonBlesserClientStub) Bless(ctx *context.T, i0 string, opts ...ipc.CallOpt) (o0 security.WireBlessings, err error) {
diff --git a/services/identity/identityd/main.go b/services/identity/identityd/main.go
index d93ba4e..b4bcadd 100644
--- a/services/identity/identityd/main.go
+++ b/services/identity/identityd/main.go
@@ -10,8 +10,8 @@
"os"
"time"
- "v.io/core/veyron2"
- "v.io/core/veyron2/vlog"
+ "v.io/v23"
+ "v.io/v23/vlog"
_ "v.io/core/veyron/profiles/static"
"v.io/core/veyron/services/identity/auditor"
@@ -39,7 +39,7 @@
func main() {
flag.Var(&emailClassifier, "email_classifier", "A comma-separated list of <domain>=<prefix> pairs. For example 'google.com=internal,v.io=trusted'. When specified, then the blessings generated for email address of <domain> will use the extension <prefix>/<email> instead of the default extension of users/<email>.")
flag.Usage = usage
- ctx, shutdown := veyron2.Init()
+ ctx, shutdown := v23.Init()
defer shutdown()
var sqlDB *sql.DB
@@ -65,7 +65,7 @@
vlog.Fatalf("Failed to start RevocationManager: %v", err)
}
- listenSpec := veyron2.GetListenSpec(ctx)
+ listenSpec := v23.GetListenSpec(ctx)
s := server.NewIdentityServer(
googleoauth,
auditor,
diff --git a/services/identity/identityd_test/main.go b/services/identity/identityd_test/main.go
index 72dfa70..3bc1055 100644
--- a/services/identity/identityd_test/main.go
+++ b/services/identity/identityd_test/main.go
@@ -7,8 +7,8 @@
"os"
"time"
- "v.io/core/veyron2"
- "v.io/core/veyron2/vlog"
+ "v.io/v23"
+ "v.io/v23/vlog"
_ "v.io/core/veyron/profiles/static"
"v.io/core/veyron/services/identity/auditor"
@@ -55,10 +55,10 @@
RevocationManager: revocationManager,
}
- ctx, shutdown := veyron2.Init()
+ ctx, shutdown := v23.Init()
defer shutdown()
- listenSpec := veyron2.GetListenSpec(ctx)
+ listenSpec := v23.GetListenSpec(ctx)
s := server.NewIdentityServer(
oauthProvider,
auditor,
diff --git a/services/identity/oauth/googleoauth.go b/services/identity/oauth/googleoauth.go
index 1cbf32c..c743af0 100644
--- a/services/identity/oauth/googleoauth.go
+++ b/services/identity/oauth/googleoauth.go
@@ -7,7 +7,7 @@
"net/http"
"os"
- "v.io/core/veyron2/vlog"
+ "v.io/v23/vlog"
)
// googleOAuth implements the OAuthProvider interface with google oauth 2.0.
diff --git a/services/identity/oauth/handler.go b/services/identity/oauth/handler.go
index 5ae52ae..b4b9184 100644
--- a/services/identity/oauth/handler.go
+++ b/services/identity/oauth/handler.go
@@ -34,9 +34,9 @@
"v.io/core/veyron/services/identity/caveats"
"v.io/core/veyron/services/identity/revocation"
"v.io/core/veyron/services/identity/util"
- "v.io/core/veyron2/security"
- "v.io/core/veyron2/vlog"
- "v.io/core/veyron2/vom"
+ "v.io/v23/security"
+ "v.io/v23/vlog"
+ "v.io/v23/vom"
)
const (
diff --git a/services/identity/revocation/caveat.vdl b/services/identity/revocation/caveat.vdl
index 673e29f..a3f46f4 100644
--- a/services/identity/revocation/caveat.vdl
+++ b/services/identity/revocation/caveat.vdl
@@ -1,8 +1,8 @@
package revocation
import (
- "v.io/core/veyron2/uniqueid"
- "v.io/core/veyron2/security"
+ "v.io/v23/uniqueid"
+ "v.io/v23/security"
)
// NotRevokedCaveat is used to implement revocation.
diff --git a/services/identity/revocation/caveat.vdl.go b/services/identity/revocation/caveat.vdl.go
index 7f440da..ad9c504 100644
--- a/services/identity/revocation/caveat.vdl.go
+++ b/services/identity/revocation/caveat.vdl.go
@@ -5,11 +5,11 @@
import (
// VDL system imports
- "v.io/core/veyron2/vdl"
+ "v.io/v23/vdl"
// VDL user imports
- "v.io/core/veyron2/security"
- "v.io/core/veyron2/uniqueid"
+ "v.io/v23/security"
+ "v.io/v23/uniqueid"
)
// NotRevokedCaveat is used to implement revocation.
diff --git a/services/identity/revocation/revocation_manager.go b/services/identity/revocation/revocation_manager.go
index 16a56f7..9dbd491 100644
--- a/services/identity/revocation/revocation_manager.go
+++ b/services/identity/revocation/revocation_manager.go
@@ -8,7 +8,7 @@
"sync"
"time"
- "v.io/core/veyron2/security"
+ "v.io/v23/security"
)
// RevocationManager persists information for revocation caveats to provided discharges and allow for future revocations.
diff --git a/services/identity/revocation/revocation_test.go b/services/identity/revocation/revocation_test.go
index 2aa0291..043f942 100644
--- a/services/identity/revocation/revocation_test.go
+++ b/services/identity/revocation/revocation_test.go
@@ -8,18 +8,18 @@
services "v.io/core/veyron/services/security"
"v.io/core/veyron/services/security/discharger"
- "v.io/core/veyron2"
- "v.io/core/veyron2/context"
- "v.io/core/veyron2/security"
+ "v.io/v23"
+ "v.io/v23/context"
+ "v.io/v23/security"
)
func revokerSetup(t *testing.T, ctx *context.T) (dischargerKey security.PublicKey, dischargerEndpoint string, revoker RevocationManager, closeFunc func()) {
revokerService := NewMockRevocationManager()
- dischargerServer, err := veyron2.NewServer(ctx)
+ dischargerServer, err := v23.NewServer(ctx)
if err != nil {
t.Fatalf("r.NewServer: %s", err)
}
- dischargerEPs, err := dischargerServer.Listen(veyron2.GetListenSpec(ctx))
+ dischargerEPs, err := dischargerServer.Listen(v23.GetListenSpec(ctx))
if err != nil {
t.Fatalf("dischargerServer.Listen failed: %v", err)
}
@@ -27,7 +27,7 @@
if err := dischargerServer.Serve("", dischargerServiceStub, nil); err != nil {
t.Fatalf("dischargerServer.Serve revoker: %s", err)
}
- return veyron2.GetPrincipal(ctx).PublicKey(),
+ return v23.GetPrincipal(ctx).PublicKey(),
dischargerEPs[0].Name(),
revokerService,
func() {
diff --git a/services/identity/server/identityd.go b/services/identity/server/identityd.go
index 52640f0..37a2be8 100644
--- a/services/identity/server/identityd.go
+++ b/services/identity/server/identityd.go
@@ -10,13 +10,13 @@
"reflect"
"strings"
- "v.io/core/veyron2"
- "v.io/core/veyron2/context"
- "v.io/core/veyron2/ipc"
- "v.io/core/veyron2/naming"
- "v.io/core/veyron2/security"
- "v.io/core/veyron2/verror"
- "v.io/core/veyron2/vlog"
+ "v.io/v23"
+ "v.io/v23/context"
+ "v.io/v23/ipc"
+ "v.io/v23/naming"
+ "v.io/v23/security"
+ "v.io/v23/verror"
+ "v.io/v23/vlog"
"v.io/core/veyron/lib/signals"
"v.io/core/veyron/security/audit"
@@ -71,8 +71,8 @@
}
func (s *IdentityServer) Serve(ctx *context.T, listenSpec *ipc.ListenSpec, host, httpaddr, tlsconfig string) {
- ctx, err := veyron2.SetPrincipal(ctx, audit.NewPrincipal(
- veyron2.GetPrincipal(ctx), s.auditor))
+ ctx, err := v23.SetPrincipal(ctx, audit.NewPrincipal(
+ v23.GetPrincipal(ctx), s.auditor))
if err != nil {
vlog.Panic(err)
}
@@ -84,7 +84,7 @@
// Setup handlers
// json-encoded public key and blessing names of this server
- principal := veyron2.GetPrincipal(ctx)
+ principal := v23.GetPrincipal(ctx)
http.Handle("/blessing-root", handlers.BlessingRoot{principal})
macaroonKey := make([]byte, 32)
@@ -154,18 +154,18 @@
// Starts the blessing services and the discharging service on the same port.
func (s *IdentityServer) setupServices(ctx *context.T, listenSpec *ipc.ListenSpec, macaroonKey []byte) (ipc.Server, []string, error) {
- server, err := veyron2.NewServer(ctx)
+ server, err := v23.NewServer(ctx)
if err != nil {
return nil, nil, fmt.Errorf("failed to create new ipc.Server: %v", err)
}
- principal := veyron2.GetPrincipal(ctx)
+ principal := v23.GetPrincipal(ctx)
objectAddr := naming.Join("identity", fmt.Sprintf("%v", principal.BlessingStore().Default()))
var rootedObjectAddr string
if eps, err := server.Listen(*listenSpec); err != nil {
defer server.Stop()
return nil, nil, fmt.Errorf("server.Listen(%v) failed: %v", *listenSpec, err)
- } else if nsroots := veyron2.GetNamespace(ctx).Roots(); len(nsroots) >= 1 {
+ } else if nsroots := v23.GetNamespace(ctx).Roots(); len(nsroots) >= 1 {
rootedObjectAddr = naming.Join(nsroots[0], objectAddr)
} else {
rootedObjectAddr = eps[0].Name()
diff --git a/services/identity/util/csrf.go b/services/identity/util/csrf.go
index 1b7c49a..dea8933 100644
--- a/services/identity/util/csrf.go
+++ b/services/identity/util/csrf.go
@@ -9,8 +9,8 @@
"net/http"
"time"
- "v.io/core/veyron2/vlog"
- "v.io/core/veyron2/vom"
+ "v.io/v23/vlog"
+ "v.io/v23/vom"
)
const (
diff --git a/services/identity/util/write.go b/services/identity/util/write.go
index 8d7544c..4f265b8 100644
--- a/services/identity/util/write.go
+++ b/services/identity/util/write.go
@@ -5,7 +5,7 @@
"html/template"
"net/http"
- "v.io/core/veyron2/vlog"
+ "v.io/v23/vlog"
)
// HTTPBadRequest sends an HTTP 400 error on 'w' and renders a pretty page.
diff --git a/services/mgmt/application/applicationd/applicationd_v23_test.go b/services/mgmt/application/applicationd/applicationd_v23_test.go
index 7fa3406..7570990 100644
--- a/services/mgmt/application/applicationd/applicationd_v23_test.go
+++ b/services/mgmt/application/applicationd/applicationd_v23_test.go
@@ -8,8 +8,8 @@
libsecurity "v.io/core/veyron/lib/testutil/security"
"v.io/core/veyron/lib/testutil/v23tests"
vsecurity "v.io/core/veyron/security"
- "v.io/core/veyron2/naming"
- "v.io/core/veyron2/security"
+ "v.io/v23/naming"
+ "v.io/v23/security"
)
//go:generate v23 test generate
diff --git a/services/mgmt/application/applicationd/main.go b/services/mgmt/application/applicationd/main.go
index 7faae65..697e098 100644
--- a/services/mgmt/application/applicationd/main.go
+++ b/services/mgmt/application/applicationd/main.go
@@ -3,8 +3,8 @@
import (
"flag"
- "v.io/core/veyron2"
- "v.io/core/veyron2/vlog"
+ "v.io/v23"
+ "v.io/v23/vlog"
"v.io/core/veyron/lib/signals"
_ "v.io/core/veyron/profiles/roaming"
@@ -17,14 +17,14 @@
)
func main() {
- ctx, shutdown := veyron2.Init()
+ ctx, shutdown := v23.Init()
defer shutdown()
if *store == "" {
vlog.Fatalf("Specify a directory for storing application envelopes using --store=<name>")
}
- server, err := veyron2.NewServer(ctx)
+ server, err := v23.NewServer(ctx)
if err != nil {
vlog.Fatalf("NewServer() failed: %v", err)
}
@@ -35,7 +35,7 @@
vlog.Fatalf("NewDispatcher() failed: %v", err)
}
- ls := veyron2.GetListenSpec(ctx)
+ ls := v23.GetListenSpec(ctx)
endpoints, err := server.Listen(ls)
if err != nil {
vlog.Fatalf("Listen(%s) failed: %v", ls, err)
diff --git a/services/mgmt/application/impl/acl_test.go b/services/mgmt/application/impl/acl_test.go
index c86b6ff..ee70124 100644
--- a/services/mgmt/application/impl/acl_test.go
+++ b/services/mgmt/application/impl/acl_test.go
@@ -9,13 +9,13 @@
"syscall"
"testing"
- "v.io/core/veyron2"
- "v.io/core/veyron2/naming"
- "v.io/core/veyron2/security"
- "v.io/core/veyron2/services/mgmt/application"
- "v.io/core/veyron2/services/security/access"
- "v.io/core/veyron2/verror"
- "v.io/core/veyron2/vlog"
+ "v.io/v23"
+ "v.io/v23/naming"
+ "v.io/v23/security"
+ "v.io/v23/services/mgmt/application"
+ "v.io/v23/services/security/access"
+ "v.io/v23/verror"
+ "v.io/v23/vlog"
"v.io/core/veyron/lib/signals"
"v.io/core/veyron/lib/testutil"
@@ -41,7 +41,7 @@
ctx, shutdown := testutil.InitForTest()
defer shutdown()
- veyron2.GetNamespace(ctx).CacheCtl(naming.DisableCache(true))
+ v23.GetNamespace(ctx).CacheCtl(naming.DisableCache(true))
defer fmt.Fprintf(stdout, "%v terminating\n", publishName)
defer vlog.VI(1).Infof("%v terminating", publishName)
@@ -68,18 +68,18 @@
func TestApplicationUpdateACL(t *testing.T) {
ctx, shutdown := testutil.InitForTest()
defer shutdown()
- veyron2.GetNamespace(ctx).CacheCtl(naming.DisableCache(true))
+ v23.GetNamespace(ctx).CacheCtl(naming.DisableCache(true))
// By default, all principals in this test will have blessings
// generated based on the username/machine running this process. Give
// them recognizable names ("root/self" etc.), so the ACLs can be set
// deterministically.
idp := tsecurity.NewIDProvider("root")
- if err := idp.Bless(veyron2.GetPrincipal(ctx), "self"); err != nil {
+ if err := idp.Bless(v23.GetPrincipal(ctx), "self"); err != nil {
t.Fatal(err)
}
- sh, deferFn := mgmttest.CreateShellAndMountTable(t, ctx, veyron2.GetPrincipal(ctx))
+ sh, deferFn := mgmttest.CreateShellAndMountTable(t, ctx, v23.GetPrincipal(ctx))
defer deferFn()
// setup mock up directory to put state in
@@ -90,11 +90,11 @@
pid := mgmttest.ReadPID(t, nms)
defer syscall.Kill(pid, syscall.SIGINT)
- otherCtx, err := veyron2.SetPrincipal(ctx, tsecurity.NewPrincipal())
+ otherCtx, err := v23.SetPrincipal(ctx, tsecurity.NewPrincipal())
if err != nil {
t.Fatal(err)
}
- if err := idp.Bless(veyron2.GetPrincipal(otherCtx), "other"); err != nil {
+ if err := idp.Bless(v23.GetPrincipal(otherCtx), "other"); err != nil {
t.Fatal(err)
}
@@ -198,28 +198,28 @@
func TestPerAppACL(t *testing.T) {
ctx, shutdown := testutil.InitForTest()
defer shutdown()
- veyron2.GetNamespace(ctx).CacheCtl(naming.DisableCache(true))
+ v23.GetNamespace(ctx).CacheCtl(naming.DisableCache(true))
// By default, all principals in this test will have blessings
// generated based on the username/machine running this process. Give
// them recognizable names ("root/self" etc.), so the ACLs can be set
// deterministically.
idp := tsecurity.NewIDProvider("root")
- if err := idp.Bless(veyron2.GetPrincipal(ctx), "self"); err != nil {
+ if err := idp.Bless(v23.GetPrincipal(ctx), "self"); err != nil {
t.Fatal(err)
}
- sh, deferFn := mgmttest.CreateShellAndMountTable(t, ctx, veyron2.GetPrincipal(ctx))
+ sh, deferFn := mgmttest.CreateShellAndMountTable(t, ctx, v23.GetPrincipal(ctx))
defer deferFn()
// setup mock up directory to put state in
storedir, cleanup := mgmttest.SetupRootDir(t, "application")
defer cleanup()
- otherCtx, err := veyron2.SetPrincipal(ctx, tsecurity.NewPrincipal())
+ otherCtx, err := v23.SetPrincipal(ctx, tsecurity.NewPrincipal())
if err != nil {
t.Fatal(err)
}
- if err := idp.Bless(veyron2.GetPrincipal(otherCtx), "other"); err != nil {
+ if err := idp.Bless(v23.GetPrincipal(otherCtx), "other"); err != nil {
t.Fatal(err)
}
@@ -337,7 +337,7 @@
ctx, shutdown := testutil.InitForTest()
defer shutdown()
- veyron2.GetNamespace(ctx).CacheCtl(naming.DisableCache(true))
+ v23.GetNamespace(ctx).CacheCtl(naming.DisableCache(true))
sh, deferFn := mgmttest.CreateShellAndMountTable(t, ctx, nil)
defer deferFn()
@@ -349,7 +349,7 @@
idp := tsecurity.NewIDProvider("root")
// Make a recognizable principal name.
- if err := idp.Bless(veyron2.GetPrincipal(ctx), "self"); err != nil {
+ if err := idp.Bless(v23.GetPrincipal(ctx), "self"); err != nil {
t.Fatal(err)
}
diff --git a/services/mgmt/application/impl/dispatcher.go b/services/mgmt/application/impl/dispatcher.go
index b08cddd..161002d 100644
--- a/services/mgmt/application/impl/dispatcher.go
+++ b/services/mgmt/application/impl/dispatcher.go
@@ -3,12 +3,12 @@
import (
"path/filepath"
- "v.io/core/veyron2/ipc"
- "v.io/core/veyron2/naming"
- "v.io/core/veyron2/security"
- "v.io/core/veyron2/services/security/access"
- "v.io/core/veyron2/verror"
- "v.io/core/veyron2/vlog"
+ "v.io/v23/ipc"
+ "v.io/v23/naming"
+ "v.io/v23/security"
+ "v.io/v23/services/security/access"
+ "v.io/v23/verror"
+ "v.io/v23/vlog"
"v.io/core/veyron/security/flag"
"v.io/core/veyron/services/mgmt/lib/fs"
diff --git a/services/mgmt/application/impl/impl_test.go b/services/mgmt/application/impl/impl_test.go
index 705e601..da555e6 100644
--- a/services/mgmt/application/impl/impl_test.go
+++ b/services/mgmt/application/impl/impl_test.go
@@ -6,12 +6,12 @@
"reflect"
"testing"
- "v.io/core/veyron2"
- "v.io/core/veyron2/context"
- "v.io/core/veyron2/naming"
- "v.io/core/veyron2/security"
- "v.io/core/veyron2/services/mgmt/application"
- "v.io/core/veyron2/verror"
+ "v.io/v23"
+ "v.io/v23/context"
+ "v.io/v23/naming"
+ "v.io/v23/security"
+ "v.io/v23/services/mgmt/application"
+ "v.io/v23/verror"
"v.io/core/veyron/lib/testutil"
_ "v.io/core/veyron/profiles/static"
@@ -23,7 +23,7 @@
func newPublisherSignature(t *testing.T, ctx *context.T, msg []byte) (security.WireBlessings, security.Signature) {
// Generate publisher blessings
- p := veyron2.GetPrincipal(ctx)
+ p := v23.GetPrincipal(ctx)
b, err := p.BlessSelf("publisher")
if err != nil {
t.Fatal(err)
diff --git a/services/mgmt/application/impl/service.go b/services/mgmt/application/impl/service.go
index 76638d4..5b5e77e 100644
--- a/services/mgmt/application/impl/service.go
+++ b/services/mgmt/application/impl/service.go
@@ -7,12 +7,12 @@
"v.io/core/veyron/services/mgmt/lib/fs"
"v.io/core/veyron/services/mgmt/repository"
- "v.io/core/veyron2/ipc"
- "v.io/core/veyron2/naming"
- "v.io/core/veyron2/services/mgmt/application"
- "v.io/core/veyron2/services/security/access"
- "v.io/core/veyron2/verror"
- "v.io/core/veyron2/vlog"
+ "v.io/v23/ipc"
+ "v.io/v23/naming"
+ "v.io/v23/services/mgmt/application"
+ "v.io/v23/services/security/access"
+ "v.io/v23/verror"
+ "v.io/v23/vlog"
)
// appRepoService implements the Application repository interface.
diff --git a/services/mgmt/binary/binaryd/binaryd_v23_test.go b/services/mgmt/binary/binaryd/binaryd_v23_test.go
index 2ecdbf4..d7a188d 100644
--- a/services/mgmt/binary/binaryd/binaryd_v23_test.go
+++ b/services/mgmt/binary/binaryd/binaryd_v23_test.go
@@ -12,7 +12,7 @@
"v.io/core/veyron/lib/testutil"
"v.io/core/veyron/lib/testutil/security"
"v.io/core/veyron/lib/testutil/v23tests"
- "v.io/core/veyron2/naming"
+ "v.io/v23/naming"
)
//go:generate v23 test generate
diff --git a/services/mgmt/binary/binaryd/main.go b/services/mgmt/binary/binaryd/main.go
index a5ff9eb..c317ff3 100644
--- a/services/mgmt/binary/binaryd/main.go
+++ b/services/mgmt/binary/binaryd/main.go
@@ -6,9 +6,9 @@
"net/http"
"os"
- "v.io/core/veyron2"
- "v.io/core/veyron2/context"
- "v.io/core/veyron2/vlog"
+ "v.io/v23"
+ "v.io/v23/context"
+ "v.io/v23/vlog"
"v.io/core/veyron/lib/netstate"
"v.io/core/veyron/lib/signals"
@@ -37,7 +37,7 @@
host = "127.0.0.1"
ips, err := netstate.GetAccessibleIPs()
if err == nil {
- ls := veyron2.GetListenSpec(ctx)
+ ls := v23.GetListenSpec(ctx)
if a, err := ls.AddressChooser("tcp", ips); err == nil && len(a) > 0 {
host = a[0].Address().String()
}
@@ -47,7 +47,7 @@
}
func main() {
- ctx, shutdown := veyron2.Init()
+ ctx, shutdown := v23.Init()
defer shutdown()
rootDir, err := impl.SetupRootDir(*rootDirFlag)
@@ -75,20 +75,20 @@
os.Exit(1)
}
}()
- server, err := veyron2.NewServer(ctx)
+ server, err := v23.NewServer(ctx)
if err != nil {
vlog.Errorf("NewServer() failed: %v", err)
return
}
defer server.Stop()
- ls := veyron2.GetListenSpec(ctx)
+ ls := v23.GetListenSpec(ctx)
endpoints, err := server.Listen(ls)
if err != nil {
vlog.Errorf("Listen(%s) failed: %v", ls, err)
return
}
- dis, err := impl.NewDispatcher(veyron2.GetPrincipal(ctx), state)
+ dis, err := impl.NewDispatcher(v23.GetPrincipal(ctx), state)
if err != nil {
vlog.Errorf("NewDispatcher() failed: %v\n", err)
return
diff --git a/services/mgmt/binary/impl/acl_test.go b/services/mgmt/binary/impl/acl_test.go
index 7f0be51..c1bbdaa 100644
--- a/services/mgmt/binary/impl/acl_test.go
+++ b/services/mgmt/binary/impl/acl_test.go
@@ -8,13 +8,13 @@
"syscall"
"testing"
- "v.io/core/veyron2"
- "v.io/core/veyron2/naming"
- "v.io/core/veyron2/security"
- "v.io/core/veyron2/services/mgmt/repository"
- "v.io/core/veyron2/services/security/access"
- "v.io/core/veyron2/verror"
- "v.io/core/veyron2/vlog"
+ "v.io/v23"
+ "v.io/v23/naming"
+ "v.io/v23/security"
+ "v.io/v23/services/mgmt/repository"
+ "v.io/v23/services/security/access"
+ "v.io/v23/verror"
+ "v.io/v23/vlog"
"v.io/core/veyron/lib/signals"
"v.io/core/veyron/lib/testutil"
@@ -51,7 +51,7 @@
if err != nil {
vlog.Fatalf("NewState(%v, %v, %v) failed: %v", storedir, "", depth, err)
}
- dispatcher, err := impl.NewDispatcher(veyron2.GetPrincipal(ctx), state)
+ dispatcher, err := impl.NewDispatcher(v23.GetPrincipal(ctx), state)
if err != nil {
vlog.Fatalf("Failed to create binaryd dispatcher: %v", err)
}
@@ -68,25 +68,25 @@
func TestBinaryCreateACL(t *testing.T) {
ctx, shutdown := testutil.InitForTest()
defer shutdown()
- veyron2.GetNamespace(ctx).CacheCtl(naming.DisableCache(true))
+ v23.GetNamespace(ctx).CacheCtl(naming.DisableCache(true))
selfPrincipal := tsecurity.NewPrincipal("self")
- selfCtx, err := veyron2.SetPrincipal(ctx, selfPrincipal)
+ selfCtx, err := v23.SetPrincipal(ctx, selfPrincipal)
if err != nil {
t.Fatalf("SetPrincipal failed: %v", err)
}
dir, childPrincipal := tsecurity.ForkCredentials(selfPrincipal, "child")
defer os.RemoveAll(dir)
- childCtx, err := veyron2.SetPrincipal(ctx, childPrincipal)
+ childCtx, err := v23.SetPrincipal(ctx, childPrincipal)
if err != nil {
t.Fatalf("SetPrincipal failed: %v", err)
}
- sh, deferFn := mgmttest.CreateShellAndMountTable(t, childCtx, veyron2.GetPrincipal(childCtx))
+ sh, deferFn := mgmttest.CreateShellAndMountTable(t, childCtx, v23.GetPrincipal(childCtx))
defer deferFn()
// make selfCtx and childCtx have the same Namespace Roots as set by
// CreateShellAndMountTable
- veyron2.GetNamespace(selfCtx).SetRoots(veyron2.GetNamespace(childCtx).Roots()...)
+ v23.GetNamespace(selfCtx).SetRoots(v23.GetNamespace(childCtx).Roots()...)
// setup mock up directory to put state in
storedir, cleanup := mgmttest.SetupRootDir(t, "bindir")
@@ -127,14 +127,14 @@
func TestBinaryRootACL(t *testing.T) {
ctx, shutdown := testutil.InitForTest()
defer shutdown()
- veyron2.GetNamespace(ctx).CacheCtl(naming.DisableCache(true))
+ v23.GetNamespace(ctx).CacheCtl(naming.DisableCache(true))
selfPrincipal := tsecurity.NewPrincipal("self")
- selfCtx, err := veyron2.SetPrincipal(ctx, selfPrincipal)
+ selfCtx, err := v23.SetPrincipal(ctx, selfPrincipal)
if err != nil {
t.Fatalf("SetPrincipal failed: %v", err)
}
- sh, deferFn := mgmttest.CreateShellAndMountTable(t, selfCtx, veyron2.GetPrincipal(selfCtx))
+ sh, deferFn := mgmttest.CreateShellAndMountTable(t, selfCtx, v23.GetPrincipal(selfCtx))
defer deferFn()
// setup mock up directory to put state in
@@ -146,7 +146,7 @@
if err := otherPrincipal.AddToRoots(selfPrincipal.BlessingStore().Default()); err != nil {
t.Fatalf("otherPrincipal.AddToRoots() failed: %v", err)
}
- otherCtx, err := veyron2.SetPrincipal(selfCtx, otherPrincipal)
+ otherCtx, err := v23.SetPrincipal(selfCtx, otherPrincipal)
if err != nil {
t.Fatalf("SetPrincipal() failed: %v", err)
}
@@ -366,14 +366,14 @@
func TestBinaryRationalStartingValueForGetACL(t *testing.T) {
ctx, shutdown := testutil.InitForTest()
defer shutdown()
- veyron2.GetNamespace(ctx).CacheCtl(naming.DisableCache(true))
+ v23.GetNamespace(ctx).CacheCtl(naming.DisableCache(true))
selfPrincipal := tsecurity.NewPrincipal("self")
- selfCtx, err := veyron2.SetPrincipal(ctx, selfPrincipal)
+ selfCtx, err := v23.SetPrincipal(ctx, selfPrincipal)
if err != nil {
t.Fatalf("SetPrincipal failed: %v", err)
}
- sh, deferFn := mgmttest.CreateShellAndMountTable(t, selfCtx, veyron2.GetPrincipal(selfCtx))
+ sh, deferFn := mgmttest.CreateShellAndMountTable(t, selfCtx, v23.GetPrincipal(selfCtx))
defer deferFn()
// setup mock up directory to put state in
diff --git a/services/mgmt/binary/impl/dispatcher.go b/services/mgmt/binary/impl/dispatcher.go
index df9fc64..0f64747 100644
--- a/services/mgmt/binary/impl/dispatcher.go
+++ b/services/mgmt/binary/impl/dispatcher.go
@@ -5,11 +5,11 @@
"os"
"path/filepath"
- "v.io/core/veyron2/ipc"
- "v.io/core/veyron2/security"
- "v.io/core/veyron2/services/mgmt/repository"
- "v.io/core/veyron2/services/security/access"
- "v.io/core/veyron2/vlog"
+ "v.io/v23/ipc"
+ "v.io/v23/security"
+ "v.io/v23/services/mgmt/repository"
+ "v.io/v23/services/security/access"
+ "v.io/v23/vlog"
"v.io/core/veyron/services/mgmt/lib/acls"
)
diff --git a/services/mgmt/binary/impl/fs_utils.go b/services/mgmt/binary/impl/fs_utils.go
index c92d622..80c0f6d 100644
--- a/services/mgmt/binary/impl/fs_utils.go
+++ b/services/mgmt/binary/impl/fs_utils.go
@@ -8,8 +8,8 @@
"strconv"
"strings"
- "v.io/core/veyron2/verror"
- "v.io/core/veyron2/vlog"
+ "v.io/v23/verror"
+ "v.io/v23/vlog"
)
const (
diff --git a/services/mgmt/binary/impl/http.go b/services/mgmt/binary/impl/http.go
index 7da2a2c..46c28b3 100644
--- a/services/mgmt/binary/impl/http.go
+++ b/services/mgmt/binary/impl/http.go
@@ -6,8 +6,8 @@
"path/filepath"
"strings"
- "v.io/core/veyron2/verror"
- "v.io/core/veyron2/vlog"
+ "v.io/v23/verror"
+ "v.io/v23/vlog"
"v.io/core/veyron/services/mgmt/binary/impl/multipart"
)
diff --git a/services/mgmt/binary/impl/http_test.go b/services/mgmt/binary/impl/http_test.go
index ec0b411..03e4b73 100644
--- a/services/mgmt/binary/impl/http_test.go
+++ b/services/mgmt/binary/impl/http_test.go
@@ -8,9 +8,9 @@
"net/http"
"testing"
- "v.io/core/veyron2"
- "v.io/core/veyron2/naming"
- "v.io/core/veyron2/services/mgmt/repository"
+ "v.io/v23"
+ "v.io/v23/naming"
+ "v.io/v23/services/mgmt/repository"
"v.io/core/veyron/lib/testutil"
"v.io/core/veyron/services/mgmt/binary/impl"
@@ -21,7 +21,7 @@
ctx, shutdown := testutil.InitForTest()
defer shutdown()
- veyron2.GetNamespace(ctx).CacheCtl(naming.DisableCache(true))
+ v23.GetNamespace(ctx).CacheCtl(naming.DisableCache(true))
// TODO(caprita): This is based on TestMultiPart (impl_test.go). Share
// the code where possible.
diff --git a/services/mgmt/binary/impl/impl_test.go b/services/mgmt/binary/impl/impl_test.go
index 762a6de..e3be7b0 100644
--- a/services/mgmt/binary/impl/impl_test.go
+++ b/services/mgmt/binary/impl/impl_test.go
@@ -10,12 +10,12 @@
"reflect"
"testing"
- "v.io/core/veyron2"
- "v.io/core/veyron2/context"
- "v.io/core/veyron2/naming"
- "v.io/core/veyron2/services/mgmt/repository"
- "v.io/core/veyron2/verror"
- "v.io/core/veyron2/vlog"
+ "v.io/v23"
+ "v.io/v23/context"
+ "v.io/v23/naming"
+ "v.io/v23/services/mgmt/repository"
+ "v.io/v23/verror"
+ "v.io/v23/vlog"
"v.io/core/veyron/lib/testutil"
_ "v.io/core/veyron/profiles/static"
@@ -49,7 +49,7 @@
vlog.Fatalf("Serve() failed: %v", err)
}
}()
- dispatcher, err := impl.NewDispatcher(veyron2.GetPrincipal(ctx), state)
+ dispatcher, err := impl.NewDispatcher(v23.GetPrincipal(ctx), state)
if err != nil {
t.Fatalf("NewDispatcher failed: %v", err)
}
@@ -75,7 +75,7 @@
ctx, shutdown := testutil.InitForTest()
defer shutdown()
- veyron2.GetNamespace(ctx).CacheCtl(naming.DisableCache(true))
+ v23.GetNamespace(ctx).CacheCtl(naming.DisableCache(true))
for i := 0; i < md5.Size; i++ {
binary, ep, _, cleanup := startServer(t, ctx, i)
@@ -129,7 +129,7 @@
ctx, shutdown := testutil.InitForTest()
defer shutdown()
- veyron2.GetNamespace(ctx).CacheCtl(naming.DisableCache(true))
+ v23.GetNamespace(ctx).CacheCtl(naming.DisableCache(true))
for length := 2; length < 5; length++ {
binary, _, _, cleanup := startServer(t, ctx, 2)
@@ -183,7 +183,7 @@
ctx, shutdown := testutil.InitForTest()
defer shutdown()
- veyron2.GetNamespace(ctx).CacheCtl(naming.DisableCache(true))
+ v23.GetNamespace(ctx).CacheCtl(naming.DisableCache(true))
for length := 2; length < 5; length++ {
binary, _, _, cleanup := startServer(t, ctx, 2)
@@ -230,7 +230,7 @@
ctx, shutdown := testutil.InitForTest()
defer shutdown()
- veyron2.GetNamespace(ctx).CacheCtl(naming.DisableCache(true))
+ v23.GetNamespace(ctx).CacheCtl(naming.DisableCache(true))
binary, _, _, cleanup := startServer(t, ctx, 2)
defer cleanup()
@@ -297,7 +297,7 @@
ctx, shutdown := testutil.InitForTest()
defer shutdown()
- veyron2.GetNamespace(ctx).CacheCtl(naming.DisableCache(true))
+ v23.GetNamespace(ctx).CacheCtl(naming.DisableCache(true))
_, ep, _, cleanup := startServer(t, ctx, 2)
defer cleanup()
diff --git a/services/mgmt/binary/impl/service.go b/services/mgmt/binary/impl/service.go
index f2be7d8..d31994b 100644
--- a/services/mgmt/binary/impl/service.go
+++ b/services/mgmt/binary/impl/service.go
@@ -37,13 +37,13 @@
"syscall"
"v.io/core/veyron/services/mgmt/lib/acls"
- "v.io/core/veyron2/ipc"
- "v.io/core/veyron2/security"
- "v.io/core/veyron2/services/mgmt/binary"
- "v.io/core/veyron2/services/mgmt/repository"
- "v.io/core/veyron2/services/security/access"
- "v.io/core/veyron2/verror"
- "v.io/core/veyron2/vlog"
+ "v.io/v23/ipc"
+ "v.io/v23/security"
+ "v.io/v23/services/mgmt/binary"
+ "v.io/v23/services/mgmt/repository"
+ "v.io/v23/services/security/access"
+ "v.io/v23/verror"
+ "v.io/v23/vlog"
)
// binaryService implements the Binary server interface.
diff --git a/services/mgmt/binary/impl/setup.go b/services/mgmt/binary/impl/setup.go
index dbc1b92..1476fe2 100644
--- a/services/mgmt/binary/impl/setup.go
+++ b/services/mgmt/binary/impl/setup.go
@@ -5,7 +5,7 @@
"os"
"path/filepath"
- "v.io/core/veyron2/vlog"
+ "v.io/v23/vlog"
)
const defaultRootPrefix = "veyron_binary_repository"
diff --git a/services/mgmt/binary/impl/util_test.go b/services/mgmt/binary/impl/util_test.go
index d747dd7..356d7c7 100644
--- a/services/mgmt/binary/impl/util_test.go
+++ b/services/mgmt/binary/impl/util_test.go
@@ -6,8 +6,8 @@
"path/filepath"
"testing"
- "v.io/core/veyron2/context"
- "v.io/core/veyron2/services/mgmt/repository"
+ "v.io/v23/context"
+ "v.io/v23/services/mgmt/repository"
"v.io/core/veyron/lib/testutil"
"v.io/core/veyron/services/mgmt/binary/impl"
diff --git a/services/mgmt/build/buildd/main.go b/services/mgmt/build/buildd/main.go
index 52aa663..4426531 100644
--- a/services/mgmt/build/buildd/main.go
+++ b/services/mgmt/build/buildd/main.go
@@ -4,9 +4,9 @@
"flag"
"os"
- "v.io/core/veyron2"
- "v.io/core/veyron2/services/mgmt/build"
- "v.io/core/veyron2/vlog"
+ "v.io/v23"
+ "v.io/v23/services/mgmt/build"
+ "v.io/v23/vlog"
"v.io/core/veyron/lib/signals"
_ "v.io/core/veyron/profiles/roaming"
@@ -21,15 +21,15 @@
)
func main() {
- ctx, shutdown := veyron2.Init()
+ ctx, shutdown := v23.Init()
defer shutdown()
- server, err := veyron2.NewServer(ctx)
+ server, err := v23.NewServer(ctx)
if err != nil {
vlog.Errorf("NewServer() failed: %v", err)
return
}
- ls := veyron2.GetListenSpec(ctx)
+ ls := v23.GetListenSpec(ctx)
endpoint, err := server.Listen(ls)
if err != nil {
vlog.Errorf("Listen(%s) failed: %v", ls, err)
diff --git a/services/mgmt/build/impl/impl_test.go b/services/mgmt/build/impl/impl_test.go
index 29edf2a..acc7151 100644
--- a/services/mgmt/build/impl/impl_test.go
+++ b/services/mgmt/build/impl/impl_test.go
@@ -8,9 +8,9 @@
"strings"
"testing"
- "v.io/core/veyron2"
- "v.io/core/veyron2/context"
- "v.io/core/veyron2/services/mgmt/build"
+ "v.io/v23"
+ "v.io/v23/context"
+ "v.io/v23/services/mgmt/build"
"v.io/core/veyron/lib/testutil"
_ "v.io/core/veyron/profiles"
@@ -46,11 +46,11 @@
// startServer starts the build server.
func startServer(t *testing.T, ctx *context.T) build.BuilderClientMethods {
gobin, goroot := findGoBinary(t, "go")
- server, err := veyron2.NewServer(ctx)
+ server, err := v23.NewServer(ctx)
if err != nil {
t.Fatalf("NewServer() failed: %v", err)
}
- l := veyron2.GetListenSpec(ctx)
+ l := v23.GetListenSpec(ctx)
endpoints, err := server.Listen(l)
if err != nil {
t.Fatalf("Listen(%s) failed: %v", l, err)
diff --git a/services/mgmt/build/impl/service.go b/services/mgmt/build/impl/service.go
index 1a5173b..7c8dba0 100644
--- a/services/mgmt/build/impl/service.go
+++ b/services/mgmt/build/impl/service.go
@@ -9,11 +9,11 @@
"path/filepath"
"runtime"
- "v.io/core/veyron2/ipc"
- "v.io/core/veyron2/services/mgmt/binary"
- "v.io/core/veyron2/services/mgmt/build"
- "v.io/core/veyron2/verror"
- "v.io/core/veyron2/vlog"
+ "v.io/v23/ipc"
+ "v.io/v23/services/mgmt/binary"
+ "v.io/v23/services/mgmt/build"
+ "v.io/v23/verror"
+ "v.io/v23/vlog"
)
const pkgPath = "v.io/core/veyron/services/mgmt/build/impl"
diff --git a/services/mgmt/build/impl/util.go b/services/mgmt/build/impl/util.go
index d783b3f..3733a4e 100644
--- a/services/mgmt/build/impl/util.go
+++ b/services/mgmt/build/impl/util.go
@@ -3,7 +3,7 @@
import (
"runtime"
- "v.io/core/veyron2/services/mgmt/build"
+ "v.io/v23/services/mgmt/build"
)
func getArch() build.Architecture {
diff --git a/services/mgmt/debug/dispatcher.go b/services/mgmt/debug/dispatcher.go
index 4a8d9b0..96f3c2e 100644
--- a/services/mgmt/debug/dispatcher.go
+++ b/services/mgmt/debug/dispatcher.go
@@ -4,8 +4,8 @@
"strings"
"time"
- "v.io/core/veyron2/ipc"
- "v.io/core/veyron2/security"
+ "v.io/v23/ipc"
+ "v.io/v23/security"
logreaderimpl "v.io/core/veyron/services/mgmt/logreader/impl"
pprofimpl "v.io/core/veyron/services/mgmt/pprof/impl"
diff --git a/services/mgmt/debug/dispatcher_test.go b/services/mgmt/debug/dispatcher_test.go
index 8c59e3c..e92fd08 100644
--- a/services/mgmt/debug/dispatcher_test.go
+++ b/services/mgmt/debug/dispatcher_test.go
@@ -12,16 +12,16 @@
"testing"
"time"
- "v.io/core/veyron2"
- "v.io/core/veyron2/context"
- "v.io/core/veyron2/ipc"
- "v.io/core/veyron2/naming"
- "v.io/core/veyron2/services/mgmt/logreader"
- "v.io/core/veyron2/services/mgmt/stats"
- vtracesvc "v.io/core/veyron2/services/mgmt/vtrace"
- "v.io/core/veyron2/vdl"
- "v.io/core/veyron2/verror"
- "v.io/core/veyron2/vtrace"
+ "v.io/v23"
+ "v.io/v23/context"
+ "v.io/v23/ipc"
+ "v.io/v23/naming"
+ "v.io/v23/services/mgmt/logreader"
+ "v.io/v23/services/mgmt/stats"
+ vtracesvc "v.io/v23/services/mgmt/vtrace"
+ "v.io/v23/vdl"
+ "v.io/v23/verror"
+ "v.io/v23/vtrace"
libstats "v.io/core/veyron/lib/stats"
"v.io/core/veyron/lib/testutil"
@@ -34,7 +34,7 @@
return "", nil, fmt.Errorf("logs directory missing")
}
disp := NewDispatcher(func() string { return logsDir }, nil)
- server, err := veyron2.NewServer(ctx)
+ server, err := v23.NewServer(ctx)
if err != nil {
return "", nil, fmt.Errorf("failed to start debug server: %v", err)
}
@@ -69,7 +69,7 @@
t.Fatalf("ioutil.WriteFile failed: %v", err)
}
- endpoint, stop, err := startDebugServer(ctx, veyron2.GetListenSpec(ctx), workdir)
+ endpoint, stop, err := startDebugServer(ctx, v23.GetListenSpec(ctx), workdir)
if err != nil {
t.Fatalf("StartDebugServer failed: %v", err)
}
@@ -168,7 +168,7 @@
ctx, cancel := context.WithTimeout(ctx, 10*time.Second)
defer cancel()
- ns := veyron2.GetNamespace(ctx)
+ ns := v23.GetNamespace(ctx)
ns.SetRoots(naming.JoinAddressName(endpoint, "debug"))
c, err := ns.Glob(ctx, "logs/...")
diff --git a/services/mgmt/device/config.vdl.go b/services/mgmt/device/config.vdl.go
index 3f6a147..3e3ade1 100644
--- a/services/mgmt/device/config.vdl.go
+++ b/services/mgmt/device/config.vdl.go
@@ -5,9 +5,9 @@
import (
// VDL system imports
- "v.io/core/veyron2"
- "v.io/core/veyron2/context"
- "v.io/core/veyron2/ipc"
+ "v.io/v23"
+ "v.io/v23/context"
+ "v.io/v23/ipc"
)
// ConfigClientMethods is the client interface
@@ -45,7 +45,7 @@
if c.client != nil {
return c.client
}
- return veyron2.GetClient(ctx)
+ return v23.GetClient(ctx)
}
func (c implConfigClientStub) Set(ctx *context.T, i0 string, i1 string, opts ...ipc.CallOpt) (err error) {
diff --git a/services/mgmt/device/config/config.go b/services/mgmt/device/config/config.go
index 8932f5d..fcf2105 100644
--- a/services/mgmt/device/config/config.go
+++ b/services/mgmt/device/config/config.go
@@ -25,7 +25,7 @@
"strings"
"v.io/core/veyron/lib/flags/consts"
- "v.io/core/veyron2/services/mgmt/application"
+ "v.io/v23/services/mgmt/application"
)
// State specifies how the device manager is configured. This should
diff --git a/services/mgmt/device/config/config_test.go b/services/mgmt/device/config/config_test.go
index 498c55d..d9d4277 100644
--- a/services/mgmt/device/config/config_test.go
+++ b/services/mgmt/device/config/config_test.go
@@ -9,7 +9,7 @@
"v.io/core/veyron/services/mgmt/device/config"
- "v.io/core/veyron2/services/mgmt/application"
+ "v.io/v23/services/mgmt/application"
)
// TestState checks that encoding/decoding State to child/from parent works
diff --git a/services/mgmt/device/deviced/commands.go b/services/mgmt/device/deviced/commands.go
index 0360781..35a5771 100644
--- a/services/mgmt/device/deviced/commands.go
+++ b/services/mgmt/device/deviced/commands.go
@@ -7,8 +7,8 @@
"v.io/lib/cmdline"
"v.io/core/veyron/services/mgmt/device/impl"
- "v.io/core/veyron2"
- "v.io/core/veyron2/vlog"
+ "v.io/v23"
+ "v.io/v23/vlog"
)
var (
@@ -127,7 +127,7 @@
}
func runStop(cmd *cmdline.Command, _ []string) error {
- ctx, shutdown := veyron2.Init()
+ ctx, shutdown := v23.Init()
defer shutdown()
if err := impl.Stop(ctx, installationDir(), cmd.Stderr(), cmd.Stdout()); err != nil {
vlog.Errorf("Stop failed: %v", err)
diff --git a/services/mgmt/device/deviced/server.go b/services/mgmt/device/deviced/server.go
index 4ab39c9..393c30e 100644
--- a/services/mgmt/device/deviced/server.go
+++ b/services/mgmt/device/deviced/server.go
@@ -19,10 +19,10 @@
"v.io/core/veyron/services/mgmt/device/config"
"v.io/core/veyron/services/mgmt/device/starter"
- "v.io/core/veyron2"
- "v.io/core/veyron2/ipc"
- "v.io/core/veyron2/mgmt"
- "v.io/core/veyron2/vlog"
+ "v.io/v23"
+ "v.io/v23/ipc"
+ "v.io/v23/mgmt"
+ "v.io/v23/vlog"
)
var (
@@ -37,7 +37,7 @@
)
func runServer(*cmdline.Command, []string) error {
- ctx, shutdown := veyron2.Init()
+ ctx, shutdown := v23.Init()
defer shutdown()
var testMode bool
@@ -71,7 +71,7 @@
if testMode {
ns.ListenSpec = ipc.ListenSpec{Addrs: ipc.ListenAddrs{{"tcp", "127.0.0.1:0"}}}
} else {
- ns.ListenSpec = veyron2.GetListenSpec(ctx)
+ ns.ListenSpec = v23.GetListenSpec(ctx)
ns.Name = *publishAs
}
var pairingToken string
diff --git a/services/mgmt/device/impl/app_service.go b/services/mgmt/device/impl/app_service.go
index c8206f1..ebb3161 100644
--- a/services/mgmt/device/impl/app_service.go
+++ b/services/mgmt/device/impl/app_service.go
@@ -135,18 +135,18 @@
"text/template"
"time"
- "v.io/core/veyron2"
- "v.io/core/veyron2/context"
- "v.io/core/veyron2/ipc"
- "v.io/core/veyron2/mgmt"
- "v.io/core/veyron2/naming"
- "v.io/core/veyron2/security"
- "v.io/core/veyron2/services/mgmt/appcycle"
- "v.io/core/veyron2/services/mgmt/application"
- "v.io/core/veyron2/services/mgmt/device"
- "v.io/core/veyron2/services/security/access"
- "v.io/core/veyron2/verror"
- "v.io/core/veyron2/vlog"
+ "v.io/v23"
+ "v.io/v23/context"
+ "v.io/v23/ipc"
+ "v.io/v23/mgmt"
+ "v.io/v23/naming"
+ "v.io/v23/security"
+ "v.io/v23/services/mgmt/appcycle"
+ "v.io/v23/services/mgmt/application"
+ "v.io/v23/services/mgmt/device"
+ "v.io/v23/services/security/access"
+ "v.io/v23/verror"
+ "v.io/v23/vlog"
vexec "v.io/core/veyron/lib/exec"
"v.io/core/veyron/lib/flags/consts"
@@ -532,12 +532,12 @@
func agentPrincipal(ctx *context.T, conn *os.File) (security.Principal, func(), error) {
agentctx, cancel := context.WithCancel(ctx)
var err error
- if agentctx, err = veyron2.SetNewStreamManager(agentctx); err != nil {
+ if agentctx, err = v23.SetNewStreamManager(agentctx); err != nil {
cancel()
conn.Close()
return nil, nil, err
}
- p, err := agent.NewAgentPrincipal(agentctx, int(conn.Fd()), veyron2.GetClient(agentctx))
+ p, err := agent.NewAgentPrincipal(agentctx, int(conn.Fd()), v23.GetClient(agentctx))
if err != nil {
cancel()
conn.Close()
diff --git a/services/mgmt/device/impl/app_state.go b/services/mgmt/device/impl/app_state.go
index 18b4db3..0a13676 100644
--- a/services/mgmt/device/impl/app_state.go
+++ b/services/mgmt/device/impl/app_state.go
@@ -6,8 +6,8 @@
"os"
"path/filepath"
- "v.io/core/veyron2/verror"
- "v.io/core/veyron2/vlog"
+ "v.io/v23/verror"
+ "v.io/v23/vlog"
)
// installationState describes the states that an installation can be in at any
diff --git a/services/mgmt/device/impl/association_instance.go b/services/mgmt/device/impl/association_instance.go
index 77e0df4..1be4967 100644
--- a/services/mgmt/device/impl/association_instance.go
+++ b/services/mgmt/device/impl/association_instance.go
@@ -7,8 +7,8 @@
"io/ioutil"
"path/filepath"
- "v.io/core/veyron2/verror"
- "v.io/core/veyron2/vlog"
+ "v.io/v23/verror"
+ "v.io/v23/vlog"
)
func saveSystemNameForInstance(dir, systemName string) error {
diff --git a/services/mgmt/device/impl/association_state.go b/services/mgmt/device/impl/association_state.go
index ddff7c3..45709a4 100644
--- a/services/mgmt/device/impl/association_state.go
+++ b/services/mgmt/device/impl/association_state.go
@@ -6,8 +6,8 @@
"path/filepath"
"sync"
- "v.io/core/veyron2/services/mgmt/device"
- "v.io/core/veyron2/verror"
+ "v.io/v23/services/mgmt/device"
+ "v.io/v23/verror"
)
// BlessingSystemAssociationStore manages a persisted association between
diff --git a/services/mgmt/device/impl/association_state_test.go b/services/mgmt/device/impl/association_state_test.go
index 23f6013..ee44ef1 100644
--- a/services/mgmt/device/impl/association_state_test.go
+++ b/services/mgmt/device/impl/association_state_test.go
@@ -8,7 +8,7 @@
"testing"
"v.io/core/veyron/services/mgmt/device/impl"
- "v.io/core/veyron2/services/mgmt/device"
+ "v.io/v23/services/mgmt/device"
)
// TestAssociationPersistance verifies correct operation of association
diff --git a/services/mgmt/device/impl/callback.go b/services/mgmt/device/impl/callback.go
index f785b61..4aea4a6 100644
--- a/services/mgmt/device/impl/callback.go
+++ b/services/mgmt/device/impl/callback.go
@@ -1,9 +1,9 @@
package impl
import (
- "v.io/core/veyron2/context"
- "v.io/core/veyron2/mgmt"
- "v.io/core/veyron2/vlog"
+ "v.io/v23/context"
+ "v.io/v23/mgmt"
+ "v.io/v23/vlog"
"v.io/core/veyron/lib/exec"
"v.io/core/veyron/services/mgmt/device"
diff --git a/services/mgmt/device/impl/claim.go b/services/mgmt/device/impl/claim.go
index 8a885ce..a2af1b0 100644
--- a/services/mgmt/device/impl/claim.go
+++ b/services/mgmt/device/impl/claim.go
@@ -5,11 +5,11 @@
"sync"
"v.io/core/veyron/services/mgmt/lib/acls"
- "v.io/core/veyron2/ipc"
- "v.io/core/veyron2/security"
- "v.io/core/veyron2/services/security/access"
- "v.io/core/veyron2/verror"
- "v.io/core/veyron2/vlog"
+ "v.io/v23/ipc"
+ "v.io/v23/security"
+ "v.io/v23/services/security/access"
+ "v.io/v23/verror"
+ "v.io/v23/vlog"
)
// claimable implements the device.Claimable RPC interface and the
diff --git a/services/mgmt/device/impl/config_service.go b/services/mgmt/device/impl/config_service.go
index f2254fc..d28b20a 100644
--- a/services/mgmt/device/impl/config_service.go
+++ b/services/mgmt/device/impl/config_service.go
@@ -10,10 +10,10 @@
"sync"
"time"
- "v.io/core/veyron2/ipc"
- "v.io/core/veyron2/naming"
- "v.io/core/veyron2/verror"
- "v.io/core/veyron2/vlog"
+ "v.io/v23/ipc"
+ "v.io/v23/naming"
+ "v.io/v23/verror"
+ "v.io/v23/vlog"
)
type callbackState struct {
diff --git a/services/mgmt/device/impl/device_installer.go b/services/mgmt/device/impl/device_installer.go
index 8e79741..61435ba 100644
--- a/services/mgmt/device/impl/device_installer.go
+++ b/services/mgmt/device/impl/device_installer.go
@@ -43,9 +43,9 @@
"syscall"
"time"
- "v.io/core/veyron2/context"
- "v.io/core/veyron2/naming"
- "v.io/core/veyron2/services/mgmt/application"
+ "v.io/v23/context"
+ "v.io/v23/naming"
+ "v.io/v23/services/mgmt/application"
"v.io/core/veyron/lib/flags/consts"
"v.io/core/veyron/services/mgmt/device/config"
diff --git a/services/mgmt/device/impl/device_service.go b/services/mgmt/device/impl/device_service.go
index f168b10..0ebfa4d 100644
--- a/services/mgmt/device/impl/device_service.go
+++ b/services/mgmt/device/impl/device_service.go
@@ -47,18 +47,18 @@
"strings"
"sync"
- "v.io/core/veyron2"
- "v.io/core/veyron2/context"
- "v.io/core/veyron2/ipc"
- "v.io/core/veyron2/mgmt"
- "v.io/core/veyron2/naming"
- "v.io/core/veyron2/security"
- "v.io/core/veyron2/services/mgmt/application"
- "v.io/core/veyron2/services/mgmt/binary"
- "v.io/core/veyron2/services/mgmt/device"
- "v.io/core/veyron2/services/security/access"
- "v.io/core/veyron2/verror"
- "v.io/core/veyron2/vlog"
+ "v.io/v23"
+ "v.io/v23/context"
+ "v.io/v23/ipc"
+ "v.io/v23/mgmt"
+ "v.io/v23/naming"
+ "v.io/v23/security"
+ "v.io/v23/services/mgmt/application"
+ "v.io/v23/services/mgmt/binary"
+ "v.io/v23/services/mgmt/device"
+ "v.io/v23/services/security/access"
+ "v.io/v23/verror"
+ "v.io/v23/vlog"
vexec "v.io/core/veyron/lib/exec"
"v.io/core/veyron/lib/flags/consts"
@@ -220,7 +220,7 @@
if s.restartHandler != nil {
s.restartHandler()
}
- veyron2.GetAppCycle(ctx).Stop()
+ v23.GetAppCycle(ctx).Stop()
return nil
}
@@ -305,7 +305,7 @@
}
cmd.Env = append(cmd.Env, consts.VeyronCredentials+"="+credentialsDir)
}
- dmPrincipal := veyron2.GetPrincipal(ctx)
+ dmPrincipal := v23.GetPrincipal(ctx)
dmBlessings, err := dmPrincipal.Bless(p.PublicKey(), dmPrincipal.BlessingStore().Default(), "testdm", security.UnconstrainedUse())
if err := p.BlessingStore().SetDefault(dmBlessings); err != nil {
vlog.Errorf("BlessingStore.SetDefault() failed: %v", err)
@@ -486,7 +486,7 @@
if s.restartHandler != nil {
s.restartHandler()
}
- veyron2.GetAppCycle(ctx).Stop()
+ v23.GetAppCycle(ctx).Stop()
deferrer = nil
return nil
}
@@ -531,7 +531,7 @@
}
func (*deviceService) Stop(call ipc.ServerContext, _ uint32) error {
- veyron2.GetAppCycle(call.Context()).Stop()
+ v23.GetAppCycle(call.Context()).Stop()
return nil
}
@@ -541,7 +541,7 @@
if s.restartHandler != nil {
s.restartHandler()
}
- veyron2.GetAppCycle(call.Context()).Stop()
+ v23.GetAppCycle(call.Context()).Stop()
return nil
}
diff --git a/services/mgmt/device/impl/dispatcher.go b/services/mgmt/device/impl/dispatcher.go
index 4432d7a..3c25ec1 100644
--- a/services/mgmt/device/impl/dispatcher.go
+++ b/services/mgmt/device/impl/dispatcher.go
@@ -15,17 +15,17 @@
"v.io/core/veyron/services/mgmt/lib/acls"
logsimpl "v.io/core/veyron/services/mgmt/logreader/impl"
- "v.io/core/veyron2"
- "v.io/core/veyron2/context"
- "v.io/core/veyron2/ipc"
- "v.io/core/veyron2/naming"
- "v.io/core/veyron2/security"
- "v.io/core/veyron2/services/mgmt/device"
- "v.io/core/veyron2/services/mgmt/pprof"
- "v.io/core/veyron2/services/mgmt/stats"
- "v.io/core/veyron2/services/security/access"
- "v.io/core/veyron2/verror"
- "v.io/core/veyron2/vlog"
+ "v.io/v23"
+ "v.io/v23/context"
+ "v.io/v23/ipc"
+ "v.io/v23/naming"
+ "v.io/v23/security"
+ "v.io/v23/services/mgmt/device"
+ "v.io/v23/services/mgmt/pprof"
+ "v.io/v23/services/mgmt/stats"
+ "v.io/v23/services/security/access"
+ "v.io/v23/verror"
+ "v.io/v23/vlog"
)
// internalState wraps state shared between different device manager
@@ -87,7 +87,7 @@
// It returns (nil, nil) if the device is no longer claimable.
func NewClaimableDispatcher(ctx *context.T, config *config.State, pairingToken string) (ipc.Dispatcher, <-chan struct{}) {
var (
- principal = veyron2.GetPrincipal(ctx)
+ principal = v23.GetPrincipal(ctx)
aclDir = aclDir(config)
locks = acls.NewLocks()
)
@@ -124,7 +124,7 @@
config: config,
uat: uat,
locks: acls.NewLocks(),
- principal: veyron2.GetPrincipal(ctx),
+ principal: v23.GetPrincipal(ctx),
mtAddress: mtAddress,
reap: reap,
}
diff --git a/services/mgmt/device/impl/helper_manager.go b/services/mgmt/device/impl/helper_manager.go
index 5bd4f90..fd39378 100644
--- a/services/mgmt/device/impl/helper_manager.go
+++ b/services/mgmt/device/impl/helper_manager.go
@@ -4,9 +4,9 @@
"os"
"os/user"
- "v.io/core/veyron2/ipc"
- "v.io/core/veyron2/verror"
- "v.io/core/veyron2/vlog"
+ "v.io/v23/ipc"
+ "v.io/v23/verror"
+ "v.io/v23/vlog"
)
type suidHelperState string
diff --git a/services/mgmt/device/impl/impl_test.go b/services/mgmt/device/impl/impl_test.go
index 449c12a..6cda65a 100644
--- a/services/mgmt/device/impl/impl_test.go
+++ b/services/mgmt/device/impl/impl_test.go
@@ -27,21 +27,21 @@
"testing"
"time"
- "v.io/core/veyron2"
- "v.io/core/veyron2/context"
- "v.io/core/veyron2/ipc"
- "v.io/core/veyron2/mgmt"
- "v.io/core/veyron2/naming"
- "v.io/core/veyron2/security"
- "v.io/core/veyron2/services/mgmt/application"
- "v.io/core/veyron2/services/mgmt/device"
- "v.io/core/veyron2/services/mgmt/logreader"
- "v.io/core/veyron2/services/mgmt/pprof"
- "v.io/core/veyron2/services/mgmt/repository"
- "v.io/core/veyron2/services/mgmt/stats"
- "v.io/core/veyron2/services/security/access"
- "v.io/core/veyron2/verror"
- "v.io/core/veyron2/vlog"
+ "v.io/v23"
+ "v.io/v23/context"
+ "v.io/v23/ipc"
+ "v.io/v23/mgmt"
+ "v.io/v23/naming"
+ "v.io/v23/security"
+ "v.io/v23/services/mgmt/application"
+ "v.io/v23/services/mgmt/device"
+ "v.io/v23/services/mgmt/logreader"
+ "v.io/v23/services/mgmt/pprof"
+ "v.io/v23/services/mgmt/repository"
+ "v.io/v23/services/mgmt/stats"
+ "v.io/v23/services/security/access"
+ "v.io/v23/verror"
+ "v.io/v23/vlog"
"v.io/core/veyron/lib/expect"
"v.io/core/veyron/lib/flags/consts"
@@ -150,7 +150,7 @@
defer fmt.Fprintf(stdout, "%v terminated\n", publishName)
defer vlog.VI(1).Infof("%v terminated", publishName)
defer shutdown()
- veyron2.GetNamespace(ctx).CacheCtl(naming.DisableCache(true))
+ v23.GetNamespace(ctx).CacheCtl(naming.DisableCache(true))
// Satisfy the contract described in doc.go by passing the config state
// through to the device manager dispatcher constructor.
@@ -186,7 +186,7 @@
Name: publishName,
ListenSpec: ipc.ListenSpec{Addrs: ipc.ListenAddrs{{"tcp", "127.0.0.1:0"}}},
ConfigState: configState,
- TestMode: strings.HasSuffix(fmt.Sprint(veyron2.GetPrincipal(ctx).BlessingStore().Default()), "/testdm"),
+ TestMode: strings.HasSuffix(fmt.Sprint(v23.GetPrincipal(ctx).BlessingStore().Default()), "/testdm"),
RestartCallback: func() { fmt.Println("restart handler") },
PairingToken: pairingToken,
},
@@ -251,7 +251,7 @@
FlagValue: *flagValue,
EnvValue: os.Getenv(testEnvVarName),
}
- client := veyron2.GetClient(ctx)
+ client := v23.GetClient(ctx)
if call, err := client.StartCall(ctx, "pingserver", "Ping", []interface{}{args}); err != nil {
vlog.Fatalf("StartCall failed: %v", err)
} else if err := call.Finish(); err != nil {
@@ -262,7 +262,7 @@
func cat(ctx *context.T, name, file string) (string, error) {
ctx, cancel := context.WithTimeout(ctx, time.Minute)
defer cancel()
- client := veyron2.GetClient(ctx)
+ client := v23.GetClient(ctx)
call, err := client.StartCall(ctx, name, "Cat", []interface{}{file})
if err != nil {
return "", err
@@ -278,7 +278,7 @@
ctx, shutdown := testutil.InitForTest()
defer shutdown()
- veyron2.GetNamespace(ctx).CacheCtl(naming.DisableCache(true))
+ v23.GetNamespace(ctx).CacheCtl(naming.DisableCache(true))
if expected, got := 1, len(args); expected != got {
vlog.Fatalf("Unexpected number of arguments: expected %d, got %d", expected, got)
@@ -327,10 +327,10 @@
return path
}
-func initForTest() (*context.T, veyron2.Shutdown) {
+func initForTest() (*context.T, v23.Shutdown) {
os.Unsetenv(consts.NamespaceRootPrefix)
ctx, shutdown := testutil.InitForTest()
- veyron2.GetNamespace(ctx).CacheCtl(naming.DisableCache(true))
+ v23.GetNamespace(ctx).CacheCtl(naming.DisableCache(true))
return ctx, shutdown
}
@@ -344,7 +344,7 @@
ctx, shutdown := initForTest()
defer shutdown()
- sh, deferFn := mgmttest.CreateShellAndMountTable(t, ctx, veyron2.GetPrincipal(ctx))
+ sh, deferFn := mgmttest.CreateShellAndMountTable(t, ctx, v23.GetPrincipal(ctx))
defer deferFn()
// Set up mock application and binary repositories.
@@ -817,7 +817,7 @@
t.Fatalf("binaryimpl.NewState failed: %v", err)
}
server, _ := mgmttest.NewServer(ctx)
- d, err := binaryimpl.NewDispatcher(veyron2.GetPrincipal(ctx), state)
+ d, err := binaryimpl.NewDispatcher(v23.GetPrincipal(ctx), state)
if err != nil {
t.Fatalf("server.NewDispatcher failed: %v", err)
}
@@ -843,7 +843,7 @@
// root blessing provider so that the principals of all the contexts
// recognize each other.
idp := tsecurity.NewIDProvider("root")
- if err := idp.Bless(veyron2.GetPrincipal(ctx), "ctx"); err != nil {
+ if err := idp.Bless(v23.GetPrincipal(ctx), "ctx"); err != nil {
t.Fatal(err)
}
@@ -870,7 +870,7 @@
*envelope = envelopeFromShell(sh, nil, appCmd, "google naps", "trapp")
claimantCtx := ctxWithNewPrincipal(t, ctx, idp, "claimant")
- octx, err := veyron2.SetPrincipal(ctx, tsecurity.NewPrincipal("other"))
+ octx, err := v23.SetPrincipal(ctx, tsecurity.NewPrincipal("other"))
if err != nil {
t.Fatal(err)
}
@@ -896,7 +896,7 @@
installAppExpectError(t, octx, verror.ErrNotTrusted.ID)
// Even if it does recognize the device (by virtue of recognizing the
// claimant), the device will not allow it to install.
- if err := veyron2.GetPrincipal(octx).AddToRoots(veyron2.GetPrincipal(claimantCtx).BlessingStore().Default()); err != nil {
+ if err := v23.GetPrincipal(octx).AddToRoots(v23.GetPrincipal(claimantCtx).BlessingStore().Default()); err != nil {
t.Fatal(err)
}
installAppExpectError(t, octx, verror.ErrNoAccess.ID)
@@ -1389,7 +1389,7 @@
// will appear in ACLs, give them recognizable names.
idp := tsecurity.NewIDProvider("root")
selfCtx := ctx
- if err := idp.Bless(veyron2.GetPrincipal(selfCtx), "self"); err != nil {
+ if err := idp.Bless(v23.GetPrincipal(selfCtx), "self"); err != nil {
t.Fatal(err)
}
otherCtx := ctxWithNewPrincipal(t, selfCtx, idp, "other")
@@ -1470,7 +1470,7 @@
// Identity provider used to ensure that all processes recognize each
// others' blessings.
idp := tsecurity.NewIDProvider("root")
- if err := idp.Bless(veyron2.GetPrincipal(ctx), "self"); err != nil {
+ if err := idp.Bless(v23.GetPrincipal(ctx), "self"); err != nil {
t.Fatal(err)
}
@@ -1646,7 +1646,7 @@
defer syscall.Kill(pid, syscall.SIGINT)
claimDevice(t, ctx, "dm", "mydevice", noPairingToken)
- publisher, err := veyron2.GetPrincipal(ctx).BlessSelf("publisher")
+ publisher, err := v23.GetPrincipal(ctx).BlessSelf("publisher")
if err != nil {
t.Fatalf("Failed to generate publisher blessings:%v", err)
}
diff --git a/services/mgmt/device/impl/instance_reaping.go b/services/mgmt/device/impl/instance_reaping.go
index d59c927..045193a 100644
--- a/services/mgmt/device/impl/instance_reaping.go
+++ b/services/mgmt/device/impl/instance_reaping.go
@@ -7,11 +7,11 @@
"syscall"
"time"
- "v.io/core/veyron2/context"
- "v.io/core/veyron2/naming"
- "v.io/core/veyron2/services/mgmt/stats"
- "v.io/core/veyron2/vdl"
- "v.io/core/veyron2/vlog"
+ "v.io/v23/context"
+ "v.io/v23/naming"
+ "v.io/v23/services/mgmt/stats"
+ "v.io/v23/vdl"
+ "v.io/v23/vlog"
)
type pidInstanceDirPair struct {
diff --git a/services/mgmt/device/impl/instance_reaping_test.go b/services/mgmt/device/impl/instance_reaping_test.go
index 17f376a..7e80f63 100644
--- a/services/mgmt/device/impl/instance_reaping_test.go
+++ b/services/mgmt/device/impl/instance_reaping_test.go
@@ -7,12 +7,12 @@
"syscall"
"testing"
- "v.io/core/veyron2"
- "v.io/core/veyron2/context"
- "v.io/core/veyron2/naming"
- "v.io/core/veyron2/services/mgmt/application"
- "v.io/core/veyron2/services/mgmt/stats"
- "v.io/core/veyron2/vdl"
+ "v.io/v23"
+ "v.io/v23/context"
+ "v.io/v23/naming"
+ "v.io/v23/services/mgmt/application"
+ "v.io/v23/services/mgmt/stats"
+ "v.io/v23/vdl"
"v.io/core/veyron/lib/flags/consts"
"v.io/core/veyron/lib/modules"
@@ -24,7 +24,7 @@
// and use it to reduce boiler plate across all tests here.
func startupHelper(t *testing.T) (func(), *context.T, *modules.Shell, *application.Envelope, string, string) {
ctx, shutdown := testutil.InitForTest()
- veyron2.GetNamespace(ctx).CacheCtl(naming.DisableCache(true))
+ v23.GetNamespace(ctx).CacheCtl(naming.DisableCache(true))
sh, deferFn := mgmttest.CreateShellAndMountTable(t, ctx, nil)
diff --git a/services/mgmt/device/impl/mock_repo_test.go b/services/mgmt/device/impl/mock_repo_test.go
index a288c5d..da24081 100644
--- a/services/mgmt/device/impl/mock_repo_test.go
+++ b/services/mgmt/device/impl/mock_repo_test.go
@@ -10,15 +10,15 @@
"reflect"
"testing"
- "v.io/core/veyron2/context"
- "v.io/core/veyron2/ipc"
- "v.io/core/veyron2/security"
- "v.io/core/veyron2/services/mgmt/application"
- "v.io/core/veyron2/services/mgmt/binary"
- "v.io/core/veyron2/services/mgmt/repository"
- "v.io/core/veyron2/services/security/access"
- "v.io/core/veyron2/verror"
- "v.io/core/veyron2/vlog"
+ "v.io/v23/context"
+ "v.io/v23/ipc"
+ "v.io/v23/security"
+ "v.io/v23/services/mgmt/application"
+ "v.io/v23/services/mgmt/binary"
+ "v.io/v23/services/mgmt/repository"
+ "v.io/v23/services/security/access"
+ "v.io/v23/verror"
+ "v.io/v23/vlog"
mgmttest "v.io/core/veyron/services/mgmt/lib/testutil"
)
diff --git a/services/mgmt/device/impl/only_for_test.go b/services/mgmt/device/impl/only_for_test.go
index 6f92afc..18a960d 100644
--- a/services/mgmt/device/impl/only_for_test.go
+++ b/services/mgmt/device/impl/only_for_test.go
@@ -6,9 +6,9 @@
"os"
"path/filepath"
- "v.io/core/veyron2/ipc"
- "v.io/core/veyron2/services/mgmt/device"
- "v.io/core/veyron2/vlog"
+ "v.io/v23/ipc"
+ "v.io/v23/services/mgmt/device"
+ "v.io/v23/vlog"
)
// This file contains code in the impl package that we only want built for tests
diff --git a/services/mgmt/device/impl/profile.go b/services/mgmt/device/impl/profile.go
index 1d2bd08..089242e 100644
--- a/services/mgmt/device/impl/profile.go
+++ b/services/mgmt/device/impl/profile.go
@@ -9,8 +9,8 @@
"v.io/core/veyron/services/mgmt/profile"
- "v.io/core/veyron2/services/mgmt/build"
- "v.io/core/veyron2/services/mgmt/device"
+ "v.io/v23/services/mgmt/build"
+ "v.io/v23/services/mgmt/device"
)
// ComputeDeviceProfile generates a description of the runtime
diff --git a/services/mgmt/device/impl/proxy_invoker.go b/services/mgmt/device/impl/proxy_invoker.go
index 96b7359..0c65d06 100644
--- a/services/mgmt/device/impl/proxy_invoker.go
+++ b/services/mgmt/device/impl/proxy_invoker.go
@@ -4,12 +4,12 @@
"fmt"
"io"
- "v.io/core/veyron2"
- "v.io/core/veyron2/ipc"
- "v.io/core/veyron2/naming"
- "v.io/core/veyron2/services/security/access"
- "v.io/core/veyron2/vdl"
- "v.io/core/veyron2/vdl/vdlroot/src/signature"
+ "v.io/v23"
+ "v.io/v23/ipc"
+ "v.io/v23/naming"
+ "v.io/v23/services/security/access"
+ "v.io/v23/vdl"
+ "v.io/v23/vdl/vdlroot/src/signature"
)
// proxyInvoker is an ipc.Invoker implementation that proxies all requests
@@ -57,7 +57,7 @@
args[i] = ap
}
ctx := inCall.Context()
- client := veyron2.GetClient(ctx)
+ client := v23.GetClient(ctx)
outCall, err := client.StartCall(ctx, p.remote, method, args)
if err != nil {
diff --git a/services/mgmt/device/impl/proxy_invoker_test.go b/services/mgmt/device/impl/proxy_invoker_test.go
index 237770b..ef5989e 100644
--- a/services/mgmt/device/impl/proxy_invoker_test.go
+++ b/services/mgmt/device/impl/proxy_invoker_test.go
@@ -4,13 +4,13 @@
"reflect"
"testing"
- "v.io/core/veyron2"
- "v.io/core/veyron2/ipc"
- "v.io/core/veyron2/naming"
- "v.io/core/veyron2/security"
- "v.io/core/veyron2/services/mgmt/stats"
- "v.io/core/veyron2/services/security/access"
- "v.io/core/veyron2/vlog"
+ "v.io/v23"
+ "v.io/v23/ipc"
+ "v.io/v23/naming"
+ "v.io/v23/security"
+ "v.io/v23/services/mgmt/stats"
+ "v.io/v23/services/security/access"
+ "v.io/v23/vlog"
"v.io/core/veyron/lib/testutil"
)
@@ -21,10 +21,10 @@
ctx, shutdown := testutil.InitForTest()
defer shutdown()
- veyron2.GetNamespace(ctx).CacheCtl(naming.DisableCache(true))
+ v23.GetNamespace(ctx).CacheCtl(naming.DisableCache(true))
// server1 is a normal server
- server1, err := veyron2.NewServer(ctx)
+ server1, err := v23.NewServer(ctx)
if err != nil {
t.Fatalf("NewServer: %v", err)
}
@@ -38,7 +38,7 @@
}
// server2 proxies requests to <suffix> to server1/__debug/stats/<suffix>
- server2, err := veyron2.NewServer(ctx)
+ server2, err := v23.NewServer(ctx)
if err != nil {
t.Fatalf("NewServer: %v", err)
}
diff --git a/services/mgmt/device/impl/util.go b/services/mgmt/device/impl/util.go
index 29d034c..ade3572 100644
--- a/services/mgmt/device/impl/util.go
+++ b/services/mgmt/device/impl/util.go
@@ -12,12 +12,12 @@
"v.io/core/veyron/services/mgmt/device/config"
"v.io/core/veyron/services/mgmt/lib/binary"
- "v.io/core/veyron2/context"
- "v.io/core/veyron2/security"
- "v.io/core/veyron2/services/mgmt/application"
- "v.io/core/veyron2/services/mgmt/repository"
- "v.io/core/veyron2/verror"
- "v.io/core/veyron2/vlog"
+ "v.io/v23/context"
+ "v.io/v23/security"
+ "v.io/v23/services/mgmt/application"
+ "v.io/v23/services/mgmt/repository"
+ "v.io/v23/verror"
+ "v.io/v23/vlog"
)
// TODO(caprita): Set these timeout in a more principled manner.
diff --git a/services/mgmt/device/impl/util_test.go b/services/mgmt/device/impl/util_test.go
index fd07606..fdb1b64 100644
--- a/services/mgmt/device/impl/util_test.go
+++ b/services/mgmt/device/impl/util_test.go
@@ -11,16 +11,16 @@
"time"
tsecurity "v.io/core/veyron/lib/testutil/security"
- "v.io/core/veyron2"
- "v.io/core/veyron2/context"
- "v.io/core/veyron2/ipc"
- "v.io/core/veyron2/naming"
- "v.io/core/veyron2/options"
- "v.io/core/veyron2/security"
- "v.io/core/veyron2/services/mgmt/application"
- "v.io/core/veyron2/services/mgmt/device"
- "v.io/core/veyron2/verror"
- "v.io/core/veyron2/vlog"
+ "v.io/v23"
+ "v.io/v23/context"
+ "v.io/v23/ipc"
+ "v.io/v23/naming"
+ "v.io/v23/options"
+ "v.io/v23/security"
+ "v.io/v23/services/mgmt/application"
+ "v.io/v23/services/mgmt/device"
+ "v.io/v23/verror"
+ "v.io/v23/vlog"
"v.io/core/veyron/lib/modules"
"v.io/core/veyron/lib/testutil"
@@ -47,7 +47,7 @@
// resolveExpectNotFound verifies that the given name is not in the mounttable.
func resolveExpectNotFound(t *testing.T, ctx *context.T, name string) {
- if me, err := veyron2.GetNamespace(ctx).Resolve(ctx, name); err == nil {
+ if me, err := v23.GetNamespace(ctx).Resolve(ctx, name); err == nil {
t.Fatalf(testutil.FormatLogLine(2, "Resolve(%v) succeeded with results %v when it was expected to fail", name, me.Names))
} else if expectErr := naming.ErrNoSuchName.ID; !verror.Is(err, expectErr) {
t.Fatalf(testutil.FormatLogLine(2, "Resolve(%v) failed with error %v, expected error ID %v", name, err, expectErr))
@@ -56,7 +56,7 @@
// resolve looks up the given name in the mounttable.
func resolve(t *testing.T, ctx *context.T, name string, replicas int) []string {
- me, err := veyron2.GetNamespace(ctx).Resolve(ctx, name)
+ me, err := v23.GetNamespace(ctx).Resolve(ctx, name)
if err != nil {
t.Fatalf("Resolve(%v) failed: %v", name, err)
}
@@ -84,7 +84,7 @@
func claimDevice(t *testing.T, ctx *context.T, name, extension, pairingToken string) {
// Setup blessings to be granted to the claimed device
- g := &granter{p: veyron2.GetPrincipal(ctx), extension: extension}
+ g := &granter{p: v23.GetPrincipal(ctx), extension: extension}
s := options.SkipResolveAuthorization{}
// Call the Claim RPC: Skip server authorization because the unclaimed
// device presents nothing that can be used to recognize it.
@@ -110,7 +110,7 @@
func claimDeviceExpectError(t *testing.T, ctx *context.T, name, extension, pairingToken string, errID verror.ID) {
// Setup blessings to be granted to the claimed device
- g := &granter{p: veyron2.GetPrincipal(ctx), extension: extension}
+ g := &granter{p: v23.GetPrincipal(ctx), extension: extension}
s := options.SkipResolveAuthorization{}
// Call the Claim RPC
if err := device.ClaimableClient(name).Claim(ctx, pairingToken, g, s); !verror.Is(err, errID) {
@@ -208,7 +208,7 @@
func startAppImpl(t *testing.T, ctx *context.T, appID, grant string) (string, error) {
var opts []ipc.CallOpt
if grant != "" {
- opts = append(opts, &granter{p: veyron2.GetPrincipal(ctx), extension: grant})
+ opts = append(opts, &granter{p: v23.GetPrincipal(ctx), extension: grant})
}
if instanceIDs, err := appStub(appID).Start(ctx, opts...); err != nil {
return "", err
@@ -362,11 +362,11 @@
}
func ctxWithNewPrincipal(t *testing.T, ctx *context.T, idp *tsecurity.IDProvider, extension string) *context.T {
- ret, err := veyron2.SetPrincipal(ctx, tsecurity.NewPrincipal())
+ ret, err := v23.SetPrincipal(ctx, tsecurity.NewPrincipal())
if err != nil {
- t.Fatalf(testutil.FormatLogLine(2, "veyron2.SetPrincipal failed: %v", err))
+ t.Fatalf(testutil.FormatLogLine(2, "v23.SetPrincipal failed: %v", err))
}
- if err := idp.Bless(veyron2.GetPrincipal(ret), extension); err != nil {
+ if err := idp.Bless(v23.GetPrincipal(ret), extension); err != nil {
t.Fatalf(testutil.FormatLogLine(2, "idp.Bless(?, %q) failed: %v", extension, err))
}
return ret
diff --git a/services/mgmt/device/starter/starter.go b/services/mgmt/device/starter/starter.go
index b4e326f..4ce3b97 100644
--- a/services/mgmt/device/starter/starter.go
+++ b/services/mgmt/device/starter/starter.go
@@ -17,12 +17,12 @@
"v.io/core/veyron/services/mgmt/device/impl"
mounttable "v.io/core/veyron/services/mounttable/lib"
- "v.io/core/veyron2"
- "v.io/core/veyron2/context"
- "v.io/core/veyron2/ipc"
- "v.io/core/veyron2/naming"
- "v.io/core/veyron2/options"
- "v.io/core/veyron2/vlog"
+ "v.io/v23"
+ "v.io/v23/context"
+ "v.io/v23/ipc"
+ "v.io/v23/naming"
+ "v.io/v23/options"
+ "v.io/v23/vlog"
)
type NamespaceArgs struct {
@@ -119,7 +119,7 @@
cancel()
return nil, err
}
- server, err := veyron2.NewServer(ctx)
+ server, err := v23.NewServer(ctx)
if err != nil {
stopMT()
cancel()
@@ -140,7 +140,7 @@
shutdown()
return nil, err
}
- publicKey, err := veyron2.GetPrincipal(ctx).PublicKey().MarshalBinary()
+ publicKey, err := v23.GetPrincipal(ctx).PublicKey().MarshalBinary()
if err != nil {
shutdown()
return nil, err
@@ -162,7 +162,7 @@
shutdown, err := startClaimedDevice(ctx, args)
if err != nil {
vlog.Errorf("Failed to start device service after it was claimed: %v", err)
- veyron2.GetAppCycle(ctx).Stop()
+ v23.GetAppCycle(ctx).Stop()
return
}
defer shutdown()
@@ -224,7 +224,7 @@
// Attempt to get a publicly accessible address for the proxy to publish
// under.
var publishAddr string
- ls := veyron2.GetListenSpec(ctx)
+ ls := v23.GetListenSpec(ctx)
if addrs, err := netstate.GetAccessibleIPs(); err == nil {
if ac := ls.AddressChooser; ac != nil {
if a, err := ac(protocol, addrs); err == nil && len(a) > 0 {
@@ -233,7 +233,7 @@
}
publishAddr = net.JoinHostPort(addrs[0].Address().String(), port)
}
- proxy, err := proxy.New(rid, veyron2.GetPrincipal(ctx), protocol, addr, publishAddr)
+ proxy, err := proxy.New(rid, v23.GetPrincipal(ctx), protocol, addr, publishAddr)
if err != nil {
return nil, fmt.Errorf("Failed to create proxy: %v", err)
}
@@ -264,7 +264,7 @@
// (1) Function to be called to force the service to shutdown
// (2) Any errors in starting the service (in which case, (1) will be nil)
func startDeviceServer(ctx *context.T, args DeviceArgs, mt string) (shutdown func(), err error) {
- server, err := veyron2.NewServer(ctx)
+ server, err := v23.NewServer(ctx)
if err != nil {
return nil, err
}
@@ -295,7 +295,7 @@
}
func mountGlobalNamespaceInLocalNamespace(ctx *context.T, localMT string) {
- ns := veyron2.GetNamespace(ctx)
+ ns := v23.GetNamespace(ctx)
for _, root := range ns.Roots() {
go func(r string) {
var blessings []string
@@ -325,7 +325,7 @@
func findServerBlessings(ctx *context.T, server string) ([]string, error) {
ctx, cancel := context.WithCancel(ctx)
defer cancel()
- client := veyron2.GetClient(ctx)
+ client := v23.GetClient(ctx)
call, err := client.StartCall(ctx, server, ipc.ReservedSignature, nil, options.NoResolve{})
if err != nil {
return nil, err
diff --git a/services/mgmt/lib/acls/aclaccess.go b/services/mgmt/lib/acls/aclaccess.go
index 8bd11f1..3a9e1c9 100644
--- a/services/mgmt/lib/acls/aclaccess.go
+++ b/services/mgmt/lib/acls/aclaccess.go
@@ -10,10 +10,10 @@
"path/filepath"
"sync"
- "v.io/core/veyron2/security"
- "v.io/core/veyron2/services/security/access"
- "v.io/core/veyron2/verror"
- "v.io/core/veyron2/vlog"
+ "v.io/v23/security"
+ "v.io/v23/services/security/access"
+ "v.io/v23/verror"
+ "v.io/v23/vlog"
"v.io/core/veyron/security/serialization"
)
diff --git a/services/mgmt/lib/acls/etag.go b/services/mgmt/lib/acls/etag.go
index ae8ab5f..ef45427 100644
--- a/services/mgmt/lib/acls/etag.go
+++ b/services/mgmt/lib/acls/etag.go
@@ -7,7 +7,7 @@
"crypto/md5"
"encoding/hex"
- "v.io/core/veyron2/services/security/access"
+ "v.io/v23/services/security/access"
)
// ComputeEtag produces the tag value returned by access.GetACL() (per
diff --git a/services/mgmt/lib/binary/impl.go b/services/mgmt/lib/binary/impl.go
index 5d89295..c313319 100644
--- a/services/mgmt/lib/binary/impl.go
+++ b/services/mgmt/lib/binary/impl.go
@@ -17,13 +17,13 @@
"path/filepath"
"time"
- "v.io/core/veyron2"
- "v.io/core/veyron2/context"
- "v.io/core/veyron2/security"
- "v.io/core/veyron2/services/mgmt/binary"
- "v.io/core/veyron2/services/mgmt/repository"
- "v.io/core/veyron2/verror"
- "v.io/core/veyron2/vlog"
+ "v.io/v23"
+ "v.io/v23/context"
+ "v.io/v23/security"
+ "v.io/v23/services/mgmt/binary"
+ "v.io/v23/services/mgmt/repository"
+ "v.io/v23/verror"
+ "v.io/v23/vlog"
"v.io/core/veyron/services/mgmt/lib/packages"
)
@@ -312,7 +312,7 @@
}
}
uploadHash := h.Sum(nil)
- sig, err := veyron2.GetPrincipal(ctx).Sign(uploadHash[:])
+ sig, err := v23.GetPrincipal(ctx).Sign(uploadHash[:])
if err != nil {
vlog.Errorf("Sign() of upload hash failed:%v", err)
return nil, err
diff --git a/services/mgmt/lib/binary/impl_test.go b/services/mgmt/lib/binary/impl_test.go
index 8dbd554..48fcf93 100644
--- a/services/mgmt/lib/binary/impl_test.go
+++ b/services/mgmt/lib/binary/impl_test.go
@@ -9,11 +9,11 @@
"reflect"
"testing"
- "v.io/core/veyron2"
- "v.io/core/veyron2/context"
- "v.io/core/veyron2/naming"
- "v.io/core/veyron2/services/mgmt/repository"
- "v.io/core/veyron2/vlog"
+ "v.io/v23"
+ "v.io/v23/context"
+ "v.io/v23/naming"
+ "v.io/v23/services/mgmt/repository"
+ "v.io/v23/vlog"
"v.io/core/veyron/lib/testutil"
_ "v.io/core/veyron/profiles"
@@ -37,7 +37,7 @@
vlog.Fatalf("WriteFile(%v, %v, %v) failed: %v", path, impl.Version, perm, err)
}
// Setup and start the binary repository server.
- server, err := veyron2.NewServer(ctx)
+ server, err := v23.NewServer(ctx)
if err != nil {
t.Fatalf("NewServer() failed: %v", err)
}
@@ -47,11 +47,11 @@
t.Fatalf("NewState(%v, %v) failed: %v", rootDir, depth, err)
}
- dispatcher, err := impl.NewDispatcher(veyron2.GetPrincipal(ctx), state)
+ dispatcher, err := impl.NewDispatcher(v23.GetPrincipal(ctx), state)
if err != nil {
t.Fatalf("NewDispatcher() failed: %v\n", err)
}
- l := veyron2.GetListenSpec(ctx)
+ l := v23.GetListenSpec(ctx)
endpoints, err := server.Listen(l)
if err != nil {
t.Fatalf("Listen(%s) failed: %v", l, err)
@@ -83,7 +83,7 @@
ctx, shutdown := testutil.InitForTest()
defer shutdown()
- veyron2.GetNamespace(ctx).CacheCtl(naming.DisableCache(true))
+ v23.GetNamespace(ctx).CacheCtl(naming.DisableCache(true))
von, cleanup := setupRepository(t, ctx)
defer cleanup()
@@ -93,7 +93,7 @@
if err != nil {
t.Fatalf("Upload(%v) failed: %v", von, err)
}
- p := veyron2.GetPrincipal(ctx)
+ p := v23.GetPrincipal(ctx)
if sig != nil {
// verify the principal signature
h := sha256.Sum256(data)
@@ -127,7 +127,7 @@
ctx, shutdown := testutil.InitForTest()
defer shutdown()
- veyron2.GetNamespace(ctx).CacheCtl(naming.DisableCache(true))
+ v23.GetNamespace(ctx).CacheCtl(naming.DisableCache(true))
von, cleanup := setupRepository(t, ctx)
defer cleanup()
@@ -184,7 +184,7 @@
ctx, shutdown := testutil.InitForTest()
defer shutdown()
- veyron2.GetNamespace(ctx).CacheCtl(naming.DisableCache(true))
+ v23.GetNamespace(ctx).CacheCtl(naming.DisableCache(true))
von, cleanup := setupRepository(t, ctx)
defer cleanup()
diff --git a/services/mgmt/lib/fs/only_for_test.go b/services/mgmt/lib/fs/only_for_test.go
index 2e1b214..a4f57db 100644
--- a/services/mgmt/lib/fs/only_for_test.go
+++ b/services/mgmt/lib/fs/only_for_test.go
@@ -1,7 +1,7 @@
package fs
import (
- "v.io/core/veyron2/naming"
+ "v.io/v23/naming"
)
// TP is a convenience function. It prepends the transactionNamePrefix
diff --git a/services/mgmt/lib/fs/simplestore.go b/services/mgmt/lib/fs/simplestore.go
index d2939d6..1006159 100644
--- a/services/mgmt/lib/fs/simplestore.go
+++ b/services/mgmt/lib/fs/simplestore.go
@@ -12,9 +12,9 @@
"v.io/core/veyron/services/mgmt/profile"
- "v.io/core/veyron2/services/mgmt/application"
- "v.io/core/veyron2/services/security/access"
- "v.io/core/veyron2/verror"
+ "v.io/v23/services/mgmt/application"
+ "v.io/v23/services/security/access"
+ "v.io/v23/verror"
)
// TODO(rjkroege@google.com) Switch Memstore to the mid-August 2014
diff --git a/services/mgmt/lib/fs/simplestore_test.go b/services/mgmt/lib/fs/simplestore_test.go
index 60c96c5..d99b6c2 100644
--- a/services/mgmt/lib/fs/simplestore_test.go
+++ b/services/mgmt/lib/fs/simplestore_test.go
@@ -9,9 +9,9 @@
"v.io/core/veyron/services/mgmt/lib/fs"
_ "v.io/core/veyron/services/mgmt/profile"
- "v.io/core/veyron2/naming"
- "v.io/core/veyron2/services/mgmt/application"
- "v.io/core/veyron2/verror"
+ "v.io/v23/naming"
+ "v.io/v23/services/mgmt/application"
+ "v.io/v23/verror"
)
func tempFile(t *testing.T) string {
diff --git a/services/mgmt/lib/packages/packages.go b/services/mgmt/lib/packages/packages.go
index a1abc45..2b42ade 100644
--- a/services/mgmt/lib/packages/packages.go
+++ b/services/mgmt/lib/packages/packages.go
@@ -14,7 +14,7 @@
"path/filepath"
"strings"
- "v.io/core/veyron2/services/mgmt/repository"
+ "v.io/v23/services/mgmt/repository"
)
const defaultType = "application/octet-stream"
diff --git a/services/mgmt/lib/packages/packages_test.go b/services/mgmt/lib/packages/packages_test.go
index 6e409cf..eb9ac71 100644
--- a/services/mgmt/lib/packages/packages_test.go
+++ b/services/mgmt/lib/packages/packages_test.go
@@ -12,7 +12,7 @@
"sort"
"testing"
- "v.io/core/veyron2/services/mgmt/repository"
+ "v.io/v23/services/mgmt/repository"
"v.io/core/veyron/services/mgmt/lib/packages"
)
diff --git a/services/mgmt/lib/testutil/modules.go b/services/mgmt/lib/testutil/modules.go
index db46ea5..708a0b8 100644
--- a/services/mgmt/lib/testutil/modules.go
+++ b/services/mgmt/lib/testutil/modules.go
@@ -7,11 +7,11 @@
"strconv"
"testing"
- "v.io/core/veyron2"
- "v.io/core/veyron2/context"
- "v.io/core/veyron2/ipc"
- "v.io/core/veyron2/security"
- "v.io/core/veyron2/vlog"
+ "v.io/v23"
+ "v.io/v23/context"
+ "v.io/v23/ipc"
+ "v.io/v23/security"
+ "v.io/v23/vlog"
"v.io/core/veyron/lib/expect"
"v.io/core/veyron/lib/flags/consts"
@@ -46,13 +46,13 @@
// CredentialsForChild creates credentials for a child process.
func CredentialsForChild(ctx *context.T, blessing string) (string, []string) {
- creds, _ := tsecurity.ForkCredentials(veyron2.GetPrincipal(ctx), blessing)
+ creds, _ := tsecurity.ForkCredentials(v23.GetPrincipal(ctx), blessing)
return creds, []string{consts.VeyronCredentials + "=" + creds}
}
// SetNSRoots sets the roots for the local runtime's namespace.
func SetNSRoots(t *testing.T, ctx *context.T, roots ...string) {
- ns := veyron2.GetNamespace(ctx)
+ ns := v23.GetNamespace(ctx)
if err := ns.SetRoots(roots...); err != nil {
t.Fatalf(testutil.FormatLogLine(3, "SetRoots(%v) failed with %v", roots, err))
}
@@ -78,7 +78,7 @@
// TODO(caprita): Define a GetNamespaceRootsCommand in modules/core and
// use that?
- oldNamespaceRoots := veyron2.GetNamespace(ctx).Roots()
+ oldNamespaceRoots := v23.GetNamespace(ctx).Roots()
fn := func() {
vlog.VI(1).Info("------------ CLEANUP ------------")
vlog.VI(1).Info("---------------------------------")
@@ -114,7 +114,7 @@
// NewServer creates a new server.
func NewServer(ctx *context.T) (ipc.Server, string) {
- server, err := veyron2.NewServer(ctx)
+ server, err := v23.NewServer(ctx)
if err != nil {
vlog.Fatalf("NewServer() failed: %v", err)
}
diff --git a/services/mgmt/logreader/impl/logfile.go b/services/mgmt/logreader/impl/logfile.go
index d4eab94..9906d52 100644
--- a/services/mgmt/logreader/impl/logfile.go
+++ b/services/mgmt/logreader/impl/logfile.go
@@ -11,11 +11,11 @@
"path/filepath"
"strings"
- "v.io/core/veyron2/ipc"
- "v.io/core/veyron2/services/mgmt/logreader"
- "v.io/core/veyron2/services/mgmt/logreader/types"
- "v.io/core/veyron2/verror"
- "v.io/core/veyron2/vlog"
+ "v.io/v23/ipc"
+ "v.io/v23/services/mgmt/logreader"
+ "v.io/v23/services/mgmt/logreader/types"
+ "v.io/v23/verror"
+ "v.io/v23/vlog"
)
const pkgPath = "v.io/core/veyron/services/mgmt/logreader/impl"
diff --git a/services/mgmt/logreader/impl/logfile_test.go b/services/mgmt/logreader/impl/logfile_test.go
index 5447160..bc40c09 100644
--- a/services/mgmt/logreader/impl/logfile_test.go
+++ b/services/mgmt/logreader/impl/logfile_test.go
@@ -10,23 +10,23 @@
_ "v.io/core/veyron/profiles"
"v.io/core/veyron/services/mgmt/logreader/impl"
- "v.io/core/veyron2"
- "v.io/core/veyron2/context"
- "v.io/core/veyron2/ipc"
- "v.io/core/veyron2/naming"
- "v.io/core/veyron2/security"
- "v.io/core/veyron2/services/mgmt/logreader"
- "v.io/core/veyron2/services/mgmt/logreader/types"
- "v.io/core/veyron2/verror"
+ "v.io/v23"
+ "v.io/v23/context"
+ "v.io/v23/ipc"
+ "v.io/v23/naming"
+ "v.io/v23/security"
+ "v.io/v23/services/mgmt/logreader"
+ "v.io/v23/services/mgmt/logreader/types"
+ "v.io/v23/verror"
)
func startServer(t *testing.T, ctx *context.T, disp ipc.Dispatcher) (ipc.Server, string, error) {
- server, err := veyron2.NewServer(ctx)
+ server, err := v23.NewServer(ctx)
if err != nil {
t.Fatalf("NewServer failed: %v", err)
return nil, "", err
}
- endpoints, err := server.Listen(veyron2.GetListenSpec(ctx))
+ endpoints, err := server.Listen(v23.GetListenSpec(ctx))
if err != nil {
t.Fatalf("Listen failed: %v", err)
return nil, "", err
diff --git a/services/mgmt/logreader/impl/reader.go b/services/mgmt/logreader/impl/reader.go
index 906a530..83cd213 100644
--- a/services/mgmt/logreader/impl/reader.go
+++ b/services/mgmt/logreader/impl/reader.go
@@ -6,8 +6,8 @@
"strings"
"time"
- "v.io/core/veyron2/ipc"
- "v.io/core/veyron2/verror"
+ "v.io/v23/ipc"
+ "v.io/v23/verror"
)
// followReader implements the functionality of io.Reader, plus:
diff --git a/services/mgmt/pprof/client/proxy.go b/services/mgmt/pprof/client/proxy.go
index 7ad3cfb..9ee924a 100644
--- a/services/mgmt/pprof/client/proxy.go
+++ b/services/mgmt/pprof/client/proxy.go
@@ -16,9 +16,9 @@
"strings"
"time"
- "v.io/core/veyron2/context"
- "v.io/core/veyron2/services/mgmt/pprof"
- "v.io/core/veyron2/vtrace"
+ "v.io/v23/context"
+ "v.io/v23/services/mgmt/pprof"
+ "v.io/v23/vtrace"
)
// StartProxy starts the pprof proxy to a remote pprof object.
diff --git a/services/mgmt/pprof/client/proxy_test.go b/services/mgmt/pprof/client/proxy_test.go
index 2db0631..ab865d4 100644
--- a/services/mgmt/pprof/client/proxy_test.go
+++ b/services/mgmt/pprof/client/proxy_test.go
@@ -6,8 +6,8 @@
"net/http"
"testing"
- "v.io/core/veyron2"
- "v.io/core/veyron2/security"
+ "v.io/v23"
+ "v.io/v23/security"
"v.io/core/veyron/lib/testutil"
_ "v.io/core/veyron/profiles"
@@ -27,12 +27,12 @@
ctx, shutdown := testutil.InitForTest()
defer shutdown()
- s, err := veyron2.NewServer(ctx)
+ s, err := v23.NewServer(ctx)
if err != nil {
t.Fatalf("failed to start server: %v", err)
}
defer s.Stop()
- endpoints, err := s.Listen(veyron2.GetListenSpec(ctx))
+ endpoints, err := s.Listen(v23.GetListenSpec(ctx))
if err != nil {
t.Fatalf("failed to listen: %v", err)
}
diff --git a/services/mgmt/pprof/impl/server.go b/services/mgmt/pprof/impl/server.go
index bd3594a..4dee156 100644
--- a/services/mgmt/pprof/impl/server.go
+++ b/services/mgmt/pprof/impl/server.go
@@ -7,9 +7,9 @@
"runtime/pprof"
"time"
- "v.io/core/veyron2/ipc"
- spprof "v.io/core/veyron2/services/mgmt/pprof"
- "v.io/core/veyron2/verror"
+ "v.io/v23/ipc"
+ spprof "v.io/v23/services/mgmt/pprof"
+ "v.io/v23/verror"
)
const pkgPath = "v.io/core/veyron/services/mgmt/pprof/impl"
diff --git a/services/mgmt/profile/impl/dispatcher.go b/services/mgmt/profile/impl/dispatcher.go
index 35396a1..80ed4bc 100644
--- a/services/mgmt/profile/impl/dispatcher.go
+++ b/services/mgmt/profile/impl/dispatcher.go
@@ -3,8 +3,8 @@
import (
"path/filepath"
- "v.io/core/veyron2/ipc"
- "v.io/core/veyron2/security"
+ "v.io/v23/ipc"
+ "v.io/v23/security"
"v.io/core/veyron/services/mgmt/lib/fs"
"v.io/core/veyron/services/mgmt/repository"
diff --git a/services/mgmt/profile/impl/impl_test.go b/services/mgmt/profile/impl/impl_test.go
index 8b7e735..eb0c2a5 100644
--- a/services/mgmt/profile/impl/impl_test.go
+++ b/services/mgmt/profile/impl/impl_test.go
@@ -6,9 +6,9 @@
"reflect"
"testing"
- "v.io/core/veyron2"
- "v.io/core/veyron2/naming"
- "v.io/core/veyron2/services/mgmt/build"
+ "v.io/v23"
+ "v.io/v23/naming"
+ "v.io/v23/services/mgmt/build"
"v.io/core/veyron/lib/testutil"
_ "v.io/core/veyron/profiles"
@@ -35,7 +35,7 @@
defer shutdown()
// Setup and start the profile repository server.
- server, err := veyron2.NewServer(ctx)
+ server, err := v23.NewServer(ctx)
if err != nil {
t.Fatalf("NewServer() failed: %v", err)
}
@@ -51,7 +51,7 @@
if err != nil {
t.Fatalf("NewDispatcher() failed: %v", err)
}
- l := veyron2.GetListenSpec(ctx)
+ l := v23.GetListenSpec(ctx)
endpoints, err := server.Listen(l)
if err != nil {
t.Fatalf("Listen(%s) failed: %v", l, err)
@@ -113,7 +113,7 @@
defer shutdown()
// Setup and start the profile repository server.
- server, err := veyron2.NewServer(ctx)
+ server, err := v23.NewServer(ctx)
if err != nil {
t.Fatalf("NewServer() failed: %v", err)
}
@@ -130,7 +130,7 @@
if err != nil {
t.Fatalf("NewDispatcher() failed: %v", err)
}
- l := veyron2.GetListenSpec(ctx)
+ l := v23.GetListenSpec(ctx)
endpoints, err := server.Listen(l)
if err != nil {
t.Fatalf("Listen(%s) failed: %v", l, err)
@@ -160,7 +160,7 @@
server.Stop()
// Setup and start a second server.
- server, err = veyron2.NewServer(ctx)
+ server, err = v23.NewServer(ctx)
if err != nil {
t.Fatalf("NewServer() failed: %v", err)
}
diff --git a/services/mgmt/profile/impl/service.go b/services/mgmt/profile/impl/service.go
index f528d5a..2519397 100644
--- a/services/mgmt/profile/impl/service.go
+++ b/services/mgmt/profile/impl/service.go
@@ -7,9 +7,9 @@
"v.io/core/veyron/services/mgmt/profile"
"v.io/core/veyron/services/mgmt/repository"
- "v.io/core/veyron2/ipc"
- "v.io/core/veyron2/naming"
- "v.io/core/veyron2/vlog"
+ "v.io/v23/ipc"
+ "v.io/v23/naming"
+ "v.io/v23/vlog"
)
// profileService implements the Profile server interface.
diff --git a/services/mgmt/profile/profile.vdl b/services/mgmt/profile/profile.vdl
index 63240ec..7da1abe 100644
--- a/services/mgmt/profile/profile.vdl
+++ b/services/mgmt/profile/profile.vdl
@@ -2,7 +2,7 @@
// types used by the implementation of Veyron profiles.
package profile
-import "v.io/core/veyron2/services/mgmt/build"
+import "v.io/v23/services/mgmt/build"
// Library describes a shared library that applications may use.
type Library struct {
diff --git a/services/mgmt/profile/profile.vdl.go b/services/mgmt/profile/profile.vdl.go
index 551f8e2..c700c18 100644
--- a/services/mgmt/profile/profile.vdl.go
+++ b/services/mgmt/profile/profile.vdl.go
@@ -7,10 +7,10 @@
import (
// VDL system imports
- "v.io/core/veyron2/vdl"
+ "v.io/v23/vdl"
// VDL user imports
- "v.io/core/veyron2/services/mgmt/build"
+ "v.io/v23/services/mgmt/build"
)
// Library describes a shared library that applications may use.
diff --git a/services/mgmt/profile/profiled/main.go b/services/mgmt/profile/profiled/main.go
index 6a5938d..7368c38 100644
--- a/services/mgmt/profile/profiled/main.go
+++ b/services/mgmt/profile/profiled/main.go
@@ -3,8 +3,8 @@
import (
"flag"
- "v.io/core/veyron2"
- "v.io/core/veyron2/vlog"
+ "v.io/v23"
+ "v.io/v23/vlog"
"v.io/core/veyron/lib/signals"
_ "v.io/core/veyron/profiles/roaming"
@@ -18,14 +18,14 @@
)
func main() {
- ctx, shutdown := veyron2.Init()
+ ctx, shutdown := v23.Init()
defer shutdown()
if *store == "" {
vlog.Fatalf("Specify a directory for storing profiles using --store=<name>")
}
- server, err := veyron2.NewServer(ctx)
+ server, err := v23.NewServer(ctx)
if err != nil {
vlog.Fatalf("NewServer() failed: %v", err)
}
@@ -35,7 +35,7 @@
vlog.Fatalf("NewDispatcher() failed: %v", err)
}
- ls := veyron2.GetListenSpec(ctx)
+ ls := v23.GetListenSpec(ctx)
endpoint, err := server.Listen(ls)
if err != nil {
vlog.Fatalf("Listen(%s) failed: %v", ls, err)
diff --git a/services/mgmt/profile/profiled/profiled_v23_test.go b/services/mgmt/profile/profiled/profiled_v23_test.go
index f0d62c4..b0085fa 100644
--- a/services/mgmt/profile/profiled/profiled_v23_test.go
+++ b/services/mgmt/profile/profiled/profiled_v23_test.go
@@ -5,7 +5,7 @@
"strings"
"v.io/core/veyron/lib/testutil/v23tests"
- "v.io/core/veyron2/naming"
+ "v.io/v23/naming"
)
//go:generate v23 test generate
diff --git a/services/mgmt/repository/repository.vdl b/services/mgmt/repository/repository.vdl
index 54b5a8e..1db5896 100644
--- a/services/mgmt/repository/repository.vdl
+++ b/services/mgmt/repository/repository.vdl
@@ -4,9 +4,9 @@
import (
"v.io/core/veyron/services/mgmt/profile"
- "v.io/core/veyron2/services/mgmt/application"
- "v.io/core/veyron2/services/security/access"
- public "v.io/core/veyron2/services/mgmt/repository"
+ "v.io/v23/services/mgmt/application"
+ "v.io/v23/services/security/access"
+ public "v.io/v23/services/mgmt/repository"
)
// Application describes an application repository internally. Besides
diff --git a/services/mgmt/repository/repository.vdl.go b/services/mgmt/repository/repository.vdl.go
index b2aab89..b966500 100644
--- a/services/mgmt/repository/repository.vdl.go
+++ b/services/mgmt/repository/repository.vdl.go
@@ -7,17 +7,17 @@
import (
// VDL system imports
- "v.io/core/veyron2"
- "v.io/core/veyron2/context"
- "v.io/core/veyron2/ipc"
- "v.io/core/veyron2/vdl"
+ "v.io/v23"
+ "v.io/v23/context"
+ "v.io/v23/ipc"
+ "v.io/v23/vdl"
// VDL user imports
"v.io/core/veyron/services/mgmt/profile"
- "v.io/core/veyron2/services/mgmt/application"
- "v.io/core/veyron2/services/mgmt/repository"
- "v.io/core/veyron2/services/security/access"
- "v.io/core/veyron2/services/security/access/object"
+ "v.io/v23/services/mgmt/application"
+ "v.io/v23/services/mgmt/repository"
+ "v.io/v23/services/security/access"
+ "v.io/v23/services/security/access/object"
)
// ApplicationClientMethods is the client interface
@@ -80,7 +80,7 @@
if c.client != nil {
return c.client
}
- return veyron2.GetClient(ctx)
+ return v23.GetClient(ctx)
}
func (c implApplicationClientStub) Put(ctx *context.T, i0 []string, i1 application.Envelope, opts ...ipc.CallOpt) (err error) {
@@ -195,7 +195,7 @@
PkgPath: "v.io/core/veyron/services/mgmt/repository",
Doc: "// Application describes an application repository internally. Besides\n// the public Application interface, it allows to add and remove\n// application envelopes.",
Embeds: []ipc.EmbedDesc{
- {"Application", "v.io/core/veyron2/services/mgmt/repository", "// Application provides access to application envelopes. An\n// application envelope is identified by an application name and an\n// application version, which are specified through the object name,\n// and a profile name, which is specified using a method argument.\n//\n// Example:\n// /apps/search/v1.Match([]string{\"base\", \"media\"})\n// returns an application envelope that can be used for downloading\n// and executing the \"search\" application, version \"v1\", runnable\n// on either the \"base\" or \"media\" profile."},
+ {"Application", "v.io/v23/services/mgmt/repository", "// Application provides access to application envelopes. An\n// application envelope is identified by an application name and an\n// application version, which are specified through the object name,\n// and a profile name, which is specified using a method argument.\n//\n// Example:\n// /apps/search/v1.Match([]string{\"base\", \"media\"})\n// returns an application envelope that can be used for downloading\n// and executing the \"search\" application, version \"v1\", runnable\n// on either the \"base\" or \"media\" profile."},
},
Methods: []ipc.MethodDesc{
{
@@ -268,7 +268,7 @@
if c.client != nil {
return c.client
}
- return veyron2.GetClient(ctx)
+ return v23.GetClient(ctx)
}
func (c implProfileClientStub) Specification(ctx *context.T, opts ...ipc.CallOpt) (o0 profile.Specification, err error) {
@@ -386,7 +386,7 @@
PkgPath: "v.io/core/veyron/services/mgmt/repository",
Doc: "// Profile describes a profile internally. Besides the public Profile\n// interface, it allows to add and remove profile specifications.",
Embeds: []ipc.EmbedDesc{
- {"Profile", "v.io/core/veyron2/services/mgmt/repository", "// Profile abstracts a device's ability to run binaries, and hides\n// specifics such as the operating system, hardware architecture, and\n// the set of installed libraries. Profiles describe binaries and\n// devices, and are used to match them."},
+ {"Profile", "v.io/v23/services/mgmt/repository", "// Profile abstracts a device's ability to run binaries, and hides\n// specifics such as the operating system, hardware architecture, and\n// the set of installed libraries. Profiles describe binaries and\n// devices, and are used to match them."},
},
Methods: []ipc.MethodDesc{
{
diff --git a/services/mgmt/stats/impl/stats.go b/services/mgmt/stats/impl/stats.go
index 5df5f0d..e8fe5c8 100644
--- a/services/mgmt/stats/impl/stats.go
+++ b/services/mgmt/stats/impl/stats.go
@@ -8,14 +8,14 @@
libstats "v.io/core/veyron/lib/stats"
- "v.io/core/veyron2/ipc"
- "v.io/core/veyron2/naming"
- "v.io/core/veyron2/services/mgmt/stats"
- "v.io/core/veyron2/services/watch"
- watchtypes "v.io/core/veyron2/services/watch/types"
- "v.io/core/veyron2/vdl"
- "v.io/core/veyron2/verror"
- "v.io/core/veyron2/vlog"
+ "v.io/v23/ipc"
+ "v.io/v23/naming"
+ "v.io/v23/services/mgmt/stats"
+ "v.io/v23/services/watch"
+ watchtypes "v.io/v23/services/watch/types"
+ "v.io/v23/vdl"
+ "v.io/v23/verror"
+ "v.io/v23/vlog"
)
type statsService struct {
diff --git a/services/mgmt/stats/impl/stats_test.go b/services/mgmt/stats/impl/stats_test.go
index f036846..ec92128 100644
--- a/services/mgmt/stats/impl/stats_test.go
+++ b/services/mgmt/stats/impl/stats_test.go
@@ -6,13 +6,13 @@
"testing"
"time"
- "v.io/core/veyron2"
- "v.io/core/veyron2/context"
- "v.io/core/veyron2/naming"
- "v.io/core/veyron2/security"
- "v.io/core/veyron2/services/mgmt/stats"
- "v.io/core/veyron2/services/watch/types"
- "v.io/core/veyron2/vdl"
+ "v.io/v23"
+ "v.io/v23/context"
+ "v.io/v23/naming"
+ "v.io/v23/security"
+ "v.io/v23/services/mgmt/stats"
+ "v.io/v23/services/watch/types"
+ "v.io/v23/vdl"
libstats "v.io/core/veyron/lib/stats"
"v.io/core/veyron/lib/stats/histogram"
@@ -31,12 +31,12 @@
func startServer(t *testing.T, ctx *context.T) (string, func()) {
disp := &statsDispatcher{}
- server, err := veyron2.NewServer(ctx)
+ server, err := v23.NewServer(ctx)
if err != nil {
t.Fatalf("NewServer failed: %v", err)
return "", nil
}
- endpoints, err := server.Listen(veyron2.GetListenSpec(ctx))
+ endpoints, err := server.Listen(v23.GetListenSpec(ctx))
if err != nil {
t.Fatalf("Listen failed: %v", err)
return "", nil
diff --git a/services/mgmt/stats/types.vdl.go b/services/mgmt/stats/types.vdl.go
index 9b70297..d39481d 100644
--- a/services/mgmt/stats/types.vdl.go
+++ b/services/mgmt/stats/types.vdl.go
@@ -6,7 +6,7 @@
import (
// VDL system imports
- "v.io/core/veyron2/vdl"
+ "v.io/v23/vdl"
)
// HistogramValue is the value of Histogram objects.
diff --git a/services/mgmt/vtrace/impl/vtrace.go b/services/mgmt/vtrace/impl/vtrace.go
index 145485a..63d62e9 100644
--- a/services/mgmt/vtrace/impl/vtrace.go
+++ b/services/mgmt/vtrace/impl/vtrace.go
@@ -1,11 +1,11 @@
package impl
import (
- "v.io/core/veyron2/ipc"
- svtrace "v.io/core/veyron2/services/mgmt/vtrace"
- "v.io/core/veyron2/uniqueid"
- "v.io/core/veyron2/verror"
- "v.io/core/veyron2/vtrace"
+ "v.io/v23/ipc"
+ svtrace "v.io/v23/services/mgmt/vtrace"
+ "v.io/v23/uniqueid"
+ "v.io/v23/verror"
+ "v.io/v23/vtrace"
)
type vtraceService struct{}
diff --git a/services/mgmt/vtrace/impl/vtrace_test.go b/services/mgmt/vtrace/impl/vtrace_test.go
index f8fbb9f..c32ac51 100644
--- a/services/mgmt/vtrace/impl/vtrace_test.go
+++ b/services/mgmt/vtrace/impl/vtrace_test.go
@@ -4,9 +4,9 @@
"io"
"testing"
- "v.io/core/veyron2"
- service "v.io/core/veyron2/services/mgmt/vtrace"
- "v.io/core/veyron2/vtrace"
+ "v.io/v23"
+ service "v.io/v23/services/mgmt/vtrace"
+ "v.io/v23/vtrace"
"v.io/core/veyron/lib/testutil"
_ "v.io/core/veyron/profiles"
@@ -17,11 +17,11 @@
ctx, shutdown := testutil.InitForTest()
defer shutdown()
- server, err := veyron2.NewServer(ctx)
+ server, err := v23.NewServer(ctx)
if err != nil {
t.Fatalf("Could not create server: %s", err)
}
- endpoints, err := server.Listen(veyron2.GetListenSpec(ctx))
+ endpoints, err := server.Listen(v23.GetListenSpec(ctx))
if err != nil {
t.Fatalf("Listen failed: %s", err)
}
diff --git a/services/mounttable/lib/collection_test_interface.vdl.go b/services/mounttable/lib/collection_test_interface.vdl.go
index f7f8721..4cb7c8d 100644
--- a/services/mounttable/lib/collection_test_interface.vdl.go
+++ b/services/mounttable/lib/collection_test_interface.vdl.go
@@ -5,9 +5,9 @@
import (
// VDL system imports
- "v.io/core/veyron2"
- "v.io/core/veyron2/context"
- "v.io/core/veyron2/ipc"
+ "v.io/v23"
+ "v.io/v23/context"
+ "v.io/v23/ipc"
)
// CollectionClientMethods is the client interface
@@ -49,7 +49,7 @@
if c.client != nil {
return c.client
}
- return veyron2.GetClient(ctx)
+ return v23.GetClient(ctx)
}
func (c implCollectionClientStub) Export(ctx *context.T, i0 string, i1 bool, opts ...ipc.CallOpt) (err error) {
diff --git a/services/mounttable/lib/collectionserver_test.go b/services/mounttable/lib/collectionserver_test.go
index e7500f3..819b7ea 100644
--- a/services/mounttable/lib/collectionserver_test.go
+++ b/services/mounttable/lib/collectionserver_test.go
@@ -3,10 +3,10 @@
import (
"sync"
- "v.io/core/veyron2/ipc"
- "v.io/core/veyron2/naming"
- "v.io/core/veyron2/security"
- "v.io/core/veyron2/verror"
+ "v.io/v23/ipc"
+ "v.io/v23/naming"
+ "v.io/v23/security"
+ "v.io/v23/verror"
)
// collectionServer is a very simple collection server implementation for testing, with sufficient debugging to help
diff --git a/services/mounttable/lib/mounttable.go b/services/mounttable/lib/mounttable.go
index 6509b5a..0c4a192 100644
--- a/services/mounttable/lib/mounttable.go
+++ b/services/mounttable/lib/mounttable.go
@@ -11,14 +11,14 @@
"v.io/core/veyron/lib/glob"
- "v.io/core/veyron2"
- "v.io/core/veyron2/ipc"
- "v.io/core/veyron2/naming"
- "v.io/core/veyron2/security"
- "v.io/core/veyron2/services/mounttable"
- "v.io/core/veyron2/services/security/access"
- "v.io/core/veyron2/verror"
- "v.io/core/veyron2/vlog"
+ "v.io/v23"
+ "v.io/v23/ipc"
+ "v.io/v23/naming"
+ "v.io/v23/security"
+ "v.io/v23/services/mounttable"
+ "v.io/v23/services/security/access"
+ "v.io/v23/verror"
+ "v.io/v23/vlog"
)
var (
@@ -442,7 +442,7 @@
if naming.Rooted(server) {
epString, _ = naming.SplitAddressName(server)
}
- _, err := veyron2.NewEndpoint(epString)
+ _, err := v23.NewEndpoint(epString)
if err != nil {
return fmt.Errorf("malformed address %q for mounted server %q", epString, server)
}
diff --git a/services/mounttable/lib/mounttable_test.go b/services/mounttable/lib/mounttable_test.go
index 77e87e5..b61188f 100644
--- a/services/mounttable/lib/mounttable_test.go
+++ b/services/mounttable/lib/mounttable_test.go
@@ -9,14 +9,14 @@
"testing"
"time"
- "v.io/core/veyron2"
- "v.io/core/veyron2/context"
- "v.io/core/veyron2/ipc"
- "v.io/core/veyron2/naming"
- "v.io/core/veyron2/options"
- "v.io/core/veyron2/security"
- "v.io/core/veyron2/services/security/access"
- "v.io/core/veyron2/vlog"
+ "v.io/v23"
+ "v.io/v23/context"
+ "v.io/v23/ipc"
+ "v.io/v23/naming"
+ "v.io/v23/options"
+ "v.io/v23/security"
+ "v.io/v23/services/security/access"
+ "v.io/v23/vlog"
"v.io/core/veyron/lib/testutil"
tsecurity "v.io/core/veyron/lib/testutil/security"
@@ -34,7 +34,7 @@
func doMount(t *testing.T, ctx *context.T, ep, suffix, service string, blessingPatterns []security.BlessingPattern, shouldSucceed bool) {
name := naming.JoinAddressName(ep, suffix)
- client := veyron2.GetClient(ctx)
+ client := v23.GetClient(ctx)
call, err := client.StartCall(ctx, name, "MountX", []interface{}{service, blessingPatterns, uint32(ttlSecs), 0}, options.NoResolve{})
if err != nil {
if !shouldSucceed {
@@ -52,7 +52,7 @@
func doUnmount(t *testing.T, ctx *context.T, ep, suffix, service string, shouldSucceed bool) {
name := naming.JoinAddressName(ep, suffix)
- client := veyron2.GetClient(ctx)
+ client := v23.GetClient(ctx)
call, err := client.StartCall(ctx, name, "Unmount", []interface{}{service}, options.NoResolve{})
if err != nil {
if !shouldSucceed {
@@ -70,7 +70,7 @@
func doGetACL(t *testing.T, ctx *context.T, ep, suffix string, shouldSucceed bool) (acl access.TaggedACLMap, etag string) {
name := naming.JoinAddressName(ep, suffix)
- client := veyron2.GetClient(ctx)
+ client := v23.GetClient(ctx)
call, err := client.StartCall(ctx, name, "GetACL", nil, options.NoResolve{})
if err != nil {
if !shouldSucceed {
@@ -89,7 +89,7 @@
func doSetACL(t *testing.T, ctx *context.T, ep, suffix string, acl access.TaggedACLMap, etag string, shouldSucceed bool) {
name := naming.JoinAddressName(ep, suffix)
- client := veyron2.GetClient(ctx)
+ client := v23.GetClient(ctx)
call, err := client.StartCall(ctx, name, "SetACL", []interface{}{acl, etag}, options.NoResolve{})
if err != nil {
if !shouldSucceed {
@@ -107,7 +107,7 @@
func doDeleteNode(t *testing.T, ctx *context.T, ep, suffix string, shouldSucceed bool) {
name := naming.JoinAddressName(ep, suffix)
- client := veyron2.GetClient(ctx)
+ client := v23.GetClient(ctx)
call, err := client.StartCall(ctx, name, "Delete", []interface{}{false}, options.NoResolve{})
if err != nil {
if !shouldSucceed {
@@ -125,7 +125,7 @@
func doDeleteSubtree(t *testing.T, ctx *context.T, ep, suffix string, shouldSucceed bool) {
name := naming.JoinAddressName(ep, suffix)
- client := veyron2.GetClient(ctx)
+ client := v23.GetClient(ctx)
call, err := client.StartCall(ctx, name, "Delete", []interface{}{true}, options.NoResolve{})
if err != nil {
if !shouldSucceed {
@@ -155,7 +155,7 @@
func resolve(ctx *context.T, name string) (*naming.VDLMountEntry, error) {
// Resolve the name one level.
- client := veyron2.GetClient(ctx)
+ client := v23.GetClient(ctx)
call, err := client.StartCall(ctx, name, "ResolveStep", nil, options.NoResolve{})
if err != nil {
return nil, err
@@ -177,7 +177,7 @@
boom(t, "Failed to Export.Resolve %s: %s", name, err)
}
// Export the value.
- client := veyron2.GetClient(ctx)
+ client := v23.GetClient(ctx)
call, err := client.StartCall(ctx, mountentry2names(resolved)[0], "Export", []interface{}{contents, true}, options.NoResolve{})
if err != nil {
boom(t, "Failed to Export.StartCall %s to %s: %s", name, contents, err)
@@ -197,7 +197,7 @@
boom(t, "Failed to Resolve %s: %s", name, err)
}
// Look up the value.
- client := veyron2.GetClient(ctx)
+ client := v23.GetClient(ctx)
call, err := client.StartCall(ctx, mountentry2names(resolved)[0], "Lookup", nil, options.NoResolve{})
if err != nil {
if shouldSucceed {
@@ -221,7 +221,7 @@
}
func newMT(t *testing.T, acl string, rootCtx *context.T) (ipc.Server, string) {
- server, err := veyron2.NewServer(rootCtx, options.ServesMountTable(true))
+ server, err := v23.NewServer(rootCtx, options.ServesMountTable(true))
if err != nil {
boom(t, "r.NewServer: %s", err)
}
@@ -231,7 +231,7 @@
boom(t, "NewMountTableDispatcher: %v", err)
}
// Start serving on a loopback address.
- eps, err := server.Listen(veyron2.GetListenSpec(rootCtx))
+ eps, err := server.Listen(v23.GetListenSpec(rootCtx))
if err != nil {
boom(t, "Failed to Listen mount table: %s", err)
}
@@ -244,12 +244,12 @@
}
func newCollection(t *testing.T, acl string, rootCtx *context.T) (ipc.Server, string) {
- server, err := veyron2.NewServer(rootCtx)
+ server, err := v23.NewServer(rootCtx)
if err != nil {
boom(t, "r.NewServer: %s", err)
}
// Start serving on a loopback address.
- eps, err := server.Listen(veyron2.GetListenSpec(rootCtx))
+ eps, err := server.Listen(v23.GetListenSpec(rootCtx))
if err != nil {
boom(t, "Failed to Listen mount table: %s", err)
}
@@ -350,7 +350,7 @@
func doGlobX(t *testing.T, ctx *context.T, ep, suffix, pattern string, joinServer bool) []string {
name := naming.JoinAddressName(ep, suffix)
- client := veyron2.GetClient(ctx)
+ client := v23.GetClient(ctx)
call, err := client.StartCall(ctx, name, ipc.GlobMethod, []interface{}{pattern}, options.NoResolve{})
if err != nil {
boom(t, "Glob.StartCall %s %s: %s", name, pattern, err)
@@ -663,29 +663,29 @@
}
}
-func initTest() (rootCtx *context.T, aliceCtx *context.T, bobCtx *context.T, shutdown veyron2.Shutdown) {
+func initTest() (rootCtx *context.T, aliceCtx *context.T, bobCtx *context.T, shutdown v23.Shutdown) {
testutil.Init()
ctx, shutdown := testutil.InitForTest()
var err error
- if rootCtx, err = veyron2.SetPrincipal(ctx, tsecurity.NewPrincipal("root")); err != nil {
+ if rootCtx, err = v23.SetPrincipal(ctx, tsecurity.NewPrincipal("root")); err != nil {
panic("failed to set root principal")
}
- if aliceCtx, err = veyron2.SetPrincipal(ctx, tsecurity.NewPrincipal("alice")); err != nil {
+ if aliceCtx, err = v23.SetPrincipal(ctx, tsecurity.NewPrincipal("alice")); err != nil {
panic("failed to set alice principal")
}
- if bobCtx, err = veyron2.SetPrincipal(ctx, tsecurity.NewPrincipal("bob")); err != nil {
+ if bobCtx, err = v23.SetPrincipal(ctx, tsecurity.NewPrincipal("bob")); err != nil {
panic("failed to set bob principal")
}
for _, r := range []*context.T{rootCtx, aliceCtx, bobCtx} {
// A hack to set the namespace roots to a value that won't work.
- veyron2.GetNamespace(r).SetRoots()
+ v23.GetNamespace(r).SetRoots()
// And have all principals recognize each others blessings.
- p1 := veyron2.GetPrincipal(r)
+ p1 := v23.GetPrincipal(r)
for _, other := range []*context.T{rootCtx, aliceCtx, bobCtx} {
// tsecurity.NewPrincipal has already setup each
// principal to use the same blessing for both server
// and client activities.
- if err := p1.AddToRoots(veyron2.GetPrincipal(other).BlessingStore().Default()); err != nil {
+ if err := p1.AddToRoots(v23.GetPrincipal(other).BlessingStore().Default()); err != nil {
panic(err)
}
}
diff --git a/services/mounttable/lib/neighborhood.go b/services/mounttable/lib/neighborhood.go
index 6e00503..6a4a156 100644
--- a/services/mounttable/lib/neighborhood.go
+++ b/services/mounttable/lib/neighborhood.go
@@ -9,14 +9,14 @@
"v.io/core/veyron/lib/glob"
"v.io/core/veyron/lib/netconfig"
- "v.io/core/veyron2"
- "v.io/core/veyron2/ipc"
- "v.io/core/veyron2/naming"
- "v.io/core/veyron2/security"
- "v.io/core/veyron2/services/mounttable"
- "v.io/core/veyron2/services/security/access"
- "v.io/core/veyron2/verror"
- "v.io/core/veyron2/vlog"
+ "v.io/v23"
+ "v.io/v23/ipc"
+ "v.io/v23/naming"
+ "v.io/v23/security"
+ "v.io/v23/services/mounttable"
+ "v.io/v23/services/security/access"
+ "v.io/v23/verror"
+ "v.io/v23/vlog"
mdns "github.com/presotto/go-mdns-sd"
)
@@ -41,7 +41,7 @@
func getPort(address string) uint16 {
epAddr, _ := naming.SplitAddressName(address)
- ep, err := veyron2.NewEndpoint(epAddr)
+ ep, err := v23.NewEndpoint(epAddr)
if err != nil {
return 0
}
diff --git a/services/mounttable/lib/neighborhood_test.go b/services/mounttable/lib/neighborhood_test.go
index 05f6b0a..11257d2 100644
--- a/services/mounttable/lib/neighborhood_test.go
+++ b/services/mounttable/lib/neighborhood_test.go
@@ -7,10 +7,10 @@
"testing"
"time"
- "v.io/core/veyron2"
- "v.io/core/veyron2/naming"
- "v.io/core/veyron2/options"
- "v.io/core/veyron2/vlog"
+ "v.io/v23"
+ "v.io/v23/naming"
+ "v.io/v23/options"
+ "v.io/v23/vlog"
"v.io/core/veyron/lib/testutil"
_ "v.io/core/veyron/profiles"
@@ -31,14 +31,14 @@
defer shutdown()
vlog.Infof("TestNeighborhood")
- server, err := veyron2.NewServer(rootCtx)
+ server, err := v23.NewServer(rootCtx)
if err != nil {
boom(t, "r.NewServer: %s", err)
}
defer server.Stop()
// Start serving on a loopback address.
- eps, err := server.Listen(veyron2.GetListenSpec(rootCtx))
+ eps, err := server.Listen(v23.GetListenSpec(rootCtx))
if err != nil {
boom(t, "Failed to Listen mount table: %s", err)
}
@@ -84,7 +84,7 @@
// Make sure we can resolve through the neighborhood.
expectedSuffix := "a/b"
- client := veyron2.GetClient(rootCtx)
+ client := v23.GetClient(rootCtx)
name := naming.JoinAddressName(estr, serverName+"/"+expectedSuffix)
call, cerr := client.StartCall(rootCtx, name, "ResolveStep", nil, options.NoResolve{})
if cerr != nil {
diff --git a/services/mounttable/lib/serverlist.go b/services/mounttable/lib/serverlist.go
index 82d658e..7da55d5 100644
--- a/services/mounttable/lib/serverlist.go
+++ b/services/mounttable/lib/serverlist.go
@@ -5,8 +5,8 @@
"sync"
"time"
- "v.io/core/veyron2/naming"
- "v.io/core/veyron2/security"
+ "v.io/v23/naming"
+ "v.io/v23/security"
)
type serverListClock interface {
diff --git a/services/mounttable/lib/serverlist_test.go b/services/mounttable/lib/serverlist_test.go
index 7c1c135..77220b0 100644
--- a/services/mounttable/lib/serverlist_test.go
+++ b/services/mounttable/lib/serverlist_test.go
@@ -6,8 +6,8 @@
"testing"
"time"
- "v.io/core/veyron2/naming"
- "v.io/core/veyron2/security"
+ "v.io/v23/naming"
+ "v.io/v23/security"
)
type fakeTime struct {
diff --git a/services/mounttable/lib/servers.go b/services/mounttable/lib/servers.go
index d045682..56d6556 100644
--- a/services/mounttable/lib/servers.go
+++ b/services/mounttable/lib/servers.go
@@ -3,12 +3,12 @@
import (
"net"
- "v.io/core/veyron2"
- "v.io/core/veyron2/context"
- "v.io/core/veyron2/ipc"
- "v.io/core/veyron2/naming"
- "v.io/core/veyron2/options"
- "v.io/core/veyron2/vlog"
+ "v.io/v23"
+ "v.io/v23/context"
+ "v.io/v23/ipc"
+ "v.io/v23/naming"
+ "v.io/v23/options"
+ "v.io/v23/vlog"
)
func StartServers(ctx *context.T, listenSpec ipc.ListenSpec, mountName, nhName, aclFile string) (string, func(), error) {
@@ -19,9 +19,9 @@
}
}
- mtServer, err := veyron2.NewServer(ctx, options.ServesMountTable(true))
+ mtServer, err := v23.NewServer(ctx, options.ServesMountTable(true))
if err != nil {
- vlog.Errorf("veyron2.NewServer failed: %v", err)
+ vlog.Errorf("v23.NewServer failed: %v", err)
return "", nil, err
}
stopFuncs = append(stopFuncs, mtServer.Stop)
@@ -54,9 +54,9 @@
if port != "" {
neighborhoodListenSpec.Addrs[0].Address = net.JoinHostPort(host, "0")
}
- nhServer, err := veyron2.NewServer(ctx, options.ServesMountTable(true))
+ nhServer, err := v23.NewServer(ctx, options.ServesMountTable(true))
if err != nil {
- vlog.Errorf("veyron2.NewServer failed: %v", err)
+ vlog.Errorf("v23.NewServer failed: %v", err)
stop()
return "", nil, err
}
diff --git a/services/mounttable/lib/tamg.go b/services/mounttable/lib/tamg.go
index 693dd5e..b4ff42d 100644
--- a/services/mounttable/lib/tamg.go
+++ b/services/mounttable/lib/tamg.go
@@ -3,9 +3,9 @@
import (
"strconv"
- "v.io/core/veyron2/security"
- "v.io/core/veyron2/services/security/access"
- "v.io/core/veyron2/verror"
+ "v.io/v23/security"
+ "v.io/v23/services/security/access"
+ "v.io/v23/verror"
)
// TAMG associates a generation with a TaggedACLMap
diff --git a/services/mounttable/mounttabled/mounttable.go b/services/mounttable/mounttabled/mounttable.go
index 307cb33..3075073 100644
--- a/services/mounttable/mounttabled/mounttable.go
+++ b/services/mounttable/mounttabled/mounttable.go
@@ -6,8 +6,8 @@
"fmt"
"os"
- "v.io/core/veyron2"
- "v.io/core/veyron2/vlog"
+ "v.io/v23"
+ "v.io/v23/vlog"
"v.io/core/veyron/lib/signals"
_ "v.io/core/veyron/profiles/roaming"
@@ -21,10 +21,10 @@
)
func main() {
- ctx, shutdown := veyron2.Init()
+ ctx, shutdown := v23.Init()
defer shutdown()
- name, stop, err := mounttable.StartServers(ctx, veyron2.GetListenSpec(ctx), *mountName, *nhName, *aclFile)
+ name, stop, err := mounttable.StartServers(ctx, v23.GetListenSpec(ctx), *mountName, *nhName, *aclFile)
if err != nil {
vlog.Errorf("mounttable.StartServers failed: %v", err)
os.Exit(1)
diff --git a/services/proxy/proxyd/main.go b/services/proxy/proxyd/main.go
index 1c446a5..30d7b28 100644
--- a/services/proxy/proxyd/main.go
+++ b/services/proxy/proxyd/main.go
@@ -9,9 +9,9 @@
_ "net/http/pprof"
"time"
- "v.io/core/veyron2"
- "v.io/core/veyron2/naming"
- "v.io/core/veyron2/vlog"
+ "v.io/v23"
+ "v.io/v23/naming"
+ "v.io/v23/vlog"
"v.io/core/veyron/lib/signals"
_ "v.io/core/veyron/profiles"
@@ -32,21 +32,21 @@
)
func main() {
- ctx, shutdown := veyron2.Init()
+ ctx, shutdown := v23.Init()
defer shutdown()
rid, err := naming.NewRoutingID()
if err != nil {
vlog.Fatal(err)
}
- proxy, err := proxy.New(rid, veyron2.GetPrincipal(ctx), *protocol, *address, *pubAddress)
+ proxy, err := proxy.New(rid, v23.GetPrincipal(ctx), *protocol, *address, *pubAddress)
if err != nil {
vlog.Fatal(err)
}
defer proxy.Shutdown()
if len(*name) > 0 {
- publisher := publisher.New(ctx, veyron2.GetNamespace(ctx), time.Minute)
+ publisher := publisher.New(ctx, v23.GetNamespace(ctx), time.Minute)
defer publisher.WaitForStop()
defer publisher.Stop()
publisher.AddServer(proxy.Endpoint().String(), false)
diff --git a/services/security/discharger.vdl b/services/security/discharger.vdl
index 0cfdd88..d6fc62e 100644
--- a/services/security/discharger.vdl
+++ b/services/security/discharger.vdl
@@ -1,6 +1,6 @@
package security
-import "v.io/core/veyron2/security"
+import "v.io/v23/security"
// Discharger is the interface for obtaining discharges for ThirdPartyCaveats.
type Discharger interface {
diff --git a/services/security/discharger.vdl.go b/services/security/discharger.vdl.go
index 9249954..0206d7c 100644
--- a/services/security/discharger.vdl.go
+++ b/services/security/discharger.vdl.go
@@ -5,12 +5,12 @@
import (
// VDL system imports
- "v.io/core/veyron2"
- "v.io/core/veyron2/context"
- "v.io/core/veyron2/ipc"
+ "v.io/v23"
+ "v.io/v23/context"
+ "v.io/v23/ipc"
// VDL user imports
- "v.io/core/veyron2/security"
+ "v.io/v23/security"
)
// DischargerClientMethods is the client interface
@@ -50,7 +50,7 @@
if c.client != nil {
return c.client
}
- return veyron2.GetClient(ctx)
+ return v23.GetClient(ctx)
}
func (c implDischargerClientStub) Discharge(ctx *context.T, i0 security.Caveat, i1 security.DischargeImpetus, opts ...ipc.CallOpt) (o0 security.WireDischarge, err error) {
diff --git a/services/security/discharger/discharger.go b/services/security/discharger/discharger.go
index 5f4b436..f0a2f31 100644
--- a/services/security/discharger/discharger.go
+++ b/services/security/discharger/discharger.go
@@ -5,8 +5,8 @@
"time"
services "v.io/core/veyron/services/security"
- "v.io/core/veyron2/ipc"
- "v.io/core/veyron2/security"
+ "v.io/v23/ipc"
+ "v.io/v23/security"
)
// dischargerd issues discharges for all caveats present in the current
diff --git a/services/security/groups/grpserverd/main.go b/services/security/groups/grpserverd/main.go
index 0109f79..0262c01 100644
--- a/services/security/groups/grpserverd/main.go
+++ b/services/security/groups/grpserverd/main.go
@@ -7,9 +7,9 @@
import (
"flag"
- "v.io/core/veyron2"
- "v.io/core/veyron2/services/security/access"
- "v.io/core/veyron2/vlog"
+ "v.io/v23"
+ "v.io/v23/services/security/access"
+ "v.io/v23/vlog"
"v.io/core/veyron/lib/signals"
_ "v.io/core/veyron/profiles/roaming"
@@ -23,14 +23,14 @@
)
func main() {
- ctx, shutdown := veyron2.Init()
+ ctx, shutdown := v23.Init()
defer shutdown()
- s, err := veyron2.NewServer(ctx)
+ s, err := v23.NewServer(ctx)
if err != nil {
- vlog.Fatal("veyron2.NewServer() failed: ", err)
+ vlog.Fatal("v23.NewServer() failed: ", err)
}
- if _, err := s.Listen(veyron2.GetListenSpec(ctx)); err != nil {
+ if _, err := s.Listen(v23.GetListenSpec(ctx)); err != nil {
vlog.Fatal("s.Listen() failed: ", err)
}
diff --git a/services/security/groups/server/group.go b/services/security/groups/server/group.go
index cc8a656..f145778 100644
--- a/services/security/groups/server/group.go
+++ b/services/security/groups/server/group.go
@@ -1,11 +1,11 @@
package server
import (
- "v.io/core/veyron2/ipc"
- "v.io/core/veyron2/security"
- "v.io/core/veyron2/services/security/access"
- "v.io/core/veyron2/services/security/groups"
- "v.io/core/veyron2/verror"
+ "v.io/v23/ipc"
+ "v.io/v23/security"
+ "v.io/v23/services/security/access"
+ "v.io/v23/services/security/groups"
+ "v.io/v23/verror"
)
type group struct {
diff --git a/services/security/groups/server/manager.go b/services/security/groups/server/manager.go
index 9016fa5..fff9dc7 100644
--- a/services/security/groups/server/manager.go
+++ b/services/security/groups/server/manager.go
@@ -3,10 +3,10 @@
import (
"strings"
- "v.io/core/veyron2/ipc"
- "v.io/core/veyron2/security"
- "v.io/core/veyron2/services/security/access"
- "v.io/core/veyron2/services/security/groups"
+ "v.io/v23/ipc"
+ "v.io/v23/security"
+ "v.io/v23/services/security/access"
+ "v.io/v23/services/security/groups"
)
type manager struct {
diff --git a/services/security/groups/server/server_test.go b/services/security/groups/server/server_test.go
index a25d886..d59c461 100644
--- a/services/security/groups/server/server_test.go
+++ b/services/security/groups/server/server_test.go
@@ -5,14 +5,14 @@
"runtime/debug"
"testing"
- "v.io/core/veyron2"
- "v.io/core/veyron2/context"
- "v.io/core/veyron2/naming"
- "v.io/core/veyron2/security"
- "v.io/core/veyron2/services/security/access"
- "v.io/core/veyron2/services/security/groups"
- "v.io/core/veyron2/verror"
- "v.io/core/veyron2/vlog"
+ "v.io/v23"
+ "v.io/v23/context"
+ "v.io/v23/naming"
+ "v.io/v23/security"
+ "v.io/v23/services/security/access"
+ "v.io/v23/services/security/groups"
+ "v.io/v23/verror"
+ "v.io/v23/vlog"
tsecurity "v.io/core/veyron/lib/testutil/security"
_ "v.io/core/veyron/profiles"
@@ -76,11 +76,11 @@
}
func newServer(ctx *context.T) (string, func()) {
- s, err := veyron2.NewServer(ctx)
+ s, err := v23.NewServer(ctx)
if err != nil {
- vlog.Fatal("veyron2.NewServer() failed: ", err)
+ vlog.Fatal("v23.NewServer() failed: ", err)
}
- eps, err := s.Listen(veyron2.GetListenSpec(ctx))
+ eps, err := s.Listen(v23.GetListenSpec(ctx))
if err != nil {
vlog.Fatal("s.Listen() failed: ", err)
}
@@ -100,7 +100,7 @@
}
func setupOrDie() (clientCtx *context.T, serverName string, cleanup func()) {
- ctx, shutdown := veyron2.Init()
+ ctx, shutdown := v23.Init()
cp, sp := tsecurity.NewPrincipal("client"), tsecurity.NewPrincipal("server")
// Have the server principal bless the client principal as "client".
@@ -118,13 +118,13 @@
vlog.Fatal("cp.AddToRoots() failed: ", err)
}
- clientCtx, err = veyron2.SetPrincipal(ctx, cp)
+ clientCtx, err = v23.SetPrincipal(ctx, cp)
if err != nil {
- vlog.Fatal("veyron2.SetPrincipal() failed: ", err)
+ vlog.Fatal("v23.SetPrincipal() failed: ", err)
}
- serverCtx, err := veyron2.SetPrincipal(ctx, sp)
+ serverCtx, err := v23.SetPrincipal(ctx, sp)
if err != nil {
- vlog.Fatal("veyron2.SetPrincipal() failed: ", err)
+ vlog.Fatal("v23.SetPrincipal() failed: ", err)
}
serverName, stopServer := newServer(serverCtx)
diff --git a/services/security/groups/server/types.vdl b/services/security/groups/server/types.vdl
index 9a8cdd0..623ff3a 100644
--- a/services/security/groups/server/types.vdl
+++ b/services/security/groups/server/types.vdl
@@ -1,8 +1,8 @@
package server
import (
- "v.io/core/veyron2/services/security/access"
- "v.io/core/veyron2/services/security/groups"
+ "v.io/v23/services/security/access"
+ "v.io/v23/services/security/groups"
)
// groupData represents the persistent state of a group. (The group name is
diff --git a/services/security/groups/server/types.vdl.go b/services/security/groups/server/types.vdl.go
index 7d1e1d3..45812c1 100644
--- a/services/security/groups/server/types.vdl.go
+++ b/services/security/groups/server/types.vdl.go
@@ -5,11 +5,11 @@
import (
// VDL system imports
- "v.io/core/veyron2/vdl"
+ "v.io/v23/vdl"
// VDL user imports
- "v.io/core/veyron2/services/security/access"
- "v.io/core/veyron2/services/security/groups"
+ "v.io/v23/services/security/access"
+ "v.io/v23/services/security/groups"
)
// groupData represents the persistent state of a group. (The group name is
