cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From weiz...@apache.org
Subject [20/50] [abbrv] git commit: updated refs/heads/disk_io_throttling to 691bc9d
Date Tue, 18 Jun 2013 07:58:20 GMT
list the VPCs with vpc id not network id

test failed because of incorrectly listing the VPC using the networkid.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/363a7b93
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/363a7b93
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/363a7b93

Branch: refs/heads/disk_io_throttling
Commit: 363a7b933c4c7a7cbec096775d991f7430e70968
Parents: f8965b6
Author: Prasanna Santhanam <tsp@apache.org>
Authored: Mon Jun 17 22:25:01 2013 +0530
Committer: Prasanna Santhanam <tsp@apache.org>
Committed: Mon Jun 17 22:25:01 2013 +0530

----------------------------------------------------------------------
 test/integration/component/test_vpc.py           | 4 ++--
 test/integration/smoke/test_portable_publicip.py | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/363a7b93/test/integration/component/test_vpc.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc.py b/test/integration/component/test_vpc.py
index 510e297..cc70695 100644
--- a/test/integration/component/test_vpc.py
+++ b/test/integration/component/test_vpc.py
@@ -1651,7 +1651,7 @@ class TestVPC(cloudstackTestCase):
     
     @attr(tags=["advanced", "intervlan"])
     def test_11_deploy_vm_wo_network_netdomain(self):
-        """ Test deployment of vm in a VPC without network netdomain
+        """ Test deployment of vm in a VPC without network domain
         """
 
         # 1. Create VPC without providing networkDomain.
@@ -2410,7 +2410,7 @@ class TestVPC(cloudstackTestCase):
 
         vpc_networks = VPC.list(
                                     self.apiclient,
-                                    id=network.id
+                                    id=vpc.id
                           )
         
         self.assertEqual(

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/363a7b93/test/integration/smoke/test_portable_publicip.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_portable_publicip.py b/test/integration/smoke/test_portable_publicip.py
index 5b2fbc7..9a3a398 100644
--- a/test/integration/smoke/test_portable_publicip.py
+++ b/test/integration/smoke/test_portable_publicip.py
@@ -21,7 +21,6 @@ from marvin.cloudstackAPI import *
 from marvin.integration.lib.utils import *
 from marvin.integration.lib.base import *
 from marvin.integration.lib.common import *
-from marvin import remoteSSHClient
 from nose.plugins.attrib import attr
 
 class Services:


Mime
View raw message