Move clean handler when delete env
@@ -478,7 +478,6 @@ class EnvSpec implements Node {
adminLogin()
resetAllGlobalConfig()
- cleanSimulatorAndMessageHandlers()
simulatorClasses.each {
Simulator sim = it.newInstance() as Simulator
@@ -536,6 +535,8 @@ class EnvSpec implements Node {
VolumeGlobalConfig.VOLUME_DELETION_POLICY.updateValue(VolumeDeletionPolicyManager.VolumeDeletionPolicy.Direct.toString())
VmGlobalConfig.VM_DELETION_POLICY.updateValue(VmInstanceDeletionPolicyManager.VmInstanceDeletionPolicy.Direct.toString())
+ cleanSimulatorAndMessageHandlers()
+
destroy(session.uuid)
resourcesNeedDeletion.each {
