cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wid...@apache.org
Subject [16/50] [abbrv] git commit: updated refs/heads/disk-cache to 6f3e4d3
Date Wed, 20 Nov 2013 14:50:46 GMT
CLOUDSTACK-5148: Fix test_createSharedNetwork_projectSpecific

VM was being created with accountid and also project. By doing
this create vm or any other resource will fail. Only specify
project in which resource is created.


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

Branch: refs/heads/disk-cache
Commit: 186b82ae3a420ae4d79efd2b04c4892fb9656f6f
Parents: c29cd9d
Author: Girish Shilamkar <girish@clogeny.com>
Authored: Thu Nov 14 21:16:01 2013 -0500
Committer: Girish Shilamkar <girish@clogeny.com>
Committed: Thu Nov 14 21:16:01 2013 -0500

----------------------------------------------------------------------
 test/integration/component/test_shared_networks.py | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/186b82ae/test/integration/component/test_shared_networks.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_shared_networks.py b/test/integration/component/test_shared_networks.py
index 66a9d26..28468c9 100644
--- a/test/integration/component/test_shared_networks.py
+++ b/test/integration/component/test_shared_networks.py
@@ -1696,25 +1696,19 @@ class TestSharedNetworks(cloudstackTestCase):
 
         self.debug("Shared Network created: %s" % self.network.id)
 
-        try:
+        with self.assertRaises(Exception):
             self.project2_admin_account_virtual_machine = VirtualMachine.create(
                                                            self.api_client,
                                                            self.services["virtual_machine"],
-                                                           accountid=self.admin_account.name,
-                                                           domainid=self.admin_account.domainid,
                                                            networkids=self.network.id,
                                                            projectid=self.project2.id,
                                                            serviceofferingid=self.service_offering.id
                                                            )
-            self.fail("Virtual Machine got created in admin account with network specified
but the network used is of scope project and the project2 is not assigned for the network.")
-        except Exception as e:
-            self.debug("Virtual Machine creation failed as network used have scoped only
for project project1. Exception: %s" % e)
-
+        self.debug("Deploying a vm to project other than the one in which \
+                   network is created raised an Exception as expected")
         self.project1_admin_account_virtual_machine = VirtualMachine.create(
                                                        self.api_client,
                                                        self.services["virtual_machine"],
-                                                       accountid=self.admin_account.name,
-                                                       domainid=self.admin_account.domainid,
                                                        networkids=self.network.id,
                                                        projectid=self.project1.id,
                                                        serviceofferingid=self.service_offering.id


Mime
View raw message