morpheus-cli 5.5.3.2 → 6.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f25e2109b97f86a74285c68d93483095a810007259c98248f3764f047763826
-  data.tar.gz: 703c64d291cebb65e2457c38f43c2fb304881db0cf334c6b86cc3317afd2c543
+  metadata.gz: 4160be97bfb96acf0fe1091e9e8d6ecde617bd2aba547ef1cfab8a11d6134ecf
+  data.tar.gz: 5e0675e4e1061595e560e2395625e7a7546813e68e09a8237ccd33d92aeb948d
 SHA512:
-  metadata.gz: 5e1ca2c4b984cf3b4f27cd3f8348b8ce7155fac65be974962a4a3d543bc6ab35efca1e6e938f6c39617e71dab1d510d87a785a4952eb6c113bbc03a9d6d77173
-  data.tar.gz: 7e00d09edce06f1d099228770835254fde5110f38e4f033529acda0c060f433e55babc72eda319bc79035e5080110ae24b6c4f4eb6600049a99c64aa3699d988
+  metadata.gz: a2992a310163d78082f7d748ca4ae50c673c32e7ae782497bb89f721135ed66509549c124290e9b4bd644cad2e3838c878331427ddd1090325f8946c7d30e731
+  data.tar.gz: 48ec07412e0cdcad359ea2dc050cc5017a9a39e368fb662e50b880628213fc4681b85da9cd5d8503ea7426be0fbac77b5e61d2dd8bc397ab13f0ce21695d2758

data/Dockerfile

@@ -1,5 +1,5 @@
 FROM ruby:2.7.5
 
-RUN gem install morpheus-cli -v 5.5.3.2
+RUN gem install morpheus-cli -v 6.0.1
 
 ENTRYPOINT ["morpheus"]

data/lib/morpheus/api/api_client.rb

@@ -400,6 +400,10 @@ class Morpheus::APIClient
     Morpheus::CloudResourcePoolsInterface.new(common_interface_options).setopts(@options)
   end
 
+  def resource_pool_groups
+    Morpheus::ResourcePoolGroupsInterface.new(common_interface_options).setopts(@options)
+  end
+
   def cloud_folders
     Morpheus::CloudFoldersInterface.new(common_interface_options).setopts(@options)
   end
@@ -950,6 +954,10 @@ class Morpheus::APIClient
     Morpheus::SecurityScansInterface.new(common_interface_options).setopts(@options)
   end
 
+  def network_floating_ips
+    Morpheus::NetworkFloatingIpsInterface.new(common_interface_options).setopts(@options)
+  end
+  
   def rest(endpoint)
     Morpheus::RestInterface.new(common_interface_options).setopts(@options.merge({base_path: "#{@base_url}/api/#{endpoint}"}))
   end

data/lib/morpheus/api/cloud_resource_pools_interface.rb

@@ -4,7 +4,15 @@ class Morpheus::CloudResourcePoolsInterface < Morpheus::APIClient
 
   def get(cloud_id, id, params={})
     raise "#{self.class}.get() passed a blank id!" if id.to_s == ''
-    url = cloud_id.nil? ? "#{@base_url}/api/zones/resource-pools/#{id}" : "#{@base_url}/api/zones/#{cloud_id}/resource-pools/#{id}"
+    url = cloud_id.nil? ? "#{@base_url}/api/zones/resource-pools/#{update_resource_pool_id(id)}" : "#{@base_url}/api/zones/#{cloud_id}/resource-pools/#{update_resource_pool_id(id)}"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    opts = {method: :get, url: url, headers: headers}
+    execute(opts)
+  end
+
+  def get_without_cloud(id, params={})
+    raise "#{self.class}.get() passed a blank id!" if id.to_s == ''
+    url = "#{@base_url}/api/resource-pools/#{update_resource_pool_id(id)}"
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     opts = {method: :get, url: url, headers: headers}
     execute(opts)
@@ -17,6 +25,13 @@ class Morpheus::CloudResourcePoolsInterface < Morpheus::APIClient
     execute(opts)
   end
 
+  def list_without_cloud(params={})
+    url = "#{@base_url}/api/resource-pools"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    opts = {method: :get, url: url, headers: headers}
+    execute(opts)
+  end
+
   def create(cloud_id, payload)
     url = "#{@base_url}/api/zones/#{cloud_id}/resource-pools"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
@@ -25,17 +40,27 @@ class Morpheus::CloudResourcePoolsInterface < Morpheus::APIClient
   end
 
   def update(cloud_id, id, payload)
-    url = "#{@base_url}/api/zones/#{cloud_id}/resource-pools/#{id}"
+    url = "#{@base_url}/api/zones/#{cloud_id}/resource-pools/#{update_resource_pool_id(id)}"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
     execute(opts)
   end
 
   def destroy(cloud_id, id, params={})
-    url = "#{@base_url}/api/zones/#{cloud_id}/resource-pools/#{id}"
+    url = "#{@base_url}/api/zones/#{cloud_id}/resource-pools/#{update_resource_pool_id(id)}"
     headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     opts = {method: :delete, url: url, headers: headers}
     execute(opts)
   end
 
+  private
+
+  def update_resource_pool_id(id)
+    id_string = id.to_s
+    if id_string["pool-"]
+      return id_string[5..-1]
+    end
+    return id
+  end
+
 end

data/lib/morpheus/api/containers_interface.rb

@@ -132,4 +132,14 @@ class Morpheus::ContainersInterface < Morpheus::APIClient
     execute(method: :put, url: "#{base_path}/#{container_id}/clone-image", payload: payload, headers: headers)
   end
 
+  def attach_floating_ip(container_id, payload={}, headers={})
+    validate_id!(container_id)
+    execute(method: :put, url: "#{base_path}/#{container_id}/attach-floating-ip", payload: payload, headers: headers)
+  end
+
+  def detach_floating_ip(container_id, payload={}, headers={})
+    validate_id!(container_id)
+    execute(method: :put, url: "#{base_path}/#{container_id}/detach-floating-ip", payload: payload, headers: headers)
+  end
+
 end

data/lib/morpheus/api/doc_interface.rb

@@ -1,11 +1,6 @@
 require 'morpheus/api/api_client'
 
 class Morpheus::DocInterface < Morpheus::APIClient
-  
-  # no Authorization header is required
-  def authorization_required?
-    false
-  end
 
   def list(params={})
     url = "/api/doc"
@@ -24,8 +19,6 @@ class Morpheus::DocInterface < Morpheus::APIClient
     execute(method: :get, url: url, headers: headers, timeout: 172800, parse_json: !is_yaml)
   end
 
-  alias :swagger :openapi
-
   def download_openapi(outfile, params={})
     # note that RestClient.execute still requires the full path with base_url
     url = "#{@base_url}/api/doc/openapi"
@@ -33,7 +26,7 @@ class Morpheus::DocInterface < Morpheus::APIClient
     if fmt
       url = url + "." + fmt
     end
-    headers = {params: params}
+    headers = {params: params, authorization: "Bearer #{@access_token}"}
     opts = {method: :get, url: url, headers: headers, timeout: 172800, parse_json: false}
 
     if @dry_run
@@ -54,6 +47,4 @@ class Morpheus::DocInterface < Morpheus::APIClient
     http_response
   end
 
-  alias :swagger :download_openapi
-
 end

data/lib/morpheus/api/jobs_interface.rb

@@ -43,10 +43,10 @@ class Morpheus::JobsInterface < Morpheus::APIClient
     execute(method: :delete, url: url, headers: headers)
   end
 
-  def execute_job(id, params={})
+  def execute_job(id, payload={}, params={})
     url = "#{base_path}/#{id}/execute"
     headers = { params: params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    execute(method: :put, url: url, headers: headers)
+    execute(method: :put, url: url, headers: headers, payload: payload.to_json)
   end
 
 =begin

data/lib/morpheus/api/key_pairs_interface.rb

@@ -45,4 +45,13 @@ class Morpheus::KeyPairsInterface < Morpheus::APIClient
     opts = {method: :delete, url: url, headers: headers}
     execute(opts)
   end
+
+  def generate(account_id, options)
+    url = "#{@base_url}/api/key-pairs/generate"
+    headers = { :params => {}, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    headers[:params]['accountId'] = account_id if account_id
+    payload = options
+    opts = {method: :post, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
 end

data/lib/morpheus/api/network_floating_ips_interface.rb

@@ -0,0 +1,37 @@
+require 'morpheus/api/api_client'
+
+class Morpheus::NetworkFloatingIpsInterface < Morpheus::APIClient
+
+  def base_path
+    "/api/networks/floating-ips"
+  end
+
+  def list(params={}, headers={})
+    execute(method: :get, url: "#{base_path}", params: params, headers: headers)
+  end
+
+  def get(id, params={}, headers={})
+    validate_id!(id)
+    execute(method: :get, url: "#{base_path}/#{CGI::escape(id.to_s)}", params: params, headers: headers)
+  end
+
+  # def create(payload, params={}, headers={})
+  #   execute(method: :post, url: "#{base_path}", params: params, payload: payload, headers: headers)
+  # end
+
+  # def update(id, payload, params={}, headers={})
+  #   validate_id!(id)
+  #   execute(method: :put, url: "#{base_path}/#{CGI::escape(id.to_s)}", params: params, payload: payload, headers: headers)
+  # end
+
+  def destroy(id, params = {}, headers={})
+    validate_id!(id)
+    execute(method: :delete, url: "#{base_path}/#{CGI::escape(id.to_s)}", params: params, headers: headers)
+  end
+
+  def release(id, payload={}, params={}, headers={})
+    validate_id!(id)
+  	execute(method: :put, url: "#{base_path}/#{CGI::escape(id.to_s)}/release", params: params, payload: payload, headers: headers)
+  end
+
+end

data/lib/morpheus/api/resource_pool_groups_interface.rb

@@ -0,0 +1,51 @@
+require 'morpheus/api/api_client'
+
+class Morpheus::ResourcePoolGroupsInterface < Morpheus::APIClient
+
+  def get(id, params={})
+    raise "#{self.class}.get() passed a blank id!" if id.to_s == ''
+    url = "#{@base_url}/api/resource-pools/groups/#{update_resource_pool_group_id(id)}"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    opts = {method: :get, url: url, headers: headers}
+    execute(opts)
+  end
+
+  def list(params={})
+    url = "#{@base_url}/api/resource-pools/groups" 
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    opts = {method: :get, url: url, headers: headers}
+    execute(opts)
+  end
+
+  def create(payload)
+    url = "#{@base_url}/api/resource-pools/groups" 
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :post, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
+  def update(id, payload)
+    url = "#{@base_url}/api/resource-pools/groups/#{update_resource_pool_group_id(id)}"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
+  def destroy(id, params={})
+    url ="#{@base_url}/api/resource-pools/groups/#{update_resource_pool_group_id(id)}"
+    headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :delete, url: url, headers: headers}
+    execute(opts)
+  end
+
+  private
+
+  def update_resource_pool_group_id(id)
+    id_string = id.to_s
+    if id_string["poolGroup-"]
+      return id_string[10..-1]
+    end
+    return id
+  end
+
+end

data/lib/morpheus/cli/cli_command.rb

@@ -149,6 +149,7 @@ module Morpheus
         #opts.separator ""
         #opts.separator "Options:"
         options[:options] ||= {} # this is where these go..for now
+        options[:option_types] = (options[:option_types] || []) + option_types
         custom_options = options[:options]
         
         # add each one to the OptionParser
@@ -345,6 +346,7 @@ module Morpheus
               custom_option_args = option.sub(/\s?\=\s?/, '__OPTION_DELIM__').split('__OPTION_DELIM__')
               custom_options = options[:options]
               option_name_args = custom_option_args[0].split('.')
+              option_type = (options[:option_types] || []).find {|it| it['fieldName'] == custom_option_args[0]} || {}
               if option_name_args.count > 1
                 nested_options = custom_options
                 option_name_args.each_with_index do |name_element,index|
@@ -353,11 +355,13 @@ module Morpheus
                     nested_options = nested_options[name_element]
                   else
                     val = custom_option_args[1]
-                    if (val.to_s[0] == '{' && val.to_s[-1] == '}') || (val.to_s[0] == '[' && val.to_s[-1] == ']')
-                      begin
-                        val = JSON.parse(val)
-                      rescue
-                        Morpheus::Logging::DarkPrinter.puts "Failed to parse option value '#{val}' as JSON" if Morpheus::Logging.debug?
+                    unless option_type['noParse']
+                      if (val.to_s[0] == '{' && val.to_s[-1] == '}') || (val.to_s[0] == '[' && val.to_s[-1] == ']')
+                        begin
+                          val = JSON.parse(val)
+                        rescue
+                          Morpheus::Logging::DarkPrinter.puts "Failed to parse option value '#{val}' as JSON" if Morpheus::Logging.debug?
+                        end
                       end
                     end
                     nested_options[name_element] = val
@@ -365,11 +369,13 @@ module Morpheus
                 end
               else
                 val = custom_option_args[1]
-                if (val.to_s[0] == '{' && val.to_s[-1] == '}') || (val.to_s[0] == '[' && val.to_s[-1] == ']')
-                  begin
-                    val = JSON.parse(val)
-                  rescue
-                    Morpheus::Logging::DarkPrinter.puts "Failed to parse option value '#{val}' as JSON" if Morpheus::Logging.debug?
+                unless option_type['noParse']
+                  if (val.to_s[0] == '{' && val.to_s[-1] == '}') || (val.to_s[0] == '[' && val.to_s[-1] == ']')
+                    begin
+                      val = JSON.parse(val)
+                    rescue
+                      Morpheus::Logging::DarkPrinter.puts "Failed to parse option value '#{val}' as JSON" if Morpheus::Logging.debug?
+                    end
                   end
                 end
                 custom_options[custom_option_args[0]] = val
@@ -1347,7 +1353,7 @@ module Morpheus
               if record.nil?
                  # avoid double error render by exiting here, ew
                 exit 1
-                raise_command_error "Storage Server not found for '#{val}'"
+                raise_command_error "#{type.titleize} not found for '#{val}'"
               end
               params[param_name] = record['id']
             else

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

@@ -89,6 +89,8 @@ class Morpheus::Cli::ApplianceSettingsCommand
         # Currency Settings
         "Currency Provider" => lambda {|it| it['currencyProvider'] },
         "Currency Provider API Key" => lambda {|it| it['currencyKey'] },
+        # Retention Settings
+        "Stats Retainment Period" => lambda {|it| it['statsRetainmentPeriod'] ? it['statsRetainmentPeriod'].to_s + ' days' : '' },
       }
       print_description_list(description_cols, appliance_settings)
 
@@ -215,6 +217,9 @@ class Morpheus::Cli::ApplianceSettingsCommand
       opts.on("--disable-all-clouds", "Set all cloud types enabled status off, can be used in conjunction with --enable-clouds options") do
         params['disableAllZoneTypes'] = true
       end
+      opts.on("--stats-retainment-period DAYS", Integer, "Stats retainment period. The number of days stats should be available. Can be 30, 60, or 90.") do |val|
+        params['statsRetainmentPeriod'] = val.to_i
+      end
       build_common_options(opts, options, [:json, :payload, :dry_run, :quiet, :remote])
     end
 

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

@@ -781,11 +781,11 @@ class Morpheus::Cli::Apps
           print_h2 "#{app_tier['tier']['name']}", options
           print cyan
           tier_instances = (app_tier['appInstances'] || []).collect {|it| it['instance']}
-          instances = tier_instances.collect { |tier_instance| instances.find { |i| i['id'] == tier_instance['id'] } }
-          if instances.empty?
+          instance_list = tier_instances.collect { |tier_instance| instances.find { |i| i['id'] == tier_instance['id'] } }
+          if instance_list.empty?
             puts yellow, "This tier is empty", reset
           else
-            instances_rows = instances.collect do |instance|
+            instances_rows = instance_list.collect do |instance|
               connection_string = ''
               if !instance['connectionInfo'].nil? && instance['connectionInfo'].empty? == false
                 connection_string = "#{instance['connectionInfo'][0]['ip']}:#{instance['connectionInfo'][0]['port']}"
@@ -1020,7 +1020,7 @@ EOT
   end
 
   def apply(args)
-    default_refresh_interval = 10
+    default_refresh_interval = 5
     params, payload, options = {}, {}, {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[app] [options]")
@@ -1381,9 +1381,15 @@ EOT
       opts.on( '--keep-backups', '--keep-backups', "Preserve copy of backups" ) do
         query_params[:keepBackups] = 'on'
       end
-      opts.on('--releaseEIPs [on|off]', ['on','off'], "Release EIPs. Default is on. Applies to Amazon only.") do |val|
-        query_params[:releaseEIPs] = val.nil? ? 'on' : val
+      opts.on('--release-ips [on|off]', ['on','off'], "Release Floating IPs. Default is on. Applies to certain types only. Only applies when used with --remove-instances") do |val|
+        query_params[:releaseFloatingIps] = val.nil? ? 'on' : val
+        query_params[:releaseEIPs] = query_params[:releaseFloatingIps] # old parameter before 6.0
       end
+      opts.on('--releaseEIPs [on|off]', ['on','off'], "Alias for Release Floating IPs") do |val|
+        query_params[:releaseFloatingIps] = val.nil? ? 'on' : val
+        query_params[:releaseEIPs] = query_params[:releaseFloatingIps] # old parameter before 6.0
+      end
+      opts.add_hidden_option('--releaseEIPs')
       opts.on( '-f', '--force', "Force Delete" ) do
         query_params[:force] = 'on'
       end

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

@@ -43,6 +43,12 @@ class Morpheus::Cli::CatalogItemTypesCommand
       opts.on('--all-labels LABEL', String, "Filter by labels, must match all of the values") do |val|
         add_query_parameter(params, 'allLabels', parse_labels(val))
       end
+      opts.on('--code CODE', String, "Filter by code" ) do |val|
+        params[:code] = val
+      end
+      opts.on('-c', '--category CATEGORY', String, "Filter by category") do |val|
+        add_query_parameter(params, 'category', val)
+      end
       build_standard_list_options(opts, options)
       opts.footer = "List catalog item types."
     end
@@ -212,6 +218,23 @@ EOT
             print reset,"(blank)","\n",reset
           end
         elsif item_type_code == 'workflow' || item_type_code == 'operationalworkflow' || item_type_code == 'taskset'
+          print_h2 "Workflow Config"
+          if catalog_item_type['workflowConfig']
+            #print reset,(JSON.pretty_generate(config) rescue config),"\n",reset
+            #print reset,(as_yaml(config, options) rescue config),"\n",reset
+            config_string = catalog_item_type['workflowConfig'] || ""
+            config_lines = config_string.split("\n")
+            config_line_count = config_lines.size
+            max_lines = 10
+            if config_lines.size > max_lines
+              config_string = config_lines.first(max_lines).join("\n")
+              config_string << "\n\n"
+              config_string << "#{dark}(#{(config_line_count - max_lines)} more lines were not shown, use -c to show the config)#{reset}"
+            end
+            print reset,config_string.chomp("\n"),"\n",reset
+          else
+            print reset,"(blank)","\n",reset
+          end
         end
       end
 
@@ -227,7 +250,7 @@ EOT
   end
 
   def add(args)
-    options = {}
+    options = {:option_types => add_catalog_item_type_option_types}
     params = {}
     logo_file = nil
     dark_logo_file = nil
@@ -657,6 +680,8 @@ EOT
     {
       "ID" => 'id',
       "Name" => 'name',
+      "Code" => 'code',
+      "Category" => 'category',
       "Labels" => lambda {|it| format_list(it['labels'], '', 3) },
       "Description" => 'description',
       "Type" => lambda {|it| format_catalog_type(it) },
@@ -680,6 +705,8 @@ EOT
       "Name" => 'name',
       "Labels" => lambda {|it| format_list(it['labels']) },
       "Description" => 'description',
+      "Code" => 'code',
+      "Category" => 'category',
       "Type" => lambda {|it| format_catalog_type(it) },
       "Visibility" => 'visibility',
       "Layout Code" => 'layoutCode',
@@ -689,6 +716,7 @@ EOT
       # "Content" => lambda {|it| it['content'] },
       "Enabled" => lambda {|it| format_boolean(it['enabled']) },
       "Featured" => lambda {|it| format_boolean(it['featured']) },
+      "Allow Quantity" => lambda {|it| format_boolean(it['allowQuantity']) },
       #"Config" => lambda {|it| it['config'] },
       "Created" => lambda {|it| format_local_dt(it['dateCreated']) },
       "Updated" => lambda {|it| format_local_dt(it['lastUpdated']) },
@@ -725,21 +753,25 @@ EOT
     [
       {'code' => 'catalogItemType.type', 'shorthand' => '-t', 'fieldName' => 'type', 'fieldLabel' => 'Type', 'type' => 'select', 'selectOptions' => [{'name' => 'Instance', 'value' => 'instance'}, {'name' => 'Blueprint', 'value' => 'blueprint'}, {'name' => 'Workflow', 'value' => 'workflow'}], 'defaultValue' => 'instance', 'required' => true, 'displayOrder' => 1},
       {'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'displayOrder' => 2},
-      {'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text', 'displayOrder' => 3},
-      {'fieldName' => 'enabled', 'fieldLabel' => 'Enabled', 'type' => 'checkbox', 'defaultValue' => true, 'displayOrder' => 4},
-      {'fieldName' => 'featured', 'fieldLabel' => 'Featured', 'type' => 'checkbox', 'defaultValue' => false, 'displayOrder' => 5},
-      {'fieldName' => 'visibility', 'fieldLabel' => 'Visibility', 'type' => 'select', 'selectOptions' => [{'name' => 'Private', 'value' => 'private'}, {'name' => 'Public', 'value' => 'public'}], 'defaultValue' => 'private', 'required' => true, 'displayOrder' => 6},
-      {'fieldName' => 'layoutCode', 'fieldLabel' => 'Layout Code', 'type' => 'text', 'required' => false, 'displayOrder' => 7},
-      {'fieldName' => 'iconPath', 'fieldLabel' => 'Logo', 'type' => 'select', 'optionSource' => 'iconList', 'displayOrder' => 8},
+      {'fieldName' => 'code', 'fieldLabel' => 'Code', 'type' => 'text', 'displayOrder' => 3},
+      {'fieldName' => 'category', 'fieldLabel' => 'Category', 'type' => 'text', 'displayOrder' => 3.5},
+      {'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text', 'displayOrder' => 4},
+      {'fieldName' => 'enabled', 'fieldLabel' => 'Enabled', 'type' => 'checkbox', 'defaultValue' => true, 'displayOrder' => 5},
+      {'fieldName' => 'featured', 'fieldLabel' => 'Featured', 'type' => 'checkbox', 'defaultValue' => false, 'displayOrder' => 6},
+      {'fieldName' => 'allowQuantity', 'fieldLabel' => 'Allow Quantity', 'type' => 'checkbox', 'defaultValue' => false, 'displayOrder' => 7},
+      {'fieldName' => 'visibility', 'fieldLabel' => 'Visibility', 'type' => 'select', 'selectOptions' => [{'name' => 'Private', 'value' => 'private'}, {'name' => 'Public', 'value' => 'public'}], 'defaultValue' => 'private', 'required' => true, 'displayOrder' => 8},
+      {'fieldName' => 'layoutCode', 'fieldLabel' => 'Layout Code', 'type' => 'text', 'required' => false, 'displayOrder' => 9},
+      {'fieldName' => 'iconPath', 'fieldLabel' => 'Logo', 'type' => 'select', 'optionSource' => 'iconList', 'displayOrder' => 10},
       #{'fieldName' => 'optionTypes', 'fieldLabel' => 'Option Types', 'type' => 'text', 'description' => 'Option Types to include, comma separated list of names or IDs.', 'displayOrder' => 8},
-      {'dependsOnCode' => 'catalogItemType.type:instance', 'fieldName' => 'config', 'fieldLabel' => 'Config', 'type' => 'code-editor', 'description' => 'JSON or YAML', 'required' => true, 'displayOrder' => 9},
-      {'dependsOnCode' => 'catalogItemType.type:blueprint', 'fieldName' => 'blueprint', 'fieldLabel' => 'Blueprint', 'type' => 'select', 'optionSource' => 'blueprints', 'description' => 'Choose a blueprint to apply to the catalog item.', 'required' => true, 'noParams' => true, 'displayOrder' => 10},
-      {'dependsOnCode' => 'catalogItemType.type:blueprint', 'fieldName' => 'appSpec', 'fieldLabel' => 'App Spec', 'type' => 'code-editor', 'description' => 'Enter a spec in the for the App, the Scribe YAML format', 'required' => true, 'displayOrder' => 11},
-      {'dependsOnCode' => 'catalogItemType.type:workflow', 'fieldName' => 'workflow', 'fieldLabel' => 'Workflow', 'type' => 'select', 'optionSource' => 'operationWorkflows', 'description' => 'Enter a spec in the for the App, the Scribe YAML format', 'noParams' => true, 'displayOrder' => 12},
+      {'dependsOnCode' => 'catalogItemType.type:instance', 'fieldName' => 'config', 'fieldLabel' => 'Config', 'type' => 'code-editor', 'description' => 'JSON or YAML', 'required' => true, 'displayOrder' => 11},
+      {'dependsOnCode' => 'catalogItemType.type:workflow', 'fieldName' => 'workflowConfig', 'fieldLabel' => 'Config', 'type' => 'textarea', 'description' => 'Enter configuration for the Workflow', 'required' => false, 'noParse' => true, 'displayOrder' => 11},
+      {'dependsOnCode' => 'catalogItemType.type:blueprint', 'fieldName' => 'blueprint', 'fieldLabel' => 'Blueprint', 'type' => 'select', 'optionSource' => 'blueprints', 'description' => 'Choose a blueprint to apply to the catalog item.', 'required' => true, 'noParams' => true, 'displayOrder' => 12},
+      {'dependsOnCode' => 'catalogItemType.type:blueprint', 'fieldName' => 'appSpec', 'fieldLabel' => 'App Spec', 'type' => 'code-editor', 'description' => 'Enter a spec in the for the App, the Scribe YAML format', 'required' => true, 'displayOrder' => 13},
+      {'dependsOnCode' => 'catalogItemType.type:workflow', 'fieldName' => 'workflow', 'fieldLabel' => 'Workflow', 'type' => 'select', 'optionSource' => 'operationWorkflows', 'description' => 'Enter a spec in the for the App, the Scribe YAML format', 'required' => true, 'noParams' => true, 'displayOrder' => 14},
       {'dependsOnCode' => 'catalogItemType.type:workflow', 'fieldName' => 'context', 'fieldLabel' => 'Context Type', 'type' => 'select', 'optionSource' => lambda { |api_client, api_params| 
         [{'name' => "Select", 'value' => ""}, {'name' => "None", 'value' => "appliance"}, {'name' => "Instance", 'value' => "instance"}, {'name' => "Server", 'value' => "server"}]
         }, 'description' => 'Context for operational workflow, determines target type', 'defaultValue' => 'Select', 'required' => false},
-      {'fieldName' => 'content', 'fieldLabel' => 'Content', 'type' => 'code-editor', 'description' => 'Wiki Page Content describing the catalog item', 'displayOrder' => 13}
+      {'fieldName' => 'content', 'fieldLabel' => 'Content', 'type' => 'code-editor', 'description' => 'Wiki Page Content describing the catalog item', 'displayOrder' => 15}
     ]
   end
 

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

@@ -33,6 +33,7 @@ class Morpheus::Cli::Clusters
     @security_groups_interface = @api_client.security_groups
     #@security_group_rules_interface = @api_client.security_group_rules
     @cloud_resource_pools_interface = @api_client.cloud_resource_pools
+    @resource_pool_groups_interface = @api_client.resource_pool_groups
     @clouds_interface = @api_client.clouds
     @servers_interface = @api_client.servers
     @server_types_interface = @api_client.server_types
@@ -644,6 +645,7 @@ class Morpheus::Cli::Clusters
             !type['enabled'] || !type['creatable'] || type['fieldComponent']
           } rescue []))
 
+
         # remove metadata option_type , prompt manually for that field 'tags' instead of 'metadata'
         metadata_option_type = option_type_list.find {|type| type['fieldName'] == 'metadata' }
         option_type_list = option_type_list.reject {|type| type['fieldName'] == 'metadata' }
@@ -665,6 +667,14 @@ class Morpheus::Cli::Clusters
         # Security Groups
         server_payload['securityGroups'] = prompt_security_groups_by_cloud(cloud, provision_type, resource_pool, options)
 
+        # KLUDGE part 2: need to ask for hauwei floating ip option
+        if option_type = option_type_list.find {|type| type['code'] == 'computeServerType.openstackLinux.selectFloatingIp'}
+          floating_ip = load_floating_options(cluster_payload, options)
+          if floating_ip != nil 
+            server_payload['config']['osExternalNetworkId'] = floating_ip
+          end
+        end
+
         # Visibility
         server_payload['visibility'] = options[:visibility] || (Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'visibility', 'fieldLabel' => 'Visibility', 'type' => 'select', 'defaultValue' => 'private', 'required' => true, 'selectOptions' => [{'name' => 'Private', 'value' => 'private'},{'name' => 'Public', 'value' => 'public'}]}], options[:options], @api_client, {})['visibility'])
 
@@ -3785,7 +3795,7 @@ class Morpheus::Cli::Clusters
           name: cluster['name'],
           type: (cluster['type']['name'] rescue ''),
           layout: (cluster['layout']['name'] rescue ''),
-          workers: cluster['workerCount'],
+          workers: cluster['servers'].size,
           cloud: (cluster['zone']['name'] rescue ''),
           status: format_cluster_status(cluster)
       }
@@ -4273,7 +4283,11 @@ class Morpheus::Cli::Clusters
           else
             resource_pool_id = resource_pool_options.first['id']
           end
-          resource_pool = @cloud_resource_pools_interface.get(cloud['id'], resource_pool_id)['resourcePool']
+          if resource_pool_id.to_s["poolGroup-"]
+            resource_pool = @resource_pool_groups_interface.get(resource_pool_id)['resourcePoolGroup'] 
+          else 
+            resource_pool = @cloud_resource_pools_interface.get(cloud['id'], resource_pool_id)['resourcePool']
+          end
         end
       end
     end
@@ -4357,6 +4371,13 @@ class Morpheus::Cli::Clusters
     end
   end
 
+  def load_floating_options(cluster, options)
+    floating_ip_opts = @api_client.options.options_for_source('openstackFloatingIpOptions', {optionsSourceType: 'openStack', zoneId: cluster['cloud']['id']})['data']
+    floating_ip_opts = floating_ip_opts.reject {|it| it['value'] == '' }
+    floating_ip = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'osExternalNetworkId', 'fieldLabel' => 'Floating IP', 'type' => 'select', 'selectOptions' => floating_ip_opts, 'required' => false, 'description' => "Select Floating IP"}], options[:options])['osExternalNetworkId']
+    return floating_ip
+  end
+
   def available_kube_templates
     option_results = options_interface.options_for_source('availableKubeTemplates')
     available_templates = option_results['data'].collect {|it|