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/07/17 09:05:13 UTC
[1/4] git commit: updated refs/heads/4.2 to d3b6902
Updated Branches:
refs/heads/4.2 1b59c5beb -> d3b690238
Fix typo netscaler_1 in TestAddMultipleNSDiffZone
Signed-off-by: Prasanna Santhanam <ts...@apache.org>
(cherry picked from commit 51b7f5de9195ab203adb651d5cdd0a0c0c1aec4f)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2a388e64
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2a388e64
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2a388e64
Branch: refs/heads/4.2
Commit: 2a388e64e7b4e80f86926d026b61ed16c0f6ca14
Parents: 1b59c5b
Author: Sowmya Krishnan <so...@citrix.com>
Authored: Wed Jul 17 09:46:30 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Wed Jul 17 12:34:41 2013 +0530
----------------------------------------------------------------------
test/integration/component/test_netscaler_nw_off.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2a388e64/test/integration/component/test_netscaler_nw_off.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_netscaler_nw_off.py b/test/integration/component/test_netscaler_nw_off.py
index a5fe5b1..9539d1b 100644
--- a/test/integration/component/test_netscaler_nw_off.py
+++ b/test/integration/component/test_netscaler_nw_off.py
@@ -404,7 +404,7 @@ class TestAddMultipleNSDiffZone(cloudstackTestCase):
physical_network = physical_networks[0]
self.debug("Adding netscaler device: %s" %
self.services["netscaler_1"]["ipaddress"])
- netscaler = NetScaler.add(
+ netscaler_1 = NetScaler.add(
self.apiclient,
self.services["netscaler_1"],
physicalnetworkid=physical_network.id
[4/4] git commit: updated refs/heads/4.2 to d3b6902
Posted by ts...@apache.org.
Fixed arguments in the format string in the debug message.
Signed-off-by: Prasanna Santhanam <ts...@apache.org>
(cherry picked from commit 2cec9f61fbce596706d46511ccc2ca3edb382321)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d3b69023
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d3b69023
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d3b69023
Branch: refs/heads/4.2
Commit: d3b6902387d8a1ab371bde6668ca5e7603c38368
Parents: dd5bac6
Author: SrikanteswaraRao Talluri <sr...@citrix.com>
Authored: Wed Jul 17 11:40:49 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Wed Jul 17 12:35:01 2013 +0530
----------------------------------------------------------------------
test/integration/component/test_vpc_network_lbrules.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d3b69023/test/integration/component/test_vpc_network_lbrules.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc_network_lbrules.py b/test/integration/component/test_vpc_network_lbrules.py
index a1dd19b..2712dac 100644
--- a/test/integration/component/test_vpc_network_lbrules.py
+++ b/test/integration/component/test_vpc_network_lbrules.py
@@ -481,7 +481,7 @@ class TestVPCNetworkLBRules(cloudstackTestCase):
vpcid=self.vpc.id,
domainid=self.account.domainid
)
- self.debug("Adding virtual machines %s and %s to LB rule" % (vmarray))
+ self.debug("Adding virtual machines %s and %s to LB rule" % (vmarray[0], vmarray[1]))
lb_rule.assign(self.apiclient, vmarray)
return lb_rule
[2/4] git commit: updated refs/heads/4.2 to d3b6902
Posted by ts...@apache.org.
CLOUDSTACK-3582: Add sleep so Netscaler recognizes the service to be up
Signed-off-by: Prasanna Santhanam <ts...@apache.org>
(cherry picked from commit bd629a5bec3f33dd51d0e445d402ae7ce3ba3484)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/dee2b983
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/dee2b983
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/dee2b983
Branch: refs/heads/4.2
Commit: dee2b983389000d30d2a926b9c755f51e9fa4b13
Parents: 2a388e6
Author: Sowmya Krishnan <so...@citrix.com>
Authored: Wed Jul 17 11:09:25 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Wed Jul 17 12:34:48 2013 +0530
----------------------------------------------------------------------
test/integration/component/test_netscaler_lb.py | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dee2b983/test/integration/component/test_netscaler_lb.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_netscaler_lb.py b/test/integration/component/test_netscaler_lb.py
index 534ffb1..146b4c6 100644
--- a/test/integration/component/test_netscaler_lb.py
+++ b/test/integration/component/test_netscaler_lb.py
@@ -2571,6 +2571,8 @@ class TestVmWithLb(cloudstackTestCase):
self.debug("Starting VM instance: %s" % self.vm_2.name)
self.vm_2.start(self.apiclient)
self.debug("Starting VM: %s" % self.vm_2.name)
+ self.debug("Sleeping for netscaler to recognize service is up")
+ time.sleep( 120 )
try:
self.debug(
[3/4] git commit: updated refs/heads/4.2 to d3b6902
Posted by ts...@apache.org.
change all instances of account.account to acccount.
Signed-off-by: Prasanna Santhanam <ts...@apache.org>
(cherry picked from commit d275beb7c1dab7522ae3cc278f7944afc0ba415d)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/dd5bac64
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/dd5bac64
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/dd5bac64
Branch: refs/heads/4.2
Commit: dd5bac646b88175a9fe360871b6be719f38b72c5
Parents: dee2b98
Author: SrikanteswaraRao Talluri <sr...@citrix.com>
Authored: Tue Jul 16 13:53:45 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Wed Jul 17 12:34:53 2013 +0530
----------------------------------------------------------------------
.../component/test_netscaler_configs.py | 180 +++++++++----------
.../component/test_netscaler_lb_algo.py | 2 +-
.../component/test_netscaler_lb_sticky.py | 2 +-
.../component/test_netscaler_nw_off.py | 108 +++++------
.../component/test_resource_limits.py | 2 +-
5 files changed, 147 insertions(+), 147 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd5bac64/test/integration/component/test_netscaler_configs.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_netscaler_configs.py b/test/integration/component/test_netscaler_configs.py
index d26da47..60075e0 100644
--- a/test/integration/component/test_netscaler_configs.py
+++ b/test/integration/component/test_netscaler_configs.py
@@ -62,24 +62,24 @@ class Services:
"protocol": 'TCP',
},
"netscaler": {
- "ipaddress": '192.168.100.213',
+ "ipaddress": '10.147.60.26',
"username": 'nsroot',
"password": 'nsroot',
"networkdevicetype": 'NetscalerVPXLoadBalancer',
- "publicinterface": '1/1',
- "privateinterface": '1/1',
+ "publicinterface": '1/3',
+ "privateinterface": '1/2',
"numretries": 2,
"lbdevicededicated": False,
"lbdevicecapacity": 50,
"port": 22,
},
"netscaler_dedicated": {
- "ipaddress": '192.168.100.213',
+ "ipaddress": '10.147.60.27',
"username": 'nsroot',
"password": 'nsroot',
"networkdevicetype": 'NetscalerVPXLoadBalancer',
- "publicinterface": '1/1',
- "privateinterface": '1/1',
+ "publicinterface": '1/3',
+ "privateinterface": '1/2',
"numretries": 2,
"lbdevicededicated": True,
"port": 22,
@@ -676,21 +676,21 @@ class TestNetScalerDedicated(cloudstackTestCase):
self.network = Network.create(
self.apiclient,
self.services["network"],
- accountid=self.account_1.account.name,
- domainid=self.account_1.account.domainid,
+ accountid=self.account_1.name,
+ domainid=self.account_1.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id
)
self.debug("Created network with ID: %s" % self.network.id)
- self.debug("Deploying VM in account: %s" % self.account_1.account.name)
+ self.debug("Deploying VM in account: %s" % self.account_1.name)
# Spawn an instance in that network
virtual_machine = VirtualMachine.create(
self.apiclient,
self.services["virtual_machine"],
- accountid=self.account_1.account.name,
- domainid=self.account_1.account.domainid,
+ accountid=self.account_1.name,
+ domainid=self.account_1.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(self.network.id)]
)
@@ -725,18 +725,18 @@ class TestNetScalerDedicated(cloudstackTestCase):
Network.create(
self.apiclient,
self.services["network"],
- accountid=self.account_2.account.name,
- domainid=self.account_2.account.domainid,
+ accountid=self.account_2.name,
+ domainid=self.account_2.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id
)
- self.debug("Deploying an instance in account: %s" % self.account_2.account.name)
+ self.debug("Deploying an instance in account: %s" % self.account_2.name)
with self.assertRaises(Exception):
VirtualMachine.create(
self.apiclient,
self.services["virtual_machine"],
- accountid=self.account_2.account.name,
- domainid=self.account_2.account.domainid,
+ accountid=self.account_2.name,
+ domainid=self.account_2.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(self.network.id)]
)
@@ -895,21 +895,21 @@ class TestNetScalerShared(cloudstackTestCase):
self.network_1 = Network.create(
self.apiclient,
self.services["network"],
- accountid=self.account_1.account.name,
- domainid=self.account_1.account.domainid,
+ accountid=self.account_1.name,
+ domainid=self.account_1.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id
)
self.debug("Created network with ID: %s" % self.network_1.id)
- self.debug("Deploying VM in account: %s" % self.account_1.account.name)
+ self.debug("Deploying VM in account: %s" % self.account_1.name)
# Spawn an instance in that network
virtual_machine_1 = VirtualMachine.create(
self.apiclient,
self.services["virtual_machine"],
- accountid=self.account_1.account.name,
- domainid=self.account_1.account.domainid,
+ accountid=self.account_1.name,
+ domainid=self.account_1.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(self.network_1.id)]
)
@@ -943,21 +943,21 @@ class TestNetScalerShared(cloudstackTestCase):
self.network_2 = Network.create(
self.apiclient,
self.services["network"],
- accountid=self.account_2.account.name,
- domainid=self.account_2.account.domainid,
+ accountid=self.account_2.name,
+ domainid=self.account_2.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id
)
self.debug("Created network with ID: %s" % self.network_1.id)
- self.debug("Deploying VM in account: %s" % self.account_2.account.name)
+ self.debug("Deploying VM in account: %s" % self.account_2.name)
# Spawn an instance in that network
virtual_machine_2 = VirtualMachine.create(
self.apiclient,
self.services["virtual_machine"],
- accountid=self.account_2.account.name,
- domainid=self.account_2.account.domainid,
+ accountid=self.account_2.name,
+ domainid=self.account_2.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(self.network_2.id)]
)
@@ -1107,7 +1107,7 @@ class TestNetScalerCustomCapacity(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
- @attr(tags = ["advancedns"])
+ @attr(tags = ["advancedns","test"])
def test_netscaler_custom_capacity(self):
"""Test netscaler device with custom capacity
"""
@@ -1144,21 +1144,21 @@ class TestNetScalerCustomCapacity(cloudstackTestCase):
self.network_1 = Network.create(
self.apiclient,
self.services["network"],
- accountid=self.account_1.account.name,
- domainid=self.account_1.account.domainid,
+ accountid=self.account_1.name,
+ domainid=self.account_1.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id
)
self.debug("Created network with ID: %s" % self.network_1.id)
- self.debug("Deploying VM in account: %s" % self.account_1.account.name)
+ self.debug("Deploying VM in account: %s" % self.account_1.name)
# Spawn an instance in that network
virtual_machine_1 = VirtualMachine.create(
self.apiclient,
self.services["virtual_machine"],
- accountid=self.account_1.account.name,
- domainid=self.account_1.account.domainid,
+ accountid=self.account_1.name,
+ domainid=self.account_1.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(self.network_1.id)]
)
@@ -1192,21 +1192,21 @@ class TestNetScalerCustomCapacity(cloudstackTestCase):
self.network_2 = Network.create(
self.apiclient,
self.services["network"],
- accountid=self.account_2.account.name,
- domainid=self.account_2.account.domainid,
+ accountid=self.account_2.name,
+ domainid=self.account_2.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id
)
self.debug("Created network with ID: %s" % self.network_2.id)
- self.debug("Deploying VM in account: %s" % self.account_2.account.name)
+ self.debug("Deploying VM in account: %s" % self.account_2.name)
# Spawn an instance in that network
virtual_machine_2 = VirtualMachine.create(
self.apiclient,
self.services["virtual_machine"],
- accountid=self.account_2.account.name,
- domainid=self.account_2.account.domainid,
+ accountid=self.account_2.name,
+ domainid=self.account_2.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(self.network_2.id)]
)
@@ -1380,7 +1380,7 @@ class TestNetScalerNoCapacity(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
- @attr(tags = ["advancedns"])
+ @attr(tags = ["advancedns","test"])
def test_netscaler_no_capacity(self):
"""Test netscaler device with no capacity remaining
"""
@@ -1418,21 +1418,21 @@ class TestNetScalerNoCapacity(cloudstackTestCase):
self.network_1 = Network.create(
self.apiclient,
self.services["network"],
- accountid=self.account_1.account.name,
- domainid=self.account_1.account.domainid,
+ accountid=self.account_1.name,
+ domainid=self.account_1.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id
)
self.debug("Created network with ID: %s" % self.network_1.id)
- self.debug("Deploying VM in account: %s" % self.account_1.account.name)
+ self.debug("Deploying VM in account: %s" % self.account_1.name)
# Spawn an instance in that network
virtual_machine_1 = VirtualMachine.create(
self.apiclient,
self.services["virtual_machine"],
- accountid=self.account_1.account.name,
- domainid=self.account_1.account.domainid,
+ accountid=self.account_1.name,
+ domainid=self.account_1.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(self.network_1.id)]
)
@@ -1466,21 +1466,21 @@ class TestNetScalerNoCapacity(cloudstackTestCase):
self.network_2 = Network.create(
self.apiclient,
self.services["network"],
- accountid=self.account_2.account.name,
- domainid=self.account_2.account.domainid,
+ accountid=self.account_2.name,
+ domainid=self.account_2.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id
)
self.debug("Created network with ID: %s" % self.network_2.id)
- self.debug("Deploying VM in account: %s" % self.account_2.account.name)
+ self.debug("Deploying VM in account: %s" % self.account_2.name)
# Spawn an instance in that network
virtual_machine_2 = VirtualMachine.create(
self.apiclient,
self.services["virtual_machine"],
- accountid=self.account_2.account.name,
- domainid=self.account_2.account.domainid,
+ accountid=self.account_2.name,
+ domainid=self.account_2.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(self.network_2.id)]
)
@@ -1648,7 +1648,7 @@ class TestGuestNetworkWithNetScaler(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
- @attr(tags = ["advancedns"])
+ @attr(tags = ["advancedns","test"])
def test_01_guest_network(self):
"""Implementing Guest Network when first VM gets deployed using the network having Netscaler as LB
"""
@@ -1694,21 +1694,21 @@ class TestGuestNetworkWithNetScaler(cloudstackTestCase):
self.network_1 = Network.create(
self.apiclient,
self.services["network"],
- accountid=self.account_1.account.name,
- domainid=self.account_1.account.domainid,
+ accountid=self.account_1.name,
+ domainid=self.account_1.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id
)
self.debug("Created network with ID: %s" % self.network_1.id)
- self.debug("Deploying VM in account: %s" % self.account_1.account.name)
+ self.debug("Deploying VM in account: %s" % self.account_1.name)
# Spawn an instance in that network
virtual_machine_1 = VirtualMachine.create(
self.apiclient,
self.services["virtual_machine"],
- accountid=self.account_1.account.name,
- domainid=self.account_1.account.domainid,
+ accountid=self.account_1.name,
+ domainid=self.account_1.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(self.network_1.id)]
)
@@ -1768,7 +1768,7 @@ class TestGuestNetworkWithNetScaler(cloudstackTestCase):
(self.services["netscaler"]["ipaddress"], e))
return
- @attr(tags = ["advancedns"])
+ @attr(tags = ["advancedns","test"])
def test_02_guest_network_multiple(self):
"""Implementing Guest Network when multiple VMs gets deployed using the network having Netscaler as LB
"""
@@ -1793,21 +1793,21 @@ class TestGuestNetworkWithNetScaler(cloudstackTestCase):
self.network_1 = Network.create(
self.apiclient,
self.services["network"],
- accountid=self.account_1.account.name,
- domainid=self.account_1.account.domainid,
+ accountid=self.account_1.name,
+ domainid=self.account_1.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id
)
self.debug("Created network with ID: %s" % self.network_1.id)
- self.debug("Deploying VM in account: %s" % self.account_1.account.name)
+ self.debug("Deploying VM in account: %s" % self.account_1.name)
# Spawn an instance in that network
virtual_machine_1 = VirtualMachine.create(
self.apiclient,
self.services["virtual_machine"],
- accountid=self.account_1.account.name,
- domainid=self.account_1.account.domainid,
+ accountid=self.account_1.name,
+ domainid=self.account_1.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(self.network_1.id)]
)
@@ -1840,21 +1840,21 @@ class TestGuestNetworkWithNetScaler(cloudstackTestCase):
self.network_2 = Network.create(
self.apiclient,
self.services["network"],
- accountid=self.account_2.account.name,
- domainid=self.account_2.account.domainid,
+ accountid=self.account_2.name,
+ domainid=self.account_2.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id
)
self.debug("Created network with ID: %s" % self.network_2.id)
- self.debug("Deploying VM in account: %s" % self.account_2.account.name)
+ self.debug("Deploying VM in account: %s" % self.account_2.name)
# Spawn an instance in that network
virtual_machine_2 = VirtualMachine.create(
self.apiclient,
self.services["virtual_machine"],
- accountid=self.account_2.account.name,
- domainid=self.account_2.account.domainid,
+ accountid=self.account_2.name,
+ domainid=self.account_2.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(self.network_2.id)]
)
@@ -1934,7 +1934,7 @@ class TestGuestNetworkWithNetScaler(cloudstackTestCase):
(self.services["netscaler"]["ipaddress"], e))
return
- @attr(tags = ["advancedns"])
+ @attr(tags = ["advancedns","test"])
def test_03_delete_account(self):
"""Delete an account that has LB rules
"""
@@ -1957,21 +1957,21 @@ class TestGuestNetworkWithNetScaler(cloudstackTestCase):
self.network = Network.create(
self.apiclient,
self.services["network"],
- accountid=self.account_1.account.name,
- domainid=self.account_1.account.domainid,
+ accountid=self.account_1.name,
+ domainid=self.account_1.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id
)
self.debug("Created network with ID: %s" % self.network.id)
- self.debug("Deploying VM in account: %s" % self.account_1.account.name)
+ self.debug("Deploying VM in account: %s" % self.account_1.name)
# Spawn an instance in that network
virtual_machine = VirtualMachine.create(
self.apiclient,
self.services["virtual_machine"],
- accountid=self.account_1.account.name,
- domainid=self.account_1.account.domainid,
+ accountid=self.account_1.name,
+ domainid=self.account_1.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(self.network.id)]
)
@@ -1999,12 +1999,12 @@ class TestGuestNetworkWithNetScaler(cloudstackTestCase):
"VM state should be running after deployment"
)
self.debug("Assigning public IP for the account: %s" %
- self.account_1.account.name)
+ self.account_1.name)
public_ip = PublicIPAddress.create(
self.apiclient,
- accountid=self.account_1.account.name,
+ accountid=self.account_1.name,
zoneid=self.zone.id,
- domainid=self.account_1.account.domainid,
+ domainid=self.account_1.domainid,
networkid=self.network.id
)
self.debug(
@@ -2015,7 +2015,7 @@ class TestGuestNetworkWithNetScaler(cloudstackTestCase):
self.apiclient,
self.services["lbrule"],
ipaddressid=public_ip.ipaddress.id,
- accountid=self.account_1.account.name,
+ accountid=self.account_1.name,
networkid=self.network.id
)
self.debug("Created the load balancing rule for public IP: %s" %
@@ -2031,10 +2031,10 @@ class TestGuestNetworkWithNetScaler(cloudstackTestCase):
)
nw = network_list[0]
- self.debug("Deleting account: %s" % self.account_1.account.name)
+ self.debug("Deleting account: %s" % self.account_1.name)
# This is a hack. Delete first account from cleanup list
self.cleanup.pop(0).delete(self.apiclient)
- self.debug("Account: %s is deleted!" % self.account_1.account.name)
+ self.debug("Account: %s is deleted!" % self.account_1.name)
self.debug("Waiting for network.gc.interval & network.gc.wait..")
interval = list_configurations(
@@ -2214,7 +2214,7 @@ class TestGuestNetworkShutDown(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
- @attr(tags = ["advancedns"])
+ @attr(tags = ["advancedns","test"])
def test_01_stop_all_vms(self):
"""Test Stopping all the Vms for any account that has LB rules.
"""
@@ -2295,7 +2295,7 @@ class TestGuestNetworkShutDown(cloudstackTestCase):
(self.services["netscaler"]["ipaddress"], e))
return
- @attr(tags = ["advancedns"])
+ @attr(tags = ["advancedns","test"])
def test_02_start_one_vm(self):
"""Test LB rules on Netscaler after starting one Vm in account
"""
@@ -2380,7 +2380,7 @@ class TestGuestNetworkShutDown(cloudstackTestCase):
(self.services["netscaler"]["ipaddress"], e))
return
- @attr(tags = ["advancedns"])
+ @attr(tags = ["advancedns","test"])
def test_03_network_restart_without_cleanup(self):
"""Test LB rules on Netscaler after network restart without cleanup
"""
@@ -2442,7 +2442,7 @@ class TestGuestNetworkShutDown(cloudstackTestCase):
(self.services["netscaler"]["ipaddress"], e))
return
- @attr(tags = ["advancedns"])
+ @attr(tags = ["advancedns","test"])
def test_04_network_restart_with_cleanup(self):
"""Test LB rules on Netscaler after network restart with cleanup
"""
@@ -2618,7 +2618,7 @@ class TestServiceProvider(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
- @attr(tags = ["advancedns"])
+ @attr(tags = ["advancedns","test"])
def test_01_create_nw_off_disabled(self):
"""Test create network with network offering disabled
"""
@@ -2664,7 +2664,7 @@ class TestServiceProvider(cloudstackTestCase):
)
return
- @attr(tags = ["advancedns"])
+ @attr(tags = ["advancedns","test"])
def test_02_create_nw_sp_disabled(self):
"""Test create network when service provider is disabled
"""
@@ -2697,7 +2697,7 @@ class TestServiceProvider(cloudstackTestCase):
)
return
- @attr(tags = ["advancedns"])
+ @attr(tags = ["advancedns","test"])
def test_03_create_lb_sp_disabled(self):
"""Test create LB rules when service provider is disabled
"""
@@ -2934,7 +2934,7 @@ class TestDeleteNetscaler(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
- @attr(tags = ["advancedns"])
+ @attr(tags = ["advancedns","test"])
def test_delete_netscaler_with_lb(self):
"""Test delete Netscaler when active LB rules are present
"""
@@ -2976,21 +2976,21 @@ class TestDeleteNetscaler(cloudstackTestCase):
self.network_1 = Network.create(
self.apiclient,
self.services["network"],
- accountid=self.account_1.account.name,
- domainid=self.account_1.account.domainid,
+ accountid=self.account_1.name,
+ domainid=self.account_1.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id
)
self.debug("Created network with ID: %s" % self.network_1.id)
- self.debug("Deploying VM in account: %s" % self.account_1.account.name)
+ self.debug("Deploying VM in account: %s" % self.account_1.name)
# Spawn an instance in that network
virtual_machine_1 = VirtualMachine.create(
self.apiclient,
self.services["virtual_machine"],
- accountid=self.account_1.account.name,
- domainid=self.account_1.account.domainid,
+ accountid=self.account_1.name,
+ domainid=self.account_1.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(self.network_1.id)]
)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd5bac64/test/integration/component/test_netscaler_lb_algo.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_netscaler_lb_algo.py b/test/integration/component/test_netscaler_lb_algo.py
index 99a537d..477bd69 100644
--- a/test/integration/component/test_netscaler_lb_algo.py
+++ b/test/integration/component/test_netscaler_lb_algo.py
@@ -62,7 +62,7 @@ class Services:
"protocol": 'TCP',
},
"netscaler": {
- "ipaddress": '192.168.100.213',
+ "ipaddress": '10.147.60.27',
"username": 'nsroot',
"password": 'nsroot',
"networkdevicetype": 'NetscalerVPXLoadBalancer',
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd5bac64/test/integration/component/test_netscaler_lb_sticky.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_netscaler_lb_sticky.py b/test/integration/component/test_netscaler_lb_sticky.py
index 5c95fb8..1edfd7b 100644
--- a/test/integration/component/test_netscaler_lb_sticky.py
+++ b/test/integration/component/test_netscaler_lb_sticky.py
@@ -62,7 +62,7 @@ class Services:
"protocol": 'TCP',
},
"netscaler": {
- "ipaddress": '192.168.100.213',
+ "ipaddress": '10.147.60.27',
"username": 'nsroot',
"password": 'nsroot',
"networkdevicetype": 'NetscalerVPXLoadBalancer',
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd5bac64/test/integration/component/test_netscaler_nw_off.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_netscaler_nw_off.py b/test/integration/component/test_netscaler_nw_off.py
index 9539d1b..6a51666 100644
--- a/test/integration/component/test_netscaler_nw_off.py
+++ b/test/integration/component/test_netscaler_nw_off.py
@@ -62,7 +62,7 @@ class Services:
"protocol": 'TCP',
},
"netscaler_1": {
- "ipaddress": '192.168.100.213',
+ "ipaddress": '10.147.60.27',
"username": 'nsroot',
"password": 'nsroot',
"networkdevicetype": 'NetscalerVPXLoadBalancer',
@@ -688,21 +688,21 @@ class TestNetScalerSharedMode(cloudstackTestCase):
self.network_1 = Network.create(
self.apiclient,
self.services["network"],
- accountid=self.account_1.account.name,
- domainid=self.account_1.account.domainid,
+ accountid=self.account_1.name,
+ domainid=self.account_1.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id
)
self.debug("Created network with ID: %s" % self.network_1.id)
- self.debug("Deploying VM in account: %s" % self.account_1.account.name)
+ self.debug("Deploying VM in account: %s" % self.account_1.name)
# Spawn an instance in that network
virtual_machine_1 = VirtualMachine.create(
self.apiclient,
self.services["virtual_machine"],
- accountid=self.account_1.account.name,
- domainid=self.account_1.account.domainid,
+ accountid=self.account_1.name,
+ domainid=self.account_1.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(self.network_1.id)]
)
@@ -736,21 +736,21 @@ class TestNetScalerSharedMode(cloudstackTestCase):
self.network_2 = Network.create(
self.apiclient,
self.services["network"],
- accountid=self.account_2.account.name,
- domainid=self.account_2.account.domainid,
+ accountid=self.account_2.name,
+ domainid=self.account_2.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id
)
self.debug("Created network with ID: %s" % self.network_2.id)
- self.debug("Deploying VM in account: %s" % self.account_2.account.name)
+ self.debug("Deploying VM in account: %s" % self.account_2.name)
# Spawn an instance in that network
virtual_machine_2 = VirtualMachine.create(
self.apiclient,
self.services["virtual_machine"],
- accountid=self.account_2.account.name,
- domainid=self.account_2.account.domainid,
+ accountid=self.account_2.name,
+ domainid=self.account_2.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(self.network_2.id)]
)
@@ -1218,8 +1218,8 @@ class TestNwOffDedicatedNetscaler(cloudstackTestCase):
self.network_1 = Network.create(
self.apiclient,
self.services["network"],
- accountid=self.account_1.account.name,
- domainid=self.account_1.account.domainid,
+ accountid=self.account_1.name,
+ domainid=self.account_1.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id
)
@@ -1229,8 +1229,8 @@ class TestNwOffDedicatedNetscaler(cloudstackTestCase):
VirtualMachine.create(
self.apiclient,
self.services["virtual_machine"],
- accountid=self.account_1.account.name,
- domainid=self.account_1.account.domainid,
+ accountid=self.account_1.name,
+ domainid=self.account_1.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(self.network_1.id)]
)
@@ -1411,17 +1411,17 @@ class TestNwOffNetscaler(cloudstackTestCase):
self.network = Network.create(
self.apiclient,
self.services["network"],
- accountid=self.account_1.account.name,
- domainid=self.account_1.account.domainid,
+ accountid=self.account_1.name,
+ domainid=self.account_1.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id
)
- self.debug("Deploying VM in account: %s" % self.account_1.account.name)
+ self.debug("Deploying VM in account: %s" % self.account_1.name)
virtual_machine = VirtualMachine.create(
self.apiclient,
self.services["virtual_machine"],
- accountid=self.account_1.account.name,
- domainid=self.account_1.account.domainid,
+ accountid=self.account_1.name,
+ domainid=self.account_1.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(self.network.id)]
)
@@ -1432,8 +1432,8 @@ class TestNwOffNetscaler(cloudstackTestCase):
self.network_2 = Network.create(
self.apiclient,
self.services["network"],
- accountid=self.account_2.account.name,
- domainid=self.account_2.account.domainid,
+ accountid=self.account_2.name,
+ domainid=self.account_2.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id
)
@@ -1442,16 +1442,16 @@ class TestNwOffNetscaler(cloudstackTestCase):
VirtualMachine.create(
self.apiclient,
self.services["virtual_machine"],
- accountid=self.account_2.account.name,
- domainid=self.account_2.account.domainid,
+ accountid=self.account_2.name,
+ domainid=self.account_2.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(self.network_2.id)]
)
self.debug(
"Attempt to create second network with dedicated network offering failed!")
- self.debug("Deleting account: %s" % self.account_1.account.name)
+ self.debug("Deleting account: %s" % self.account_1.name)
self.account_1.delete(self.apiclient)
- self.debug("Account: %s deleted!" % self.account_1.account.name)
+ self.debug("Account: %s deleted!" % self.account_1.name)
interval = list_configurations(
self.apiclient,
name='network.gc.interval'
@@ -1464,14 +1464,14 @@ class TestNwOffNetscaler(cloudstackTestCase):
# Sleep to ensure that all resources are deleted
time.sleep(int(interval[0].value) + int(wait[0].value))
- self.debug("Deploying VM in account: %s" % self.account_2.account.name)
+ self.debug("Deploying VM in account: %s" % self.account_2.name)
# Spawn an instance in that network
virtual_machine_2 = VirtualMachine.create(
self.apiclient,
self.services["virtual_machine"],
- accountid=self.account_2.account.name,
- domainid=self.account_2.account.domainid,
+ accountid=self.account_2.name,
+ domainid=self.account_2.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(self.network_2.id)]
)
@@ -1708,21 +1708,21 @@ class TestNwOffSToDUpgrade(cloudstackTestCase):
self.network_1 = Network.create(
self.apiclient,
self.services["network"],
- accountid=self.account_1.account.name,
- domainid=self.account_1.account.domainid,
+ accountid=self.account_1.name,
+ domainid=self.account_1.domainid,
networkofferingid=self.network_offering_shared.id,
zoneid=self.zone.id
)
self.debug("Created network with ID: %s" % self.network_1.id)
- self.debug("Deploying VM in account: %s" % self.account_1.account.name)
+ self.debug("Deploying VM in account: %s" % self.account_1.name)
# Spawn an instance in that network
virtual_machine_1 = VirtualMachine.create(
self.apiclient,
self.services["virtual_machine"],
- accountid=self.account_1.account.name,
- domainid=self.account_1.account.domainid,
+ accountid=self.account_1.name,
+ domainid=self.account_1.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(self.network_1.id)]
)
@@ -1756,21 +1756,21 @@ class TestNwOffSToDUpgrade(cloudstackTestCase):
self.network_2 = Network.create(
self.apiclient,
self.services["network"],
- accountid=self.account_2.account.name,
- domainid=self.account_2.account.domainid,
+ accountid=self.account_2.name,
+ domainid=self.account_2.domainid,
networkofferingid=self.network_offering_shared.id,
zoneid=self.zone.id
)
self.debug("Created network with ID: %s" % self.network_2.id)
- self.debug("Deploying VM in account: %s" % self.account_2.account.name)
+ self.debug("Deploying VM in account: %s" % self.account_2.name)
# Spawn an instance in that network
virtual_machine_2 = VirtualMachine.create(
self.apiclient,
self.services["virtual_machine"],
- accountid=self.account_2.account.name,
- domainid=self.account_2.account.domainid,
+ accountid=self.account_2.name,
+ domainid=self.account_2.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(self.network_2.id)]
)
@@ -1854,7 +1854,7 @@ class TestNwOffSToDUpgrade(cloudstackTestCase):
)
self.debug("Stopping All VMs before upgrading network for account: %s" %
- self.account_1.account.name)
+ self.account_1.name)
virtual_machine_1.stop(self.apiclient)
list_vm_response = VirtualMachine.list(
@@ -1909,7 +1909,7 @@ class TestNwOffSToDUpgrade(cloudstackTestCase):
)
self.debug("Starting All VMs after upgrading network for account: %s" %
- self.account_1.account.name)
+ self.account_1.name)
virtual_machine_1.start(self.apiclient)
list_vm_response = VirtualMachine.list(
@@ -1942,9 +1942,9 @@ class TestNwOffSToDUpgrade(cloudstackTestCase):
public_ip = PublicIPAddress.create(
self.apiclient,
- accountid=self.account_1.account.name,
+ accountid=self.account_1.name,
zoneid=self.zone.id,
- domainid=self.account_1.account.domainid,
+ domainid=self.account_1.domainid,
networkid=self.network_1.id
)
self.debug(
@@ -1955,7 +1955,7 @@ class TestNwOffSToDUpgrade(cloudstackTestCase):
self.apiclient,
self.services["lbrule"],
ipaddressid=public_ip.ipaddress.id,
- accountid=self.account_1.account.name,
+ accountid=self.account_1.name,
networkid=self.network_1.id
)
self.debug("Created the load balancing rule for public IP: %s" %
@@ -2125,21 +2125,21 @@ class TestNwOffDToSUpgrade(cloudstackTestCase):
self.network_1 = Network.create(
self.apiclient,
self.services["network"],
- accountid=self.account_1.account.name,
- domainid=self.account_1.account.domainid,
+ accountid=self.account_1.name,
+ domainid=self.account_1.domainid,
networkofferingid=self.network_offering_shared.id,
zoneid=self.zone.id
)
self.debug("Created network with ID: %s" % self.network_1.id)
- self.debug("Deploying VM in account: %s" % self.account_1.account.name)
+ self.debug("Deploying VM in account: %s" % self.account_1.name)
# Spawn an instance in that network
virtual_machine_1 = VirtualMachine.create(
self.apiclient,
self.services["virtual_machine"],
- accountid=self.account_1.account.name,
- domainid=self.account_1.account.domainid,
+ accountid=self.account_1.name,
+ domainid=self.account_1.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(self.network_1.id)]
)
@@ -2173,21 +2173,21 @@ class TestNwOffDToSUpgrade(cloudstackTestCase):
self.network_2 = Network.create(
self.apiclient,
self.services["network"],
- accountid=self.account_2.account.name,
- domainid=self.account_2.account.domainid,
+ accountid=self.account_2.name,
+ domainid=self.account_2.domainid,
networkofferingid=self.network_offering_shared.id,
zoneid=self.zone.id
)
self.debug("Created network with ID: %s" % self.network_2.id)
- self.debug("Deploying VM in account: %s" % self.account_2.account.name)
+ self.debug("Deploying VM in account: %s" % self.account_2.name)
# Spawn an instance in that network
virtual_machine_2 = VirtualMachine.create(
self.apiclient,
self.services["virtual_machine"],
- accountid=self.account_2.account.name,
- domainid=self.account_2.account.domainid,
+ accountid=self.account_2.name,
+ domainid=self.account_2.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(self.network_2.id)]
)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd5bac64/test/integration/component/test_resource_limits.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_resource_limits.py b/test/integration/component/test_resource_limits.py
index ea79c07..833723c 100644
--- a/test/integration/component/test_resource_limits.py
+++ b/test/integration/component/test_resource_limits.py
@@ -1004,7 +1004,7 @@ class TestResourceLimitsDomain(cloudstackTestCase):
self.apiclient,
self.services["server"],
templateid=self.template.id,
- accountid=self.account_1.account.name,
+ accountid=self.account_1.name,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id
)