Updated Branches: refs/heads/4.2 d66edb5e2 -> 4a6fcd253
CLOUDSTACK-3901: Test for vpc offerings - Fix the test that ensures vpc offerings cannot be created with firewall service - CLOUDSTACK-3902 blocks the fix for vpc offerings created without source nat service. Without source NAT VPC creation should fail. Signed-off-by: Prasanna Santhanam <t...@apache.org> (cherry picked from commit e4de46e4b1b517b0f304c6d6c2218a925c109ee4) Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4a6fcd25 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4a6fcd25 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4a6fcd25 Branch: refs/heads/4.2 Commit: 4a6fcd253ce81ffe09b2caff21e02aefa8c7f1ca Parents: d66edb5 Author: Prasanna Santhanam <t...@apache.org> Authored: Mon Jul 29 16:21:07 2013 +0530 Committer: Prasanna Santhanam <t...@apache.org> Committed: Mon Jul 29 16:22:03 2013 +0530 ---------------------------------------------------------------------- test/integration/component/test_vpc_offerings.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4a6fcd25/test/integration/component/test_vpc_offerings.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_vpc_offerings.py b/test/integration/component/test_vpc_offerings.py index 75b503a..5911270 100644 --- a/test/integration/component/test_vpc_offerings.py +++ b/test/integration/component/test_vpc_offerings.py @@ -880,11 +880,9 @@ class TestVPCOffering(cloudstackTestCase): # 1. Creating VPC Offering with no SourceNat service should FAIL. # 2. Creating VPC Offering with services NOT supported by VPC # like Firewall should not be allowed - # 3. Creating VPC Offering with services NOT supported by VPC - # like Firewall should not be allowed self.debug("Creating a VPC offering without sourceNAT") - self.services["vpc_offering"]["supportedservices"] = 'Dhcp,Dns,PortForwarding,Vpn,Firewall,Lb,UserData,StaticNat' + self.services["vpc_offering"]["supportedservices"] = 'Dhcp,Dns,PortForwarding,Vpn,Lb,UserData,StaticNat' with self.assertRaises(Exception): VpcOffering.create( @@ -892,8 +890,8 @@ class TestVPCOffering(cloudstackTestCase): self.services["vpc_offering"] ) - self.debug("Creating a VPC offering without Firewall") - self.services["vpc_offering"]["supportedservices"] = 'Dhcp,Dns,PortForwarding,Vpn,SourceNat,Lb,UserData,StaticNat' + self.debug("Creating a VPC offering with Firewall") + self.services["vpc_offering"]["supportedservices"] = 'Dhcp,Dns,PortForwarding,Firewall,Vpn,SourceNat,Lb,UserData,StaticNat' with self.assertRaises(Exception): VpcOffering.create( @@ -1005,7 +1003,7 @@ class TestVPCOffering(cloudstackTestCase): ) return - @attr(tags=["advanced", "intervlan", "needle"]) + @attr(tags=["advanced", "intervlan"]) def test_08_list_vpc_off(self): """Test list VPC offering"""
