From 9b8f40833e99d765e91c874a1e3109ad27c7a461 Mon Sep 17 00:00:00 2001 From: Cong Phuoc Hoang Date: Tue, 5 Jun 2018 16:49:20 +0900 Subject: [PATCH] Disable unit tests for alarm monitoring features This patch will disable unit tests for alarm monitoring according to https://review.openstack.org/#/c/572050. After this patch is merged and Heat-translator is released, we will enable unit tests. Change-Id: I49fc28857a152879be0fdd9957ff5e4f2f640ac1 --- tacker/tests/unit/test_tosca_templates_under_samples.py | 8 +++++--- .../unit/vnfm/infra_drivers/openstack/test_openstack.py | 4 ++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/tacker/tests/unit/test_tosca_templates_under_samples.py b/tacker/tests/unit/test_tosca_templates_under_samples.py index 7241a84e6..9a08cd0b5 100644 --- a/tacker/tests/unit/test_tosca_templates_under_samples.py +++ b/tacker/tests/unit/test_tosca_templates_under_samples.py @@ -13,14 +13,14 @@ # under the License. import os - import testtools +import unittest + +from tacker.tosca import utils from toscaparser import tosca_template from toscaparser.utils import yamlparser from translator.hot import tosca_translator -from tacker.tosca import utils - class TestSamples(testtools.TestCase): """Sample tosca validation. @@ -82,9 +82,11 @@ class TestSamples(testtools.TestCase): def test_scale_sample(self, tosca_file=['tosca-vnfd-scale.yaml']): self._test_samples(tosca_file) + @unittest.skip("Skip and wait for releasing Heat Translator") def test_alarm_sample(self, tosca_file=['tosca-vnfd-alarm-scale.yaml']): self._test_samples(tosca_file) + @unittest.skip("Skip and wait for releasing Heat Translator") def test_list_samples(self, files=['tosca-vnfd-scale.yaml', 'tosca-vnfd-alarm-scale.yaml']): diff --git a/tacker/tests/unit/vnfm/infra_drivers/openstack/test_openstack.py b/tacker/tests/unit/vnfm/infra_drivers/openstack/test_openstack.py index 9f5d8804a..9057b4669 100644 --- a/tacker/tests/unit/vnfm/infra_drivers/openstack/test_openstack.py +++ b/tacker/tests/unit/vnfm/infra_drivers/openstack/test_openstack.py @@ -17,6 +17,7 @@ import codecs import json import mock import os +import unittest import yaml from tacker import context @@ -426,6 +427,7 @@ class TestOpenStack(base.TestCase): 'hot_tosca_mac_ip.yaml' ) + @unittest.skip("Skip and wait for releasing Heat Translator") def test_create_tosca_alarm_respawn(self): self._test_assert_equal_for_tosca_templates( 'tosca_alarm_respawn.yaml', @@ -433,6 +435,7 @@ class TestOpenStack(base.TestCase): is_monitor=False ) + @unittest.skip("Skip and wait for releasing Heat Translator") def test_create_tosca_alarm_scale(self): self._test_assert_equal_for_tosca_templates( 'tosca_alarm_scale.yaml', @@ -441,6 +444,7 @@ class TestOpenStack(base.TestCase): is_monitor=False ) + @unittest.skip("Skip and wait for releasing Heat Translator") def test_create_tosca_with_alarm_monitoring_not_matched(self): self.assertRaises(vnfm.MetadataNotMatched, self._test_assert_equal_for_tosca_templates,