import socket
import base64
import string
-import random
+import random
+import time
from collections import defaultdict
from nova.exception import ImageNotFound
from nova.api.ec2.cloud import CloudController
def delete_instance(self, tenant_name, instance_name, id=None):
+
+ def _delete_security_group(instance):
+ security_group = instance.metadata.get('security_groups', '')
+ if security_group:
+ manager = SecurityGroup(self.driver)
+ timeout = 10.0 # wait a maximum of 10 seconds before forcing the security group delete
+ start_time = time.time()
+ instance_deleted = False
+ while instance_deleted == False and (time.time() - start_time) < timeout:
+ inst = self.driver.shell.nova_manager.servers.findall(id=instance.id)
+ if not inst:
+ instance_deleted = True
+ time.sleep(.5)
+ manager.delete_security_group(security_group)
+
+ thread_manager = ThreadManager()
self.driver.shell.nova_manager.connect(tenant=tenant_name)
args = {'name': instance_name}
if id:
instances = self.driver.shell.nova_manager.servers.findall(**args)
security_group_manager = SecurityGroup(self.driver)
for instance in instances:
- # deleate this instance's security groups
- security_group = instance.metadata.get('security_groups', '')
- if security_group:
- # dont delete the default security group
- if security_group != 'default':
- security_group_manager.delete_security_group(security_group)
# destroy instance
self.driver.shell.nova_manager.servers.delete(instance)
+ # deleate this instance's security groups
+ thread_manager.run(_delete_security_group, instance)
return 1
def stop_instances(self, instance_name, tenant_name, id=None):