cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sanj...@apache.org
Subject [3/3] git commit: updated refs/heads/master to 5b7527e
Date Wed, 22 Apr 2015 10:24:46 GMT
Incorporated review comments provided in PR#183


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

Branch: refs/heads/master
Commit: 5b7527e2da3cfed57dd3d4d107d2cfbce024a1af
Parents: 0bae300
Author: sanjeev <sanjeev@apache.org>
Authored: Wed Apr 22 15:14:52 2015 +0530
Committer: sanjeev <sanjeev@apache.org>
Committed: Wed Apr 22 15:51:01 2015 +0530

----------------------------------------------------------------------
 .../component/test_multiple_ips_per_nic.py        | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5b7527e2/test/integration/component/test_multiple_ips_per_nic.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_multiple_ips_per_nic.py b/test/integration/component/test_multiple_ips_per_nic.py
index 6d26b3e..ea4ba96 100644
--- a/test/integration/component/test_multiple_ips_per_nic.py
+++ b/test/integration/component/test_multiple_ips_per_nic.py
@@ -417,12 +417,18 @@ class TestBasicOperations(cloudstackTestCase):
                 None,
                 "Removing IP from nic didn't release the ip address from user_ip_address
table"
             )
-            ipaddress_2 = NIC.addIp(
-                self.apiclient,
-                id=virtual_machine.nic[0].id,
-                ipaddress=ipaddress_1.ipaddress
-            )
-            NIC.removeIp(self.apiclient, ipaddressid=ipaddress_2.id)
+        else:
+            qresultset = self.dbclient.execute(
+                "select id from nic_secondary_ips where ip4_address = '%s';"
+                % str(ipaddress_1.ipaddress))
+            if len(qresultset):
+                self.fail("Failed to release the secondary ip from the nic")
+        ipaddress_2 = NIC.addIp(
+            self.apiclient,
+            id=virtual_machine.nic[0].id,
+            ipaddress=ipaddress_1.ipaddress
+        )
+        NIC.removeIp(self.apiclient, ipaddressid=ipaddress_2.id)
         try:
             NIC.removeIp(
                 self.apiclient,


Mime
View raw message