diff --git a/nfv/nfv-vim/nfv_vim/config.ini b/nfv/nfv-vim/nfv_vim/config.ini index 2a59a9c0..31c59aa9 100755 --- a/nfv/nfv-vim/nfv_vim/config.ini +++ b/nfv/nfv-vim/nfv_vim/config.ini @@ -41,9 +41,7 @@ max_cold_migrate_wait_in_secs=900 max_resize_wait_in_secs=900 max_evacuate_wait_in_secs=900 max_cold_migrate_local_image_disk_gb=60 -max_cold_migrate_local_lvm_disk_gb=20 max_evacuate_local_image_disk_gb=60 -max_evacuate_local_lvm_disk_gb=20 [sw-mgmt-configuration] diff --git a/nfv/nfv-vim/nfv_vim/directors/_instance_director.py b/nfv/nfv-vim/nfv_vim/directors/_instance_director.py index 3f1e575f..9efa32e0 100755 --- a/nfv/nfv-vim/nfv_vim/directors/_instance_director.py +++ b/nfv/nfv-vim/nfv_vim/directors/_instance_director.py @@ -1553,7 +1553,7 @@ class InstanceDirector(object): nfvi.objects.v1.InstanceTypeAttributes( vcpus, mem_mb, disk_gb, ephemeral_gb, swap_gb, None, auto_recovery, live_migration_timeout, live_migration_max_downtime, - nfvi.objects.v1.STORAGE_TYPE.LOCAL_LVM_BACKED) + nfvi.objects.v1.STORAGE_TYPE.LOCAL_IMAGE_BACKED) nfvi.nfvi_create_instance_type(instance_type_uuid, instance_type_name, instance_type_attributes, instance_type_create_callback) diff --git a/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_instance_type.py b/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_instance_type.py index b76bd453..a6ede900 100755 --- a/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_instance_type.py +++ b/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_instance_type.py @@ -17,7 +17,6 @@ class InstanceTypeStorage(Constants): """ UNKNOWN = Constant('unknown') REMOTE_BACKED = Constant('remote') - LOCAL_LVM_BACKED = Constant('local_lvm') LOCAL_IMAGE_BACKED = Constant('local_image') diff --git a/nfv/nfv-vim/nfv_vim/objects/_instance.py b/nfv/nfv-vim/nfv_vim/objects/_instance.py index 2981470f..e7708d91 100755 --- a/nfv/nfv-vim/nfv_vim/objects/_instance.py +++ b/nfv/nfv-vim/nfv_vim/objects/_instance.py @@ -1473,8 +1473,6 @@ class Instance(ObjectData): config_option = None if STORAGE_TYPE.LOCAL_IMAGE_BACKED == storage_type: config_option = 'max_cold_migrate_local_image_disk_gb' - elif STORAGE_TYPE.LOCAL_LVM_BACKED == storage_type: - config_option = 'max_cold_migrate_local_lvm_disk_gb' if (config_option is not None and config.section_exists('instance-configuration')): @@ -1511,8 +1509,6 @@ class Instance(ObjectData): config_option = None if STORAGE_TYPE.LOCAL_IMAGE_BACKED == storage_type: config_option = 'max_evacuate_local_image_disk_gb' - elif STORAGE_TYPE.LOCAL_LVM_BACKED == storage_type: - config_option = 'max_evacuate_local_lvm_disk_gb' if (config_option is not None and config.section_exists('instance-configuration')): diff --git a/nfv/nfv-vim/nfv_vim/objects/_instance_type.py b/nfv/nfv-vim/nfv_vim/objects/_instance_type.py index 07ff8bc3..d2acb7b1 100755 --- a/nfv/nfv-vim/nfv_vim/objects/_instance_type.py +++ b/nfv/nfv-vim/nfv_vim/objects/_instance_type.py @@ -21,7 +21,6 @@ class InstanceTypeStorage(Constants): """ UNKNOWN = Constant('unknown') REMOTE_BACKED = Constant('remote') - LOCAL_LVM_BACKED = Constant('local_lvm') LOCAL_IMAGE_BACKED = Constant('local_image')