X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_mon%2Fcollector%2Fvnf_collectors%2Fopenstack.py;fp=osm_mon%2Fcollector%2Fvnf_collectors%2Fopenstack.py;h=2005ebe8bf6badee0abea1bf18412b9f388692b1;hb=649e6b264fb9e92103267dabd16ed9a3dbadb302;hp=da98cc6182783a103c9fc14ab2f9dea7b2ed3fba;hpb=197909586553113bb7e28124f96d4a239f5a94b2;p=osm%2FMON.git diff --git a/osm_mon/collector/vnf_collectors/openstack.py b/osm_mon/collector/vnf_collectors/openstack.py index da98cc6..2005ebe 100644 --- a/osm_mon/collector/vnf_collectors/openstack.py +++ b/osm_mon/collector/vnf_collectors/openstack.py @@ -123,13 +123,13 @@ 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) @@ -146,7 +146,7 @@ class OpenstackCollector(BaseVimCollector): start=start_date, resource_id=interface['id'], granularity=self.granularity) - if len(measures): + if measures: total_measure += measures[-1][2] except gnocchiclient.exceptions.NotFound as e: @@ -161,7 +161,7 @@ class OpenstackCollector(BaseVimCollector): start=start_date, resource_id=resource_id, granularity=self.granularity) - if len(measures): + if measures: metric = VnfMetric(nsr_id, vnf_member_index, vdur['name'], metric_name, measures[-1][2]) metrics.append(metric)