Bugfixes

ceilometer

@@ -105,14 +105,17 @@ def getMeter(protocol, server, port, token_id, meter, resource_id):
     elif meter in ('network.incoming.bytes', 'network.outgoing.bytes'):
         url = "/v2/meters/%s?q.field=metadata.instance_id&q.op=eq&q.value=%s&limit=1" % (meter, resource_id)
     else:
-        return "Error: unknown meter!"
+        return "Sorry, Unknown Meter"
 
     if protocol == 'http':
         res_json = json.loads(api_request.httpGet(url, server, port, {"X-Auth-Token": token_id}).getData())
     else:
         res_json = json.loads(api_request.httpsGet(url, server, port, {"X-Auth-Token": token_id}).getData())
 
-    return res_json[0]['counter_volume']
+    if res_json:
+        return res_json[0]['counter_volume']
+    else:
+        return 'Sorry, Sample Not Found'
 
 def main():
     config_file_path = os.path.join(os.path.dirname(__file__), 'proxy.conf')