Merge "Vitrage ID and vertex id will be standard openstack uuid from now on - fixed"

vitrage_tempest_tests/tests/api/event/test_events.py

@@ -19,6 +19,8 @@ from datetime import datetime
 from oslo_log import log as logging
 from oslotest import base
 
+import unittest
+
 from vitrage.common.constants import EntityCategory
 from vitrage.common.constants import EventProperties as EventProps
 from vitrage.common.constants import VertexProperties as VProps
@@ -39,22 +41,40 @@ class TestEvents(base.BaseTestCase):
         cls.vitrage_client = \
             v_client.Client('1', session=keystone_client.get_session(cls.conf))
 
-    def test_send_doctor_event(self):
+    def test_send_doctor_event_with_resource_id(self):
         """Sending an event in Doctor format should result in an alarm"""
+        details = {
+            'hostname': 'host123',
+            'source': 'sample_monitor',
+            'cause': 'another alarm',
+            'severity': 'critical',
+            'status': 'down',
+            'monitor_id': 'sample monitor',
+            'resource_id': 'host123',
+            'monitor_event_id': '456',
+        }
+        self._test_send_doctor_event(details)
+
+    @unittest.skip("testing skipping")
+    def test_send_doctor_event_without_resource_id(self):
+        """Sending an event in Doctor format should result in an alarm"""
+        details = {
+            'hostname': 'host123',
+            'source': 'sample_monitor',
+            'cause': 'another alarm',
+            'severity': 'critical',
+            'status': 'down',
+            'monitor_id': 'sample monitor',
+            'monitor_event_id': '456',
+        }
+        self._test_send_doctor_event(details)
+
+    def _test_send_doctor_event(self, details):
         try:
             # post an event to the message bus
             event_time = datetime.now()
             event_time_iso = event_time.isoformat()
             event_type = 'compute.host.down'
-            details = {
-                'hostname': 'host123',
-                'source': 'sample_monitor',
-                'cause': 'another alarm',
-                'severity': 'critical',
-                'status': 'down',
-                'monitor_id': 'sample monitor',
-                'monitor_event_id': '456',
-            }
 
             self.vitrage_client.event.post(event_time_iso, event_type, details)
 
@@ -67,12 +87,15 @@ class TestEvents(base.BaseTestCase):
             alarm = api_alarms[0]
             event_time_tz = six.u(event_time.strftime('%Y-%m-%dT%H:%M:%SZ'))
             self._check_alarm(alarm, event_time_tz, event_type, details)
+            event_time = datetime.now()
+            event_time_iso = event_time.isoformat()
+            details['status'] = 'up'
+            self.vitrage_client.event.post(event_time_iso, event_type, details)
 
         except Exception as e:
             LOG.exception(e)
             raise
         finally:
-            # do what?
             LOG.warning('done')
 
     def _check_alarms(self):

vitrage_tempest_tests/tests/api/topology/base.py

@@ -29,8 +29,7 @@ class BaseTopologyTest(BaseApiTest):
     def _rollback_to_default(self):
         self._delete_entities()
         api_graph = self.vitrage_client.topology.get(
-            limit=4,
-            root='RESOURCE:openstack.cluster:OpenStack Cluster',
+            root=None,
             all_tenants=True)
         graph = self._create_graph_from_graph_dictionary(api_graph)
         entities = self._entities_validation_data()

vitrage_tempest_tests/tests/api/topology/test_topology.py

@@ -31,6 +31,7 @@ NOVA_QUERY = '{"and": [{"==": {"category": "RESOURCE"}},' \
              '{"==": {"type": "nova.instance"}},' \
              '{"==": {"type": "nova.host"}},' \
              '{"==": {"type": "nova.zone"}}]}]}'
+CLUSTER_VERTEX_ID = 'RESOURCE:openstack.cluster:OpenStack Cluster'
 
 
 class TestTopology(BaseTopologyTest):
@@ -277,7 +278,7 @@ class TestTopology(BaseTopologyTest):
             # Calculate expected results
             api_graph = self.vitrage_client.topology.get(
                 limit=2,
-                root='RESOURCE:openstack.cluster:OpenStack Cluster',
+                root=CLUSTER_VERTEX_ID,
                 all_tenants=True)
             graph = self._create_graph_from_graph_dictionary(api_graph)
             entities = self._entities_validation_data(
@@ -310,7 +311,7 @@ class TestTopology(BaseTopologyTest):
             # Calculate expected results
             api_graph = self.vitrage_client.topology.get(
                 limit=3,
-                root='RESOURCE:openstack.cluster:OpenStack Cluster',
+                root=CLUSTER_VERTEX_ID,
                 all_tenants=True)
             graph = self._create_graph_from_graph_dictionary(api_graph)
             entities = self._entities_validation_data(
@@ -348,14 +349,13 @@ class TestTopology(BaseTopologyTest):
             # Calculate expected results
             self.vitrage_client.topology.get(
                 limit=2,
-                root='RESOURCE:openstack.cluster:OpenStack Cluster',
+                root=None,
                 all_tenants=True)
         except ClientException as e:
             self.assertEqual(403, e.code)
             self.assertEqual(
-                str(e),
+                str(e.message),
                 "Graph-type 'graph' requires a 'root' with 'depth'")
-            raise
         finally:
             self._rollback_to_default()