Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack into disk_io_throttling

This commit is contained in:
Wei Zhou 2013-06-17 13:25:57 +02:00
commit 3ad2f0f06b
1 changed files with 4 additions and 1 deletions

View File

@ -246,6 +246,7 @@ class TestNetworksInAdvancedSG(cloudstackTestCase):
raise Exception("Warning: Exception during network cleanup : %s" % e)
return
@attr(tags = ["advancedsg"])
def test_createIsolatedNetwork(self):
""" Test Isolated Network """
@ -423,8 +424,9 @@ class TestNetworksInAdvancedSG(cloudstackTestCase):
except Exception as e:
self.debug("Network creation failed because create isolated network is invalid in advanced zone with security groups.")
@attr(tags = ["advancedsg"])
def test_createSharedNetwork_withoutSG(self):
""" Test Shared Network with used vlan 01 """
""" Test Shared Network with without SecurityProvider """
# Steps,
# 1. create an Admin account
@ -574,6 +576,7 @@ class TestNetworksInAdvancedSG(cloudstackTestCase):
except Exception as e:
self.debug("Network creation failed because there is no SecurityProvider in the network offering.")
@attr(tags = ["advancedsg"])
def test_deployVM_SharedwithSG(self):
""" Test VM deployment in shared networks with SecurityProvider """