You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by gi...@apache.org on 2014/07/30 08:43:29 UTC
git commit: updated refs/heads/master to ec10e8d
Repository: cloudstack
Updated Branches:
refs/heads/master 5fa2d1c7c -> ec10e8db2
CLOUDSTACK-7199: Fixed test_multiple_ips_per_nic.py test failures
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ec10e8db
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ec10e8db
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ec10e8db
Branch: refs/heads/master
Commit: ec10e8db27e9f3a60a3d74053c5260d87616a3fa
Parents: 5fa2d1c
Author: Girish Shilamkar <gi...@clogeny.com>
Authored: Wed Jul 30 12:08:20 2014 +0530
Committer: Girish Shilamkar <gi...@clogeny.com>
Committed: Wed Jul 30 12:12:58 2014 +0530
----------------------------------------------------------------------
.../component/test_multiple_ips_per_nic.py | 45 +++++++++-----------
1 file changed, 21 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec10e8db/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 7de2f40..570ddd2 100644
--- a/test/integration/component/test_multiple_ips_per_nic.py
+++ b/test/integration/component/test_multiple_ips_per_nic.py
@@ -150,16 +150,15 @@ class TestBasicOperations(cloudstackTestCase):
cls.services["shared_network_offering_all_services"])
cls._cleanup.append(cls.shared_network_offering)
cls.mode = cls.zone.networktype
- if cls.mode == "advanced":
- cls.isolated_network_offering = CreateEnabledNetworkOffering(cls.api_client,
+ cls.isolated_network_offering = CreateEnabledNetworkOffering(cls.api_client,
cls.services["isolated_network_offering"])
- cls._cleanup.append(cls.isolated_network_offering)
- cls.isolated_network_offering_vpc = CreateEnabledNetworkOffering(cls.api_client,
+ cls._cleanup.append(cls.isolated_network_offering)
+ cls.isolated_network_offering_vpc = CreateEnabledNetworkOffering(cls.api_client,
cls.services["nw_offering_isolated_vpc"])
- cls._cleanup.append(cls.isolated_network_offering_vpc)
- cls.vpc_off = VpcOffering.create(cls.api_client, cls.services["vpc_offering"])
- cls.vpc_off.update(cls.api_client, state='Enabled')
- cls._cleanup.append(cls.vpc_off)
+ cls._cleanup.append(cls.isolated_network_offering_vpc)
+ cls.vpc_off = VpcOffering.create(cls.api_client, cls.services["vpc_offering"])
+ cls.vpc_off.update(cls.api_client, state='Enabled')
+ cls._cleanup.append(cls.vpc_off)
return
@classmethod
@@ -489,14 +488,13 @@ class TestNetworkRules(cloudstackTestCase):
cls.services["shared_network_offering_all_services"])
cls._cleanup.append(cls.shared_network_offering)
cls.mode = cls.zone.networktype
- if cls.mode == "advanced":
- cls.isolated_network_offering = CreateEnabledNetworkOffering(cls.api_client, cls.services["isolated_network_offering"])
- cls._cleanup.append(cls.isolated_network_offering)
- cls.isolated_network_offering_vpc = CreateEnabledNetworkOffering(cls.api_client, cls.services["nw_offering_isolated_vpc"])
- cls._cleanup.append(cls.isolated_network_offering_vpc)
- cls.vpc_off = VpcOffering.create(cls.api_client, cls.services["vpc_offering"])
- cls.vpc_off.update(cls.api_client, state='Enabled')
- cls._cleanup.append(cls.vpc_off)
+ cls.isolated_network_offering = CreateEnabledNetworkOffering(cls.api_client, cls.services["isolated_network_offering"])
+ cls._cleanup.append(cls.isolated_network_offering)
+ cls.isolated_network_offering_vpc = CreateEnabledNetworkOffering(cls.api_client, cls.services["nw_offering_isolated_vpc"])
+ cls._cleanup.append(cls.isolated_network_offering_vpc)
+ cls.vpc_off = VpcOffering.create(cls.api_client, cls.services["vpc_offering"])
+ cls.vpc_off.update(cls.api_client, state='Enabled')
+ cls._cleanup.append(cls.vpc_off)
return
@classmethod
@@ -864,14 +862,13 @@ class TestVmNetworkOperations(cloudstackTestCase):
cls.services["shared_network_offering_all_services"])
cls._cleanup.append(cls.shared_network_offering)
cls.mode = cls.zone.networktype
- if cls.mode == "advanced":
- cls.isolated_network_offering = CreateEnabledNetworkOffering(cls.api_client, cls.services["isolated_network_offering"])
- cls._cleanup.append(cls.isolated_network_offering)
- cls.isolated_network_offering_vpc = CreateEnabledNetworkOffering(cls.api_client, cls.services["nw_offering_isolated_vpc"])
- cls._cleanup.append(cls.isolated_network_offering_vpc)
- cls.vpc_off = VpcOffering.create(cls.api_client, cls.services["vpc_offering"])
- cls.vpc_off.update(cls.api_client, state='Enabled')
- cls._cleanup.append(cls.vpc_off)
+ cls.isolated_network_offering = CreateEnabledNetworkOffering(cls.api_client, cls.services["isolated_network_offering"])
+ cls._cleanup.append(cls.isolated_network_offering)
+ cls.isolated_network_offering_vpc = CreateEnabledNetworkOffering(cls.api_client, cls.services["nw_offering_isolated_vpc"])
+ cls._cleanup.append(cls.isolated_network_offering_vpc)
+ cls.vpc_off = VpcOffering.create(cls.api_client, cls.services["vpc_offering"])
+ cls.vpc_off.update(cls.api_client, state='Enabled')
+ cls._cleanup.append(cls.vpc_off)
return
@classmethod