morpheus-cli 5.4.2 → 5.4.4

data/lib/morpheus/cli/commands/instances.rb

@@ -17,7 +17,8 @@ class Morpheus::Cli::Instances
                        :logs, :stats, :stop, :start, :restart, :actions, :action, :suspend, :eject, :stop_service, :start_service, :restart_service, 
                        :backup, :backups, :resize, :clone, :envs, :setenv, :delenv, 
                        :lock, :unlock, :clone_image,
-                       :security_groups, :apply_security_groups, :run_workflow, :import_snapshot, :snapshot, :snapshots,
+                       :security_groups, :apply_security_groups, :run_workflow,
+                       :import_snapshot, :snapshot, :snapshots, :revert_to_snapshot, :remove_all_snapshots, :remove_all_container_snapshots, :create_linked_clone,
                        :console, :status_check, {:containers => :list_containers}, 
                        :scaling, {:'scaling-update' => :scaling_update},
                        :wiki, :update_wiki,
@@ -52,6 +53,7 @@ class Morpheus::Cli::Instances
     @execution_request_interface = @api_client.execution_request
     @deploy_interface = @api_client.deploy
     @deployments_interface = @api_client.deployments
+    @snapshots_interface = @api_client.snapshots
   end
   
   def handle(args)
@@ -2692,6 +2694,10 @@ class Morpheus::Cli::Instances
       layout_id = instance['layout']['id']
       plan_id = instance['plan']['id']
       current_plan_name = instance['plan']['name']
+
+      # need to GET provision type for some settings...
+      provision_type = @provision_types_interface.get(instance['layout']['provisionTypeId'])['provisionType']
+
       # prompt for service plan
       service_plans_json = @instances_interface.service_plans({zoneId: cloud_id, siteId: group_id, layoutId: layout_id})
       service_plans = service_plans_json["plans"]
@@ -2713,11 +2719,17 @@ class Morpheus::Cli::Instances
       current_volumes = volumes_response['volumes'].sort {|x,y| x['displayOrder'] <=> y['displayOrder'] }
 
       # prompt for volumes
-      volumes = prompt_resize_volumes(current_volumes, service_plan, options)
+      volumes = prompt_resize_volumes(current_volumes, service_plan, provision_type, options)
       if !volumes.empty?
         payload["volumes"] = volumes
       end
 
+      # plan customizations
+      plan_opts = prompt_service_plan_options(service_plan, options, @api_client, {}, instance)
+      if plan_opts && !plan_opts.empty?
+        payload['servicePlanOptions'] = plan_opts
+      end
+
       # only amazon supports this option
       # for now, always do this
       payload["deleteOriginalVolumes"] = true
@@ -3361,6 +3373,223 @@ EOT
     end
   end
 
+  def revert_to_snapshot(args)
+    options = {}
+    instance = nil
+    snapshot_id = nil
+
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+     opts.banner = subcommand_usage("[instance]")
+      opts.on("--snapshot ID", String, "Optional snapshot") do |val|
+        snapshot_id = val
+      end
+      build_common_options(opts, options, [:auto_confirm, :json, :dry_run, :remote])
+           build_standard_add_options(opts, options) #, [:options, :payload, :json, :dry_run, :remote, :quiet])
+      opts.footer = "Revert an Instance to saved Snapshot previously made." + "\n" +
+                    "[snapshotId] is required. This is the id of the snapshot to replace the current instance."
+    end
+    
+    optparse.parse!(args)
+    if args.count != 1
+      raise_command_error "wrong number of arguments, expected 1 and got (#{args.count}) #{args.join(' ')}\n#{optparse}"
+    end
+    connect(options)
+    begin
+      instance = find_instance_by_name_or_id(args[0])
+      unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to revert instance '#{instance['name']}'?", options)
+        exit 1
+      end
+      options[:options]['instanceId'] = instance['id']
+      begin
+        snapshot_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'snapshotId', 'type' => 'select', 'fieldLabel' => 'Snapshot', 'optionSource' => 'instanceSnapshots', 'required' => true, 'description' => 'Select Snapshot.'}], {}, @api_client, options[:options])
+      
+        if !snapshot_prompt['snapshotId'].to_s.empty?
+          snapshot_id = snapshot_prompt['snapshotId']
+        end
+      rescue RestClient::Exception => e
+        puts "Failed to load instance snapshots"
+      end
+      
+      @instances_interface.setopts(options)
+ 
+      payload = {}
+      if options[:dry_run]
+        print_dry_run @instances_interface.dry.revert_to_snapshot(instance['id'], snapshot_id, payload)
+        return
+      end
+      
+      json_response = @instances_interface.revert_to_snapshot(instance['id'], snapshot_id, payload)
+      if options[:json]
+        puts as_json(json_response, options)
+      else
+        print_green_success "Snapshot revert initiated."
+      end
+      return 0
+
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
+  def remove_all_container_snapshots(args)
+    options = {}
+    instance = nil
+    container_id = nil
+
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+     opts.banner = subcommand_usage("[instance]")
+      opts.on("--container ID", String, "Required container") do |val|
+        container_id = val
+      end
+      build_common_options(opts, options, [:auto_confirm, :json, :dry_run, :remote])
+      opts.footer = "Remove all snapshots attached to an instances container." + "\n" +
+                    "[containerId] is required. This is the id of the container which removes all attached snapshots."
+    end
+    
+    optparse.parse!(args)
+    if args.count != 1
+      raise_command_error "wrong number of arguments, expected 1 and got (#{args.count}) #{args.join(' ')}\n#{optparse}"
+    end
+    connect(options)
+    begin
+      instance = find_instance_by_name_or_id(args[0])
+      unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to remove all snapshots for a container?", options)
+        exit 1
+      end
+      options[:options]['instanceId'] = instance['id']
+      begin
+        container_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'containerId', 'type' => 'select', 'fieldLabel' => 'Container', 'optionSource' => 'instanceContainers', 'required' => true, 'description' => 'Select Container.'}], {}, @api_client, options[:options])
+        
+        if !container_prompt['containerId'].to_s.empty?
+          container_id = container_prompt['containerId']
+        end
+      rescue RestClient::Exception => e
+        puts "Failed to load instance containers"
+      end
+      
+      @instances_interface.setopts(options)
+ 
+      payload = {}
+      if options[:dry_run]
+        print_dry_run @instances_interface.dry.remove_all_container_snapshots(instance['id'], container_id, payload)
+        return
+      end
+      
+      json_response = @instances_interface.remove_all_container_snapshots(instance['id'], container_id, payload)
+      if options[:json]
+        puts as_json(json_response, options)
+      else
+        print_green_success "Snapshot delete initiated."
+      end
+      return 0
+
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
+  def remove_all_snapshots(args)
+    options = {}
+    instance = nil
+
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+     opts.banner = subcommand_usage("[instance]")
+      build_common_options(opts, options, [:auto_confirm, :json, :dry_run, :remote])
+      opts.footer = "Remove all snapshots attached to an instance." + "\n" +
+                    "Warning: This will remove all snapshots across all containers of an instance."
+    end
+    
+    optparse.parse!(args)
+    if args.count != 1
+      raise_command_error "wrong number of arguments, expected 1 and got (#{args.count}) #{args.join(' ')}\n#{optparse}"
+    end
+    connect(options)
+    begin
+      instance = find_instance_by_name_or_id(args[0])
+      unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to remove all snapshots for this instance?", options)
+        exit 1
+      end
+      options[:options]['instanceId'] = instance['id']
+
+      @instances_interface.setopts(options)
+ 
+      payload = {}
+      if options[:dry_run]
+        print_dry_run @instances_interface.dry.remove_all_instance_snapshots(instance['id'], payload)
+        return
+      end
+      
+      json_response = @instances_interface.remove_all_instance_snapshots(instance['id'], payload)
+      if options[:json]
+        puts as_json(json_response, options)
+      else
+        print_green_success "Snapshots attaced to instance #{instance['name']} queued for deletion."
+      end
+      return 0
+
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
+  def create_linked_clone(args)
+    options = {}
+    instance = nil
+    snapshot_id = nil
+
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+     opts.banner = subcommand_usage("[instance]")
+      opts.on("--snapshot ID", String, "Optional snapshot") do |val|
+        snapshot_id = val
+      end
+      build_common_options(opts, options, [:auto_confirm, :json, :dry_run, :remote])
+      opts.footer = "Create a linked clone using the selected snapshot of an Instance." + "\n" +
+                    "[snapshotId] is required. This is the id of the snapshot which the clone will refer to."
+    end
+    
+    optparse.parse!(args)
+    if args.count != 1
+      raise_command_error "wrong number of arguments, expected 1 and got (#{args.count}) #{args.join(' ')}\n#{optparse}"
+    end
+    connect(options)
+    begin
+      instance = find_instance_by_name_or_id(args[0])
+      options[:options]['instanceId'] = instance['id']
+      begin
+        snapshot_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'snapshotId', 'type' => 'select', 'fieldLabel' => 'Snapshot', 'optionSource' => 'instanceSnapshots', 'required' => true, 'description' => 'Select Snapshot.'}], {}, @api_client, options[:options])
+      
+        if !snapshot_prompt['snapshotId'].to_s.empty?
+          snapshot_id = snapshot_prompt['snapshotId']
+        end
+      rescue RestClient::Exception => e
+        puts "Failed to load instance snapshots"
+      end
+      
+      @instances_interface.setopts(options)
+ 
+      payload = {}
+      if options[:dry_run]
+        print_dry_run @instances_interface.dry.create_linked_clone(instance['id'], snapshot_id, payload)
+        return
+      end
+      
+      json_response = @instances_interface.create_linked_clone(instance['id'], snapshot_id, payload)
+      if options[:json]
+        puts as_json(json_response, options)
+      else
+        print_green_success "Linked Clone creation initiated."
+      end
+      return 0
+
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
 
   def scaling(args)
     options = {}
@@ -4133,6 +4362,9 @@ EOT
       opts.on( '--name VALUE', String, "Image Name (Template Name). Default is server name + timestamp" ) do |val|
         options[:options]['templateName'] = val
       end
+      opts.on( '--folder VALUE', String, "Folder externalId or '/' to use the root folder" ) do |val|
+        options[:options]['zoneFolder'] = val
+      end
       build_standard_update_options(opts, options)
       opts.footer = <<-EOT
 Clone to image (template) for an instance
@@ -4144,6 +4376,18 @@ EOT
     connect(options)
     instance = find_instance_by_name_or_id(args[0])
     return 1 if instance.nil?
+    # need to GET provision type for hasFolders
+    provision_type_code = instance['layout']['provisionTypeCode'] rescue nil
+    provision_type = nil
+    if provision_type_code
+      provision_type = provision_types_interface.list({code:provision_type_code})['provisionTypes'][0]
+      if provision_type.nil?
+        print_red_alert "Provision Type not found by code #{provision_type_code}"
+        exit 1
+      end
+    else
+      provision_type = get_provision_type_for_zone_type(cloud['zoneType']['id'])
+    end
     payload = {}
     if options[:payload]
       payload = options[:payload]
@@ -4156,6 +4400,15 @@ EOT
           payload['templateName'] = v_prompt['templateName']
         end
       end
+      #if instance['layout']['provisionTypeCode'] == 'vmware'
+      if provision_type && provision_type["hasFolders"]
+        if payload['zoneFolder'].nil?
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'zoneFolder', 'type' => 'select', 'optionSource' => 'vmwareFolders', 'fieldLabel' => 'Folder', 'description' => "Folder externalId or '/' to use the root folder", 'required' => true}], options[:options], @api_client, {siteId: instance['group']['id'], zoneId: instance['cloud']['id']})
+          if v_prompt['zoneFolder'].to_s != ''
+            payload['zoneFolder'] = v_prompt['zoneFolder']
+          end
+        end
+      end
     end
     @instances_interface.setopts(options)
     if options[:dry_run]

data/lib/morpheus/cli/commands/library_instance_types_command.rb

@@ -39,6 +39,9 @@ class Morpheus::Cli::LibraryInstanceTypesCommand
       opts.on('--technology VALUE', String, "Filter by technology") do |val|
         params['provisionTypeCode'] = val
       end
+      opts.on('--featured [true|false]',String, "Filter by featured.") do |val|
+        params['featured'] = (val.to_s.downcase != 'false' && val.to_s.downcase != 'off')
+      end
       build_common_options(opts, options, [:list, :query, :json, :yaml, :csv, :fields, :dry_run, :remote])
       opts.footer = "List instance types."
     end

data/lib/morpheus/cli/commands/monitoring_apps_command.rb

@@ -509,10 +509,10 @@ class Morpheus::Cli::MonitoringAppsCommand
       end
       @monitoring_apps_interface.setopts(options)
       if options[:dry_run]
-        print_dry_run @monitoring_apps_interface.dry.quarantine(monitor_app["id"], payload)
+        print_dry_run @monitoring_apps_interface.dry.mute(monitor_app["id"], payload)
         return 0
       end
-      json_response = @monitoring_apps_interface.quarantine(monitor_app["id"], payload)
+      json_response = @monitoring_apps_interface.mute(monitor_app["id"], payload)
       if options[:json]
         puts as_json(json_response, options)
       elsif !options[:quiet]
@@ -557,10 +557,10 @@ class Morpheus::Cli::MonitoringAppsCommand
       end
       @monitoring_apps_interface.setopts(options)
       if options[:dry_run]
-        print_dry_run @monitoring_apps_interface.dry.quarantine(monitor_app["id"], payload)
+        print_dry_run @monitoring_apps_interface.dry.mute(monitor_app["id"], payload)
         return 0
       end
-      json_response = @monitoring_apps_interface.quarantine(monitor_app["id"], payload)
+      json_response = @monitoring_apps_interface.mute(monitor_app["id"], payload)
       if options[:json]
         puts as_json(json_response, options)
       elsif !options[:quiet]
@@ -602,10 +602,10 @@ class Morpheus::Cli::MonitoringAppsCommand
       end
       @monitoring_apps_interface.setopts(options)
       if options[:dry_run]
-        print_dry_run @monitoring_apps_interface.dry.quarantine_all(payload)
+        print_dry_run @monitoring_apps_interface.dry.mute_all(payload)
         return 0
       end
-      json_response = @monitoring_apps_interface.quarantine_all(payload)
+      json_response = @monitoring_apps_interface.mute_all(payload)
       if options[:json]
         puts as_json(json_response, options)
       elsif !options[:quiet]
@@ -648,10 +648,10 @@ class Morpheus::Cli::MonitoringAppsCommand
       end
       @monitoring_apps_interface.setopts(options)
       if options[:dry_run]
-        print_dry_run @monitoring_apps_interface.dry.quarantine_all(payload)
+        print_dry_run @monitoring_apps_interface.dry.mute_all(payload)
         return 0
       end
-      json_response = @monitoring_apps_interface.quarantine_all(payload)
+      json_response = @monitoring_apps_interface.mute_all(payload)
       if options[:json]
         puts as_json(json_response, options)
       elsif !options[:quiet]

data/lib/morpheus/cli/commands/monitoring_checks_command.rb

@@ -507,10 +507,10 @@ class Morpheus::Cli::MonitoringChecksCommand
       end
       @monitoring_checks_interface.setopts(options)
       if options[:dry_run]
-        print_dry_run @monitoring_checks_interface.dry.quarantine(check["id"], payload)
+        print_dry_run @monitoring_checks_interface.dry.mute(check["id"], payload)
         return 0
       end
-      json_response = @monitoring_checks_interface.quarantine(check["id"], payload)
+      json_response = @monitoring_checks_interface.mute(check["id"], payload)
       if options[:json]
         puts as_json(json_response, options)
       elsif !options[:quiet]
@@ -555,10 +555,10 @@ class Morpheus::Cli::MonitoringChecksCommand
       end
       @monitoring_checks_interface.setopts(options)
       if options[:dry_run]
-        print_dry_run @monitoring_checks_interface.dry.quarantine(check["id"], payload)
+        print_dry_run @monitoring_checks_interface.dry.mute(check["id"], payload)
         return 0
       end
-      json_response = @monitoring_checks_interface.quarantine(check["id"], payload)
+      json_response = @monitoring_checks_interface.mute(check["id"], payload)
       if options[:json]
         puts as_json(json_response, options)
       elsif !options[:quiet]
@@ -600,10 +600,10 @@ class Morpheus::Cli::MonitoringChecksCommand
       end
       @monitoring_checks_interface.setopts(options)
       if options[:dry_run]
-        print_dry_run @monitoring_checks_interface.dry.quarantine_all(payload)
+        print_dry_run @monitoring_checks_interface.dry.mute_all(payload)
         return 0
       end
-      json_response = @monitoring_checks_interface.quarantine_all(payload)
+      json_response = @monitoring_checks_interface.mute_all(payload)
       if options[:json]
         puts as_json(json_response, options)
       elsif !options[:quiet]
@@ -646,10 +646,10 @@ class Morpheus::Cli::MonitoringChecksCommand
       end
       @monitoring_checks_interface.setopts(options)
       if options[:dry_run]
-        print_dry_run @monitoring_checks_interface.dry.quarantine_all(payload)
+        print_dry_run @monitoring_checks_interface.dry.mute_all(payload)
         return 0
       end
-      json_response = @monitoring_checks_interface.quarantine_all(payload)
+      json_response = @monitoring_checks_interface.mute_all(payload)
       if options[:json]
         puts as_json(json_response, options)
       elsif !options[:quiet]

data/lib/morpheus/cli/commands/monitoring_groups_command.rb

@@ -467,10 +467,10 @@ class Morpheus::Cli::MonitoringGroupsCommand
       end
       @monitoring_groups_interface.setopts(options)
       if options[:dry_run]
-        print_dry_run @monitoring_groups_interface.dry.quarantine(check_group["id"], payload)
+        print_dry_run @monitoring_groups_interface.dry.mute(check_group["id"], payload)
         return 0
       end
-      json_response = @monitoring_groups_interface.quarantine(check_group["id"], payload)
+      json_response = @monitoring_groups_interface.mute(check_group["id"], payload)
       if options[:json]
         puts as_json(json_response, options)
       elsif !options[:quiet]
@@ -515,10 +515,10 @@ class Morpheus::Cli::MonitoringGroupsCommand
       end
       @monitoring_groups_interface.setopts(options)
       if options[:dry_run]
-        print_dry_run @monitoring_groups_interface.dry.quarantine(check_group["id"], payload)
+        print_dry_run @monitoring_groups_interface.dry.mute(check_group["id"], payload)
         return 0
       end
-      json_response = @monitoring_groups_interface.quarantine(check_group["id"], payload)
+      json_response = @monitoring_groups_interface.mute(check_group["id"], payload)
       if options[:json]
         puts as_json(json_response, options)
       elsif !options[:quiet]
@@ -560,10 +560,10 @@ class Morpheus::Cli::MonitoringGroupsCommand
       end
       @monitoring_groups_interface.setopts(options)
       if options[:dry_run]
-        print_dry_run @monitoring_groups_interface.dry.quarantine_all(payload)
+        print_dry_run @monitoring_groups_interface.dry.mute_all(payload)
         return 0
       end
-      json_response = @monitoring_groups_interface.quarantine_all(payload)
+      json_response = @monitoring_groups_interface.mute_all(payload)
       if options[:json]
         puts as_json(json_response, options)
       elsif !options[:quiet]
@@ -606,10 +606,10 @@ class Morpheus::Cli::MonitoringGroupsCommand
       end
       @monitoring_groups_interface.setopts(options)
       if options[:dry_run]
-        print_dry_run @monitoring_groups_interface.dry.quarantine_all(payload)
+        print_dry_run @monitoring_groups_interface.dry.mute_all(payload)
         return 0
       end
-      json_response = @monitoring_groups_interface.quarantine_all(payload)
+      json_response = @monitoring_groups_interface.mute_all(payload)
       if options[:json]
         puts as_json(json_response, options)
       elsif !options[:quiet]

data/lib/morpheus/cli/commands/monitoring_incidents_command.rb

@@ -579,10 +579,10 @@ class Morpheus::Cli::MonitoringIncidentsCommand
       end
       @monitoring_incidents_interface.setopts(options)
       if options[:dry_run]
-        print_dry_run @monitoring_incidents_interface.dry.quarantine(incident["id"], payload)
+        print_dry_run @monitoring_incidents_interface.dry.mute(incident["id"], payload)
         return 0
       end
-      json_response = @monitoring_incidents_interface.quarantine(incident["id"], payload)
+      json_response = @monitoring_incidents_interface.mute(incident["id"], payload)
       if options[:json]
         puts as_json(json_response, options)
       elsif !options[:quiet]
@@ -627,10 +627,10 @@ class Morpheus::Cli::MonitoringIncidentsCommand
       end
       @monitoring_incidents_interface.setopts(options)
       if options[:dry_run]
-        print_dry_run @monitoring_incidents_interface.dry.quarantine(incident["id"], payload)
+        print_dry_run @monitoring_incidents_interface.dry.mute(incident["id"], payload)
         return 0
       end
-      json_response = @monitoring_incidents_interface.quarantine(incident["id"], payload)
+      json_response = @monitoring_incidents_interface.mute(incident["id"], payload)
       if options[:json]
         puts as_json(json_response, options)
       elsif !options[:quiet]
@@ -672,10 +672,10 @@ class Morpheus::Cli::MonitoringIncidentsCommand
       end
       @monitoring_incidents_interface.setopts(options)
       if options[:dry_run]
-        print_dry_run @monitoring_incidents_interface.dry.quarantine_all(payload)
+        print_dry_run @monitoring_incidents_interface.dry.mute_all(payload)
         return 0
       end
-      json_response = @monitoring_incidents_interface.quarantine_all(payload)
+      json_response = @monitoring_incidents_interface.mute_all(payload)
       if options[:json]
         puts as_json(json_response, options)
       elsif !options[:quiet]
@@ -718,10 +718,10 @@ class Morpheus::Cli::MonitoringIncidentsCommand
       end
       @monitoring_incidents_interface.setopts(options)
       if options[:dry_run]
-        print_dry_run @monitoring_incidents_interface.dry.quarantine_all(payload)
+        print_dry_run @monitoring_incidents_interface.dry.mute_all(payload)
         return 0
       end
-      json_response = @monitoring_incidents_interface.quarantine_all(payload)
+      json_response = @monitoring_incidents_interface.mute_all(payload)
       if options[:json]
         puts as_json(json_response, options)
       elsif !options[:quiet]

data/lib/morpheus/cli/commands/network_static_routes_command.rb

@@ -149,6 +149,11 @@ class Morpheus::Cli::NetworkStaticRoutesCommand
       return 1
     end
 
+    if !network_type['hasStaticRoutes']
+      print_red_alert "Static routes not supported for #{network_type['name']}"
+      return 1
+    end
+
     payload = nil
     if options[:payload]
       payload = options[:payload]

data/lib/morpheus/cli/commands/networks_command.rb

@@ -189,7 +189,7 @@ class Morpheus::Cli::NetworksCommand
       print cyan
       description_cols = {
         "ID" => 'id',
-        "Name" => 'name',
+        "Name" => lambda {|it| it['displayName'] ? it['displayName'] : it['name'] },
         "Description" => 'description',
         "Type" => lambda {|it| it['type'] ? it['type']['name'] : '' },
         "Group" => lambda {|it| it['group'] ? it['group']['name'] : 'Shared' },
@@ -242,7 +242,7 @@ class Morpheus::Cli::NetworksCommand
         subnet_rows = subnets.collect { |subnet|
           {
             id: subnet['id'],
-            name: "  #{subnet['name']}",
+            name: "  #{subnet['displayName'] || subnet['name']}",
             # type: subnet['type'] ? subnet['type']['name'] : '',
             type: "Subnet",
             cloud: network['zone'] ? network['zone']['name'] : '',

data/lib/morpheus/cli/commands/ping.rb

@@ -106,14 +106,12 @@ EOT
         if json_response['applianceUrl']
           appliance[:appliance_url] = json_response['applianceUrl']
         end
-        # set status to ready if we have a version but no status yet for some reason
-        if appliance[:build_version] && appliance[:status].nil?
-          appliance[:status] = 'ready'
-        end
-        # update setupNeeded? 
+        # setupNeeded? 
         if json_response['setupNeeded'] == true
           # appliance[:setup_needed] = true
           appliance[:status] = 'fresh'
+        else
+          appliance[:status] = 'ready'
         end
         # if took_sec
         #   appliance[:last_check] ||= {}

data/lib/morpheus/cli/commands/policies_command.rb

@@ -511,7 +511,7 @@ class Morpheus::Cli::PoliciesCommand
           policy_type_option_types = policy_type['optionTypes']
           # puts "POLICY OPTION TYPES:\n #{policy_type_option_types.inspect}"
           if policy_type_option_types
-            config_prompt = Morpheus::Cli::OptionTypes.prompt(policy_type_option_types, options, @api_client)
+            config_prompt = Morpheus::Cli::OptionTypes.prompt(policy_type_option_types, options, @api_client, {}, false, true, true)
             # everything should be under fieldContext:'config'
             # payload['policy'].deep_merge!(config_prompt)
             if config_prompt['config']