KVM and XEN Disk Management Parity
Implements blueprint disk-configuration-parity This change splits local_gb into root_gb and ephemeral_gb. libvirt interpreted local_gb as what ephemeral_gb is now, whereas XenAPI interpreted local_gb as what root_gb is now. Change-Id: I496600991bac1e990326d4ded1607fee08209d68
This commit is contained in:
		@@ -31,13 +31,13 @@ def stub_out_db_instance_api(stubs):
 | 
			
		||||
    """Stubs out the db API for creating Instances."""
 | 
			
		||||
 | 
			
		||||
    INSTANCE_TYPES = {
 | 
			
		||||
        'm1.tiny': dict(memory_mb=512, vcpus=1, local_gb=0, flavorid=1),
 | 
			
		||||
        'm1.small': dict(memory_mb=2048, vcpus=1, local_gb=20, flavorid=2),
 | 
			
		||||
        'm1.tiny': dict(memory_mb=512, vcpus=1, root_gb=0, flavorid=1),
 | 
			
		||||
        'm1.small': dict(memory_mb=2048, vcpus=1, root_gb=20, flavorid=2),
 | 
			
		||||
        'm1.medium':
 | 
			
		||||
            dict(memory_mb=4096, vcpus=2, local_gb=40, flavorid=3),
 | 
			
		||||
        'm1.large': dict(memory_mb=8192, vcpus=4, local_gb=80, flavorid=4),
 | 
			
		||||
            dict(memory_mb=4096, vcpus=2, root_gb=40, flavorid=3),
 | 
			
		||||
        'm1.large': dict(memory_mb=8192, vcpus=4, root_gb=80, flavorid=4),
 | 
			
		||||
        'm1.xlarge':
 | 
			
		||||
            dict(memory_mb=16384, vcpus=8, local_gb=160, flavorid=5)}
 | 
			
		||||
            dict(memory_mb=16384, vcpus=8, root_gb=160, flavorid=5)}
 | 
			
		||||
 | 
			
		||||
    class FakeModel(object):
 | 
			
		||||
        """Stubs out for model."""
 | 
			
		||||
@@ -76,7 +76,7 @@ def stub_out_db_instance_api(stubs):
 | 
			
		||||
            'memory_mb': type_data['memory_mb'],
 | 
			
		||||
            'vcpus': type_data['vcpus'],
 | 
			
		||||
            'mac_addresses': [{'address': values['mac_address']}],
 | 
			
		||||
            'local_gb': type_data['local_gb'],
 | 
			
		||||
            'root_gb': type_data['root_gb'],
 | 
			
		||||
            }
 | 
			
		||||
        return FakeModel(base_options)
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user