X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_mon%2Fcollector%2Fvnf_collectors%2Fopenstack.py;h=2005ebe8bf6badee0abea1bf18412b9f388692b1;hb=649e6b264fb9e92103267dabd16ed9a3dbadb302;hp=33d6299bc476b2fe4c6cd79e78cdec769cca0048;hpb=2bdf4023aa0e0c4d61af6af969fb8c90522e2fe0;p=osm%2FMON.git

diff --git a/osm_mon/collector/vnf_collectors/openstack.py b/osm_mon/collector/vnf_collectors/openstack.py
index 33d6299..2005ebe 100644
--- a/osm_mon/collector/vnf_collectors/openstack.py
+++ b/osm_mon/collector/vnf_collectors/openstack.py
@@ -42,16 +42,19 @@ log = logging.getLogger(__name__)
 
 METRIC_MAPPINGS = {
     "average_memory_utilization": "memory.usage",
-    "disk_read_ops": "disk.read.requests",
-    "disk_write_ops": "disk.write.requests",
-    "disk_read_bytes": "disk.read.bytes",
-    "disk_write_bytes": "disk.write.bytes",
-    "packets_dropped": "interface.if_dropped",
-    "packets_received": "interface.if_packets",
-    "packets_sent": "interface.if_packets",
+    "disk_read_ops": "disk.read.requests.rate",
+    "disk_write_ops": "disk.write.requests.rate",
+    "disk_read_bytes": "disk.read.bytes.rate",
+    "disk_write_bytes": "disk.write.bytes.rate",
+    "packets_in_dropped": "network.outgoing.packets.drop",
+    "packets_out_dropped": "network.incoming.packets.drop",
+    "packets_received": "network.incoming.packets.rate",
+    "packets_sent": "network.outgoing.packets.rate",
     "cpu_utilization": "cpu_util",
 }
 
+INTERFACE_METRICS = ['packets_in_dropped', 'packets_out_dropped', 'packets_received', 'packets_sent']
+
 
 class OpenstackCollector(BaseVimCollector):
     def __init__(self, config: Config, vim_account_id: str):
@@ -120,30 +123,52 @@ class OpenstackCollector(BaseVimCollector):
                     except ValueError:
                         log.warning(
                             "Could not find resource_uuid for vdur %s, vnf_member_index %s, nsr_id %s. "
-                            "Was it recently deleted?".format(
-                                vdur['name'], vnf_member_index, nsr_id))
+                            "Was it recently deleted?",
+                            vdur['name'], vnf_member_index, nsr_id)
                         continue
                     if self.backend == 'ceilometer':
                         measures = self.client.samples.list(meter_name=openstack_metric_name, limit=1, q=[
                             {'field': 'resource_id', 'op': 'eq', 'value': resource_id}])
-                        if len(measures):
+                        if measures:
                             metric = VnfMetric(nsr_id, vnf_member_index, vdur['name'], metric_name,
                                                measures[0].counter_volume)
                             metrics.append(metric)
                     elif self.backend == 'gnocchi':
                         delta = 10 * self.granularity
                         start_date = datetime.datetime.now() - datetime.timedelta(seconds=delta)
-                        try:
-                            measures = self.client.metric.get_measures(openstack_metric_name,
-                                                                       start=start_date,
-                                                                       resource_id=resource_id,
-                                                                       granularity=self.granularity)
-                            if len(measures):
-                                metric = VnfMetric(nsr_id, vnf_member_index, vdur['name'], metric_name, measures[-1][2])
-                                metrics.append(metric)
-                        except gnocchiclient.exceptions.NotFound as e:
-                            log.debug("No metric found: %s", e)
-                            pass
+                        if metric_name in INTERFACE_METRICS:
+                            total_measure = 0.0
+                            interfaces = self.client.resource.search(resource_type='instance_network_interface',
+                                                                     query={'=': {'instance_id': resource_id}})
+                            for interface in interfaces:
+                                try:
+                                    measures = self.client.metric.get_measures(openstack_metric_name,
+                                                                               start=start_date,
+                                                                               resource_id=interface['id'],
+                                                                               granularity=self.granularity)
+                                    if measures:
+                                        total_measure += measures[-1][2]
+
+                                except gnocchiclient.exceptions.NotFound as e:
+                                    log.debug("No metric %s found for interface %s: %s", openstack_metric_name,
+                                              interface['id'], e)
+                            metric = VnfMetric(nsr_id, vnf_member_index, vdur['name'], metric_name,
+                                               total_measure)
+                            metrics.append(metric)
+                        else:
+                            try:
+                                measures = self.client.metric.get_measures(openstack_metric_name,
+                                                                           start=start_date,
+                                                                           resource_id=resource_id,
+                                                                           granularity=self.granularity)
+                                if measures:
+                                    metric = VnfMetric(nsr_id, vnf_member_index, vdur['name'], metric_name,
+                                                       measures[-1][2])
+                                    metrics.append(metric)
+                            except gnocchiclient.exceptions.NotFound as e:
+                                log.debug("No metric %s found for instance %s: %s", openstack_metric_name, resource_id,
+                                          e)
+
                     else:
                         raise Exception('Unknown metric backend: %s', self.backend)
         return metrics