Updates to the affinity router test framework as
well as bug fixes to the affinity router found by
the test framework.
Change-Id: I90e6baa9e9ee11bd8034498b8651e9e14512e528
diff --git a/tests/afrouter/suites/test1.json b/tests/afrouter/suites/test1.json
index 9e749ac..77cc0ec 100644
--- a/tests/afrouter/suites/test1.json
+++ b/tests/afrouter/suites/test1.json
@@ -1,16 +1,26 @@
{
"environment":{
- "cmdLine":"afrouter -config arouter_test.json",
+ "cmdLine":"afrouter -logLevel 1 -config arouter_test.json",
"protoFiles": [
{
"importPath":"github.com/opencord/voltha-go/protos/",
"service":"VolthaService",
"package":"voltha"
+ },
+ {
+ "importPath":"github.com/opencord/voltha-go/protos/",
+ "service":"Configuration",
+ "package":"afrouter"
+ }
+ ],
+ "Junk": [
+ {
+ "importPath":"github.com/opencord/voltha-go/protos/",
+ "service":"Configuration",
+ "package":"afrouter"
}
],
"imports": [
- "github.com/golang/protobuf/ptypes/empty",
- "github.com/opencord/voltha-go/protos/openflow_13"
],
"protoDesc":"voltha.pb",
"protoSubst": [
@@ -19,13 +29,28 @@
"to":"empty.Empty"
}
],
- "clients": [
- {
- "name":"client",
- "port":"5000"
- }
- ],
- "servers": [
+ "clients": {
+ "imports": [
+ "github.com/golang/protobuf/ptypes/empty",
+ "github.com/opencord/voltha-go/protos/openflow_13"
+ ],
+ "endpoints": [
+ {
+ "name":"client",
+ "port":"5000"
+ },
+ {
+ "name":"stats",
+ "port":"55554"
+ }
+ ]
+ },
+ "servers": {
+ "imports": [
+ "github.com/golang/protobuf/ptypes/empty",
+ "github.com/opencord/voltha-go/protos/openflow_13"
+ ],
+ "endpoints": [
{
"name":"core11",
"port":"5011"
@@ -49,8 +74,21 @@
{
"name":"core32",
"port":"5032"
+ },
+ {
+ "name":"roCore1",
+ "port":"5001"
+ },
+ {
+ "name":"roCore2",
+ "port":"5002"
+ },
+ {
+ "name":"roCore3",
+ "port":"5003"
}
- ]
+ ]
+ }
},
"tests":[
{
@@ -150,6 +188,19 @@
]
}
]
+ },
+ {
+ "name":"Get goroutine count",
+ "infoOnly":true,
+ "send": {
+ "client":"stats",
+ "method":"GetGoroutineCount",
+ "param":"{}",
+ "meta": [ ],
+ "expect":"{Count:39}",
+ "expectMeta": [ ]
+ },
+ "servers": [ ]
}
]
}