This is an automated email from the ASF dual-hosted git repository.
abhisar pushed a commit to branch 4.20
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/4.20 by this push:
new 7cdcf571fac Fix xcpng test failures (#12812)
7cdcf571fac is described below
commit 7cdcf571fac5e4a7f1e683668293d6251803f101
Author: Vishesh <[email protected]>
AuthorDate: Thu Mar 19 13:46:01 2026 +0530
Fix xcpng test failures (#12812)
---
.../test_redundant_router_deployment_planning.py | 770 +++++++++++----------
test/integration/smoke/test_public_ip_range.py | 68 +-
2 files changed, 432 insertions(+), 406 deletions(-)
diff --git
a/test/integration/component/maint/test_redundant_router_deployment_planning.py
b/test/integration/component/maint/test_redundant_router_deployment_planning.py
index 5012fd1f2e9..d10e3ee5a7f 100644
---
a/test/integration/component/maint/test_redundant_router_deployment_planning.py
+++
b/test/integration/component/maint/test_redundant_router_deployment_planning.py
@@ -398,141 +398,146 @@ class TestRvRDeploymentPlanning(cloudstackTestCase):
self.apiclient.updatePod(cmd)
self.debug("Enabled first pod for testing..")
- # Creating network using the network offering created
- self.debug("Creating network with network offering: %s" %
- self.network_offering.id)
- network = Network.create(
- self.apiclient,
- self.services["network"],
- accountid=self.account.name,
- domainid=self.account.domainid,
- networkofferingid=self.network_offering.id,
- zoneid=self.zone.id
- )
- self.debug("Created network with ID: %s" % network.id)
-
- networks = Network.list(
- self.apiclient,
- id=network.id,
- listall=True
- )
- self.assertEqual(
- isinstance(networks, list),
- True,
- "List networks should return a valid response for created network"
- )
- nw_response = networks[0]
-
- self.debug("Network state: %s" % nw_response.state)
- self.assertEqual(
- nw_response.state,
- "Allocated",
- "The network should be in allocated state after creation"
- )
-
- self.debug("Listing routers for network: %s" % network.name)
- routers = Router.list(
- self.apiclient,
- networkid=network.id,
- listall=True
- )
- self.assertEqual(
- routers,
- None,
- "Routers should not be spawned when network is in allocated state"
- )
-
- self.debug("Deploying VM in account: %s" % self.account.name)
+ try:
+ # Creating network using the network offering created
+ self.debug("Creating network with network offering: %s" %
+
self.network_offering.id)
+ network = Network.create(
+ self.apiclient,
+ self.services["network"],
+ accountid=self.account.name,
+ domainid=self.account.domainid,
+ networkofferingid=self.network_offering.id,
+ zoneid=self.zone.id
+ )
+ self.debug("Created network with ID: %s" % network.id)
+
+ networks = Network.list(
+ self.apiclient,
+ id=network.id,
+ listall=True
+ )
+ self.assertEqual(
+ isinstance(networks, list),
+ True,
+ "List networks should return a valid response for created
network"
+ )
+ nw_response = networks[0]
+
+ self.debug("Network state: %s" % nw_response.state)
+ self.assertEqual(
+ nw_response.state,
+ "Allocated",
+ "The network should be in allocated state after
creation"
+ )
- # Spawn an instance in that network
- virtual_machine = VirtualMachine.create(
+ self.debug("Listing routers for network: %s" % network.name)
+ routers = Router.list(
self.apiclient,
- self.services["virtual_machine"],
- accountid=self.account.name,
- domainid=self.account.domainid,
- serviceofferingid=self.service_offering.id,
- networkids=[str(network.id)]
+ networkid=network.id,
+ listall=True
)
- self.debug("Deployed VM in network: %s" % network.id)
-
- vms = VirtualMachine.list(
+ self.assertEqual(
+ routers,
+ None,
+ "Routers should not be spawned when network is in allocated
state"
+ )
+
+ self.debug("Deploying VM in account: %s" % self.account.name)
+
+ # Spawn an instance in that network
+ virtual_machine = VirtualMachine.create(
+ self.apiclient,
+ self.services["virtual_machine"],
+ accountid=self.account.name,
+ domainid=self.account.domainid,
+
serviceofferingid=self.service_offering.id,
+ networkids=[str(network.id)]
+ )
+ self.debug("Deployed VM in network: %s" % network.id)
+
+ vms = VirtualMachine.list(
+ self.apiclient,
+ id=virtual_machine.id,
+ listall=True
+ )
+ self.assertEqual(
+ isinstance(vms, list),
+ True,
+ "List Vms should return a valid list"
+ )
+ vm = vms[0]
+ self.assertEqual(
+ vm.state,
+ "Running",
+ "Vm should be in running state after deployment"
+ )
+
+ self.debug("Listing routers for network: %s" % network.name)
+ routers = Router.list(
self.apiclient,
- id=virtual_machine.id,
+ networkid=network.id,
listall=True
)
- self.assertEqual(
- isinstance(vms, list),
- True,
- "List Vms should return a valid list"
- )
- vm = vms[0]
- self.assertEqual(
- vm.state,
- "Running",
- "Vm should be in running state after deployment"
- )
+ self.assertEqual(
+ isinstance(routers, list),
+ True,
+ "list router should return Primary and backup routers"
+ )
+ self.assertEqual(
+ len(routers),
+ 2,
+ "Length of the list router should be 2 (Backup &
Primary)"
+ )
- self.debug("Listing routers for network: %s" % network.name)
- routers = Router.list(
+ hosts = Host.list(
self.apiclient,
- networkid=network.id,
+ id=routers[0].hostid,
listall=True
)
- self.assertEqual(
- isinstance(routers, list),
- True,
- "list router should return Primary and backup routers"
- )
- self.assertEqual(
- len(routers),
- 2,
- "Length of the list router should be 2 (Backup & Primary)"
- )
-
- hosts = Host.list(
- self.apiclient,
- id=routers[0].hostid,
- listall=True
- )
- self.assertEqual(
- isinstance(hosts, list),
- True,
- "List host should return a valid data"
- )
- first_host = hosts[0]
-
- hosts = Host.list(
- self.apiclient,
- id=routers[1].hostid,
- listall=True
- )
- self.assertEqual(
- isinstance(hosts, list),
- True,
- "List host should return a valid data"
- )
- second_host = hosts[0]
-
- # Checking if the cluster IDs of both routers are different?
- self.assertNotEqual(
- first_host.clusterid,
- second_host.clusterid,
- "Both the routers should be in different clusters"
- )
- self.debug("Enabling remaining pods if any..")
- pods = Pod.list(
- self.apiclient,
- zoneid=self.zone.id,
- listall=True,
- allocationstate="Disabled"
- )
+ self.assertEqual(
+ isinstance(hosts, list),
+ True,
+ "List host should return a valid data"
+ )
+ first_host = hosts[0]
+
+ hosts = Host.list(
+ self.apiclient,
+ id=routers[1].hostid,
+ listall=True
+ )
+ self.assertEqual(
+ isinstance(hosts, list),
+ True,
+ "List host should return a valid data"
+ )
+ second_host = hosts[0]
+
+ # Checking if the cluster IDs of both routers are different?
+ self.assertNotEqual(
+ first_host.clusterid,
+ second_host.clusterid,
+ "Both the routers should be in different
clusters"
+ )
+ finally:
+ try:
+ self.debug("Enabling remaining pods if any..")
+ pods = Pod.list(
+ self.apiclient,
+ zoneid=self.zone.id,
+ listall=True,
+ allocationstate="Disabled"
+ )
- if pods is not None:
- for pod in pods:
- cmd = updatePod.updatePodCmd()
- cmd.id = pod.id
- cmd.allocationstate = 'Enabled'
- self.apiclient.updatePod(cmd)
+ if pods is not None:
+ for pod in pods:
+ cmd = updatePod.updatePodCmd()
+ cmd.id = pod.id
+ cmd.allocationstate = 'Enabled'
+ self.apiclient.updatePod(cmd)
+ except Exception as e:
+ self.debug("Warning: Exception during pod re-enablement: %s" %
e)
return
# @attr(tags=["advanced", "advancedns"])
@@ -557,7 +562,7 @@ class TestRvRDeploymentPlanning(cloudstackTestCase):
# 3. VM should be deployed and in Running state and on the specified
# host
# 4. There should be two routers (PRIMARY and BACKUP) for this network
- # ensure both routers should be on different storage pools
+ # ensure both routers should be on different hosts
self.debug(
"Checking if the current zone has multiple active pods in it..")
@@ -636,144 +641,150 @@ class TestRvRDeploymentPlanning(cloudstackTestCase):
self.apiclient.updateCluster(cmd)
self.debug("Enabled first cluster for testing..")
- # Creating network using the network offering created
- self.debug("Creating network with network offering: %s" %
- self.network_offering.id)
- network = Network.create(
- self.apiclient,
- self.services["network"],
- accountid=self.account.name,
- domainid=self.account.domainid,
- networkofferingid=self.network_offering.id,
- zoneid=self.zone.id
- )
- self.debug("Created network with ID: %s" % network.id)
-
- networks = Network.list(
- self.apiclient,
- id=network.id,
- listall=True
- )
- self.assertEqual(
- isinstance(networks, list),
- True,
- "List networks should return a valid response for created network"
- )
- nw_response = networks[0]
-
- self.debug("Network state: %s" % nw_response.state)
- self.assertEqual(
- nw_response.state,
- "Allocated",
- "The network should be in allocated state after creation"
- )
-
- self.debug("Listing routers for network: %s" % network.name)
- routers = Router.list(
- self.apiclient,
- networkid=network.id,
- listall=True
- )
- self.assertEqual(
- routers,
- None,
- "Routers should not be spawned when network is in allocated state"
- )
-
- self.debug("Retrieving the list of hosts in the cluster")
- hosts = Host.list(
- self.apiclient,
- clusterid=enabled_cluster.id,
- listall=True
- )
- self.assertEqual(
- isinstance(hosts, list),
- True,
- "List hosts should not return an empty response"
- )
- host = hosts[0]
-
- self.debug("Deploying VM in account: %s" % self.account.name)
-
- # Spawn an instance in that network
- virtual_machine = VirtualMachine.create(
- self.apiclient,
- self.services["virtual_machine"],
- accountid=self.account.name,
- domainid=self.account.domainid,
- serviceofferingid=self.service_offering.id,
- networkids=[str(network.id)],
- hostid=host.id
- )
- self.debug("Deployed VM in network: %s" % network.id)
+ try:
+ # Creating network using the network offering created
+ self.debug("Creating network with network offering: %s" %
+
self.network_offering.id)
+ network = Network.create(
+ self.apiclient,
+ self.services["network"],
+ accountid=self.account.name,
+ domainid=self.account.domainid,
+ networkofferingid=self.network_offering.id,
+ zoneid=self.zone.id
+ )
+ self.debug("Created network with ID: %s" % network.id)
+
+ networks = Network.list(
+ self.apiclient,
+ id=network.id,
+ listall=True
+ )
+ self.assertEqual(
+ isinstance(networks, list),
+ True,
+ "List networks should return a valid response for created
network"
+ )
+ nw_response = networks[0]
+
+ self.debug("Network state: %s" % nw_response.state)
+ self.assertEqual(
+ nw_response.state,
+ "Allocated",
+ "The network should be in allocated state after
creation"
+ )
- vms = VirtualMachine.list(
+ self.debug("Listing routers for network: %s" % network.name)
+ routers = Router.list(
self.apiclient,
- id=virtual_machine.id,
+ networkid=network.id,
listall=True
)
- self.assertEqual(
- isinstance(vms, list),
- True,
- "List Vms should return a valid list"
- )
- vm = vms[0]
- self.assertEqual(
- vm.state,
- "Running",
- "Vm should be in running state after deployment"
- )
-
- self.debug("Listing routers for network: %s" % network.name)
- routers = Router.list(
+ self.assertEqual(
+ routers,
+ None,
+ "Routers should not be spawned when network is in allocated
state"
+ )
+
+ self.debug("Retrieving the list of hosts in the cluster")
+ hosts = Host.list(
self.apiclient,
- networkid=network.id,
+ clusterid=enabled_cluster.id,
listall=True
)
- self.assertEqual(
- isinstance(routers, list),
- True,
- "list router should return Primary and backup routers"
- )
- self.assertEqual(
- len(routers),
- 2,
- "Length of the list router should be 2 (Backup & Primary)"
- )
- self.assertNotEqual(
- routers[0].hostid,
- routers[1].hostid,
- "Both the routers should be in different storage pools"
- )
- self.debug("Enabling remaining pods if any..")
- pods = Pod.list(
- self.apiclient,
- zoneid=self.zone.id,
- listall=True,
- allocationstate="Disabled"
+ self.assertEqual(
+ isinstance(hosts, list),
+ True,
+ "List hosts should not return an empty response"
+ )
+ host = hosts[0]
+
+ self.debug("Deploying VM in account: %s" % self.account.name)
+
+ # Spawn an instance in that network
+ virtual_machine = VirtualMachine.create(
+ self.apiclient,
+ self.services["virtual_machine"],
+ accountid=self.account.name,
+ domainid=self.account.domainid,
+
serviceofferingid=self.service_offering.id,
+ networkids=[str(network.id)],
+ hostid=host.id
+ )
+ self.debug("Deployed VM in network: %s" % network.id)
+
+ vms = VirtualMachine.list(
+ self.apiclient,
+ id=virtual_machine.id,
+ listall=True
+ )
+ self.assertEqual(
+ isinstance(vms, list),
+ True,
+ "List Vms should return a valid list"
+ )
+ vm = vms[0]
+ self.assertEqual(
+ vm.state,
+ "Running",
+ "Vm should be in running state after deployment"
+ )
+
+ self.debug("Listing routers for network: %s" % network.name)
+ routers = Router.list(
+ self.apiclient,
+ networkid=network.id,
+ listall=True
+ )
+ self.assertEqual(
+ isinstance(routers, list),
+ True,
+ "list router should return Primary and backup routers"
)
- if pods is not None:
- for pod in pods:
- cmd = updatePod.updatePodCmd()
- cmd.id = pod.id
- cmd.allocationstate = 'Enabled'
- self.apiclient.updatePod(cmd)
-
- clusters = Cluster.list(
+ self.assertEqual(
+ len(routers),
+ 2,
+ "Length of the list router should be 2 (Backup &
Primary)"
+ )
+ self.assertNotEqual(
+ routers[0].hostid,
+ routers[1].hostid,
+ "Both the routers should be in different hosts"
+ )
+ finally:
+ try:
+ self.debug("Enabling remaining pods if any..")
+ pods = Pod.list(
self.apiclient,
- allocationstate="Disabled",
- podid=enabled_pod.id,
- listall=True
+ zoneid=self.zone.id,
+ listall=True,
+ allocationstate="Disabled"
)
-
- if clusters is not None:
- for cluster in clusters:
- cmd = updateCluster.updateClusterCmd()
- cmd.id = cluster.id
- cmd.allocationstate = 'Enabled'
- self.apiclient.updateCluster(cmd)
+ if pods is not None:
+ for pod in pods:
+ cmd = updatePod.updatePodCmd()
+ cmd.id = pod.id
+ cmd.allocationstate = 'Enabled'
+ self.apiclient.updatePod(cmd)
+
+ clusters = Cluster.list(
+ self.apiclient,
+ allocationstate="Disabled",
+ podid=enabled_pod.id,
+ listall=True
+ )
+
+ if clusters is not None:
+ for cluster in clusters:
+ cmd = updateCluster.updateClusterCmd()
+ cmd.id = cluster.id
+ cmd.allocationstate = 'Enabled'
+ self.apiclient.updateCluster(cmd)
+ except Exception as e:
+ self.debug("Warning: Exception during resource re-enablement:
%s" % e)
return
+
# @attr(tags=["advanced", "advancedns", "ssh"])
@attr(tags=["TODO"])
def test_RvR_multihosts(self):
@@ -874,140 +885,145 @@ class TestRvRDeploymentPlanning(cloudstackTestCase):
self.apiclient.updateCluster(cmd)
self.debug("Enabled first cluster for testing..")
- # Creating network using the network offering created
- self.debug("Creating network with network offering: %s" %
- self.network_offering.id)
- network = Network.create(
- self.apiclient,
- self.services["network"],
- accountid=self.account.name,
- domainid=self.account.domainid,
- networkofferingid=self.network_offering.id,
- zoneid=self.zone.id
- )
- self.debug("Created network with ID: %s" % network.id)
-
- networks = Network.list(
- self.apiclient,
- id=network.id,
- listall=True
- )
- self.assertEqual(
- isinstance(networks, list),
- True,
- "List networks should return a valid response for created network"
- )
- nw_response = networks[0]
-
- self.debug("Network state: %s" % nw_response.state)
- self.assertEqual(
- nw_response.state,
- "Allocated",
- "The network should be in allocated state after creation"
- )
-
- self.debug("Listing routers for network: %s" % network.name)
- routers = Router.list(
- self.apiclient,
- networkid=network.id,
- listall=True
- )
- self.assertEqual(
- routers,
- None,
- "Routers should not be spawned when network is in allocated state"
- )
-
- self.debug("Retrieving the list of hosts in the cluster")
- hosts = Host.list(
- self.apiclient,
- clusterid=enabled_cluster.id,
- listall=True
- )
- self.assertEqual(
- isinstance(hosts, list),
- True,
- "List hosts should not return an empty response"
- )
- host = hosts[0]
-
- self.debug("Deploying VM in account: %s" % self.account.name)
-
- # Spawn an instance in that network
- virtual_machine = VirtualMachine.create(
- self.apiclient,
- self.services["virtual_machine"],
- accountid=self.account.name,
- domainid=self.account.domainid,
- serviceofferingid=self.service_offering.id,
- networkids=[str(network.id)],
- hostid=host.id
- )
- self.debug("Deployed VM in network: %s" % network.id)
+ try:
+ # Creating network using the network offering created
+ self.debug("Creating network with network offering: %s" %
+
self.network_offering.id)
+ network = Network.create(
+ self.apiclient,
+ self.services["network"],
+ accountid=self.account.name,
+ domainid=self.account.domainid,
+ networkofferingid=self.network_offering.id,
+ zoneid=self.zone.id
+ )
+ self.debug("Created network with ID: %s" % network.id)
+
+ networks = Network.list(
+ self.apiclient,
+ id=network.id,
+ listall=True
+ )
+ self.assertEqual(
+ isinstance(networks, list),
+ True,
+ "List networks should return a valid response for created
network"
+ )
+ nw_response = networks[0]
+
+ self.debug("Network state: %s" % nw_response.state)
+ self.assertEqual(
+ nw_response.state,
+ "Allocated",
+ "The network should be in allocated state after
creation"
+ )
- vms = VirtualMachine.list(
+ self.debug("Listing routers for network: %s" % network.name)
+ routers = Router.list(
self.apiclient,
- id=virtual_machine.id,
+ networkid=network.id,
listall=True
)
- self.assertEqual(
- isinstance(vms, list),
- True,
- "List Vms should return a valid list"
- )
- vm = vms[0]
- self.assertEqual(
- vm.state,
- "Running",
- "Vm should be in running state after deployment"
- )
-
- self.debug("Listing routers for network: %s" % network.name)
- routers = Router.list(
+ self.assertEqual(
+ routers,
+ None,
+ "Routers should not be spawned when network is in allocated
state"
+ )
+
+ self.debug("Retrieving the list of hosts in the cluster")
+ hosts = Host.list(
self.apiclient,
- networkid=network.id,
+ clusterid=enabled_cluster.id,
listall=True
)
- self.assertEqual(
- isinstance(routers, list),
- True,
- "list router should return Primary and backup routers"
- )
- self.assertEqual(
- len(routers),
- 2,
- "Length of the list router should be 2 (Backup & Primary)"
- )
- self.assertNotEqual(
- routers[0].hostid,
- routers[1].hostid,
- "Both the routers should be in different hosts"
- )
- self.debug("Enabling remaining pods if any..")
- pods = Pod.list(
- self.apiclient,
- zoneid=self.zone.id,
- listall=True,
- allocationstate="Disabled"
+ self.assertEqual(
+ isinstance(hosts, list),
+ True,
+ "List hosts should not return an empty response"
+ )
+ host = hosts[0]
+
+ self.debug("Deploying VM in account: %s" % self.account.name)
+
+ # Spawn an instance in that network
+ virtual_machine = VirtualMachine.create(
+ self.apiclient,
+ self.services["virtual_machine"],
+ accountid=self.account.name,
+ domainid=self.account.domainid,
+
serviceofferingid=self.service_offering.id,
+ networkids=[str(network.id)],
+ hostid=host.id
+ )
+ self.debug("Deployed VM in network: %s" % network.id)
+
+ vms = VirtualMachine.list(
+ self.apiclient,
+ id=virtual_machine.id,
+ listall=True
+ )
+ self.assertEqual(
+ isinstance(vms, list),
+ True,
+ "List Vms should return a valid list"
+ )
+ vm = vms[0]
+ self.assertEqual(
+ vm.state,
+ "Running",
+ "Vm should be in running state after deployment"
+ )
+
+ self.debug("Listing routers for network: %s" % network.name)
+ routers = Router.list(
+ self.apiclient,
+ networkid=network.id,
+ listall=True
+ )
+ self.assertEqual(
+ isinstance(routers, list),
+ True,
+ "list router should return Primary and backup routers"
)
-
- if pods is not None:
- for pod in pods:
- cmd = updatePod.updatePodCmd()
- cmd.id = pod.id
- cmd.allocationstate = 'Enabled'
- self.apiclient.updatePod(cmd)
-
- clusters = Cluster.list(
+ self.assertEqual(
+ len(routers),
+ 2,
+ "Length of the list router should be 2 (Backup &
Primary)"
+ )
+ self.assertNotEqual(
+ routers[0].hostid,
+ routers[1].hostid,
+ "Both the routers should be in different hosts"
+ )
+ finally:
+ try:
+ self.debug("Enabling remaining pods if any..")
+ pods = Pod.list(
self.apiclient,
- allocationstate="Disabled",
- podid=enabled_pod.id,
- listall=True
+ zoneid=self.zone.id,
+ listall=True,
+ allocationstate="Disabled"
)
- if clusters is not None:
- for cluster in clusters:
- cmd = updateCluster.updateClusterCmd()
- cmd.id = cluster.id
- cmd.allocationstate = 'Enabled'
- self.apiclient.updateCluster(cmd)
+
+ if pods is not None:
+ for pod in pods:
+ cmd = updatePod.updatePodCmd()
+ cmd.id = pod.id
+ cmd.allocationstate = 'Enabled'
+ self.apiclient.updatePod(cmd)
+
+ clusters = Cluster.list(
+ self.apiclient,
+ allocationstate="Disabled",
+ podid=enabled_pod.id,
+ listall=True
+ )
+ if clusters is not None:
+ for cluster in clusters:
+ cmd = updateCluster.updateClusterCmd()
+ cmd.id = cluster.id
+ cmd.allocationstate = 'Enabled'
+ self.apiclient.updateCluster(cmd)
+ except Exception as e:
+ self.debug("Warning: Exception during resource re-enablement:
%s" % e)
return
diff --git a/test/integration/smoke/test_public_ip_range.py
b/test/integration/smoke/test_public_ip_range.py
index 19edc4c164f..997716caaaf 100644
--- a/test/integration/smoke/test_public_ip_range.py
+++ b/test/integration/smoke/test_public_ip_range.py
@@ -286,20 +286,25 @@ class TestDedicatePublicIPRange(cloudstackTestCase):
cmd.allocationstate = 'Disabled'
self.apiclient.updateZone(cmd)
- # Delete System VM and IP range, so System VM can get IP from original
ranges
- self.debug("Destroying System VM: %s" % systemvm_id)
- cmd = destroySystemVm.destroySystemVmCmd()
- cmd.id = systemvm_id
- self.apiclient.destroySystemVm(cmd)
-
- domain_id = self.public_ip_range.vlan.domainid
- self.public_ip_range.delete(self.apiclient)
-
- # Enable Zone
- cmd = updateZone.updateZoneCmd()
- cmd.id = self.zone.id
- cmd.allocationstate = 'Enabled'
- self.apiclient.updateZone(cmd)
+ try:
+ # Delete System VM and IP range, so System VM can get IP from
original ranges
+ self.debug("Destroying System VM: %s" % systemvm_id)
+ cmd = destroySystemVm.destroySystemVmCmd()
+ cmd.id = systemvm_id
+ self.apiclient.destroySystemVm(cmd)
+
+ domain_id = self.public_ip_range.vlan.domainid
+ self.public_ip_range.delete(self.apiclient)
+
+ finally:
+ # Enable Zone
+ try:
+ cmd = updateZone.updateZoneCmd()
+ cmd.id = self.zone.id
+ cmd.allocationstate = 'Enabled'
+ self.apiclient.updateZone(cmd)
+ except Exception as e:
+ self.debug("Warning: Exception during zone re-enablement in
base_system_vm: %s" % e)
# Wait for System VM to start and check System VM public IP
systemvm_id = self.wait_for_system_vm_start(
@@ -399,18 +404,23 @@ class TestDedicatePublicIPRange(cloudstackTestCase):
cmd.allocationstate = 'Disabled'
self.apiclient.updateZone(cmd)
- # Delete System VM and IP range, so System VM can get IP from original
ranges
- if system_vms:
- for v in system_vms:
- self.debug("Destroying System VM: %s" % v.id)
- cmd = destroySystemVm.destroySystemVmCmd()
- cmd.id = v.id
- self.apiclient.destroySystemVm(cmd)
-
- self.public_ip_range.delete(self.apiclient)
-
- # Enable Zone
- cmd = updateZone.updateZoneCmd()
- cmd.id = self.zone.id
- cmd.allocationstate = 'Enabled'
- self.apiclient.updateZone(cmd)
+ try:
+ # Delete System VM and IP range, so System VM can get IP from
original ranges
+ if system_vms:
+ for v in system_vms:
+ self.debug("Destroying System VM: %s" % v.id)
+ cmd = destroySystemVm.destroySystemVmCmd()
+ cmd.id = v.id
+ self.apiclient.destroySystemVm(cmd)
+
+ self.public_ip_range.delete(self.apiclient)
+
+ finally:
+ # Enable Zone
+ try:
+ cmd = updateZone.updateZoneCmd()
+ cmd.id = self.zone.id
+ cmd.allocationstate = 'Enabled'
+ self.apiclient.updateZone(cmd)
+ except Exception as e:
+ self.debug("Warning: Exception during zone re-enablement in
delete_range: %s" % e)
