@@ -442,14 +442,22 @@ def create(self, region=3):
442
442
def drop (self ):
443
443
""" Drop all the proxies in current configuration (except the LB) """
444
444
445
- print 'Dropping all proxies ...'
446
- proxies = rotator .linode_cmd .linode_list_proxies ()
447
- for item in proxies .split ('\n ' ):
448
- if item .strip () == "" : continue
449
- ip ,dc ,lid ,si ,so = item .split (',' )
450
- print '\t Dropping linode' ,lid ,'with IP' ,ip ,'from dc' ,dc ,'...'
451
- self .linode_cmd .linode_delete (int (lid ))
452
-
445
+ if self .config .vps_provider == 'linode' :
446
+ print 'Dropping all proxies ...'
447
+ proxies = rotator .linode_cmd .linode_list_proxies ()
448
+ for item in proxies .split ('\n ' ):
449
+ if item .strip () == "" : continue
450
+ ip ,dc ,lid ,si ,so = item .split (',' )
451
+ print '\t Dropping linode' ,lid ,'with IP' ,ip ,'from dc' ,dc ,'...'
452
+ self .linode_cmd .linode_delete (int (lid ))
453
+
454
+ elif self .config .vps_provider == 'aws' :
455
+ print 'Dropping all proxies ...'
456
+ proxies = rotator .aws_command .list_proxies ()
457
+ for item in proxies :
458
+ ip ,_ ,instance_id = item .split (',' )
459
+ print '\t Dropping ec2' ,instance_id ,'with IP' ,ip ,'...'
460
+ self .aws_command .delete_ec2 (instance_id )
453
461
print 'done.'
454
462
455
463
def provision (self , count = 8 , add = False ):
0 commit comments