Revision 79c33f4e

b/snf-tools/snf-admin
149 149
                            help='show servers of user with id UID')
150 150
    
151 151
    def main(self, server_id=None):
152
        servers = models.VirtualMachine.objects.order_by('id')
153 152
        if server_id:
154
            servers = servers.filter(id=server_id)
155
        if not self.show_deleted:
156
            servers = servers.filter(deleted=False)
157
        if self.uid:
158
            user = get_user(self.uid)
159
            if user:
160
                servers = servers.filter(owner=user)
161
            else:
162
                print 'Unknown user id'
163
                return
153
            servers = [models.VirtualMachine.objects.get(id=server_id)]
154
        else:
155
            servers = models.VirtualMachine.objects.order_by('id')
156
            if not self.show_deleted:
157
                servers = servers.exclude(deleted=True)
158
            if self.uid:
159
                user = get_user(self.uid)
160
                if user:
161
                    servers = servers.filter(owner=user)
162
                else:
163
                    print 'Unknown user id'
164
                    return
164 165
        
165 166
        print_items(servers, self.detail)
166 167

  
......
213 214
    description = 'list users'
214 215
    
215 216
    def add_options(self, parser):
217
        parser.add_option('-a', action='store_true', dest='show_deleted',
218
                        default=False, help='also list deleted users')
216 219
        parser.add_option('-l', action='store_true', dest='detail',
217 220
                        default=False, help='show detailed output')
218 221
    
......
220 223
        if user_id:
221 224
            users = [models.SynnefoUser.objects.get(id=user_id)]
222 225
        else:
223
            active_users = models.SynnefoUser.objects.exclude(state='DELETED')
224
            users = active_users.order_by('id')
226
            users = models.SynnefoUser.objects.order_by('id')
227
            if not self.show_deleted:
228
                users = users.exclude(state='DELETED')
225 229
        print_items(users, self.detail, keys=('id', 'name', 'uniq'))
226 230

  
227 231

  
......
291 295
    description = 'list images'
292 296
    
293 297
    def add_options(self, parser):
298
        parser.add_option('-a', action='store_true', dest='show_deleted',
299
                        default=False, help='also list deleted images')
294 300
        parser.add_option('-l', action='store_true', dest='detail',
295 301
                        default=False, help='show detailed output')
296 302
    
......
299 305
            images = [models.Image.objects.get(id=image_id)]
300 306
        else:
301 307
            images = models.Image.objects.order_by('id')
308
            if not self.show_deleted:
309
                images = images.exclude(state='DELETED')
302 310
        print_items(images, self.detail)
303 311

  
304 312

  
......
496 504
    description = 'list images'
497 505
    
498 506
    def add_options(self, parser):
507
        parser.add_option('-a', action='store_true', dest='show_deleted',
508
                default=False, help='also list deleted flavors')
499 509
        parser.add_option('-l', action='store_true', dest='detail',
500 510
                        default=False, help='show detailed output')
501 511
    
......
503 513
        if flavor_id:
504 514
            flavors = [models.Flavor.objects.get(id=flavor_id)]
505 515
        else:
506
            flavors = models.Flavor.objects.exclude(deleted=True).order_by('id')
516
            flavors = models.Flavor.objects.order_by('id')
517
            if not self.show_deleted:
518
                flavors = flavors.exclude(deleted=True)
507 519
        print_items(flavors, self.detail)
508 520

  
509 521

  

Also available in: Unified diff