raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Reversed protocol scheme order in Addresses

Browse source
This commit is contained in:
drewhk 2013-01-24 04:28:21 -08:00 • committed by Endre Sándor Varga
parent b6ad46e88c
commit fe22c7515f
22 changed files with 127 additions and 127 deletions
Download patch file Download diff file Expand all files Collapse all files

48
akka-remote/src/test/scala/akka/remote/RemoteRouterSpec.scala
View file

@ -29,7 +29,7 @@ akka {
/blub {
router = round-robin
nr-of-instances = 2
target.nodes = ["tcp.akka://remote-sys@localhost:12347"]
target.nodes = ["akka.tcp://remote-sys@localhost:12347"]
}
/elastic-blub {
router = round-robin
@ -37,10 +37,10 @@ akka {
lower-bound = 2
upper-bound = 3
}
target.nodes = ["tcp.akka://remote-sys@localhost:12347"]
target.nodes = ["akka.tcp://remote-sys@localhost:12347"]
}
/remote-blub {
remote = "tcp.akka://remote-sys@localhost:12347"
remote = "akka.tcp://remote-sys@localhost:12347"
router = round-robin
nr-of-instances = 2
}
@ -48,12 +48,12 @@ akka {
remote = "akka://RemoteRouterSpec"
router = round-robin
nr-of-instances = 2
target.nodes = ["tcp.akka://remote-sys@localhost:12347"]
target.nodes = ["akka.tcp://remote-sys@localhost:12347"]
}
/local-blub2 {
router = round-robin
nr-of-instances = 4
target.nodes = ["tcp.akka://remote-sys@localhost:12347"]
target.nodes = ["akka.tcp://remote-sys@localhost:12347"]
}
}
}
@ -85,13 +85,13 @@ akka.actor.deployment {
val children = replies.toSet
children must have size 2
children.map(_.parent) must have size 1
children foreach (_.address.toString must be === "tcp.akka://remote-sys@localhost:12347")
children foreach (_.address.toString must be === "akka.tcp://remote-sys@localhost:12347")
system.stop(router)
}
"deploy its children on remote host driven by programatic definition" in {
val router = system.actorOf(Props[Echo].withRouter(new RemoteRouterConfig(RoundRobinRouter(2),
Seq(Address("tcp.akka", "remote-sys", "localhost", 12347)))), "blub2")
Seq(Address("akka.tcp", "remote-sys", "localhost", 12347)))), "blub2")
val replies = for (i ← 1 to 5) yield {
router ! ""
expectMsgType[ActorRef].path
@ -99,7 +99,7 @@ akka.actor.deployment {
val children = replies.toSet
children must have size 2
children.map(_.parent) must have size 1
children foreach (_.address.toString must be === "tcp.akka://remote-sys@localhost:12347")
children foreach (_.address.toString must be === "akka.tcp://remote-sys@localhost:12347")
system.stop(router)
}
@ -112,13 +112,13 @@ akka.actor.deployment {
val children = replies.toSet
children.size must be >= 2
children.map(_.parent) must have size 1
children foreach (_.address.toString must be === "tcp.akka://remote-sys@localhost:12347")
children foreach (_.address.toString must be === "akka.tcp://remote-sys@localhost:12347")
system.stop(router)
}
"deploy remote routers based on configuration" in {
val router = system.actorOf(Props[Echo].withRouter(FromConfig), "remote-blub")
router.path.address.toString must be("tcp.akka://remote-sys@localhost:12347")
router.path.address.toString must be("akka.tcp://remote-sys@localhost:12347")
val replies = for (i ← 1 to 5) yield {
router ! ""
expectMsgType[ActorRef].path
@ -128,14 +128,14 @@ akka.actor.deployment {
val parents = children.map(_.parent)
parents must have size 1
parents.head must be(router.path)
children foreach (_.address.toString must be === "tcp.akka://remote-sys@localhost:12347")
children foreach (_.address.toString must be === "akka.tcp://remote-sys@localhost:12347")
system.stop(router)
}
"deploy remote routers based on explicit deployment" in {
val router = system.actorOf(Props[Echo].withRouter(RoundRobinRouter(2))
.withDeploy(Deploy(scope = RemoteScope(AddressFromURIString("tcp.akka://remote-sys@localhost:12347")))), "remote-blub2")
router.path.address.toString must be("tcp.akka://remote-sys@localhost:12347")
.withDeploy(Deploy(scope = RemoteScope(AddressFromURIString("akka.tcp://remote-sys@localhost:12347")))), "remote-blub2")
router.path.address.toString must be("akka.tcp://remote-sys@localhost:12347")
val replies = for (i ← 1 to 5) yield {
router ! ""
expectMsgType[ActorRef].path
@ -145,13 +145,13 @@ akka.actor.deployment {
val parents = children.map(_.parent)
parents must have size 1
parents.head must be(router.path)
children foreach (_.address.toString must be === "tcp.akka://remote-sys@localhost:12347")
children foreach (_.address.toString must be === "akka.tcp://remote-sys@localhost:12347")
system.stop(router)
}
"let remote deployment be overridden by local configuration" in {
val router = system.actorOf(Props[Echo].withRouter(RoundRobinRouter(2))
.withDeploy(Deploy(scope = RemoteScope(AddressFromURIString("tcp.akka://remote-sys@localhost:12347")))), "local-blub")
.withDeploy(Deploy(scope = RemoteScope(AddressFromURIString("akka.tcp://remote-sys@localhost:12347")))), "local-blub")
router.path.address.toString must be("akka://RemoteRouterSpec")
val replies = for (i ← 1 to 5) yield {
router ! ""
@ -161,15 +161,15 @@ akka.actor.deployment {
children must have size 2
val parents = children.map(_.parent)
parents must have size 1
parents.head.address must be(Address("tcp.akka", "remote-sys", "localhost", 12347))
children foreach (_.address.toString must be === "tcp.akka://remote-sys@localhost:12347")
parents.head.address must be(Address("akka.tcp", "remote-sys", "localhost", 12347))
children foreach (_.address.toString must be === "akka.tcp://remote-sys@localhost:12347")
system.stop(router)
}
"let remote deployment router be overridden by local configuration" in {
val router = system.actorOf(Props[Echo].withRouter(RoundRobinRouter(2))
.withDeploy(Deploy(scope = RemoteScope(AddressFromURIString("tcp.akka://remote-sys@localhost:12347")))), "local-blub2")
router.path.address.toString must be("tcp.akka://remote-sys@localhost:12347")
.withDeploy(Deploy(scope = RemoteScope(AddressFromURIString("akka.tcp://remote-sys@localhost:12347")))), "local-blub2")
router.path.address.toString must be("akka.tcp://remote-sys@localhost:12347")
val replies = for (i ← 1 to 5) yield {
router ! ""
expectMsgType[ActorRef].path
@ -179,14 +179,14 @@ akka.actor.deployment {
val parents = children.map(_.parent)
parents must have size 1
parents.head must be(router.path)
children foreach (_.address.toString must be === "tcp.akka://remote-sys@localhost:12347")
children foreach (_.address.toString must be === "akka.tcp://remote-sys@localhost:12347")
system.stop(router)
}
"let remote deployment be overridden by remote configuration" in {
val router = system.actorOf(Props[Echo].withRouter(RoundRobinRouter(2))
.withDeploy(Deploy(scope = RemoteScope(AddressFromURIString("tcp.akka://remote-sys@localhost:12347")))), "remote-override")
router.path.address.toString must be("tcp.akka://remote-sys@localhost:12347")
.withDeploy(Deploy(scope = RemoteScope(AddressFromURIString("akka.tcp://remote-sys@localhost:12347")))), "remote-override")
router.path.address.toString must be("akka.tcp://remote-sys@localhost:12347")
val replies = for (i ← 1 to 5) yield {
router ! ""
expectMsgType[ActorRef].path
@ -196,7 +196,7 @@ akka.actor.deployment {
val parents = children.map(_.parent)
parents must have size 1
parents.head must be(router.path)
children foreach (_.address.toString must be === "tcp.akka://remote-sys@localhost:12347")
children foreach (_.address.toString must be === "akka.tcp://remote-sys@localhost:12347")
system.stop(router)
}
@ -206,7 +206,7 @@ akka.actor.deployment {
}
val router = system.actorOf(Props.empty.withRouter(new RemoteRouterConfig(
RoundRobinRouter(1, supervisorStrategy = escalator),
Seq(Address("tcp.akka", "remote-sys", "localhost", 12347)))), "blub3")
Seq(Address("akka.tcp", "remote-sys", "localhost", 12347)))), "blub3")
router ! CurrentRoutees
EventFilter[ActorKilledException](occurrences = 1) intercept {