Add monitor APIs

Author: Sunight

qingcloud/iaas/connection.py

@@ -1793,3 +1793,60 @@ def modify_loadbalancer_backend_attributes(self, loadbalancer_backend,
             self.req_checker.check_lb_backend_weight(body['weight'])
 
         return self.send_request(action, body)
+
+    def get_monitoring_data(self, resource,
+                                  meters,
+                                  step,
+                                  start_time,
+                                  end_time,
+                                  **ignore):
+        """ Get resource monitoring data.
+
+            @param resource: the ID of resource, can be instance_id, volume_id, eip_id or router_id.
+            @param meters: list of metering types you want to get.
+                           If resource is instance, meter can be "cpu", "disk-os", "memory",
+                           "'disk-%s' % attached_volume_id", "'if-%s' % vxnet_mac_address".
+                           If resource is volume, meter should be "'disk-%s' % volume_id".
+                           If resource is eip, meter should be "traffic".
+                           If resource is router, meter should be "vxnet-0".
+            @param step: The metering time step, valid steps: "5m", "15m", "30m", "1h", "2h", "1d".
+            @param start_time: the starting time stamp. In the format YYYY-MM-DDThh:mm:ssZ.
+            @param end_time: the ending time stamp. In the format YYYY-MM-DDThh:mm:ssZ.
+        """
+        action = const.ACTION_GET_MONITOR
+        valid_keys = ['resource', 'meters', 'step', 'start_time', 'end_time']
+        body = filter_out_none(locals(), valid_keys)
+        if not self.req_checker.check_params(body,
+                required_params=['resource', 'meters', 'step', 'start_time', 'end_time'],
+                integer_params=[],
+                list_params=['meters']
+                ):
+            return None
+
+        return self.send_request(action, body)
+
+    def get_loadbalancer_monitoring_data(self, resource,
+                                               meters,
+                                               step,
+                                               start_time,
+                                               end_time,
+                                               **ignore):
+        """ Get load balancer monitoring data.
+
+            @param resource: the ID of resource, can be loadbalancer_id, listener_id or backend_id.
+            @param meters: list of metering types you want to get, valid values: request, traffic.
+            @param step: The metering time step, valid steps: "5m", "15m", "30m", "1h", "2h", "1d".
+            @param start_time: the starting time stamp. In the format YYYY-MM-DDThh:mm:ssZ.
+            @param end_time: the ending time stamp. In the format YYYY-MM-DDThh:mm:ssZ.
+        """
+        action = const.ACTION_GET_LOADBALANCER_MONITOR
+        valid_keys = ['resource', 'meters', 'step', 'start_time', 'end_time']
+        body = filter_out_none(locals(), valid_keys)
+        if not self.req_checker.check_params(body,
+                required_params=['resource', 'meters', 'step', 'start_time', 'end_time'],
+                integer_params=[],
+                list_params=['meters']
+                ):
+            return None
+
+        return self.send_request(action, body)

qingcloud/iaas/constants.py

@@ -114,6 +114,9 @@
 ACTION_MODIFY_LOADBALANCER_BACKEND_ATTRIBUTES = "ModifyLoadBalancerBackendAttributes"
 ACTION_DESCRIBE_LOADBALANCER_BACKENDS = "DescribeLoadBalancerBackends"
 
+# monitor
+ACTION_GET_MONITOR = "GetMonitor"
+ACTION_GET_LOADBALANCER_MONITOR = "GetLoadBalancerMonitor"
 
 ########## Constants for resource ##########
 

qingcloud/misc/utils.py

@@ -20,7 +20,8 @@
 import stat
 
 def save_private_key(file_name, private_key):
-    """ save ssh private key """
+    """ Save ssh private key
+    """
     if not save_file(file_name, private_key):
         return False
     os.chmod(file_name, stat.S_IREAD + stat.S_IWRITE)
@@ -39,9 +40,8 @@ def get_utf8_value(value):
         return value
 
 def filter_out_none(dictionary, keys=None):
-    """
-    Filter out items whose value is None.
-    If `keys` specified, only return non-None and key matched items.
+    """ Filter out items whose value is None.
+        If `keys` specified, only return non-None items with matched key.
     """
     ret = {}
     if keys is None:
@@ -57,16 +57,14 @@ def filter_out_none(dictionary, keys=None):
 ISO8601_MS = '%Y-%m-%dT%H:%M:%S.%fZ'
 
 def get_ts(ts=None):
-    """
-    Get formatted time
+    """ Get formatted time
     """
     if not ts:
         ts = time.gmtime()
     return time.strftime(ISO8601, ts)
 
 def parse_ts(ts):
-    """
-    Return as timestamp
+    """ Return as timestamp
     """
     ts = ts.strip()
     try: