sync tempest

Change-Id: I5bafa207fdfdd07f3601e924764ee93c08512bf4

vitrage_tempest_tests/add_legacy_dir_templates.py

@@ -34,5 +34,6 @@ def main():
         full_path = resources_path + f
         TestConfiguration.add_templates(full_path)
 
+
 if __name__ == "__main__":
     sys.exit(main())

vitrage_tempest_tests/tests/datasources/test_heat_stack.py

@@ -16,6 +16,8 @@ from oslo_log import log as logging
 from vitrage_tempest_tests.tests import utils
 
 from vitrage_tempest_tests.tests.api.topology.base import BaseTopologyTest
+from vitrage_tempest_tests.tests.common.general_utils\
+    import tempest_resources_dir
 from vitrage_tempest_tests.tests.common import heat_utils
 
 LOG = logging.getLogger(__name__)
@@ -36,21 +38,19 @@ class TestHeatStack(BaseTopologyTest):
 
     @utils.tempest_logger
     def test_nested_heat_stack(self):
-        self._test_heat_stack(
-            nested=True,
-            template_file='/etc/vitrage/heat_nested_template.yaml')
+        self._test_heat_stack(nested=True,
+                              tmpl_file='heat_nested_template.yaml')
 
     @utils.tempest_logger
     def test_heat_stack(self):
-        self._test_heat_stack(
-            nested=False, template_file='/etc/vitrage/heat_template.yaml')
+        self._test_heat_stack(nested=False, tmpl_file='heat_template.yaml')
 
-    def _test_heat_stack(self, nested, template_file):
+    def _test_heat_stack(self, nested, tmpl_file):
         """heat stack test
 
         This test validate correctness topology graph with heat stack module
         """
-
+        template_file = tempest_resources_dir() + '/heat/' + tmpl_file
         try:
             # Action
             heat_utils.create_stacks(self.NUM_STACKS, nested, template_file)

vitrage_tempest_tests/tests/datasources/test_static_physical.py

@@ -18,6 +18,8 @@ import time
 
 from oslo_log import log as logging
 from vitrage_tempest_tests.tests.base import BaseVitrageTempest
+from vitrage_tempest_tests.tests.common.general_utils \
+    import tempest_resources_dir
 from vitrage_tempest_tests.tests import utils
 
 LOG = logging.getLogger(__name__)
@@ -71,7 +73,8 @@ class TestStaticPhysical(BaseVitrageTempest):
         hostname = socket.gethostname()
 
         # template file
-        file_path = '/etc/vitrage/static_physical_configuration.yaml'
+        resources_path = tempest_resources_dir() + '/static_physical/'
+        file_path = resources_path + '/static_physical_configuration.yaml'
         with open(file_path, 'r') as f:
             template_data = f.read()
         template_data = template_data.replace('tmp-devstack', hostname)

vitrage_tempest_tests/tests/e2e/test_e2e_webhook.py

@@ -85,6 +85,7 @@ class TestWebhook(TestActionsBase):
             self._trigger_undo_action(TRIGGER_ALARM_1)
             self.mock_server.reset_requests_list()
 
+    @utils.tempest_logger
     def test_webhook_with_no_filter(self):
         """Test to see that a webhook with no filter receives all
 
@@ -119,6 +120,7 @@ class TestWebhook(TestActionsBase):
             self._trigger_undo_action(TRIGGER_ALARM_2)
             self.mock_server.reset_requests_list()
 
+    @utils.tempest_logger
     def test_webhook_with_no_match(self):
         """Test to check that filters with no match do not send event """
 
@@ -150,6 +152,7 @@ class TestWebhook(TestActionsBase):
             self._trigger_undo_action(TRIGGER_ALARM_2)
             self.mock_server.reset_requests_list()
 
+    @utils.tempest_logger
     def test_multiple_webhooks(self):
         """Test to check filter by type and by ID (with 2 different
 

vitrage_tempest_tests/tests/resources/heat/heat_nested_template.yaml

@@ -9,4 +9,4 @@ resources:
     properties:
       count: 1
       resource_def:
-        type: file:///etc/vitrage/server.yaml
+        type: server.yaml

vitrage_tempest_tests/tests/resources/templates/api/host_high_memory_usage_scenarios.yaml

@@ -64,8 +64,8 @@ scenarios:
          state: SUBOPTIMAL
  - scenario:
     condition: lack_of_available_memory_alarm_on_host
-    actions: 
-     - action: 
+    actions:
+     - action:
         action_type: set_state
         action_target:
          target: host