Revision 3768eb67 snf-cyclades-app/synnefo/volume/tests/volumes.py

b/snf-cyclades-app/synnefo/volume/tests/volumes.py
52 52 
        name, args, kwargs = mrapi().ModifyInstance.mock_calls[0]
53 53 
        self.assertEqual(kwargs["instance"], self.vm.backend_vm_id)
54 54 
        disk_info = kwargs["disks"][0][2]
55 
        self.assertEqual(disk_info["size"], self.size)
55 
        self.assertEqual(disk_info["size"], self.size << 10)
56 56 
        self.assertEqual(disk_info["name"], vol.backend_volume_uuid)
57 57 
        self.assertEqual(disk_info["volume_name"], vol.backend_volume_uuid)
58 58 
        self.assertFalse("origin" in disk_info)
......
86 86 
        name, args, kwargs = mrapi().ModifyInstance.mock_calls[0]
87 87 
        self.assertEqual(kwargs["instance"], self.vm.backend_vm_id)
88 88 
        disk_info = kwargs["disks"][0][2]
89 
        self.assertEqual(disk_info["size"], self.size)
89 
        self.assertEqual(disk_info["size"], self.size << 10)
90 90 
        self.assertEqual(disk_info["name"], vol.backend_volume_uuid)
91 91 
        self.assertEqual(disk_info["volume_name"], vol.backend_volume_uuid)
92 92 
        self.assertEqual(disk_info["origin"], svol.backend_volume_uuid)
......
125 125 
        name, args, kwargs = mrapi().ModifyInstance.mock_calls[0]
126 126 
        self.assertEqual(kwargs["instance"], self.vm.backend_vm_id)
127 127 
        disk_info = kwargs["disks"][0][2]
128 
        self.assertEqual(disk_info["size"], self.size)
128 
        self.assertEqual(disk_info["size"], self.size << 10)
129 129 
        self.assertEqual(disk_info["name"], vol.backend_volume_uuid)
130 130 
        self.assertEqual(disk_info["volume_name"], vol.backend_volume_uuid)
131 131 
        self.assertEqual(disk_info["origin"], "snf-snapshot-43")
132 132 

  		





  133
  133
  
    
    def test_delete(self, mrapi):


  		





  134
  134
  
    
        # We can not deleted detached volumes


  		





  135
  
  
    
        vol = mf.VolumeFactory(machine=None)


  		





  
  135
  
    
        vol = mf.VolumeFactory(machine=None, status="AVAILABLE")


  		





  136
  136
  
    
        self.assertRaises(faults.BadRequest,


  		





  137
  137
  
    
                          volumes.delete,


  		





  138
  138
  
    
                          vol)


  		





  ......




  141
  141
  
    
        # Also we cannot delete root volume


  		





  142
  142
  
    
        vol.index = 0


  		





  143
  143
  
    
        vol.machine = vm


  		





  
  144
  
    
        vol.status = "IN_USE"


  		





  
  145
  
    
        vol.save()


  		





  144
  146
  
    
        self.assertRaises(faults.BadRequest,


  		





  145
  147
  
    
                          volumes.delete,


  		





  146
  148
  
    
                          vol)


  		












Also available in:
  Unified diff