Revision b49e7db8

b/snf-cyclades-app/synnefo/api/management/commands/server-inspect.py
70 70

  
71 71
        try:
72 72
            vm_id = int(args[0])
73
            vm = VirtualMachine.objects.get(id=vm_id)
73 74
        except ValueError:
74 75
            raise CommandError("Invalid server ID")
75

  
76
        try:
77
            vm = VirtualMachine.objects.get(id=vm_id)
78 76
        except VirtualMachine.DoesNotExist:
79 77
            raise CommandError("Server not found in DB")
80 78

  
......
105 103
        client = vm.get_client()
106 104
        try:
107 105
            g_vm = client.GetInstance(vm.backend_vm_id)
106
            self.stdout.write('\n')
107
            self.stdout.write(sep)
108
            self.stdout.write('State of Server in Ganeti\n')
109
            self.stdout.write(sep)
110
            for i in GANETI_INSTANCE_FIELDS:
111
                try:
112
                    value = g_vm[i]
113
                    if i.find('time') != -1:
114
                        value = datetime.fromtimestamp(value)
115
                    self.stdout.write(i.ljust(14) + ': ' + str(value) + '\n')
116
                except KeyError:
117
                    pass
108 118
        except GanetiApiError as e:
109 119
            if e.code == 404:
110 120
                self.stdout.write('Server does not exist in backend %s\n' %
111 121
                                  vm.backend.clustername)
112
                return
113 122
            else:
114 123
                raise e
115 124

  
116
        self.stdout.write('\n')
117
        self.stdout.write(sep)
118
        self.stdout.write('State of Server in Ganeti\n')
119
        self.stdout.write(sep)
120
        for i in GANETI_INSTANCE_FIELDS:
121
            try:
122
                value = g_vm[i]
123
                if i.find('time') != -1:
124
                    value = datetime.fromtimestamp(value)
125
                self.stdout.write(i.ljust(14) + ': ' + str(value) + '\n')
126
            except KeyError:
127
                pass
128

  
129 125
        if not options['jobs']:
130 126
            return
131 127

  

Also available in: Unified diff