etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <tsp@apache.org>
(cherry picked from commit e4de46e4b1)
This commit is contained in:
Prasanna Santhanam 2013-07-29 16:21:07 +05:30
parent d66edb5e2b
commit 4a6fcd253c
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/integration/component/test_vpc_offerings.py
View File

@ -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"""