Multiple changes to the test framework. Interim commit
to avoid losing code if my VM crashes

Change-Id: I5f03db81851dba1fb0c944c8e5f3a845ddbec2c8
diff --git a/tests/afrouter/suites/test1.json b/tests/afrouter/suites/test1.json
index a6791a0..9e749ac 100644
--- a/tests/afrouter/suites/test1.json
+++ b/tests/afrouter/suites/test1.json
@@ -60,7 +60,8 @@
 				"method":"CreateDevice",
 				"param":"{Type:\"simulated_olt\"}",
 				"expect":"{Id:\"abcd1234\",Type:\"simulated_olt\"}",
-				"_meta":""
+				"_meta":"",
+				"_expectMeta":""
 			},
 			"servers": [
 				{
@@ -90,7 +91,8 @@
 				"method":"GetDevice",
 				"param":"{Id:\"abcd1234\"}",
 				"expect":"{Id:\"abcd1234\",Type:\"simulated_olt\"}",
-				"_meta":""
+				"_meta":"",
+				"_expectMeta":""
 			},
 			"servers": [
 				{
@@ -98,7 +100,7 @@
 					"meta": [
 						{
 							"key":"voltha_serial_number",
-							"value":"0"
+							"value":"1"
 						}
 					]
 				},
@@ -107,7 +109,43 @@
 					"meta": [
 						{
 							"key":"voltha_serial_number",
-							"value":"0"
+							"value":"1"
+						}
+					]
+				}
+			]
+		},
+		{
+			"name":"Test Subscribe",
+			"send": {
+				"client":"client",
+				"method":"Subscribe",
+				"param":"{OfagentId:\"Agent007\"}",
+				"meta": [
+					{
+						"key":"voltha_backend_name",
+						"value":""
+					}
+				],
+				"expect":"{OfagentId:\"Agent007\",VolthaId:\"core11\"}",
+				"expectMeta": [
+					{
+						"key":"voltha_backend_name",
+						"value":"vcore1"
+					}
+				]
+			},
+			"servers": [
+				{
+					"name":"core11",
+					"meta": [
+						{
+							"key":"voltha_serial_number",
+							"value":"2"
+						},
+						{
+							"key":"voltha_backend_name",
+							"value":""
 						}
 					]
 				}