commit 10c0e4fa4219b31334687894075a5c04f42a4813
author Jenkins <jenkins@review.openstack.org> Wed Dec 10 20:32:26 2014 +0000
committer Gerrit Code Review <review@openstack.org> Wed Dec 10 20:32:26 2014 +0000
tree c806e6bdbbdeedadf1fe74fc655aa710b60f0008
parent 02a73e9e7d37ee2b7e95d18b21d428f947bd8756
parent cf61121ac27f70ad7f66770f2d41d29328e161de

Merge "Skip test_update_router_admin_state for baremetal"

tempest/scenario/test_network_basic_ops.py

diff --git a/tempest/scenario/test_network_basic_ops.py b/tempest/scenario/test_network_basic_ops.py
index 98a059f..d24eb01 100644
--- a/tempest/scenario/test_network_basic_ops.py
+++ b/tempest/scenario/test_network_basic_ops.py
@@ -398,6 +398,9 @@
         self._hotplug_server()
         self._check_network_internal_connectivity(network=self.new_net)
 
+    @testtools.skipIf(CONF.baremetal.driver_enabled,
+                      'Router state cannot be altered on a shared baremetal '
+                      'network')
     @test.attr(type='smoke')
     @test.services('compute', 'network')
     def test_update_router_admin_state(self):