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

marvin_refactor: sg offering test 

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
This commit is contained in:
Prasanna Santhanam 2013-03-31 19:46:37 +05:30
parent 0f8a9ae4b9
commit dcd96afd16
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/marvin/marvin/integration/lib/factory/NetworkOfferingFactory.py
View File

@ -60,7 +60,7 @@ class DefaultSharedNetworkOfferingWithSGServiceFactory(NetworkOfferingFactory):
displaytext = factory.Sequence(lambda n : "DefaultSharedNetworkOfferingWithSGService" + random_gen())
name = factory.Sequence(lambda n : "DefaultSharedNetworkOfferingWithSGService" + random_gen())
availability = "Optional"
supportedservices = "SecurityGroup, Dns, Dhcp, UserData"
supportedservices = "SecurityGroup,Dns,Dhcp,UserData"
guestiptype = "Shared"
traffictype = "GUEST"

14
tools/marvin/marvin/integration/lib/factory/test/testFactories.py
View File

@ -19,13 +19,13 @@ import unittest
from marvin.cloudstackTestClient import cloudstackTestClient
from marvin.integration.lib.factory.AccountFactory import *
from marvin.integration.lib.base.Account import *
from marvin.integration.lib.base.Account import Account
from marvin.integration.lib.factory.ServiceOfferingFactory import *
from marvin.integration.lib.base.ServiceOffering import *
from marvin.integration.lib.base.ServiceOffering import ServiceOffering
from marvin.integration.lib.factory.NetworkOfferingFactory import *
from marvin.integration.lib.base.NetworkOffering import *
from marvin.integration.lib.base.NetworkOffering import NetworkOffering
class AccountFactoryTest(unittest.TestCase):
def setUp(self):
@ -86,4 +86,10 @@ class NetworkOfferingFactoryTest(unittest.TestCase):
self.assertTrue(snatOffering is not None, msg = "no network offering was created")
self.assertEqual(snatOffering.name, snatOfferingFactory.name, msg="error in network offering factory creation")
snatOffering.update(self.apiClient, state='Enabled')
def test_defaultSGOfferingEnable(self):
sgOfferingFactory = DefaultSharedNetworkOfferingWithSGServiceFactory()
sgOffering = NetworkOffering.create(apiclient=self.apiClient, NetworkOfferingFactory=sgOfferingFactory)
sgOffering.update(self.apiClient, state='Enabled')
def tearDown(self):
pass