You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ts...@apache.org on 2013/06/30 18:13:54 UTC
git commit: updated refs/heads/4.2 to cb1d6ea
Updated Branches:
refs/heads/4.2 48a2c761b -> cb1d6eaa0
Fix attr plugin import and class reference
Signed-off-by: Prasanna Santhanam <ts...@apache.org>
(cherry picked from commit e7fe43567bef589a128a03f49db8cf8e7ebd7b3c)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/cb1d6eaa
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/cb1d6eaa
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/cb1d6eaa
Branch: refs/heads/4.2
Commit: cb1d6eaa0e034a26800ced2e3e67636febdd82b2
Parents: 48a2c76
Author: Prasanna Santhanam <ts...@apache.org>
Authored: Sun Jun 30 21:43:08 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Sun Jun 30 21:43:39 2013 +0530
----------------------------------------------------------------------
test/integration/component/test_advancedsg_networks.py | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cb1d6eaa/test/integration/component/test_advancedsg_networks.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_advancedsg_networks.py b/test/integration/component/test_advancedsg_networks.py
index f8774be..4834351 100644
--- a/test/integration/component/test_advancedsg_networks.py
+++ b/test/integration/component/test_advancedsg_networks.py
@@ -24,9 +24,8 @@ from marvin.cloudstackAPI import *
from marvin.integration.lib.utils import *
from marvin.integration.lib.base import *
from marvin.integration.lib.common import *
-from marvin.remoteSSHClient import remoteSSHClient
-import datetime
import netaddr
+from nose.plugins.attrib import attr
class Services:
""" Test networks in advanced zone with security groups"""
@@ -156,7 +155,7 @@ class TestNetworksInAdvancedSG(cloudstackTestCase):
@classmethod
def setUpClass(cls):
cls.api_client = super(
- TestSharedNetworks,
+ TestNetworksInAdvancedSG,
cls
).getClsTestClient().getApiClient()
@@ -687,7 +686,7 @@ class TestNetworksInAdvancedSG(cloudstackTestCase):
"The network offering state should get updated to Enabled."
)
- physical_network = list_physical_networks_response[0]
+ physical_network = PhysicalNetwork.list(self.api_client)[0]
#create network using the shared network offering created
self.services["shared_network_sg"]["acltype"] = "domain"