Make changes in module ids:
We made changes in module id name is the source code
to align with service names. These changes in the
test script are to align with module id name changes.
Here are the changes in module id names:

-const string MODULE_CONTROL_NODE_NAME = "ControlNode"
-const string MODULE_VROUTER_AGENT_NAME = "VRouterAgent"
-const string MODULE_API_SERVER_NAME = "ApiServer"
-const string MODULE_SCHEMA_TRANSFORMER_NAME = "Schema"
-const string MODULE_OPSERVER_NAME = "OpServer"
-const string MODULE_COLLECTOR_NAME = "Collector"
-const string MODULE_QUERY_ENGINE_NAME = "QueryEngine"
-const string MODULE_SVC_MONITOR_NAME = "ServiceMonitor"
+const string MODULE_CONTROL_NODE_NAME = "Contrail-Control"
+const string MODULE_VROUTER_AGENT_NAME = "Contrail-Vrouter-Agent"
+const string MODULE_API_SERVER_NAME = "Contrail-Api"
+const string MODULE_SCHEMA_TRANSFORMER_NAME = "Contrail-Schema"
+const string MODULE_OPSERVER_NAME = "Contrail-Analytics-Api"
+const string MODULE_COLLECTOR_NAME = "Contrail-Collector"
+const string MODULE_QUERY_ENGINE_NAME = "Contrail-Query-Engine"
+const string MODULE_SVC_MONITOR_NAME = "Contrail-Svc-Monitor"
 const string MODULE_DNS_NAME = "DnsAgent"
-const string MODULE_DISCOVERY_SERVICE_NAME = "DiscoveryService"
+const string MODULE_DISCOVERY_SERVICE_NAME = "Contrail-Discovery"
Merge pull request #150 from bhushana/chandan_bug

Make changes in module ids