morpheus-cli 3.4.1.2 → 3.4.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efb715b7f77375167099ebac68e98850cfa8986f
-  data.tar.gz: 254eeeccb861eb78b9ef53e8fb8ce40c7bcfea32
+  metadata.gz: 8d494a00b196af210b1c23ccf1de41b2e069f0ad
+  data.tar.gz: dabfc1813d542df60e0905187499f7dbe8b210ee
 SHA512:
-  metadata.gz: 5733564843f2afa6e9d464c542425583973676a5f32b7b6efe34a2f92a5f8292a6246575f1d5bc4834bf06cfbb39c9d7aed73342757aa38eb32cc631f8c08422
-  data.tar.gz: a34905dff786cd7024ecfb4cf00c76f847bf7ccdd322cba36b06d0487af062bec2071db98688029c13f37ad9291c7533b65a7c8c36c1b313b6e0edb1048203ee
+  metadata.gz: dd186cffdf47d09863722bdcc0fd8f5e62f247afb49195d7b900d1315594c063ddaeee13bbcfa7169778218d0a8f130296f42da1018727559dc1b1e13def9d3a
+  data.tar.gz: e396de94d79b666b423c4745f5e4c04f62aa2fcbb14f9ad972058fb7e88f43b9e115f81127b74ad1b2a8fc162e531d22d16f516401c502b99483cdf33d46ed06

data/lib/morpheus/cli/hosts.rb

@@ -474,130 +474,146 @@ class Morpheus::Cli::Hosts
       opts.on( '-t', '--type TYPE', "Server Type Code" ) do |val|
         options[:server_type_code] = val
       end
-      build_common_options(opts, options, [:options, :json, :dry_run, :quiet, :remote])
+      build_common_options(opts, options, [:options, :payload, :json, :dry_run, :quiet, :remote])
     end
     optparse.parse!(args)
     connect(options)
+    begin
+      payload = nil
+      if options[:payload]
+        payload = options[:payload]
+      else
+        # support old format of `hosts add CLOUD NAME`
+        if args[0]
+          options[:cloud] = args[0]
+        end
+        if args[1]
+          options[:host_name] = args[1]
+        end
+        # use active group by default
+        options[:group] ||= @active_group_id
 
-    # support old format of `hosts add CLOUD NAME`
-    if args[0]
-      options[:cloud] = args[0]
-    end
-    if args[1]
-      options[:host_name] = args[1]
-    end
-    # use active group by default
-    options[:group] ||= @active_group_id
+        params = {}
 
-    params = {}
+        # Group
+        group_id = nil
+        group = options[:group] ? find_group_by_name_or_id_for_provisioning(options[:group]) : nil
+        if group
+          group_id = group["id"]
+        else
+          # print_red_alert "Group not found or specified!"
+          # exit 1
+          group_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'group', 'type' => 'select', 'fieldLabel' => 'Group', 'selectOptions' => get_available_groups(), 'required' => true, 'description' => 'Select Group.'}],options[:options],@api_client,{})
+          group_id = group_prompt['group']
+        end
 
-    # Group
-    group_id = nil
-    group = options[:group] ? find_group_by_name_or_id_for_provisioning(options[:group]) : nil
-    if group
-      group_id = group["id"]
-    else
-      # print_red_alert "Group not found or specified!"
-      # exit 1
-      group_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'group', 'type' => 'select', 'fieldLabel' => 'Group', 'selectOptions' => get_available_groups(), 'required' => true, 'description' => 'Select Group.'}],options[:options],@api_client,{})
-      group_id = group_prompt['group']
-    end
+        # Cloud
+        cloud_id = nil
+        cloud = options[:cloud] ? find_cloud_by_name_or_id_for_provisioning(group_id, options[:cloud]) : nil
+        if cloud
+          cloud_id = cloud["id"]
+        else
+          available_clouds = get_available_clouds(group_id)
+          if available_clouds.empty?
+            print_red_alert "Group #{group['name']} has no available clouds"
+            exit 1
+          end
+          cloud_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'cloud', 'type' => 'select', 'fieldLabel' => 'Cloud', 'selectOptions' => available_clouds, 'required' => true, 'description' => 'Select Cloud.'}],options[:options],@api_client,{groupId: group_id})
+          cloud_id = cloud_prompt['cloud']
+          cloud = find_cloud_by_id_for_provisioning(group_id, cloud_id)
+        end
 
-    # Cloud
-    cloud_id = nil
-    cloud = options[:cloud] ? find_cloud_by_name_or_id_for_provisioning(group_id, options[:cloud]) : nil
-    if cloud
-      cloud_id = cloud["id"]
-    else
-      available_clouds = get_available_clouds(group_id)
-      if available_clouds.empty?
-        print_red_alert "Group #{group['name']} has no available clouds"
-        exit 1
-      end
-      cloud_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'cloud', 'type' => 'select', 'fieldLabel' => 'Cloud', 'selectOptions' => available_clouds, 'required' => true, 'description' => 'Select Cloud.'}],options[:options],@api_client,{groupId: group_id})
-      cloud_id = cloud_prompt['cloud']
-      cloud = find_cloud_by_id_for_provisioning(group_id, cloud_id)
-    end
+        # Zone Type
+        cloud_type = cloud_type_for_id(cloud['zoneTypeId'])
 
-    # Zone Type
-    cloud_type = cloud_type_for_id(cloud['zoneTypeId'])
+        # Server Type
+        cloud_server_types = cloud_type['serverTypes'].select{|b| b['creatable'] == true }.sort { |x,y| x['displayOrder'] <=> y['displayOrder'] }
+        if options[:server_type_code]
+          server_type_code = options[:server_type_code]
+        else
+          server_type_options = cloud_server_types.collect {|it| {'name' => it['name'], 'value' => it['code']} }
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'type', 'type' => 'select', 'fieldLabel' => "Server Type", 'selectOptions' => server_type_options, 'required' => true, 'skipSingleOption' => true, 'description' => 'Choose a server type.'}], options[:options])
+          server_type_code = v_prompt['type']
+        end
+        server_type = cloud_server_types.find {|it| it['code'] == server_type_code }
+        if server_type.nil?
+          print_red_alert "Server Type #{server_type_code} not found cloud #{cloud['name']}"
+          exit 1
+        end
 
-    # Server Type
-    cloud_server_types = cloud_type['serverTypes'].select{|b| b['creatable'] == true }.sort { |x,y| x['displayOrder'] <=> y['displayOrder'] }
-    if options[:server_type_code]
-      server_type_code = options[:server_type_code]
-    else
-      server_type_options = cloud_server_types.collect {|it| {'name' => it['name'], 'value' => it['code']} }
-      v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'type', 'type' => 'select', 'fieldLabel' => "Server Type", 'selectOptions' => server_type_options, 'required' => true, 'skipSingleOption' => true, 'description' => 'Choose a server type.'}], options[:options])
-      server_type_code = v_prompt['type']
-    end
-    server_type = cloud_server_types.find {|it| it['code'] == server_type_code }
-    if server_type.nil?
-      print_red_alert "Server Type #{server_type_code} not found cloud #{cloud['name']}"
-      exit 1
-    end
+        # Server Name
+        host_name = nil
+        if options[:host_name]
+          host_name = options[:host_name]
+        else
+          name_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'name', 'fieldLabel' => 'Server Name', 'type' => 'text', 'required' => true}], options[:options])
+          host_name = name_prompt['name'] || ''
+        end
 
-    # Server Name
-    host_name = nil
-    if options[:host_name]
-      host_name = options[:host_name]
-    else
-      name_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'name', 'fieldLabel' => 'Server Name', 'type' => 'text', 'required' => true}], options[:options])
-      host_name = name_prompt['name'] || ''
-    end
+        payload = {}
+        # prompt for service plan
+        service_plans_json = @servers_interface.service_plans({zoneId: cloud['id'], serverTypeId: server_type["id"]})
+        service_plans = service_plans_json["plans"]
+        service_plans_dropdown = service_plans.collect {|sp| {'name' => sp["name"], 'value' => sp["id"]} } # already sorted
+        plan_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'plan', 'type' => 'select', 'fieldLabel' => 'Plan', 'selectOptions' => service_plans_dropdown, 'required' => true, 'description' => 'Choose the appropriately sized plan for this server'}],options[:options])
+        service_plan = service_plans.find {|sp| sp["id"] == plan_prompt['plan'].to_i }
+
+        payload['server'] = {
+          'name' => host_name,
+          'zone' => {'id' => cloud['id']},
+          'computeServerType' => {'id' => server_type['id']},
+          'plan' => {'id' => service_plan["id"]}
+        }
+
+        # prompt for resource pool
+        has_zone_pools = server_type["provisionType"] && server_type["provisionType"]["hasZonePools"]
+        if has_zone_pools
+          resource_pool_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => 'config', 'fieldName' => 'resourcePool', 'type' => 'select', 'fieldLabel' => 'Resource Pool', 'optionSource' => 'zonePools', 'required' => true, 'skipSingleOption' => true, 'description' => 'Select resource pool.'}],options[:options],api_client,{groupId: group_id, zoneId: cloud_id, cloudId: cloud_id, planId: service_plan["id"]})
+          if resource_pool_prompt['config'] && resource_pool_prompt['config']['resourcePool']
+            payload['config'] ||= {}
+            payload['config']['resourcePool'] = resource_pool_prompt['config']['resourcePool']
+          end
+        end
 
-    payload = {}
-    # prompt for service plan
-    service_plans_json = @servers_interface.service_plans({zoneId: cloud['id'], serverTypeId: server_type["id"]})
-    service_plans = service_plans_json["plans"]
-    service_plans_dropdown = service_plans.collect {|sp| {'name' => sp["name"], 'value' => sp["id"]} } # already sorted
-    plan_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'plan', 'type' => 'select', 'fieldLabel' => 'Plan', 'selectOptions' => service_plans_dropdown, 'required' => true, 'description' => 'Choose the appropriately sized plan for this server'}],options[:options])
-    service_plan = service_plans.find {|sp| sp["id"] == plan_prompt['plan'].to_i }
-
-    # prompt for volumes
-    volumes = prompt_volumes(service_plan, options, @api_client, {})
-    if !volumes.empty?
-      payload[:volumes] = volumes
-    end
+        # prompt for volumes
+        volumes = prompt_volumes(service_plan, options, @api_client, {})
+        if !volumes.empty?
+          payload['volumes'] = volumes
+        end
 
-    # prompt for network interfaces (if supported)
-    if server_type["provisionType"] && server_type["provisionType"]["id"] && server_type["provisionType"]["hasNetworks"]
-      begin
-        network_interfaces = prompt_network_interfaces(cloud['id'], server_type["provisionType"]["id"], options)
-        if !network_interfaces.empty?
-          payload[:networkInterfaces] = network_interfaces
+        # prompt for network interfaces (if supported)
+        if server_type["provisionType"] && server_type["provisionType"]["id"] && server_type["provisionType"]["hasNetworks"]
+          begin
+            network_interfaces = prompt_network_interfaces(cloud['id'], server_type["provisionType"]["id"], options)
+            if !network_interfaces.empty?
+              payload['networkInterfaces'] = network_interfaces
+            end
+          rescue RestClient::Exception => e
+            print yellow,"Unable to load network options. Proceeding...",reset,"\n"
+            print_rest_exception(e, options) if Morpheus::Logging.debug?
+          end
         end
-      rescue RestClient::Exception => e
-        print yellow,"Unable to load network options. Proceeding...",reset,"\n"
-        print_rest_exception(e, options) if Morpheus::Logging.debug?
-      end
-    end
 
-    server_type_option_types = server_type['optionTypes']
-    # remove volume options if volumes were configured
-    if !payload[:volumes].empty?
-      server_type_option_types = reject_volume_option_types(server_type_option_types)
-    end
-    # remove networkId option if networks were configured above
-    if !payload[:networkInterfaces].empty?
-      server_type_option_types = reject_networking_option_types(server_type_option_types)
-    end
-    # remove cpu and memory option types, which now come from the plan
-    server_type_option_types = reject_service_plan_option_types(server_type_option_types)
+        server_type_option_types = server_type['optionTypes']
+        # remove volume options if volumes were configured
+        if !payload['volumes'].empty?
+          server_type_option_types = reject_volume_option_types(server_type_option_types)
+        end
+        # remove networkId option if networks were configured above
+        if !payload['networkInterfaces'].empty?
+          server_type_option_types = reject_networking_option_types(server_type_option_types)
+        end
+        # remove resourcePoolId if it was configured above
+        if has_zone_pools
+          server_type_option_types = server_type_option_types.reject {|opt| ['resourcePool','resourcePoolId','azureResourceGroupId'].include?(opt['fieldName']) }
+        end
+        # remove cpu and memory option types, which now come from the plan
+        server_type_option_types = reject_service_plan_option_types(server_type_option_types)
 
-    params = Morpheus::Cli::OptionTypes.prompt(server_type_option_types,options[:options],@api_client, {zoneId: cloud['id']})
-    begin
-      params['server'] = params['server'] || {}
-      payload = payload.merge({
-                                server: {
-                                  name: host_name,
-                                  zone: {id: cloud['id']},
-                                  computeServerType: {id: server_type['id']},
-                                  plan: {id: service_plan["id"]}
-                                }.merge(params['server'])
-      })
-      payload[:network] = params['network'] if params['network']
-      payload[:config] = params['config'] if params['config']
+        params = Morpheus::Cli::OptionTypes.prompt(server_type_option_types,options[:options],@api_client, {zoneId: cloud['id']})
+        payload.deep_merge!(params)
+        
+      end
       if options[:dry_run]
         print_dry_run @servers_interface.dry.create(payload)
         return

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

@@ -317,6 +317,16 @@ module Morpheus::Cli::ProvisioningHelper
     end
     payload['instance']['plan'] = {'id' => service_plan["id"]}
 
+    # prompt for resource pool
+    has_zone_pools = layout["provisionType"] && layout["provisionType"]["id"] && layout["provisionType"]["hasZonePools"]
+    if has_zone_pools
+      resource_pool_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => 'config', 'fieldName' => 'resourcePoolId', 'type' => 'select', 'fieldLabel' => 'Resource Pool', 'optionSource' => 'zonePools', 'required' => true, 'skipSingleOption' => true, 'description' => 'Select resource pool.'}],options[:options],api_client,{groupId: group_id, zoneId: cloud_id, cloudId: cloud_id, instanceTypeId: instance_type['id'], planId: service_plan["id"]})
+      if resource_pool_prompt['config'] && resource_pool_prompt['config']['resourcePoolId']
+        payload['config'] ||= {}
+        payload['config']['resourcePoolId'] = resource_pool_prompt['config']['resourcePoolId']
+      end
+    end
+
     # prompt for volumes
     volumes = prompt_volumes(service_plan, options, api_client, {})
     if !volumes.empty?
@@ -354,6 +364,10 @@ module Morpheus::Cli::ProvisioningHelper
     if !payload['networkInterfaces'].empty?
       option_type_list = reject_networking_option_types(option_type_list)
     end
+    # remove resourcePoolId if it was configured above
+    if has_zone_pools
+      option_type_list = option_type_list.reject {|opt| ['resourcePool','resourcePoolId','azureResourceGroupId'].include?(opt['fieldName']) }
+    end
 
     instance_config_payload = Morpheus::Cli::OptionTypes.prompt(option_type_list, options[:options], @api_client, {groupId: group_id, cloudId: cloud_id, zoneId: cloud_id, instanceTypeId: instance_type['id'], version: version_prompt['version']})
     payload.deep_merge!(instance_config_payload)
@@ -864,7 +878,7 @@ module Morpheus::Cli::ProvisioningHelper
     network_interface_types = (zone_network_data['networkTypes'] || []).sort { |x,y| x['displayOrder'] <=> y['displayOrder'] }
     enable_network_type_selection = (zone_network_data['enableNetworkTypeSelection'] == 'on' || zone_network_data['enableNetworkTypeSelection'] == true)
     has_networks = zone_network_data["hasNetworks"] == true
-    max_networks = zone_network_data["maxNetworks"] ? zone_network_data["maxNetworks"].to_i : nil
+    max_networks = (zone_network_data["maxNetworks"].to_i > 0) ? zone_network_data["maxNetworks"].to_i : nil
 
     # skip unless provision type supports networks
     if !has_networks
@@ -941,10 +955,11 @@ module Morpheus::Cli::ProvisioningHelper
 
       network_interfaces << network_interface
       interface_index += 1
-      has_another_interface = options[:options] && options[:options]["networkInterface#{interface_index}"]
-      add_another_interface = has_another_interface || (!no_prompt && Morpheus::Cli::OptionTypes.confirm("Add another network interface?", {:default => false}))
       if max_networks && network_interfaces.size >= max_networks
         add_another_interface = false
+      else
+        has_another_interface = options[:options] && options[:options]["networkInterface#{interface_index}"]
+        add_another_interface = has_another_interface || (!no_prompt && Morpheus::Cli::OptionTypes.confirm("Add another network interface?", {:default => false}))
       end
 
     end

data/lib/morpheus/cli/roles.rb

@@ -33,47 +33,50 @@ class Morpheus::Cli::Roles
 
   def list(args)
     options = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage()
-      build_common_options(opts, options, [:list, :json, :dry_run])
+      build_common_options(opts, options, [:list, :query, :json, :yaml, :csv, :fields, :dry_run, :remote])
+      opts.footer = "List roles."
     end
     optparse.parse!(args)
 
     connect(options)
     begin
-      load_whoami()
-
       account = find_account_from_options(options)
       account_id = account ? account['id'] : nil
+      
       params = {}
-      [:phrase, :offset, :max, :sort, :direction].each do |k|
-        params[k] = options[k] unless options[k].nil?
-      end
+      params.merge!(parse_list_options(options))
 
       if options[:dry_run]
         print_dry_run @roles_interface.dry.list(account_id, params)
         return
       end
+      load_whoami()
       json_response = @roles_interface.list(account_id, params)
-      roles = json_response['roles']
       if options[:json]
-        print JSON.pretty_generate(json_response)
-        print "\n"
+        puts as_json(json_response, options, "roles")
+        return 0
+      elsif options[:yaml]
+        puts as_yaml(json_response, options, "roles")
+        return 0
+      elsif options[:csv]
+        puts records_as_csv(json_response['roles'], options)
+        return 0
+      end
+      roles = json_response['roles']
+      title = "Morpheus Roles"
+      subtitles = []
+      subtitles += parse_list_subtitles(options)
+      print_h1 title, subtitles
+      if roles.empty?
+        print cyan,"No roles found.",reset,"\n"
       else
-        title = "Morpheus Roles"
-        subtitles = []
-        if params[:phrase]
-          subtitles << "Search: #{params[:phrase]}".strip
-        end
-        print_h1 title, subtitles
-        if roles.empty?
-          print cyan,"No roles found.",reset,"\n"
-        else
-          print_roles_table(roles, {is_master_account: @is_master_account})
-          print_results_pagination(json_response)
-        end
-        print reset,"\n"
+        print_roles_table(roles, {is_master_account: @is_master_account})
+        print_results_pagination(json_response)
       end
+      print reset,"\n"
+      return 0
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
       exit 1
@@ -82,7 +85,7 @@ class Morpheus::Cli::Roles
 
   def get(args)
     options = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
       opts.on(nil,'--feature-access', "Display Feature Access") do |val|
         options[:include_feature_access] = true
@@ -102,13 +105,15 @@ class Morpheus::Cli::Roles
         options[:include_cloud_access] = true
         options[:include_instance_type_access] = true
       end
-      build_common_options(opts, options, [:json, :dry_run])
+      build_common_options(opts, options, [:json, :yaml, :csv, :fields, :dry_run, :remote])
+      opts.footer = "Get details about a role.\n" +
+                    "[name] is required. This is the name or id of a role."
     end
     optparse.parse!(args)
 
     if args.count < 1
       puts optparse
-      exit 1
+      return 1
     end
 
     connect(options)
@@ -143,103 +148,110 @@ class Morpheus::Cli::Roles
       end
 
       if options[:json]
-        print JSON.pretty_generate(json_response)
-        print "\n"
+        puts as_json(json_response, options, "role")
+        return 0
+      elsif options[:yaml]
+        puts as_yaml(json_response, options, "role")
+        return 0
+      elsif options[:csv]
+        puts records_as_csv([json_response['role']], options)
+        return 0
+      end
+
+      print cyan
+      print_h1 "Role Details"
+      print cyan
+      description_cols = {
+        "ID" => 'id',
+        "Name" => 'authority',
+        "Description" => 'description',
+        "Scope" => lambda {|it| it['scope'] },
+        "Type" => lambda {|it| format_role_type(it) },
+        "Multitenant" => lambda {|it| format_boolean(it['multitenant']) },
+        "Owner" => lambda {|it| role['owner'] ? role['owner']['name'] : '' },
+        #"Account" => lambda {|it| it['account'] ? it['account']['name'] : '' },
+        "Created" => lambda {|it| format_local_dt(it['dateCreated']) },
+        "Updated" => lambda {|it| format_local_dt(it['lastUpdated']) }
+      }
+      print_description_list(description_cols, role)
+
+      print_h2 "Role Instance Limits"
+      print cyan
+      print_description_list({
+        "Max Storage"  => lambda {|it| (it && it['maxStorage'].to_i != 0) ? Filesize.from("#{it['maxStorage']} B").pretty : "no limit" },
+        "Max Memory"  => lambda {|it| (it && it['maxMemory'].to_i != 0) ? Filesize.from("#{it['maxMemory']} B").pretty : "no limit" },
+        "CPU Count"  => lambda {|it| (it && it['maxCpu'].to_i != 0) ? it['maxCpu'] : "no limit" }
+      }, role['instanceLimits'])
+
+      print_h2 "Feature Access"
+      print cyan
+
+      if options[:include_feature_access]
+        rows = json_response['featurePermissions'].collect do |it|
+          {
+            code: it['code'],
+            name: it['name'],
+            access: get_access_string(it['access']),
+          }
+        end
+        tp rows, [:code, :name, :access]
       else
-        print cyan
-        print_h1 "Role Details"
-        print cyan
-        description_cols = {
-          "ID" => 'id',
-          "Name" => 'authority',
-          "Description" => 'description',
-          "Scope" => lambda {|it| it['scope'] },
-          "Type" => lambda {|it| format_role_type(it) },
-          "Multitenant" => lambda {|it| format_boolean(it['multitenant']) },
-          "Owner" => lambda {|it| role['owner'] ? role['owner']['name'] : '' },
-          #"Account" => lambda {|it| it['account'] ? it['account']['name'] : '' },
-          "Created" => lambda {|it| format_local_dt(it['dateCreated']) },
-          "Updated" => lambda {|it| format_local_dt(it['lastUpdated']) }
-        }
-        print_description_list(description_cols, role)
-
-        print_h2 "Role Instance Limits"
-        print cyan
-        print_description_list({
-          "Max Storage"  => lambda {|it| (it && it['maxStorage'].to_i != 0) ? Filesize.from("#{it['maxStorage']} B").pretty : "no limit" },
-          "Max Memory"  => lambda {|it| (it && it['maxMemory'].to_i != 0) ? Filesize.from("#{it['maxMemory']} B").pretty : "no limit" },
-          "CPU Count"  => lambda {|it| (it && it['maxCpu'].to_i != 0) ? it['maxCpu'] : "no limit" }
-        }, role['instanceLimits'])
-
-        print_h2 "Feature Access"
-        print cyan
-
-        if options[:include_feature_access]
-          rows = json_response['featurePermissions'].collect do |it|
+        puts "Use --feature-access to list feature access"
+      end
+
+      print_h2 "Group Access"
+      print cyan
+      puts "Global Group Access: #{get_access_string(json_response['globalSiteAccess'])}\n\n"
+      if json_response['globalSiteAccess'] == 'custom'
+        if options[:include_group_access]
+          rows = json_response['sites'].collect do |it|
             {
-              code: it['code'],
               name: it['name'],
               access: get_access_string(it['access']),
             }
           end
-          tp rows, [:code, :name, :access]
+          tp rows, [:name, :access]
         else
-          puts "Use --feature-access to list feature access"
-        end
-
-        print_h2 "Group Access"
-        print cyan
-        puts "Global Group Access: #{get_access_string(json_response['globalSiteAccess'])}\n\n"
-        if json_response['globalSiteAccess'] == 'custom'
-          if options[:include_group_access]
-            rows = json_response['sites'].collect do |it|
-              {
-                name: it['name'],
-                access: get_access_string(it['access']),
-              }
-            end
-            tp rows, [:name, :access]
-          else
-            puts "Use --group-access to list custom access"
-          end
+          puts "Use --group-access to list custom access"
         end
+      end
 
-        print_h2 "Cloud Access"
-        print cyan
-        puts "Global Cloud Access: #{get_access_string(json_response['globalZoneAccess'])}\n\n"
-        if json_response['globalZoneAccess'] == 'custom'
-          if options[:include_cloud_access]
-            rows = json_response['zones'].collect do |it|
-              {
-                name: it['name'],
-                access: get_access_string(it['access']),
-              }
-            end
-            tp rows, [:name, :access]
-          else
-            puts "Use --cloud-access to list custom access"
+      print_h2 "Cloud Access"
+      print cyan
+      puts "Global Cloud Access: #{get_access_string(json_response['globalZoneAccess'])}\n\n"
+      if json_response['globalZoneAccess'] == 'custom'
+        if options[:include_cloud_access]
+          rows = json_response['zones'].collect do |it|
+            {
+              name: it['name'],
+              access: get_access_string(it['access']),
+            }
           end
+          tp rows, [:name, :access]
+        else
+          puts "Use --cloud-access to list custom access"
         end
+      end
 
-        print_h2 "Instance Type Access"
-        print cyan
-        puts "Global Instance Type Access: #{get_access_string(json_response['globalInstanceTypeAccess'])}\n\n"
-        if json_response['globalInstanceTypeAccess'] == 'custom'
-          if options[:include_instance_type_access]
-            rows = json_response['instanceTypePermissions'].collect do |it|
-              {
-                name: it['name'],
-                access: get_access_string(it['access']),
-              }
-            end
-            tp rows, [:name, :access]
-          else
-            puts "Use --instance-type-access to list custom access"
+      print_h2 "Instance Type Access"
+      print cyan
+      puts "Global Instance Type Access: #{get_access_string(json_response['globalInstanceTypeAccess'])}\n\n"
+      if json_response['globalInstanceTypeAccess'] == 'custom'
+        if options[:include_instance_type_access]
+          rows = json_response['instanceTypePermissions'].collect do |it|
+            {
+              name: it['name'],
+              access: get_access_string(it['access']),
+            }
           end
+          tp rows, [:name, :access]
+        else
+          puts "Use --instance-type-access to list custom access"
         end
-
-        print reset,"\n"
       end
+
+      print reset,"\n"
+      return 0
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
       exit 1
@@ -249,10 +261,10 @@ class Morpheus::Cli::Roles
   def add(args)
     usage = "Usage: morpheus roles add [options]"
     options = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[options]")
       build_option_type_options(opts, options, add_role_option_types)
-      build_common_options(opts, options, [:options, :json, :dry_run])
+      build_common_options(opts, options, [:options, :json, :dry_run, :remote])
     end
     optparse.parse!(args)
 
@@ -342,10 +354,10 @@ class Morpheus::Cli::Roles
   def update(args)
     usage = "Usage: morpheus roles update [name] [options]"
     options = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name] [options]")
       build_option_type_options(opts, options, update_role_option_types)
-      build_common_options(opts, options, [:options, :json, :dry_run])
+      build_common_options(opts, options, [:options, :json, :dry_run, :remote])
     end
     optparse.parse!(args)
 
@@ -424,9 +436,9 @@ class Morpheus::Cli::Roles
   def remove(args)
     usage = "Usage: morpheus roles remove [name]"
     options = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
-      build_common_options(opts, options, [:auto_confirm, :json, :dry_run])
+      build_common_options(opts, options, [:auto_confirm, :json, :dry_run, :remote])
     end
     optparse.parse!(args)
     if args.count < 1
@@ -465,9 +477,9 @@ class Morpheus::Cli::Roles
   def update_feature_access(args)
     usage = "Usage: morpheus roles update-feature-access [name] [code] [full|read|user|yes|no|none]"
     options = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name] [code] [full|read|user|yes|no|none]")
-      build_common_options(opts, options, [:json, :dry_run])
+      build_common_options(opts, options, [:json, :dry_run, :remote])
     end
     optparse.parse!(args)
 
@@ -513,9 +525,9 @@ class Morpheus::Cli::Roles
   def update_global_group_access(args)
     usage = "Usage: morpheus roles update-global-group-access [name] [full|read|custom|none]"
     options = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name] [code] [full|read|custom|none]")
-      build_common_options(opts, options, [:json, :dry_run])
+      build_common_options(opts, options, [:json, :dry_run, :remote])
     end
     optparse.parse!(args)
 
@@ -557,24 +569,48 @@ class Morpheus::Cli::Roles
   end
 
   def update_group_access(args)
-    usage = "Usage: morpheus roles update-group-access [name] [group_name] [full|read|none]"
     options = {}
-    optparse = OptionParser.new do|opts|
-      opts.banner = subcommand_usage("[name] [group] [full|read|none]")
-      build_common_options(opts, options, [:json, :dry_run])
+    name = nil
+    group_name = nil
+    access_value = nil
+    do_all = false
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[name]")
+      opts.on( '-g', '--group GROUP', "Group name or id" ) do |val|
+        group_name = val
+      end
+      opts.on( nil, '--all', "Update all groups at once." ) do
+        do_all = true
+      end
+      opts.on( '--access VALUE', String, "Access value [full|read|none]" ) do |val|
+        access_value = val
+      end
+      build_common_options(opts, options, [:json, :dry_run, :remote])
+      opts.footer = "Update role access for a group or all groups.\n" +
+                    "[name] is required. This is the name or id of a role.\n" + 
+                    "--group or --all is required. This is the name or id of a group.\n" + 
+                    "--access is required. This is the new access value."
     end
     optparse.parse!(args)
-
-    if args.count < 2
+    if args.count < 1
       puts optparse
-      exit 1
+      return 1
     end
     name = args[0]
-    group_name = args[1]
-    access_value = args[2].to_s.downcase
+    # support old usage: [name] [group] [access]
+    group_name ||= args[1]
+    access_value ||= args[2]
+
+    if (!group_name && !do_all) || !access_value
+      puts optparse
+      return 1
+    end
+    
+    access_value = access_value.to_s.downcase
+
     if !['full', 'read', 'none'].include?(access_value)
       puts optparse
-      exit 1
+      return 1
     end
 
     connect(options)
@@ -582,7 +618,7 @@ class Morpheus::Cli::Roles
       account = find_account_from_options(options)
       account_id = account ? account['id'] : nil
       role = find_role_by_name_or_id(account_id, name)
-      exit 1 if role.nil?
+      return 1 if role.nil?
 
       role_json = @roles_interface.get(account_id, role['id'])
       if role_json['globalSiteAccess'] != 'custom'
@@ -594,11 +630,22 @@ class Morpheus::Cli::Roles
 
       # group_id = find_group_id_by_name(group_name)
       # exit 1 if group_id.nil?
-      group = find_group_by_name(group_name)
-      exit 1 if group.nil?
-      group_id = group['id']
+      group = nil
+      group_id = nil
+      if !do_all
+        group = find_group_by_name(group_name)
+        return 1 if group.nil?
+        group_id = group['id']
+      end
 
-      params = {groupId: group_id, access: access_value}
+      params = {}
+      if do_all
+        params['allGroups'] = true
+      else
+        params['groupId'] = group_id
+      end
+      params['access'] = access_value
+      
       if options[:dry_run]
         print_dry_run @roles_interface.dry.update_group(account_id, role['id'], params)
         return
@@ -609,8 +656,13 @@ class Morpheus::Cli::Roles
         print JSON.pretty_generate(json_response)
         print "\n"
       else
-        print_green_success "Role #{role['authority']} global group access updated"
+        if do_all
+          print_green_success "Role #{role['authority']} access updated for all groups"
+        else
+          print_green_success "Role #{role['authority']} access updated for group #{group['name']}"
+        end
       end
+      return 0
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
       exit 1
@@ -620,9 +672,9 @@ class Morpheus::Cli::Roles
   def update_global_cloud_access(args)
     usage = "Usage: morpheus roles update-global-cloud-access [name] [full|custom|none]"
     options = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name] [full|custom|none]")
-      build_common_options(opts, options, [:json, :dry_run])
+      build_common_options(opts, options, [:json, :dry_run, :remote])
     end
     optparse.parse!(args)
 
@@ -664,24 +716,50 @@ class Morpheus::Cli::Roles
   end
 
   def update_cloud_access(args)
-    usage = "Usage: morpheus roles update-cloud-access [name] [cloud_name] [full|none]"
     options = {}
-    optparse = OptionParser.new do|opts|
-      opts.banner = subcommand_usage("[name] [cloud] [full|none]")
+    cloud_name = nil
+    access_value = nil
+    do_all = false
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[name]")
+      opts.on( '-c', '--cloud CLOUD', "Cloud name or id" ) do |val|
+        puts "val is : #{val}"
+        cloud_name = val
+      end
+      opts.on( nil, '--all', "Update all clouds at once." ) do
+        do_all = true
+      end
+      opts.on( '--access VALUE', String, "Access value [full|read|none]" ) do |val|
+        access_value = val
+      end
       opts.on( '-g', '--group GROUP', "Group to find cloud in" ) do |val|
         options[:group] = val
       end
-      build_common_options(opts, options, [:json, :dry_run])
+      build_common_options(opts, options, [:json, :dry_run, :remote])
+      opts.footer = "Update role access for a cloud or all clouds.\n" +
+                    "[name] is required. This is the name or id of a role.\n" + 
+                    "--cloud or --all is required. This is the name or id of a cloud.\n" + 
+                    "--access is required. This is the new access value."
     end
     optparse.parse!(args)
 
-    if args.count < 2
+    if args.count < 1
       puts optparse
-      exit 1
+      return 1
     end
     name = args[0]
-    cloud_name = args[1]
-    access_value = args[2].to_s.downcase
+    # support old usage: [name] [cloud] [access]
+    cloud_name ||= args[1]
+    access_value ||= args[2]
+
+    if (!cloud_name && !do_all) || !access_value
+      puts optparse
+      return 1
+    end
+    puts "cloud_name is : #{cloud_name}"
+    puts "access_value is : #{access_value}"
+    access_value = access_value.to_s.downcase
+
     if !['full', 'none'].include?(access_value)
       puts optparse
       exit 1
@@ -702,21 +780,30 @@ class Morpheus::Cli::Roles
         exit 1
       end
 
+      # crap, group_id is needed for this api, maybe just use infrastructure or some other optionSource instead.
       group_id = nil
-      if !options[:group].nil?
-        group_id = find_group_id_by_name(options[:group])
-      else
-        group_id = @active_group_id
+      cloud_id = nil
+      if !do_all
+        group_id = nil
+        if !options[:group].nil?
+          group_id = find_group_id_by_name(options[:group])
+        else
+          group_id = @active_group_id
+        end
+        if group_id.nil?
+          print_red_alert "Group not found or specified!"
+          return 1
+        end
+        cloud_id = find_cloud_id_by_name(group_id, cloud_name)
+        return 1 if cloud_id.nil?
       end
-
-      if group_id.nil?
-        print_red_alert "Group not found or specified!"
-        exit 1
+      params = {}
+      if do_all
+        params['allClouds'] = true
+      else
+        params['cloudId'] = cloud_id
       end
-
-      cloud_id = find_cloud_id_by_name(group_id, cloud_name)
-      exit 1 if cloud_id.nil?
-      params = {cloudId: cloud_id, access: access_value}
+      params['access'] = access_value
       if options[:dry_run]
         print_dry_run @roles_interface.dry.update_cloud(account_id, role['id'], params)
         return
@@ -727,8 +814,13 @@ class Morpheus::Cli::Roles
         print JSON.pretty_generate(json_response)
         print "\n"
       else
-        print_green_success "Role #{role['authority']} global cloud access updated"
+        if do_all
+          print_green_success "Role #{role['authority']} access updated for all clouds"
+        else
+          print_green_success "Role #{role['authority']} access updated for cloud id #{cloud_id}"
+        end
       end
+      return 0
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
       exit 1
@@ -738,9 +830,9 @@ class Morpheus::Cli::Roles
   def update_global_instance_type_access(args)
     usage = "Usage: morpheus roles update-global-instance-type-access [name] [full|custom|none]"
     options = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name] [full|custom|none]")
-      build_common_options(opts, options, [:json, :dry_run])
+      build_common_options(opts, options, [:json, :dry_run, :remote])
     end
     optparse.parse!(args)
 
@@ -783,24 +875,48 @@ class Morpheus::Cli::Roles
   end
 
   def update_instance_type_access(args)
-    usage = "Usage: morpheus roles update-instance-type-access [name] [instance_type_name] [full|none]"
     options = {}
-    optparse = OptionParser.new do|opts|
-      opts.banner = subcommand_usage("[name] [instance-type] [full|none]")
-      build_common_options(opts, options, [:json, :dry_run])
+    instance_type_name = nil
+    access_value = nil
+    do_all = false
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[name]")
+      opts.on( '--instance-type INSTANCE_TYPE', String, "Instance Type name" ) do |val|
+        instance_type_name = val
+      end
+      opts.on( nil, '--all', "Update all instance types at once." ) do
+        do_all = true
+      end
+      opts.on( '--access VALUE', String, "Access value [full|read|none]" ) do |val|
+        access_value = val
+      end
+      build_common_options(opts, options, [:json, :dry_run, :remote])
+      opts.footer = "Update role access for an instance type or all instance types.\n" +
+                    "[name] is required. This is the name or id of a role.\n" + 
+                    "--instance-type or --all is required. This is the name of an instance type.\n" + 
+                    "--access is required. This is the new access value."
     end
     optparse.parse!(args)
 
-    if args.count < 2
+    if args.count < 1
       puts optparse
-      exit 1
+      return 1
     end
     name = args[0]
-    instance_type_name = args[1]
-    access_value = args[2].to_s.downcase
+    # support old usage: [name] [instance-type] [access]
+    instance_type_name ||= args[1]
+    access_value ||= args[2]
+
+    if (!instance_type_name && !do_all) || !access_value
+      puts optparse
+      return 1
+    end
+    
+    access_value = access_value.to_s.downcase
+
     if !['full', 'none'].include?(access_value)
       puts optparse
-      exit 1
+      return 1
     end
 
     connect(options)
@@ -808,20 +924,30 @@ class Morpheus::Cli::Roles
       account = find_account_from_options(options)
       account_id = account ? account['id'] : nil
       role = find_role_by_name_or_id(account_id, name)
-      exit 1 if role.nil?
+      return 1 if role.nil?
 
       role_json = @roles_interface.get(account_id, role['id'])
       if role_json['globalInstanceTypeAccess'] != 'custom'
         print "\n", red, "Global Instance Type Access is currently: #{role_json['globalInstanceTypeAccess'].capitalize}"
         print "\n", "You must first set it to Custom via `morpheus roles update-global-instance-type-access \"#{name}\" custom`"
         print "\n\n", reset
-        exit 1
+        return 1
       end
 
-      instance_type = find_instance_type_by_name(instance_type_name)
-      exit 1 if instance_type.nil?
+      instance_type = nil
+      if !do_all
+        instance_type = find_instance_type_by_name(instance_type_name)
+        return 1 if instance_type.nil?
+      end
+
+      params = {}
+      if do_all
+        params['allInstanceTypes'] = true
+      else
+        params['instanceTypeId'] = instance_type['id']
+      end
+      params['access'] = access_value
 
-      params = {instanceTypeId: instance_type['id'], access: access_value}
       if options[:dry_run]
         print_dry_run @roles_interface.dry.update_instance_type(account_id, role['id'], params)
         return
@@ -832,8 +958,13 @@ class Morpheus::Cli::Roles
         print JSON.pretty_generate(json_response)
         print "\n"
       else
-        print_green_success "Role #{role['authority']} global instance type access updated"
+        if do_all
+          print_green_success "Role #{role['authority']} access updated for all instance types"
+        else
+          print_green_success "Role #{role['authority']} access updated for instance type #{instance_type['name']}"
+        end
       end
+      return 0
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
       exit 1
@@ -903,7 +1034,7 @@ class Morpheus::Cli::Roles
   end
 
   def find_instance_type_by_name(name)
-    results = @instance_types_interface.get({name: name})
+    results = @instance_types_interface.list({name: name})
     if results['instanceTypes'].empty?
       print_red_alert "Instance Type not found by name #{name}"
       return nil

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "3.4.1.2"
+    VERSION = "3.4.1.3"
   end
 end

data/lib/morpheus/cli/virtual_images.rb

@@ -657,7 +657,7 @@ class Morpheus::Cli::VirtualImages
       {'fieldName' => 'osType', 'fieldLabel' => 'OS Type', 'type' => 'select', 'optionSource' => 'osTypes', 'required' => false, 'description' => 'Select OS Type.', 'displayOrder' => 3},
       {'fieldName' => 'minRam', 'fieldLabel' => 'Minimum Memory (MB)', 'type' => 'number', 'required' => false, 'description' => 'Minimum Memory (MB)', 'displayOrder' => 4},
       {'fieldName' => 'isCloudInit', 'fieldLabel' => 'Cloud Init Enabled?', 'type' => 'checkbox', 'required' => false, 'description' => 'Cloud Init Enabled?', 'displayOrder' => 4},
-      {'fieldName' => 'installAgent', 'fieldLabel' => 'Install Agent?', 'type' => 'checkbox', 'required' => false, 'description' => 'Cloud Init Enabled?', 'displayOrder' => 4},
+      {'fieldName' => 'installAgent', 'fieldLabel' => 'Install Agent?', 'type' => 'checkbox', 'required' => false, 'description' => 'Install Agent?', 'displayOrder' => 4},
       {'fieldName' => 'sshUsername', 'fieldLabel' => 'SSH Username', 'type' => 'text', 'required' => false, 'description' => 'Enter an SSH Username', 'displayOrder' => 5},
       {'fieldName' => 'sshPassword', 'fieldLabel' => 'SSH Password', 'type' => 'password', 'required' => false, 'description' => 'Enter an SSH Password', 'displayOrder' => 6},
       {'fieldName' => 'storageProviderId', 'type' => 'select', 'fieldLabel' => 'Storage Provider', 'optionSource' => 'storageProviders', 'required' => false, 'description' => 'Select Storage Provider.', 'displayOrder' => 7},

data/lib/morpheus/cli/workflows.rb

@@ -77,27 +77,56 @@ class Morpheus::Cli::Workflows
 
   def add(args)
     options = {}
+    params = {}
+    task_arg_list = nil
     optparse = OptionParser.new do|opts|
-      opts.banner = subcommand_usage("[name] --tasks x,y,z")
-      opts.on("--tasks x,y,z", Array, "List of tasks to run in order") do |list|
-        options[:task_names] = list
+      opts.banner = subcommand_usage("[name] --tasks taskId:phase,taskId2:phase,taskId3:phase")
+      opts.on("--name NAME", String, "Name for workflow") do |val|
+        params['name'] = val
       end
-      build_common_options(opts, options, [:options, :json, :dry_run, :quiet, :remote])
+      opts.on("--tasks x,y,z", Array, "List of tasks to run in order, in the format <Task ID>:<Task Phase> Task Phase is optional, the default is 'provision'.") do |list|
+        task_arg_list = []
+        list.each do |it|
+          task_id, task_phase = it.split(":")
+          task_arg_list << {task_id: task_id.to_s.strip, task_phase: task_phase.to_s.strip}
+        end
+      end
+      build_common_options(opts, options, [:options, :payload, :json, :dry_run, :quiet, :remote])
     end
     optparse.parse!(args)
-    if args.count < 1 || options[:task_names].empty?
-      puts optparse
-      exit 1
-    end
-    workflow_name = args[0]
+
     connect(options)
     begin
-      tasks = []
-      options[:task_names].each do |task_name|
-        tasks << find_task_by_name_or_id(task_name.to_s.strip)['id']
+      payload = nil
+      if options[:payload]
+        payload = options[:payload]
+      else
+        if args[0] && !params['name']
+          params['name'] = args[0]
+        end
+        if (!params['name'] || task_arg_list.nil?)
+          puts optparse
+          return 1
+        end
+        tasks = []
+        if task_arg_list
+          task_arg_list.each do |task_arg|
+            found_task = find_task_by_name_or_id(task_arg[:task_id])
+            return 1 if found_task.nil?
+            row = {'taskId' => found_task['id']}
+            if !task_arg[:task_phase].to_s.strip.empty?
+              row['taskPhase'] = task_arg[:task_phase]
+            end
+            tasks << row
+          end
+        end
+        payload = {'taskSet' => {}}
+        params.deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
+        payload['taskSet'].deep_merge!(params)
+        if !tasks.empty?
+          payload['taskSet']['tasks'] = tasks
+        end
       end
-
-      payload = {taskSet: {name: workflow_name, tasks: tasks}}
       if options[:dry_run]
         print_dry_run @task_sets_interface.dry.create(payload)
         return
@@ -200,7 +229,7 @@ class Morpheus::Cli::Workflows
           print cyan
           puts as_pretty_table(tasks, task_set_task_columns)
         end
-        print reset,"\n"
+        print reset
       end
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
@@ -210,18 +239,24 @@ class Morpheus::Cli::Workflows
 
   def update(args)
     options = {}
+    params = {}
+    task_arg_list = nil
     optparse = OptionParser.new do|opts|
-      opts.banner = subcommand_usage("[name] --tasks x,y,z")
-      opts.on("--tasks x,y,z", Array, "New list of tasks to run in order") do |list|
-        options[:task_names]= list
+      opts.banner = subcommand_usage("[name] --tasks taskId:phase,taskId2:phase,taskId3:phase")
+      opts.on("--tasks x,y,z", Array, "New list of tasks to run in the format <Task ID>:<Phase>. Phase is optional, the default is 'provision'.") do |list|
+        task_arg_list = []
+        list.each do |it|
+          task_id, task_phase = it.split(":")
+          task_arg_list << {task_id: task_id.to_s.strip, task_phase: task_phase.to_s.strip}
+        end
       end
       opts.on("--name NAME", String, "New name for workflow") do |val|
-        options[:new_name] = val
+        params['name'] = val
       end
-      build_common_options(opts, options, [:json, :dry_run, :quiet, :remote])
+      build_common_options(opts, options, [:options, :payload, :json, :dry_run, :quiet, :remote])
     end
     optparse.parse!(args)
-    if args.count < 1 || (options[:new_name].empty? && options[:task_names].empty?)
+    if args.count < 1
       puts optparse
       exit 1
     end
@@ -229,18 +264,29 @@ class Morpheus::Cli::Workflows
     connect(options)
     begin
       workflow = find_workflow_by_name_or_id(workflow_name)
-      payload = {taskSet: {id: workflow['id']} }
-      tasks = []
-      if options[:task_names]
-        options[:task_names].each do |task_name|
-          tasks << find_task_by_name_or_id(task_name)['id']
-        end
-        payload[:taskSet][:tasks] = tasks
+      return 1 if workflow.nil?
+      payload = nil
+      if options[:payload]
+        payload = options[:payload]
       else
-        payload[:taskSet][:tasks] = workflow['tasks']
-      end
-      if options[:new_name]
-        payload[:taskSet][:name] = options[:new_name]
+        tasks = []
+        if task_arg_list
+          task_arg_list.each do |task_arg|
+            found_task = find_task_by_name_or_id(task_arg[:task_id])
+            return 1 if found_task.nil?
+            row = {'taskId' => found_task['id']}
+            if !task_arg[:task_phase].to_s.strip.empty?
+              row['taskPhase'] = task_arg[:task_phase]
+            end
+            tasks << row
+          end
+        end
+        payload = {'taskSet' => {}}
+        params.deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
+        payload['taskSet'].deep_merge!(params)
+        if !tasks.empty?
+          payload['taskSet']['tasks'] = tasks
+        end
       end
       if options[:dry_run]
         print_dry_run @task_sets_interface.dry.update(workflow['id'], payload)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 3.4.1.2
+  version: 3.4.1.3
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-18 00:00:00.000000000 Z
+date: 2018-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler