sg offering test Signed-off-by: Prasanna Santhanam <[email protected]>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/fed58404 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fed58404 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/fed58404 Branch: refs/heads/marvin_refactor Commit: fed58404f737fa619369f4c459c9bc0de8b24942 Parents: cef6634 Author: Prasanna Santhanam <[email protected]> Authored: Sun Mar 31 19:46:37 2013 +0530 Committer: Prasanna Santhanam <[email protected]> Committed: Sun Mar 31 22:19:29 2013 +0530 ---------------------------------------------------------------------- .../lib/factory/NetworkOfferingFactory.py | 2 +- .../integration/lib/factory/test/testFactories.py | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fed58404/tools/marvin/marvin/integration/lib/factory/NetworkOfferingFactory.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/integration/lib/factory/NetworkOfferingFactory.py b/tools/marvin/marvin/integration/lib/factory/NetworkOfferingFactory.py index 3673828..8b00819 100644 --- a/tools/marvin/marvin/integration/lib/factory/NetworkOfferingFactory.py +++ b/tools/marvin/marvin/integration/lib/factory/NetworkOfferingFactory.py @@ -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" http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fed58404/tools/marvin/marvin/integration/lib/factory/test/testFactories.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/integration/lib/factory/test/testFactories.py b/tools/marvin/marvin/integration/lib/factory/test/testFactories.py index 1d18305..1637020 100644 --- a/tools/marvin/marvin/integration/lib/factory/test/testFactories.py +++ b/tools/marvin/marvin/integration/lib/factory/test/testFactories.py @@ -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 \ No newline at end of file
