fix server tests, add tags to mock JSON responses

Author: Elias Nygren

test/json_data/server.json

@@ -8,7 +8,12 @@
 				"hostname" : "fi.example.com",
 				"memory_amount" : "512",
 				"uuid" : "00798b85-efdc-41ca-8021-f6ef457b8531",
-				"state" : "started"
+				"state" : "started",
+				"tags": {
+					"tag": [
+						"web1"
+					]
+				}
 			},
 			{
 				"zone" : "uk-lon1",
@@ -17,8 +22,13 @@
 				"hostname" : "uk.example.com",
 				"memory_amount" : "512",
 				"uuid" : "009d64ef-31d1-4684-a26b-c86c955cbf46",
-				"state" : "stopped"
+				"state" : "stopped",
+				"tags": {
+					"tag": [
+						"web2"
+					]
+				}
 			}
 		]
 	}
-}
+}

test/json_data/server_00798b85-efdc-41ca-8021-f6ef457b8531.json

@@ -31,6 +31,11 @@
 				}
 			]
 		},
+		"tags": {
+			"tag": [
+				"web1"
+			]
+		},
 		"timezone" : "UTC",
 		"title" : "Helsinki server",
 		"uuid" : "00798b85-efdc-41ca-8021-f6ef457b8531",
@@ -41,4 +46,4 @@
 		"vnc_port" : "00000",
 		"zone" : "fi-hel1"
 	}
-}
+}

test/json_data/server_009d64ef-31d1-4684-a26b-c86c955cbf46.json

@@ -31,6 +31,11 @@
 				}
 			]
 		},
+		"tags": {
+			"tag": [
+				"web2"
+			]
+		},
 		"timezone" : "UTC",
 		"title" : "London server",
 		"uuid" : "009d64ef-31d1-4684-a26b-c86c955cbf46",
@@ -41,4 +46,4 @@
 		"vnc_port" : "00000",
 		"zone" : "uk-lon1"
 	}
-}
+}