morpheus-cli 8.0.0 → 8.0.2

data/lib/morpheus/cli/mixins/provisioning_helper.rb

@@ -508,16 +508,17 @@ module Morpheus::Cli::ProvisioningHelper
 
     while instance_name.nil? do
       name_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'name', 'fieldLabel' => 'Instance Name', 'type' => 'text', 'required' => options[:name_required], 'defaultValue' => options[:default_name]}], options[:options])
-
-      if name_prompt['name'].nil? && !options[:name_required]
+      name = name_prompt['name']
+      if name.nil? && !options[:name_required]
         break
       else
-        if instances_interface.list({name: name_prompt['name']})['instances'].empty?
-          instance_name = name_prompt['name']
+        if instances_interface.list({name: name})['instances'].empty?
+          instance_name = name
         else
-          print_red_alert "Name must be unique"
+          print_red_alert "Name must be unique, #{name} already exists"
+          options[:options].delete('name')
           exit 1 if no_prompt
-          if options[:default_name] == name_prompt['name']
+          if options[:default_name] == name
             options[:default_name] += '-2'
           end
         end
@@ -796,7 +797,8 @@ module Morpheus::Cli::ProvisioningHelper
             resource_pool_prompt = Morpheus::Cli::OptionTypes.prompt([resource_pool_option_type],options[:options],api_client,{}, no_prompt, true)
             resource_pool_prompt.deep_compact!
             payload.deep_merge!(resource_pool_prompt)
-            resource_pool = Morpheus::Cli::OptionTypes.get_last_select()
+            # this results in the layout, not the resourcePool for some reason...
+            #resource_pool = Morpheus::Cli::OptionTypes.get_last_select() 
             if resource_pool_option_type['fieldContext'] && resource_pool_prompt[resource_pool_option_type['fieldContext']]
               pool_id = resource_pool_prompt[resource_pool_option_type['fieldContext']][resource_pool_option_type['fieldName']]
             elsif resource_pool_prompt[resource_pool_option_type['fieldName']]
@@ -833,38 +835,13 @@ module Morpheus::Cli::ProvisioningHelper
         option_type_list = option_type_list.reject {|opt| ['provisionServerId'].include?(opt['fieldName'])}
       end
 
-      # add selectable datastores for resource pool
+      # add selectable datastores
+      # no longer use the plan datastores info, always load from data-stores api instead
+      # note: this modifies service_plan in place with 'datastores' and 'autoOptions'
       if options[:select_datastore]
-        begin
-          selectable_datastores = datastores_interface.list({'zoneId' => cloud_id, 'siteId' => group_id, 'poolId' => resource_pool['id'], 'resourcePoolId' => resource_pool['id']})
-          service_plan['datastores'] = {'clusters' => [], 'datastores' => []}
-          ['clusters', 'datastores'].each do |type|
-            service_plan['datastores'][type] ||= []
-            selectable_datastores[type].reject { |ds| service_plan['datastores'][type].find {|it| it['id'] == ds['id']} }.each { |ds|
-              service_plan['datastores'][type] << ds
-            }
-          end
-        rescue => error
-          Morpheus::Logging::DarkPrinter.puts "Unable to load available data-stores, using datastores option source instead." if Morpheus::Logging.debug?
-        end
-
-        if provision_type && provision_type['supportsAutoDatastore']
-          service_plan['supportsAutoDatastore'] = true
-          service_plan['autoOptions'] ||= []
-          if service_plan['datastores'] && service_plan['datastores']['clusters']
-            if service_plan['datastores']['clusters'].count > 0 && !service_plan['autoOptions'].find {|it| it['id'] == 'autoCluster'}
-              service_plan['autoOptions'] << {'id' => 'autoCluster', 'name' => 'Auto - Cluster'}
-            end
-          else
-            service_plan['autoOptions'] << {'id' => 'autoCluster', 'name' => 'Auto - Cluster'}
-          end
-          if service_plan['datastores'] && service_plan['datastores']['datastores']
-            if service_plan['datastores']['datastores'].count > 0 && !service_plan['autoOptions'].find {|it| it['id'] == 'auto'}
-              service_plan['autoOptions'] << {'id' => 'auto', 'name' => 'Auto - Datastore'}
-            end
-          else
-            service_plan['autoOptions'] << {'id' => 'auto', 'name' => 'Auto - Datastore'}
-          end
+        if provision_type['hasDatastore']
+          datastore_params = {'zoneId' => cloud_id, 'siteId' => group_id, 'resourcePoolId' => resource_pool['id']}
+          load_service_plan_datastores(service_plan, provision_type, datastore_params)
         end
       end
     end
@@ -1089,7 +1066,7 @@ module Morpheus::Cli::ProvisioningHelper
     no_prompt = (options[:no_prompt] || (options[:options] && options[:options][:no_prompt]))
     volumes = []
     plan_size = nil
-    if plan_info['maxStorage']
+    if plan_info['maxStorage'].to_i > 0
       plan_size = plan_info['maxStorage'].to_i / (1024 * 1024 * 1024)
     end
     root_storage_types = []
@@ -1162,7 +1139,7 @@ module Morpheus::Cli::ProvisioningHelper
       storage_type_id = nil
       storage_type = nil
     else
-      default_storage_type = root_storage_types.find {|t| t['value'].to_s == volume['storageType'].to_s}
+      default_storage_type = root_storage_types.find {|t| t['value'].to_s == (volume['typeId'] || volume['storageType']).to_s}
       v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'storageType', 'type' => 'select', 'fieldLabel' => 'Root Storage Type', 'selectOptions' => root_storage_types, 'required' => true, 'defaultFirstOption' => true, 'skipSingleOption' => true, 'description' => 'Choose a storage type.', 'defaultValue' => default_storage_type ? default_storage_type['name'] : volume['storageType']}], options[:options])
       storage_type_id = v_prompt[field_context]['storageType']
       storage_type = plan_info['storageTypes'].find {|i| i['id'] == storage_type_id.to_i }
@@ -1198,6 +1175,11 @@ module Morpheus::Cli::ProvisioningHelper
           volume['size'] = nil #volume.delete('size')
         end
       end
+      # root volume storage controller mount input is disabled in the UI.
+      # if plan_info['customizeVolume'] # && storage_type['customStorageController']
+      #   cmp = prompt_volume_controller_mount_point(volumes, field_context, volume_index, volume, plan_info, provision_type, options, server)
+      #   volume['controllerMountPoint'] = cmp if !cmp.to_s.empty?
+      # end
     else
       # might need different logic here ? =o
       #volume['size'] = plan_size
@@ -1217,29 +1199,254 @@ module Morpheus::Cli::ProvisioningHelper
       has_another_volume = (options[:options] && options[:options]["dataVolume#{volume_index}"]) || (options[:options] && options[:options]['volumes'] && options[:options]['volumes'][volume_index])
       add_another_volume = has_another_volume || (!no_prompt && Morpheus::Cli::OptionTypes.confirm("Add data volume?", {:default => (options[:defaultAddFirstDataVolume] == true && volume_index == 1)}))
       while add_another_volume do
-          #puts "Configure Data #{volume_index} Volume"
+        #puts "Configure Data #{volume_index} Volume"
+
+        field_context = "dataVolume#{volume_index}"
+
+        #volume_label = (volume_index == 1 ? 'data' : "data #{volume_index}")
+        volume_label = "data-#{volume_index}"
+        volume = {
+          #'id' => -1,
+          'rootVolume' => false,
+          'name' => volume_label,
+          'size' => plan_size,
+          'sizeId' => nil,
+          'storageType' => nil,
+          'datastoreId' => nil
+        }
+        if options[:options] && options[:options]['volumes'] && options[:options]['volumes'][volume_index]
+          volume = options[:options]['volumes'][volume_index]
+        end
+
+        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'storageType', 'type' => 'select', 'fieldLabel' => "Disk #{volume_index} Storage Type", 'selectOptions' => storage_types, 'required' => true, 'defaultFirstOption' => true, 'skipSingleOption' => true, 'description' => 'Choose a storage type.', 'defaultValue' => volume['storageType']}], options[:options])
+        storage_type_id = v_prompt[field_context]['storageType']
+        volume['storageType'] = storage_type_id
+        storage_type = plan_info['storageTypes'].find {|i| i['id'] == storage_type_id.to_i }
+
+        # sometimes the user chooses sizeId from a list of size options (AccountPrice) and other times it is free form
+        custom_size_options = []
+        if plan_info['customSizeOptions'] && plan_info['customSizeOptions'][storage_type_id.to_s]
+          plan_info['customSizeOptions'][storage_type_id.to_s].each do |opt|
+            if !opt.nil?
+              custom_size_options << {'name' => opt['value'], 'value' => opt['key']}
+            end
+          end
+        end
+
+        if plan_info['customizeVolume'] && storage_type['customLabel']
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'name', 'type' => 'text', 'fieldLabel' => "Disk #{volume_index} Volume Label", 'required' => true, 'description' => 'Enter a volume label.', 'defaultValue' => volume['name']}], options[:options])
+          volume['name'] = v_prompt[field_context]['name']
+        end
+        if plan_info['customizeVolume'] && storage_type['customSize']
+          if custom_size_options.empty?
+            v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'size', 'type' => 'number', 'fieldLabel' => "Disk #{volume_index} Volume Size (GB)", 'required' => true, 'description' => 'Enter a volume size (GB).', 'defaultValue' => volume['size']}], options[:options])
+            volume['size'] = v_prompt[field_context]['size']
+            volume['sizeId'] = nil #volume.delete('sizeId')
+          else
+            v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'sizeId', 'type' => 'select', 'fieldLabel' => "Disk #{volume_index} Volume Size", 'selectOptions' => custom_size_options, 'required' => true, 'description' => 'Choose a volume size.', 'defaultValue' => volume['sizeId']}], options[:options])
+            volume['sizeId'] = v_prompt[field_context]['sizeId']
+            volume['size'] = nil #volume.delete('size')
+          end
+        else
+          # might need different logic here ? =o
+          volume['size'] = plan_size
+          volume['sizeId'] = nil #volume.delete('sizeId')
+        end
+        #todo: Pass in virtual_image to prompt based on its storage_controllers (and volume configuration)
+        if plan_info['customizeVolume'] # && storage_type['customStorageController']
+          cmp = prompt_volume_controller_mount_point(volumes, field_context, volume_index, volume, plan_info, provision_type, options, nil)
+          volume['controllerMountPoint'] = cmp if !cmp.to_s.empty?
+        end
+        if !datastore_options.empty?
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'datastoreId', 'type' => 'select', 'fieldLabel' => "Disk #{volume_index} Datastore", 'selectOptions' => datastore_options, 'required' => true, 'description' => 'Choose a datastore.', 'defaultValue' => volume['datastoreId']}], options[:options])
+          volume['datastoreId'] = v_prompt[field_context]['datastoreId']
+        end
+
+        volumes << volume
+
+        volume_index += 1
+        if options[:options] && options[:options]['volumes'] && options[:options]['volumes'][volume_index]
+          add_another_volume = true
+        elsif plan_info['maxDisk'] && volume_index >= plan_info['maxDisk']
+          # todo: should maxDisk check consider the root volume too?
+          add_another_volume = false
+        else
+          has_another_volume = options[:options] && options[:options]["dataVolume#{volume_index}"]
+          add_another_volume = has_another_volume || (!no_prompt && Morpheus::Cli::OptionTypes.confirm("Add another data volume?", {:default => false}))
+        end
+
+      end
+
+    end
+
+    return volumes
+  end
+
+
+  # This recreates the behavior of multi_disk.js
+  # returns array of volumes based on service plan options (plan_info)
+  def prompt_resize_volumes(current_volumes, plan_info, provision_type, options={}, server=nil)
+    #puts "Configure Volumes:"
+    no_prompt = (options[:no_prompt] || (options[:options] && options[:options][:no_prompt]))
+
+    current_root_volume = current_volumes[0]
+
+    volumes = []
+
+    plan_size = nil
+    if plan_info['maxStorage'].to_i > 0
+      plan_size = plan_info['maxStorage'].to_i / (1024 * 1024 * 1024)
+    end
+
+    root_storage_types = []
+    if plan_info['rootStorageTypes']
+      plan_info['rootStorageTypes'].each do |opt|
+        if !opt.nil?
+          root_storage_types << {'name' => opt['name'], 'value' => opt['id']}
+        end
+      end
+    end
+
+    storage_types = []
+    if plan_info['storageTypes']
+      plan_info['storageTypes'].each do |opt|
+        if !opt.nil?
+          storage_types << {'name' => opt['name'], 'value' => opt['id']}
+        end
+      end
+    end
+
+    # no longer use the plan datastores info, always load from data-stores api instead
+    # note: this modifies service_plan in place with 'datastores' and 'autoOptions'
+    group_id = cloud_id = options['siteId']
+    cloud_id = options['zoneId']
+    server_resource_pool_id = server ? (server['resourcePoolId'] || (server['resourcePool'] ? server['resourcePool']['id'] : nil)) : nil
+    resource_pool_id = options['resourcePoolId'] || server_resource_pool_id
+    if provision_type['hasDatastore']
+      datastore_params = {'zoneId' => cloud_id, 'siteId' => group_id, 'resourcePoolId' => resource_pool_id}
+      load_service_plan_datastores(plan_info, provision_type, datastore_params)
+    end
+    datastore_options = []
+    if plan_info['supportsAutoDatastore']
+      if plan_info['autoOptions']
+        plan_info['autoOptions'].each do |opt|
+          if !opt.nil?
+            datastore_options << {'name' => opt['name'], 'value' => opt['id']}
+          end
+        end
+      end
+    end
+    if plan_info['datastores']
+      plan_info['datastores'].each do |k, v|
+        v.each do |opt|
+          if !opt.nil?
+            datastore_options << {'name' => "#{k}: #{opt['name']}", 'value' => opt['id']}
+          end
+        end
+      end
+    end
+
+    #puts "Configure Root Volume"
+
+    field_context = "rootVolume"
+    storage_type = nil
+    storage_type_id = nil
+    if root_storage_types.empty?
+      # this means there's no configuration, just send a single root volume to the server
+      storage_type_id = nil
+      storage_type = nil
+    else
+      #v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'storageType', 'type' => 'select', 'fieldLabel' => 'Root Storage Type', 'selectOptions' => root_storage_types, 'required' => true, 'defaultFirstOption' => true, 'skipSingleOption' => true, 'description' => 'Choose a storage type.'}], options[:options])
+      #storage_type_id = v_prompt[field_context]['storageType']
+      storage_type_id = (current_root_volume['typeId'] || current_root_volume['storageType'] || (current_root_volume['type']['id'] rescue nil))
+      storage_type = plan_info['storageTypes'].find {|i| i['id'] == storage_type_id.to_i }
+    end
+
+    # sometimes the user chooses sizeId from a list of size options (AccountPrice) and other times it is free form
+    root_custom_size_options = []
+    if plan_info['rootCustomSizeOptions'] && plan_info['rootCustomSizeOptions'][storage_type_id.to_s]
+      plan_info['rootCustomSizeOptions'][storage_type_id.to_s].each do |opt|
+        if !opt.nil?
+          root_custom_size_options << {'name' => opt['value'], 'value' => opt['key']}
+        end
+      end
+    end
+    volume = {
+      'id' => current_root_volume['id'],
+      'rootVolume' => true,
+      'name' => current_root_volume['name'],
+      'size' => get_volume_size(current_root_volume) || plan_size,
+      'sizeId' => nil,
+      'storageType' => storage_type_id,
+      'datastoreId' => current_root_volume['datastoreId']
+    }
+    if !current_root_volume['controllerMountPoint'].to_s.empty?
+      volume['controllerMountPoint'] = current_root_volume['controllerMountPoint']
+    end
+    if plan_info['rootDiskCustomizable'] && storage_type && storage_type['customLabel']
+      v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'name', 'type' => 'text', 'fieldLabel' => 'Root Volume Label', 'required' => true, 'description' => 'Enter a volume label.', 'defaultValue' => volume['name']}], options[:options])
+      volume['name'] = v_prompt[field_context]['name']
+    end
+    if plan_info['rootDiskCustomizable'] && storage_type && storage_type['customSize']
+      # provision_type['rootDiskSizeKnown'] == false means size cannot be changed
+      if provision_type['rootDiskSizeKnown'] == false
+        # volume['size'] = plan_size if plan_size.to_i != 0
+      else
+        if root_custom_size_options.empty?
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'size', 'type' => 'number', 'fieldLabel' => 'Root Volume Size (GB)', 'required' => true, 'description' => 'Enter a volume size (GB).', 'defaultValue' => volume['size']}], options[:options])
+          volume['size'] = v_prompt[field_context]['size']
+          volume['sizeId'] = nil #volume.delete('sizeId')
+        else
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'sizeId', 'type' => 'select', 'fieldLabel' => 'Root Volume Size', 'selectOptions' => root_custom_size_options, 'required' => true, 'description' => 'Choose a volume size.'}], options[:options])
+          volume['sizeId'] = v_prompt[field_context]['sizeId']
+          volume['size'] = nil #volume.delete('size')
+        end
+      end
+    else
+      # might need different logic here ? =o
+      # volume['size'] = plan_size
+      # volume['sizeId'] = nil #volume.delete('sizeId')
+    end
+    # if !datastore_options.empty?
+    #   v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'datastoreId', 'type' => 'select', 'fieldLabel' => 'Root Datastore', 'selectOptions' => datastore_options, 'required' => true, 'description' => 'Choose a datastore.'}], options[:options])
+    #   volume['datastoreId'] = v_prompt[field_context]['datastoreId']
+    # end
+
+    volumes << volume
+
+    # modify or delete existing data volumes
+    (1..(current_volumes.size-1)).each do |volume_index|
+      current_volume = current_volumes[volume_index]
+      if current_volume
 
-          field_context = "dataVolume#{volume_index}"
+        field_context = "dataVolume#{volume_index}"
 
-          volume_label = (volume_index == 1 ? 'data' : "data #{volume_index}")
+        action_options = [{'name' => 'Modify', 'value' => 'modify'}, {'name' => 'Keep', 'value' => 'keep'}, {'name' => 'Delete', 'value' => 'delete'}]
+        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'action', 'type' => 'select', 'fieldLabel' => "Modify/Keep/Delete volume '#{current_volume['name']}'", 'selectOptions' => action_options, 'required' => true, 'defaultValue' => 'keep', 'description' => 'Modify, Keep or Delete existing data volume?'}], options[:options])
+        volume_action = v_prompt[field_context]['action']
+
+        if volume_action == 'delete'
+          # deleted volume is just excluded from post params
+          next
+        elsif volume_action == 'keep'
           volume = {
-            #'id' => -1,
+            'id' => current_volume['id'].to_i,
             'rootVolume' => false,
-            'name' => volume_label,
-            'size' => plan_size,
+            'name' => current_volume['name'],
+            'size' => get_volume_size(current_volume) || plan_size,
             'sizeId' => nil,
-            'storageType' => nil,
-            'datastoreId' => nil
+            'storageType' => (current_volume['typeId'] || current_volume['storageType'] || (current_volume['type']['id'] rescue nil)),
+            'datastoreId' => current_volume['datastoreId']
           }
-          if options[:options] && options[:options]['volumes'] && options[:options]['volumes'][volume_index]
-            volume = options[:options]['volumes'][volume_index]
+          if !current_volume['controllerMountPoint'].to_s.empty?
+            volume['controllerMountPoint'] = current_volume['controllerMountPoint']
           end
-
-          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'storageType', 'type' => 'select', 'fieldLabel' => "Disk #{volume_index} Storage Type", 'selectOptions' => storage_types, 'required' => true, 'defaultFirstOption' => true, 'skipSingleOption' => true, 'description' => 'Choose a storage type.', 'defaultValue' => volume['storageType']}], options[:options])
-          storage_type_id = v_prompt[field_context]['storageType']
-          volume['storageType'] = storage_type_id
+          volumes << volume
+        else
+          # v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'storageType', 'type' => 'select', 'fieldLabel' => "Disk #{volume_index} Storage Type", 'selectOptions' => storage_types, 'required' => true, 'skipSingleOption' => true, 'description' => 'Choose a storage type.'}], options[:options])
+          # storage_type_id = v_prompt[field_context]['storageType']
+          storage_type_id = (current_volume['typeId'] || current_volume['storageType'] || (current_volume['type']['id'] rescue nil))
           storage_type = plan_info['storageTypes'].find {|i| i['id'] == storage_type_id.to_i }
-
           # sometimes the user chooses sizeId from a list of size options (AccountPrice) and other times it is free form
           custom_size_options = []
           if plan_info['customSizeOptions'] && plan_info['customSizeOptions'][storage_type_id.to_s]
@@ -1250,6 +1457,19 @@ module Morpheus::Cli::ProvisioningHelper
             end
           end
 
+          volume = {
+            'id' => current_volume['id'].to_i,
+            'rootVolume' => false,
+            'name' => current_volume['name'],
+            'size' => get_volume_size(current_volume) || plan_size,
+            'sizeId' => nil,
+            'storageType' => (current_volume['typeId'] || current_volume['storageType'] || (current_volume['type']['id'] rescue current_volume['type'])),
+            'datastoreId' => current_volume['datastoreId']
+          }
+          if !current_volume['controllerMountPoint'].to_s.empty?
+            volume['controllerMountPoint'] = current_volume['controllerMountPoint']
+          end
+          
           if plan_info['customizeVolume'] && storage_type['customLabel']
             v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'name', 'type' => 'text', 'fieldLabel' => "Disk #{volume_index} Volume Label", 'required' => true, 'description' => 'Enter a volume label.', 'defaultValue' => volume['name']}], options[:options])
             volume['name'] = v_prompt[field_context]['name']
@@ -1260,331 +1480,323 @@ module Morpheus::Cli::ProvisioningHelper
               volume['size'] = v_prompt[field_context]['size']
               volume['sizeId'] = nil #volume.delete('sizeId')
             else
-              v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'sizeId', 'type' => 'select', 'fieldLabel' => "Disk #{volume_index} Volume Size", 'selectOptions' => custom_size_options, 'required' => true, 'description' => 'Choose a volume size.', 'defaultValue' => volume['sizeId']}], options[:options])
+              v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'sizeId', 'type' => 'select', 'fieldLabel' => "Disk #{volume_index} Volume Size", 'selectOptions' => custom_size_options, 'required' => true, 'description' => 'Choose a volume size.'}], options[:options])
               volume['sizeId'] = v_prompt[field_context]['sizeId']
               volume['size'] = nil #volume.delete('size')
             end
           else
             # might need different logic here ? =o
-            volume['size'] = plan_size
-            volume['sizeId'] = nil #volume.delete('sizeId')
-          end
-          if !datastore_options.empty?
-            v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'datastoreId', 'type' => 'select', 'fieldLabel' => "Disk #{volume_index} Datastore", 'selectOptions' => datastore_options, 'required' => true, 'description' => 'Choose a datastore.', 'defaultValue' => volume['datastoreId']}], options[:options])
-            volume['datastoreId'] = v_prompt[field_context]['datastoreId']
+            # volume['size'] = plan_size
+            # volume['sizeId'] = nil #volume.delete('sizeId')
           end
+          # if plan_info['customizeVolume'] # && storage_type['customStorageController']
+          #   cmp = prompt_volume_controller_mount_point(volumes, field_context, volume_index, volume, plan_info, provision_type, options, server)
+          #   volume['controllerMountPoint'] = cmp if !cmp.to_s.empty?
+          # end
+          # if !datastore_options.empty?
+          #   v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'datastoreId', 'type' => 'select', 'fieldLabel' => "Disk #{volume_index} Datastore", 'selectOptions' => datastore_options, 'required' => true, 'description' => 'Choose a datastore.'}], options[:options])
+          #   volume['datastoreId'] = v_prompt[field_context]['datastoreId']
+          # end
 
           volumes << volume
 
-          volume_index += 1
-          if options[:options] && options[:options]['volumes'] && options[:options]['volumes'][volume_index]
-            add_another_volume = true
-          elsif plan_info['maxDisk'] && volume_index >= plan_info['maxDisk']
-            # todo: should maxDisk check consider the root volume too?
-            add_another_volume = false
-          else
-            has_another_volume = options[:options] && options[:options]["dataVolume#{volume_index}"]
-            add_another_volume = has_another_volume || (!no_prompt && Morpheus::Cli::OptionTypes.confirm("Add another data volume?", {:default => false}))
-          end
-
         end
 
       end
-
-      return volumes
     end
 
 
-    # This recreates the behavior of multi_disk.js
-    # returns array of volumes based on service plan options (plan_info)
-    def prompt_resize_volumes(current_volumes, plan_info, provision_type, options={})
-      #puts "Configure Volumes:"
-      no_prompt = (options[:no_prompt] || (options[:options] && options[:options][:no_prompt]))
-
-      current_root_volume = current_volumes[0]
-
-      volumes = []
-
-      plan_size = nil
-      if plan_info['maxStorage']
-        plan_size = plan_info['maxStorage'].to_i / (1024 * 1024 * 1024)
-      end
-
-      root_storage_types = []
-      if plan_info['rootStorageTypes']
-        plan_info['rootStorageTypes'].each do |opt|
-          if !opt.nil?
-            root_storage_types << {'name' => opt['name'], 'value' => opt['id']}
-          end
-        end
-      end
-
-      storage_types = []
-      if plan_info['storageTypes']
-        plan_info['storageTypes'].each do |opt|
-          if !opt.nil?
-            storage_types << {'name' => opt['name'], 'value' => opt['id']}
-          end
-        end
-      end
+    if plan_info['addVolumes']
+      volume_index = current_volumes.size
+      has_another_volume = options[:options] && options[:options]["dataVolume#{volume_index}"]
+      add_another_volume = has_another_volume || (!no_prompt && Morpheus::Cli::OptionTypes.confirm("Add data volume?", {:default => false}))
+      while add_another_volume do
+        #puts "Configure Data #{volume_index} Volume"
+        previous_volume = volumes.last
+        default_storage_type_id = (previous_volume['typeId'] || previous_volume['storageType'] || (previous_volume['type']['id'] rescue previous_volume['type']))
+        storage_type_match = storage_types.find {|type| type['value'] == default_storage_type_id}
+        default_storage_type = storage_type_match ? (storage_type_match['name'] || storage_type_match['value']) : nil
+        field_context = "dataVolume#{volume_index}"
+        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'defaultValue' => default_storage_type, 'fieldContext' => field_context, 'fieldName' => 'storageType', 'type' => 'select', 'fieldLabel' => "Disk #{volume_index} Storage Type", 'selectOptions' => storage_types, 'required' => true, 'defaultFirstOption' => true, 'skipSingleOption' => true, 'description' => 'Choose a storage type.'}], options[:options])
+        storage_type_id = v_prompt[field_context]['storageType']
+        storage_type = plan_info['storageTypes'].find {|i| i['id'] == storage_type_id.to_i }
 
-      datastore_options = []
-      if plan_info['supportsAutoDatastore']
-        if plan_info['autoOptions']
-          plan_info['autoOptions'].each do |opt|
+        # sometimes the user chooses sizeId from a list of size options (AccountPrice) and other times it is free form
+        custom_size_options = []
+        if plan_info['customSizeOptions'] && plan_info['customSizeOptions'][storage_type_id.to_s]
+          plan_info['customSizeOptions'][storage_type_id.to_s].each do |opt|
             if !opt.nil?
-              datastore_options << {'name' => opt['name'], 'value' => opt['id']}
+              custom_size_options << {'name' => opt['value'], 'value' => opt['key']}
             end
           end
         end
-      end
-      if plan_info['datastores']
-        plan_info['datastores'].each do |k, v|
-          v.each do |opt|
-            if !opt.nil?
-              datastore_options << {'name' => "#{k}: #{opt['name']}", 'value' => opt['id']}
-            end
-          end
-        end
-      end
-
-      #puts "Configure Root Volume"
-
-      field_context = "rootVolume"
 
-      if root_storage_types.empty?
-        # this means there's no configuration, just send a single root volume to the server
-        storage_type_id = nil
-        storage_type = nil
-      else
-        #v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'storageType', 'type' => 'select', 'fieldLabel' => 'Root Storage Type', 'selectOptions' => root_storage_types, 'required' => true, 'defaultFirstOption' => true, 'skipSingleOption' => true, 'description' => 'Choose a storage type.'}], options[:options])
-        #storage_type_id = v_prompt[field_context]['storageType']
-        storage_type_id = current_root_volume['type'] || current_root_volume['storageType']
-        storage_type = plan_info['storageTypes'].find {|i| i['id'] == storage_type_id.to_i }
-      end
+        #volume_label = (volume_index == 1 ? 'data' : "data #{volume_index}")
+        volume_label = "data-#{volume_index}"
+        volume = {
+          'id' => -1,
+          'rootVolume' => false,
+          'name' => volume_label,
+          'size' => plan_size,
+          'sizeId' => nil,
+          'storageType' => storage_type_id,
+          'datastoreId' => nil
+        }
 
-      # sometimes the user chooses sizeId from a list of size options (AccountPrice) and other times it is free form
-      root_custom_size_options = []
-      if plan_info['rootCustomSizeOptions'] && plan_info['rootCustomSizeOptions'][storage_type_id.to_s]
-        plan_info['rootCustomSizeOptions'][storage_type_id.to_s].each do |opt|
-          if !opt.nil?
-            root_custom_size_options << {'name' => opt['value'], 'value' => opt['key']}
-          end
+        if plan_info['customizeVolume'] && storage_type['customLabel']
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'name', 'type' => 'text', 'fieldLabel' => "Disk #{volume_index} Volume Label", 'required' => true, 'description' => 'Enter a volume label.', 'defaultValue' => volume_label}], options[:options])
+          volume['name'] = v_prompt[field_context]['name']
         end
-      end
-
-      volume = {
-        'id' => current_root_volume['id'],
-        'rootVolume' => true,
-        'name' => current_root_volume['name'],
-        'size' => current_root_volume['size'] > 0 ? current_root_volume['size'] : plan_size,
-        'sizeId' => nil,
-        'storageType' => storage_type_id,
-        'datastoreId' => current_root_volume['datastoreId']
-      }
-
-      if plan_info['rootDiskCustomizable'] && storage_type && storage_type['customLabel']
-        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'name', 'type' => 'text', 'fieldLabel' => 'Root Volume Label', 'required' => true, 'description' => 'Enter a volume label.', 'defaultValue' => volume['name']}], options[:options])
-        volume['name'] = v_prompt[field_context]['name']
-      end
-      if plan_info['rootDiskCustomizable'] && storage_type && storage_type['customSize']
-        # provision_type['rootDiskSizeKnown'] == false means size cannot be changed
-        if provision_type['rootDiskSizeKnown'] == false
-          # volume['size'] = plan_size if plan_size.to_i != 0
-        else
-          if root_custom_size_options.empty?
-            v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'size', 'type' => 'number', 'fieldLabel' => 'Root Volume Size (GB)', 'required' => true, 'description' => 'Enter a volume size (GB).', 'defaultValue' => volume['size']}], options[:options])
+        if plan_info['customizeVolume'] && storage_type['customSize']
+          if custom_size_options.empty?
+            v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'size', 'type' => 'number', 'fieldLabel' => "Disk #{volume_index} Volume Size (GB)", 'required' => true, 'description' => 'Enter a volume size (GB).', 'defaultValue' => volume['size']}], options[:options])
             volume['size'] = v_prompt[field_context]['size']
             volume['sizeId'] = nil #volume.delete('sizeId')
           else
-            v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'sizeId', 'type' => 'select', 'fieldLabel' => 'Root Volume Size', 'selectOptions' => root_custom_size_options, 'required' => true, 'description' => 'Choose a volume size.'}], options[:options])
+            v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'sizeId', 'type' => 'select', 'fieldLabel' => "Disk #{volume_index} Volume Size", 'selectOptions' => custom_size_options, 'required' => true, 'description' => 'Choose a volume size.'}], options[:options])
             volume['sizeId'] = v_prompt[field_context]['sizeId']
             volume['size'] = nil #volume.delete('size')
           end
+        else
+          # might need different logic here ? =o
+          # volume['size'] = plan_size
+          # volume['sizeId'] = nil #volume.delete('sizeId')
+        end
+        if plan_info['customizeVolume'] # && storage_type['customStorageController']
+          cmp = prompt_volume_controller_mount_point(volumes, field_context, volume_index, volume, plan_info, provision_type, options, server)
+          volume['controllerMountPoint'] = cmp if !cmp.to_s.empty?
+        end
+        if !datastore_options.empty?
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'datastoreId', 'type' => 'select', 'fieldLabel' => "Disk #{volume_index} Datastore", 'selectOptions' => datastore_options, 'required' => true, 'description' => 'Choose a datastore.', 'defaultValue' => current_root_volume['datastoreId']}], options[:options])
+          volume['datastoreId'] = v_prompt[field_context]['datastoreId'] unless v_prompt[field_context]['datastoreId'].to_s.empty?
         end
-      else
-        # might need different logic here ? =o
-        # volume['size'] = plan_size
-        # volume['sizeId'] = nil #volume.delete('sizeId')
-      end
-      # if !datastore_options.empty?
-      #   v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'datastoreId', 'type' => 'select', 'fieldLabel' => 'Root Datastore', 'selectOptions' => datastore_options, 'required' => true, 'description' => 'Choose a datastore.'}], options[:options])
-      #   volume['datastoreId'] = v_prompt[field_context]['datastoreId']
-      # end
 
-      volumes << volume
-
-      # modify or delete existing data volumes
-      (1..(current_volumes.size-1)).each do |volume_index|
-        current_volume = current_volumes[volume_index]
-        if current_volume
-
-          field_context = "dataVolume#{volume_index}"
-
-          action_options = [{'name' => 'Modify', 'value' => 'modify'}, {'name' => 'Keep', 'value' => 'keep'}, {'name' => 'Delete', 'value' => 'delete'}]
-          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'action', 'type' => 'select', 'fieldLabel' => "Modify/Keep/Delete volume '#{current_volume['name']}'", 'selectOptions' => action_options, 'required' => true, 'defaultValue' => 'keep', 'description' => 'Modify, Keep or Delete existing data volume?'}], options[:options])
-          volume_action = v_prompt[field_context]['action']
-
-          if volume_action == 'delete'
-            # deleted volume is just excluded from post params
-            next
-          elsif volume_action == 'keep'
-            volume = {
-              'id' => current_volume['id'].to_i,
-              'rootVolume' => false,
-              'name' => current_volume['name'],
-              'size' => current_volume['size'] > (plan_size || 0) ? current_volume['size'] : plan_size,
-              'sizeId' => nil,
-              'storageType' => (current_volume['type'] || current_volume['storageType']),
-              'datastoreId' => current_volume['datastoreId']
-            }
-            volumes << volume
-          else
-            # v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'storageType', 'type' => 'select', 'fieldLabel' => "Disk #{volume_index} Storage Type", 'selectOptions' => storage_types, 'required' => true, 'skipSingleOption' => true, 'description' => 'Choose a storage type.'}], options[:options])
-            # storage_type_id = v_prompt[field_context]['storageType']
-            storage_type_id = current_volume['type'] || current_volume['storageType']
-            storage_type = plan_info['storageTypes'].find {|i| i['id'] == storage_type_id.to_i }
-            # sometimes the user chooses sizeId from a list of size options (AccountPrice) and other times it is free form
-            custom_size_options = []
-            if plan_info['customSizeOptions'] && plan_info['customSizeOptions'][storage_type_id.to_s]
-              plan_info['customSizeOptions'][storage_type_id.to_s].each do |opt|
-                if !opt.nil?
-                  custom_size_options << {'name' => opt['value'], 'value' => opt['key']}
-                end
-              end
-            end
+        volumes << volume
 
-            volume = {
-              'id' => current_volume['id'].to_i,
-              'rootVolume' => false,
-              'name' => current_volume['name'],
-              'size' => current_volume['size'] ? current_volume['size'] : (plan_size || 0),
-              'sizeId' => nil,
-              'storageType' => (current_volume['type'] || current_volume['storageType']),
-              'datastoreId' => current_volume['datastoreId']
-            }
-
-            if plan_info['customizeVolume'] && storage_type['customLabel']
-              v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'name', 'type' => 'text', 'fieldLabel' => "Disk #{volume_index} Volume Label", 'required' => true, 'description' => 'Enter a volume label.', 'defaultValue' => volume['name']}], options[:options])
-              volume['name'] = v_prompt[field_context]['name']
-            end
-            if plan_info['customizeVolume'] && storage_type['customSize']
-              if custom_size_options.empty?
-                v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'size', 'type' => 'number', 'fieldLabel' => "Disk #{volume_index} Volume Size (GB)", 'required' => true, 'description' => 'Enter a volume size (GB).', 'defaultValue' => volume['size']}], options[:options])
-                volume['size'] = v_prompt[field_context]['size']
-                volume['sizeId'] = nil #volume.delete('sizeId')
-              else
-                v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'sizeId', 'type' => 'select', 'fieldLabel' => "Disk #{volume_index} Volume Size", 'selectOptions' => custom_size_options, 'required' => true, 'description' => 'Choose a volume size.'}], options[:options])
-                volume['sizeId'] = v_prompt[field_context]['sizeId']
-                volume['size'] = nil #volume.delete('size')
-              end
-            else
-              # might need different logic here ? =o
-              # volume['size'] = plan_size
-              # volume['sizeId'] = nil #volume.delete('sizeId')
-            end
-            # if !datastore_options.empty?
-            #   v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'datastoreId', 'type' => 'select', 'fieldLabel' => "Disk #{volume_index} Datastore", 'selectOptions' => datastore_options, 'required' => true, 'description' => 'Choose a datastore.'}], options[:options])
-            #   volume['datastoreId'] = v_prompt[field_context]['datastoreId']
-            # end
+        # todo: should maxDisk check consider the root volume too?
+        if plan_info['maxDisk'] && volume_index >= plan_info['maxDisk']
+          add_another_volume = false
+        else
+          volume_index += 1
+          has_another_volume = options[:options] && options[:options]["dataVolume#{volume_index}"]
+          add_another_volume = has_another_volume || (!no_prompt && Morpheus::Cli::OptionTypes.confirm("Add another data volume?", {default:false}))
+        end
 
-            volumes << volume
+      end
 
-          end
+    end
+
+    return volumes
+  end
 
+  # loads datastores and modifies service_plan in place
+  # populating datastores: {datastores: [],clusters: []}, supportsAutoDatastore: true, autoOptions: []
+  def load_service_plan_datastores(service_plan, provision_type, params)
+    begin
+      selectable_datastores = datastores_interface.list(params)
+      service_plan['datastores'] = {'clusters' => [], 'datastores' => []}
+      ['clusters', 'datastores'].each do |type|
+        service_plan['datastores'][type] ||= []
+        selectable_datastores[type].reject { |ds| service_plan['datastores'][type].find {|it| it['id'] == ds['id']} }.each { |ds|
+          service_plan['datastores'][type] << ds
+        }
+      end
+    rescue => error
+      Morpheus::Logging::DarkPrinter.puts "Unable to load available data-stores, using datastores option source instead." if Morpheus::Logging.debug?
+    end
+  
+    if provision_type && provision_type['supportsAutoDatastore']
+      service_plan['supportsAutoDatastore'] = true
+      service_plan['autoOptions'] ||= []
+      if service_plan['datastores'] && service_plan['datastores']['clusters']
+        if service_plan['datastores']['clusters'].count > 0 && !service_plan['autoOptions'].find {|it| it['id'] == 'autoCluster'}
+          service_plan['autoOptions'] << {'id' => 'autoCluster', 'name' => 'Auto - Cluster'}
         end
+      else
+        service_plan['autoOptions'] << {'id' => 'autoCluster', 'name' => 'Auto - Cluster'}
       end
+      if service_plan['datastores'] && service_plan['datastores']['datastores']
+        if service_plan['datastores']['datastores'].count > 0 && !service_plan['autoOptions'].find {|it| it['id'] == 'auto'}
+          service_plan['autoOptions'] << {'id' => 'auto', 'name' => 'Auto - Datastore'}
+        end
+      else
+        service_plan['autoOptions'] << {'id' => 'auto', 'name' => 'Auto - Datastore'}
+      end
+    end
+    return service_plan
+  end
 
+  def get_volume_size(volume)
+    if volume['size'].to_i > 0
+      volume['size']
+    elsif volume['maxStorage'].to_i > 0
+      volume['maxStorage'].to_i / (1024**3)
+    else
+      nil  
+    end
+  end
 
-      if plan_info['addVolumes']
-        volume_index = current_volumes.size
-        has_another_volume = options[:options] && options[:options]["dataVolume#{volume_index}"]
-        add_another_volume = has_another_volume || (!no_prompt && Morpheus::Cli::OptionTypes.confirm("Add data volume?", {:default => false}))
-        while add_another_volume do
-            #puts "Configure Data #{volume_index} Volume"
-
-            current_root_volume_type = current_root_volume['type']
-            storage_type_match = storage_types.find {|type| type['value'] == current_root_volume_type}
-            default_storage_type = storage_type_match ? current_root_volume_type : storage_types[0]['value']
-            field_context = "dataVolume#{volume_index}"
-            v_prompt = Morpheus::Cli::OptionTypes.prompt([{'defaultValue' => default_storage_type, 'fieldContext' => field_context, 'fieldName' => 'storageType', 'type' => 'select', 'fieldLabel' => "Disk #{volume_index} Storage Type", 'selectOptions' => storage_types, 'required' => true, 'defaultFirstOption' => true, 'skipSingleOption' => true, 'description' => 'Choose a storage type.'}], options[:options])
-            storage_type_id = v_prompt[field_context]['storageType']
-            storage_type = plan_info['storageTypes'].find {|i| i['id'] == storage_type_id.to_i }
-
-            # sometimes the user chooses sizeId from a list of size options (AccountPrice) and other times it is free form
-            custom_size_options = []
-            if plan_info['customSizeOptions'] && plan_info['customSizeOptions'][storage_type_id.to_s]
-              plan_info['customSizeOptions'][storage_type_id.to_s].each do |opt|
-                if !opt.nil?
-                  custom_size_options << {'name' => opt['value'], 'value' => opt['key']}
-                end
-              end
+  def prompt_volume_controller_mount_point(volumes, field_context, volume_index, volume, plan_info, provision_type, options={}, server=nil)
+    begin
+      # The /api/provision-types has always returned all the controllerTypes, yay
+      # It did not return hasStorageControllers: true|false though, so fallback to checking if controllerTypes.size > 0.
+      # has_storage_controllers = provision_type['hasStorageControllers'] || ['vmware'].include?(provision_type['code'])
+      # storage_controller_types = has_storage_controllers ? options_interface.options_for_source('storageControllerTypes',{provisionTypeId:provision_type['id']})['data'] : []
+      storage_controller_types = provision_type['controllerTypes']
+      has_storage_controllers = provision_type['hasStorageControllers'] || (storage_controller_types && !storage_controller_types.empty?)
+      storage_controllers = server ? server['controllers'] : []
+      if has_storage_controllers
+        # existing storage controllers from server
+        storage_controller_options = []
+        storage_controller_options.push({'name' => 'Auto', 'value' => 'auto'})
+        storage_controller_options.push({'name' => 'New', 'value' => -1})
+        storage_controllers.each_with_index do |sc, index|
+          # storage_controller_options.push({'name' => sc['name'], 'value' => sc['id']})
+          # API did not always return controller busNumber so extract from the volume mountPoint if needed
+          if sc['busNumber'].nil?
+            matching_volume = volumes.find {|v| v['controllerMountPoint'] && v['controllerMountPoint'].split(':')[0] == sc['id'].to_s }
+            if matching_volume
+              sc['busNumber'] = matching_volume['controllerMountPoint'].split(":")[1]
             end
-
-            volume_label = (volume_index == 1 ? 'data' : "data #{volume_index}")
-            volume = {
-              'id' => -1,
-              'rootVolume' => false,
-              'name' => volume_label,
-              'size' => plan_size,
-              'sizeId' => nil,
-              'storageType' => storage_type_id,
-              'datastoreId' => nil
-            }
-
-            if plan_info['customizeVolume'] && storage_type['customLabel']
-              v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'name', 'type' => 'text', 'fieldLabel' => "Disk #{volume_index} Volume Label", 'required' => true, 'description' => 'Enter a volume label.', 'defaultValue' => volume_label}], options[:options])
-              volume['name'] = v_prompt[field_context]['name']
+          end
+          sct = storage_controller_types.find { |t| t['id'] == sc['type']['id'] }
+          storage_controller_options.push({'name' => "#{sct['category'].to_s.upcase rescue ''} #{sc['busNumber'] || index}", 'value' => sc['id']})
+        end if storage_controllers
+        # The controller mount point specification for this volume in the format: `id:busNumber:typeId:unitNumber"`
+        # For new storage controllers the id is passed as -1, so an example value would be: `"-1:1:6:0"` which translates to id: -1 (new), busNumber: 1, storage controller type id: 6 (SCSI VMware Paravirtual), unit number: 0.
+        # Split -O dataVolume1.controllerMountPoint="-1:1:6:0" into its components.
+        controller_mount_point = ""
+        controller_id, bus_number, controller_type_id, unit_number = nil, nil, nil, nil
+        if options[:options][field_context] && options[:options][field_context]['controllerMountPoint']
+          parts = options[:options][field_context]['controllerMountPoint'].split(":").collect {|it| it.to_s.strip }
+          controller_id, bus_number, controller_type_id, unit_number = parts[0],parts[1],parts[2],parts[3]
+          # if we dont have every part then clear the options value so it prompt down below
+          if controller_id.to_s.empty? || bus_number.to_s.empty? || controller_type_id.to_s.empty? || unit_number.to_s.empty?
+            options[:options][field_context].delete('controllerMountPoint')
+          end
+        end
+        # Select Storage Controller, auto, new or existing
+        # Choose Existing or Add a new controller which requires selecting type selecting type.
+        if !controller_id.to_s.empty?
+          controller_id = controller_id
+        else
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'controllerId', 'type' => 'select', 'fieldLabel' => "Disk #{volume_index} Storage Controller #{volume_index}", 'selectOptions' => storage_controller_options, 'required' => true, 'description' => 'Choose a storage controller.', 'defaultValue' => (volume['controllerId'] || 'auto') }], options[:options])
+          controller_id = v_prompt[field_context]['controllerId']
+        end
+        skip_controller_mount_point = false
+        if controller_id.to_s == 'auto'
+          # auto just means omit controllerMountPoint
+          skip_controller_mount_point = true
+        elsif controller_id.to_i < 1
+          # -1 (or anything but a positive integer) means new controller
+          controller_id = -1
+        elsif controller_id
+          controller_id = controller_id.to_i
+        end
+        if skip_controller_mount_point
+          # skip mount point parameter
+          # volume.delete('controllerMountPoint')
+          # volume.delete('controllerId')
+          return nil
+        else
+          storage_controller_type = nil
+          storage_controller = nil
+          # New Controller?
+          if controller_id == -1
+            #[field_context]['controllerTypeId'] controller_type_id = unless controller_type_id.to_s.empty?
+            storage_controller_type_options = storage_controller_types.sort {|a,b| a['displayOrder'].to_i <=> b['displayOrder'].to_i}.collect {|it| {"name" => it["name"], "value" => it["id"]}}
+            if !controller_type_id.to_s.empty?
+              options[:options][field_context]['controllerTypeId'] = controller_type_id
             end
-            if plan_info['customizeVolume'] && storage_type['customSize']
-              if custom_size_options.empty?
-                v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'size', 'type' => 'number', 'fieldLabel' => "Disk #{volume_index} Volume Size (GB)", 'required' => true, 'description' => 'Enter a volume size (GB).', 'defaultValue' => plan_size}], options[:options])
-                volume['size'] = v_prompt[field_context]['size']
-                volume['sizeId'] = nil #volume.delete('sizeId')
-              else
-                v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'sizeId', 'type' => 'select', 'fieldLabel' => "Disk #{volume_index} Volume Size", 'selectOptions' => custom_size_options, 'required' => true, 'description' => 'Choose a volume size.'}], options[:options])
-                volume['sizeId'] = v_prompt[field_context]['sizeId']
-                volume['size'] = nil #volume.delete('size')
-              end
-            else
-              # might need different logic here ? =o
-              # volume['size'] = plan_size
-              # volume['sizeId'] = nil #volume.delete('sizeId')
+            v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'controllerTypeId', 'type' => 'select', 'fieldLabel' => "Disk #{volume_index} Storage Controller Type", 'selectOptions' => storage_controller_type_options, 'required' => true, 'description' => 'Choose a storage controller type.'}], options[:options])
+            controller_type_id = v_prompt[field_context]['controllerTypeId']
+            # find the selected controller type
+            storage_controller_type = storage_controller_types.find {|it| it['id'] == controller_type_id }
+            if storage_controller_type.nil?
+              raise_command_error("Storage controller type not found for id #{controller_type_id}")
             end
-            
-            if datastore_options.empty? && storage_type['hasDatastore'] != false
-              begin
-                datastore_res = datastores_interface.list({'poolId' => current_root_volume['resourcePoolId'], 'resourcePoolId' => current_root_volume['resourcePoolId'], 'zoneId' => options['zoneId'], 'siteId' => options['siteId']})['datastores']
-                datastore_res.each do |opt|
-                  datastore_options << {'name' => opt['name'], 'value' => opt['id']}
+            storage_controller = {'id' => -1, 'type' => {'id' => storage_controller_type['id']}}
+            max_devices = storage_controller_type['maxDevices'] || 1
+            reserved_bus_numbers = storage_controllers.select {|it| it['category'] == storage_controller_type['category'] }.collect {|it| it['busNumber'].to_s}.uniq
+            bus_number = bus_number.to_i || 0
+            while true
+              if !reserved_bus_numbers.include?(bus_number.to_s)
+                break
+              else
+                next_bus_number = bus_number + 1
+                if next_bus_number >= max_devices
+                  Morpheus::Logging::DarkPrinter.puts "Failed to find an available bus number!"
+                  break
                 end
-              rescue
-                datastore_options = []
+                bus_number = next_bus_number
               end
             end
-            if !datastore_options.empty?
-              v_prompt = Morpheus::Cli::OptionTypes.prompt([{'defaultValue' => current_root_volume['datastoreId'],'fieldContext' => field_context, 'fieldName' => 'datastoreId', 'type' => 'select', 'fieldLabel' => "Disk #{volume_index} Datastore", 'selectOptions' => datastore_options, 'required' => true, 'description' => 'Choose a datastore.'}], options[:options])
-              volume['datastoreId'] = v_prompt[field_context]['datastoreId']
+            storage_controller['busNumber'] = bus_number.to_s
+            storage_controller['name'] = "#{storage_controller_type['category'].to_s.upcase} #{bus_number}"
+            # storage_controller['unitNumber'] = "null"
+            # add new controller to the list
+            storage_controllers.push(storage_controller)
+          else
+            # existing controller
+            # controller_type_id = controller_type_id
+            # find the selected controller type
+            storage_controller = storage_controllers.find {|it| it['id'] == controller_id.to_i }
+            if storage_controller.nil?
+              raise_command_error("Storage controller type not found for id #{controller_type_id}")
             end
-
-            volumes << volume
-
-            # todo: should maxDisk check consider the root volume too?
-            if plan_info['maxDisk'] && volume_index >= plan_info['maxDisk']
-              add_another_volume = false
-            else
-              volume_index += 1
-              has_another_volume = options[:options] && options[:options]["dataVolume#{volume_index}"]
-              add_another_volume = has_another_volume || (!no_prompt && Morpheus::Cli::OptionTypes.confirm("Add another data volume?"))
+          end
+          # Choose Controller Mount Point
+          mount_point_options = []
+          controller_list = storage_controllers
+          # only show the selected controller
+          controller_list = [storage_controller]
+          controller_list.each do |sc|
+            sct = storage_controller_types.find { |t| t['id'] == sc['type']['id'] }
+            category = sct['category']
+            max_devices = sct['maxDevices'] || 1
+            matching_type_ids = storage_controller_types.select { |t| t['category'] == category }.collect {|t| t['id'] }
+            # find available unit numbers by reversing the controllerMountPoint to find matching types, blarghhh
+            reserved_unit_numbers = (volumes || []).collect {|v| 
+              if !v['controllerMountPoint'].to_s.empty?
+                parts = v['controllerMountPoint'].split(":")
+                vol_controller_id = parts[0]
+                vol_bus_number = parts[1]
+                vol_sct_id = parts[2]
+                vol_unit_number = parts[3]
+                if matching_type_ids.include?(vol_sct_id.to_i)
+                  vol_unit_number.to_i
+                else
+                  nil
+                end
+              else
+                nil
+              end
+            }.compact.uniq
+            (0..(max_devices - 1)).each do |index|
+              cmp_value = [sc['id'],sc['busNumber'],sct['id'],index].join(":")
+              if reserved_unit_numbers.include?(index)
+                #mount_point_options << {'name' => "#{category.to_s.upcase} #{sc['busNumber']}:#{index}", 'value' => cmp_value}
+              else
+                mount_point_options << {'name' => "#{category.to_s.upcase} #{sc['busNumber']}:#{index}", 'value' => cmp_value}
+              end
             end
-
           end
-
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'controllerMountPoint', 'type' => 'select', 'fieldLabel' => "Disk #{volume_index} Controller Mount Point", 'selectOptions' => mount_point_options, 'required' => true, 'description' => 'Choose a storage controller mount point.'}], options[:options])
+          controller_mount_point = v_prompt[field_context]['controllerMountPoint']
+          # build controllerMountPoint parameter as "id:busNumber:typeId:unitNumber"
+          #controller_mount_point = [controller_id, bus_number, controller_type_id, unit_number].collect {|it| it.to_s.strip}.join(":")
+          # volume['controllerMountPoint'] = controller_mount_point
+          return controller_mount_point
         end
-
-        return volumes
+      else
+        # storage controllers not supported, carry on then
       end
-
+    rescue => e
+      raise e
+      Morpheus::Cli::ErrorHandler.new(my_terminal.stderr).handle_error(e) if Morpheus::Logging.debug?
+      Morpheus::Logging::DarkPrinter.puts "Failed to prompt for storage controller. Proceeding..."
+    end
+  end
 
   # This recreates the behavior of multi_networks.js
   # This is used by both `instances add` and `hosts add`