X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_mon%2Ftest%2Fcollector%2Ftest_collector.py;h=2a5491fa009c6f1766186ee5a56da39f9559c0d5;hb=987f8f62bf405ac78a4a1ea3f6e634c686119e05;hp=84905b7441be644f4ba6fa7f6fe5bd98bd04750e;hpb=91b1018e1c84758bbc47394f50d04fe3ee81d812;p=osm%2FMON.git

diff --git a/osm_mon/test/collector/test_collector.py b/osm_mon/test/collector/test_collector.py
index 84905b7..2a5491f 100644
--- a/osm_mon/test/collector/test_collector.py
+++ b/osm_mon/test/collector/test_collector.py
@@ -23,8 +23,7 @@
 import asyncio
 import random
 import unittest
-
-from mock import mock
+from unittest import mock
 
 from osm_mon.collector.collector import MonCollector
 
@@ -35,12 +34,6 @@ class MonCollectorTest(unittest.TestCase):
         self.loop = asyncio.new_event_loop()
         asyncio.set_event_loop(None)
 
-    def test_generate_vca_vdu_name(self):
-        vdur_name = 'test-juju-metrics01-1-ubuntuvdu1-1'
-        expected = 'test-juju-metricsab-b-ubuntuvdub'
-        result = self.loop.run_until_complete(MonCollector._generate_vca_vdu_name(vdur_name))
-        self.assertEqual(result, expected)
-
     @mock.patch.object(random, 'randint')
     def test_generate_read_metric_payload(self, randint):
         randint.return_value = 1
@@ -57,6 +50,5 @@ class MonCollectorTest(unittest.TestCase):
             'collection_period': 1,
             'collection_unit': 'DAY',
         }
-        result = self.loop.run_until_complete(
-            MonCollector._generate_read_metric_payload(metric_name, nsr_id, vdu_name, vnf_member_index))
+        result = MonCollector._generate_read_metric_payload(metric_name, nsr_id, vdu_name, vnf_member_index)
         self.assertEqual(result, expected_payload)