ref: Switch to using v5 endpoints by default.
Change-Id: Ia516e7e64d0af6649b3a2f1bc3baaeb897540234
MultiPart: 2/2
diff --git a/profiles/internal/naming/endpoint_test.go b/profiles/internal/naming/endpoint_test.go
index 2b9d204..0f39365 100644
--- a/profiles/internal/naming/endpoint_test.go
+++ b/profiles/internal/naming/endpoint_test.go
@@ -36,8 +36,8 @@
Protocol: naming.UnknownProtocol,
Address: "batman.com:2345",
RID: naming.FixedRoutingID(0x0),
- MinRPCVersion: 2,
- MaxRPCVersion: 3,
+ MinRPCVersion: version.DeprecatedRPCVersion,
+ MaxRPCVersion: version.DeprecatedRPCVersion,
IsMountTable: true,
}
v3s := &Endpoint{
@@ -178,7 +178,7 @@
}{
{v1, "@2@@batman.com:1234@000000000000000000000000dabbad00@@@@", "", version.UnknownRPCVersion, version.UnknownRPCVersion, true},
{v2, "@2@@batman.com:2345@000000000000000000000000dabbad00@1@10@@", "", 1, 10, true},
- {v2hp, "@2@@batman.com:2345@00000000000000000000000000000000@2@3@@", "batman.com:2345", 2, 3, true},
+ {v2hp, "@2@@batman.com:2345@00000000000000000000000000000000@1@1@@", "batman.com:2345", 2, 3, true},
}
for _, test := range testcasesB {
@@ -265,26 +265,25 @@
}
func TestParseHostPort(t *testing.T) {
- var min, max version.RPCVersion = 1, 2
dns := &Endpoint{
Protocol: "tcp",
Address: "batman.com:4444",
- MinRPCVersion: min,
- MaxRPCVersion: max,
+ MinRPCVersion: version.DeprecatedRPCVersion,
+ MaxRPCVersion: version.DeprecatedRPCVersion,
IsMountTable: true,
}
ipv4 := &Endpoint{
Protocol: "tcp",
Address: "192.168.1.1:4444",
- MinRPCVersion: min,
- MaxRPCVersion: max,
+ MinRPCVersion: version.DeprecatedRPCVersion,
+ MaxRPCVersion: version.DeprecatedRPCVersion,
IsMountTable: true,
}
ipv6 := &Endpoint{
Protocol: "tcp",
Address: "[01:02::]:4444",
- MinRPCVersion: min,
- MaxRPCVersion: max,
+ MinRPCVersion: version.DeprecatedRPCVersion,
+ MaxRPCVersion: version.DeprecatedRPCVersion,
IsMountTable: true,
}
testcases := []struct {
@@ -298,7 +297,7 @@
for _, test := range testcases {
addr := net.JoinHostPort(test.Host, test.Port)
- epString := naming.FormatEndpoint("tcp", addr, version.RPCVersionRange{min, max})
+ epString := naming.FormatEndpoint("tcp", addr)
if ep, err := NewEndpoint(epString); err != nil {
t.Errorf("NewEndpoint(%q) failed with %v", addr, err)
} else {
diff --git a/profiles/internal/rpc/sort_internal_test.go b/profiles/internal/rpc/sort_internal_test.go
index a4c7b4d..3cfe452 100644
--- a/profiles/internal/rpc/sort_internal_test.go
+++ b/profiles/internal/rpc/sort_internal_test.go
@@ -11,7 +11,7 @@
"testing"
"v.io/v23/naming"
- "v.io/v23/rpc/version"
+ inaming "v.io/x/ref/profiles/internal/naming"
)
func servers2names(servers []naming.MountedServer) []string {
@@ -28,7 +28,13 @@
}
for _, a := range []string{"127.0.0.1", "127.0.0.2"} {
- addr := naming.FormatEndpoint("tcp", a, version.RPCVersionRange{100, 200})
+ ep := inaming.Endpoint{
+ Protocol: "tcp",
+ Address: a,
+ MinRPCVersion: 100,
+ MaxRPCVersion: 200,
+ }
+ addr := ep.VersionedString(4)
name := naming.JoinAddressName(addr, "")
servers = append(servers, naming.MountedServer{Server: name})
}
@@ -83,10 +89,10 @@
// Just foobar and tcp4
want := []string{
- "/@2@foobar@127.0.0.10@@@@@",
- "/@2@foobar@127.0.0.11@@@@@",
- "/@2@tcp4@127.0.0.1@@@@@",
- "/@2@tcp4@127.0.0.2@@@@@",
+ "/@5@foobar@127.0.0.10@@@@@",
+ "/@5@foobar@127.0.0.11@@@@@",
+ "/@5@tcp4@127.0.0.1@@@@@",
+ "/@5@tcp4@127.0.0.2@@@@@",
"/127.0.0.12:14141",
}
result, err := filterAndOrderServers(servers, []string{"foobar", "tcp4"}, ipnets)
@@ -103,14 +109,14 @@
// original ordering within each protocol, with protocols that
// are not in the default ordering list at the end.
want = []string{
- "/@2@tcp4@127.0.0.1@@@@@",
- "/@2@tcp4@127.0.0.2@@@@@",
- "/@2@tcp@127.0.0.3@@@@@",
- "/@2@tcp@127.0.0.4@@@@@",
- "/@2@tcp6@127.0.0.7@@@@@",
- "/@2@tcp6@127.0.0.8@@@@@",
- "/@2@foobar@127.0.0.10@@@@@",
- "/@2@foobar@127.0.0.11@@@@@",
+ "/@5@tcp4@127.0.0.1@@@@@",
+ "/@5@tcp4@127.0.0.2@@@@@",
+ "/@5@tcp@127.0.0.3@@@@@",
+ "/@5@tcp@127.0.0.4@@@@@",
+ "/@5@tcp6@127.0.0.7@@@@@",
+ "/@5@tcp6@127.0.0.8@@@@@",
+ "/@5@foobar@127.0.0.10@@@@@",
+ "/@5@foobar@127.0.0.11@@@@@",
"/127.0.0.12:14141",
}
if result, err = filterAndOrderServers(servers, nil, ipnets); err != nil {
@@ -129,12 +135,12 @@
// Just "tcp" implies tcp4 and tcp6 as well.
want = []string{
- "/@2@tcp@127.0.0.3@@@@@",
- "/@2@tcp@127.0.0.4@@@@@",
- "/@2@tcp4@127.0.0.1@@@@@",
- "/@2@tcp4@127.0.0.2@@@@@",
- "/@2@tcp6@127.0.0.7@@@@@",
- "/@2@tcp6@127.0.0.8@@@@@",
+ "/@5@tcp@127.0.0.3@@@@@",
+ "/@5@tcp@127.0.0.4@@@@@",
+ "/@5@tcp4@127.0.0.1@@@@@",
+ "/@5@tcp4@127.0.0.2@@@@@",
+ "/@5@tcp6@127.0.0.7@@@@@",
+ "/@5@tcp6@127.0.0.8@@@@@",
"/127.0.0.12:14141",
}
if result, err = filterAndOrderServers(servers, []string{"tcp"}, ipnets); err != nil {
@@ -146,14 +152,14 @@
// Ask for all protocols, with no ordering, except for locality
want = []string{
- "/@2@tcp@127.0.0.3@@@@@",
- "/@2@tcp@127.0.0.1@@@@@",
- "/@2@tcp@74.125.69.139@@@@@",
- "/@2@tcp@192.168.1.10@@@@@",
- "/@2@tcp@74.125.142.83@@@@@",
+ "/@5@tcp@127.0.0.3@@@@@",
+ "/@5@tcp@127.0.0.1@@@@@",
+ "/@5@tcp@74.125.69.139@@@@@",
+ "/@5@tcp@192.168.1.10@@@@@",
+ "/@5@tcp@74.125.142.83@@@@@",
"/127.0.0.12:14141",
- "/@2@foobar@127.0.0.10@@@@@",
- "/@2@foobar@127.0.0.11@@@@@",
+ "/@5@foobar@127.0.0.10@@@@@",
+ "/@5@foobar@127.0.0.11@@@@@",
}
servers = []naming.MountedServer{}
// naming.UnknownProtocol
@@ -188,11 +194,11 @@
t.Fatalf("unexpected error: %s", err)
}
want := []string{
- "/@2@tcp@127.0.0.3@@@@@",
- "/@2@tcp@127.0.0.1@@@@@",
- "/@2@tcp@74.125.69.139@@@@@",
- "/@2@tcp@192.168.1.10@@@@@",
- "/@2@tcp@74.125.142.83@@@@@",
+ "/@5@tcp@127.0.0.3@@@@@",
+ "/@5@tcp@127.0.0.1@@@@@",
+ "/@5@tcp@74.125.69.139@@@@@",
+ "/@5@tcp@192.168.1.10@@@@@",
+ "/@5@tcp@74.125.142.83@@@@@",
}
if got := servers2names(result); !reflect.DeepEqual(got, want) {
t.Errorf("got: %v, want %v", got, want)
@@ -206,16 +212,16 @@
t.Fatalf("unexpected error: %s", err)
}
want = []string{
- "/@2@ws@127.0.0.3:123@@@@@",
- "/@2@ws@127.0.0.1@@@@@",
- "/@2@ws@74.125.69.139@@@@@",
- "/@2@ws@192.168.1.10@@@@@",
- "/@2@ws@74.125.142.83@@@@@",
- "/@2@tcp@127.0.0.3@@@@@",
- "/@2@tcp@127.0.0.1@@@@@",
- "/@2@tcp@74.125.69.139@@@@@",
- "/@2@tcp@192.168.1.10@@@@@",
- "/@2@tcp@74.125.142.83@@@@@",
+ "/@5@ws@127.0.0.3:123@@@@@",
+ "/@5@ws@127.0.0.1@@@@@",
+ "/@5@ws@74.125.69.139@@@@@",
+ "/@5@ws@192.168.1.10@@@@@",
+ "/@5@ws@74.125.142.83@@@@@",
+ "/@5@tcp@127.0.0.3@@@@@",
+ "/@5@tcp@127.0.0.1@@@@@",
+ "/@5@tcp@74.125.69.139@@@@@",
+ "/@5@tcp@192.168.1.10@@@@@",
+ "/@5@tcp@74.125.142.83@@@@@",
}
if got := servers2names(result); !reflect.DeepEqual(got, want) {
t.Errorf("got: %v, want %v", got, want)
