Re-enabling fixed test cases

Girish Shilamkar · Girish Shilamkar · commit 83f2bb5ac70f · 2014-06-25T18:02:04.000+05:30
Conflicts:

	test/integration/smoke/test_scale_vm.py
diff --git a/test/integration/smoke/test_guest_vlan_range.py b/test/integration/smoke/test_guest_vlan_range.py
@@ -78,7 +78,7 @@ def tearDown(self):
             raise Exception("Warning: Exception during cleanup : %s" % e)
         return
 
-    @attr(tags=["advanced", "guestvlanrange", "dedicate", "release"], BugId="CLOUDSTACK-6738", required_hardware="false")
+    @attr(tags=["advanced", "guestvlanrange", "dedicate", "release"], required_hardware="false")
     def test_dedicateGuestVlanRange(self):
         """Test guest vlan range dedication
         """
diff --git a/test/integration/smoke/test_non_contigiousvlan.py b/test/integration/smoke/test_non_contigiousvlan.py
@@ -38,7 +38,7 @@ def setUp(self):
             raise Exception("Failed to set non contiguous vlan ids to test. Free some ids from \
                         from existing physical networks at ends")
 
-    @attr(tags = ["advanced"], BugId="CLOUDSTACK-6776", required_hardware="false")
+    @attr(tags = ["advanced"], required_hardware="false")
     def test_extendPhysicalNetworkVlan(self):
         """
         Test to update a physical network and extend its vlan
diff --git a/test/integration/smoke/test_scale_vm.py b/test/integration/smoke/test_scale_vm.py
@@ -102,6 +102,7 @@ def tearDown(self):
         cleanup_resources(self.apiclient, self.cleanup)
         return
 
+    @attr(hypervisor="xenserver")
     @attr(tags=["advanced", "basic"], required_hardware="true")
     def test_01_scale_vm(self):
         """Test scale virtual machine 
