Disable sanity OSTF tests without Resource API or Event API
Change-Id: I4a5bace408d5b4d6c4c8d7f85e442846de2aec1a
This commit is contained in:
		@@ -49,7 +49,8 @@ class TestOpenstackTelemetry(api.ToolchainApi):
 | 
			
		||||
    def _deploy_telemetry_plugin(self, caller, advanced_options=None,
 | 
			
		||||
                                 additional_tests=None,
 | 
			
		||||
                                 additional_plugins=None, roles=None,
 | 
			
		||||
                                 settings=None, test_sets=None):
 | 
			
		||||
                                 settings=None, test_sets=None,
 | 
			
		||||
                                 check_services=True):
 | 
			
		||||
        self.check_run(caller)
 | 
			
		||||
        self.env.revert_snapshot("ready_with_5_slaves")
 | 
			
		||||
        self.add_plugin(self.OPENSTACK_TELEMETRY)
 | 
			
		||||
@@ -69,7 +70,8 @@ class TestOpenstackTelemetry(api.ToolchainApi):
 | 
			
		||||
            "slave-04": ["compute", "cinder"],
 | 
			
		||||
            "slave-05": ["elasticsearch_kibana", "influxdb_grafana"]
 | 
			
		||||
        } if not roles else roles
 | 
			
		||||
        self.helpers.deploy_cluster(nodes_roles=node_roles)
 | 
			
		||||
        self.helpers.deploy_cluster(nodes_roles=node_roles,
 | 
			
		||||
                                    check_services=check_services)
 | 
			
		||||
        self.check_plugins_online()
 | 
			
		||||
        self.helpers.run_ostf(test_sets=test_sets)
 | 
			
		||||
        self.OPENSTACK_TELEMETRY.check_ceilometer_sample_functionality()
 | 
			
		||||
@@ -417,7 +419,8 @@ class TestOpenstackTelemetry(api.ToolchainApi):
 | 
			
		||||
        self._deploy_telemetry_plugin("deploy_telemetry_ceilometer_core",
 | 
			
		||||
                                      roles=self.ceilometer_core_roles,
 | 
			
		||||
                                      settings=settings,
 | 
			
		||||
                                      test_sets=test_sets)
 | 
			
		||||
                                      test_sets=test_sets,
 | 
			
		||||
                                      check_services=False)
 | 
			
		||||
 | 
			
		||||
    @test(depends_on_groups=["prepare_slaves_5"],
 | 
			
		||||
          groups=["deploy_telemetry_ceilometer_core_resource_api", "deploy",
 | 
			
		||||
@@ -464,7 +467,7 @@ class TestOpenstackTelemetry(api.ToolchainApi):
 | 
			
		||||
            advanced_options=options,
 | 
			
		||||
            additional_tests=additional_tests,
 | 
			
		||||
            roles=self.ceilometer_core_roles, settings=settings,
 | 
			
		||||
            test_sets=test_sets)
 | 
			
		||||
            test_sets=test_sets, check_services=False)
 | 
			
		||||
 | 
			
		||||
    @test(depends_on_groups=["prepare_slaves_5"],
 | 
			
		||||
          groups=["deploy_telemetry_ceilometer_core_event_api", "deploy",
 | 
			
		||||
@@ -511,7 +514,7 @@ class TestOpenstackTelemetry(api.ToolchainApi):
 | 
			
		||||
            advanced_options=options,
 | 
			
		||||
            additional_tests=additional_tests,
 | 
			
		||||
            roles=self.ceilometer_core_roles, settings=settings,
 | 
			
		||||
            test_sets=test_sets)
 | 
			
		||||
            test_sets=test_sets, check_services=False)
 | 
			
		||||
 | 
			
		||||
    @test(depends_on_groups=["prepare_slaves_5"],
 | 
			
		||||
          groups=["deploy_telemetry_ceilometer_core_resource_event_api",
 | 
			
		||||
@@ -592,7 +595,8 @@ class TestOpenstackTelemetry(api.ToolchainApi):
 | 
			
		||||
                                      additional_plugins=self.KAFKA,
 | 
			
		||||
                                      roles=self.ceilometer_core_kafka_roles,
 | 
			
		||||
                                      settings=settings,
 | 
			
		||||
                                      test_sets=test_sets)
 | 
			
		||||
                                      test_sets=test_sets,
 | 
			
		||||
                                      check_services=False)
 | 
			
		||||
 | 
			
		||||
    @test(depends_on_groups=["prepare_slaves_5"],
 | 
			
		||||
          groups=["deploy_telemetry_ceilometer_core_kafka_resource_api",
 | 
			
		||||
@@ -640,7 +644,7 @@ class TestOpenstackTelemetry(api.ToolchainApi):
 | 
			
		||||
            additional_tests=additional_tests,
 | 
			
		||||
            additional_plugins=self.KAFKA,
 | 
			
		||||
            roles=self.ceilometer_core_kafka_roles, settings=settings,
 | 
			
		||||
            test_sets=test_sets)
 | 
			
		||||
            test_sets=test_sets, check_services=False)
 | 
			
		||||
 | 
			
		||||
    @test(depends_on_groups=["prepare_slaves_5"],
 | 
			
		||||
          groups=["deploy_telemetry_ceilometer_core_kafka_event_api", "deploy",
 | 
			
		||||
@@ -688,7 +692,7 @@ class TestOpenstackTelemetry(api.ToolchainApi):
 | 
			
		||||
            additional_tests=additional_tests,
 | 
			
		||||
            additional_plugins=self.KAFKA,
 | 
			
		||||
            roles=self.ceilometer_core_kafka_roles, settings=settings,
 | 
			
		||||
            test_sets=test_sets)
 | 
			
		||||
            test_sets=test_sets, check_services=False)
 | 
			
		||||
 | 
			
		||||
    @test(depends_on_groups=["prepare_slaves_5"],
 | 
			
		||||
          groups=["deploy_telemetry_ceilometer_core_kafka_resource_event_api",
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user