morpheus-cli 3.6.28 → 3.6.29

data/lib/morpheus/cli/library_option_lists_command.rb

@@ -285,7 +285,7 @@ class Morpheus::Cli::LibraryOptionListsCommand
           end
         end
         if params.empty?
-          print_red_alert "Specify atleast one option to update"
+          print_red_alert "Specify at least one option to update"
           puts optparse
           exit 1
         end

data/lib/morpheus/cli/library_option_types_command.rb

@@ -211,7 +211,7 @@ class Morpheus::Cli::LibraryOptionTypesCommand
       #params = options[:options] || {}
       params = Morpheus::Cli::OptionTypes.no_prompt(update_option_type_option_types, options[:options], @api_client, options[:params])
       if params.empty?
-        print_red_alert "Specify atleast one option to update"
+        print_red_alert "Specify at least one option to update"
         puts optparse
         exit 1
       end

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

@@ -317,7 +317,10 @@ module Morpheus::Cli::ProvisioningHelper
 
     available_versions = options_interface.options_for_source('instanceVersions',{groupId: group_id, cloudId: cloud_id, instanceTypeId: instance_type['id']})['data']
     default_version_value = payload['instance']['version'] ? payload['instance']['version'] : payload['version']
-    default_layout_value = payload['instance']['layout'] ? payload['instance']['layout']['id'] : nil
+    default_layout_value = payload['instance']['layout'] ? payload['instance']['layout'] : payload['layout']
+    if default_layout_value && default_layout_value.is_a?(Hash)
+      default_layout_value = default_layout_value['id']
+    end
     # JD: version is always nil because it is not stored in the blueprint or config !!
     # so for now, infer the version from the layout
     # requires api 3.6.2 to get "layouts" from /options/versions
@@ -341,6 +344,12 @@ module Morpheus::Cli::ProvisioningHelper
       version_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'version', 'type' => 'select', 'fieldLabel' => 'Version', 'selectOptions' => available_versions, 'required' => version_is_required, 'skipSingleOption' => true, 'autoPickOption' => true, 'description' => 'Select which version of the instance type to be provisioned.', 'defaultValue' => default_version_value}],options[:options],api_client,{groupId: group_id, cloudId: cloud_id, instanceTypeId: instance_type['id']})
       version_value = version_prompt['version']
     end
+    # JD: there is a bug here, the version needs to be passed perhaps? or the optionSource methods need updating...
+    # could just allow for now ...
+    # if options[:options]["layout"]
+    #   layout_id = options[:options]["layout"]
+    #   ...
+    # end
     layout_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'layout', 'type' => 'select', 'fieldLabel' => 'Layout', 'optionSource' => 'layoutsForCloud', 'required' => true, 'description' => 'Select which configuration of the instance type to be provisioned.', 'defaultValue' => default_layout_value}],options[:options],api_client,{groupId: group_id, cloudId: cloud_id, instanceTypeId: instance_type['id'], version: version_value})
     layout_id = layout_prompt['layout']
     layout = instance_type['instanceTypeLayouts'].find{ |lt| lt['id'] == layout_id.to_i}
@@ -432,7 +441,7 @@ module Morpheus::Cli::ProvisioningHelper
       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']})
+    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_value})
     payload.deep_merge!(instance_config_payload)
 
     ## Advanced Options

data/lib/morpheus/cli/monitoring_contacts_command.rb

@@ -231,7 +231,7 @@ class Morpheus::Cli::MonitoringContactsCommand
       contact = find_contact_by_name_or_id(args[0])
 
       if params.empty?
-        print_red_alert "Specify atleast one option to update"
+        print_red_alert "Specify at least one option to update"
         puts optparse
         exit 1
       end

data/lib/morpheus/cli/monitoring_incidents_command.rb

@@ -447,7 +447,7 @@ class Morpheus::Cli::MonitoringIncidentsCommand
       end
 
       if params.empty?
-        print_red_alert "Specify atleast one option to update"
+        print_red_alert "Specify at least one option to update"
         puts optparse
         exit 1
       end

data/lib/morpheus/cli/network_services_command.rb

@@ -35,8 +35,8 @@ class Morpheus::Cli::NetworkServicesCommand
     params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage()
-      build_common_options(opts, options, [:list, :json, :yaml, :csv, :fields, :json, :dry_run, :remote])
-      opts.footer = "List network services."
+      build_common_options(opts, options, [:list, :query, :json, :yaml, :csv, :fields, :dry_run, :remote])
+      opts.footer = "List network services (Integrations)."
     end
     optparse.parse!(args)
     connect(options)
@@ -81,7 +81,11 @@ class Morpheus::Cli::NetworkServicesCommand
         print cyan
         print as_pretty_table(rows, columns, options)
         print reset
-        print_results_pagination(json_response, {:label => "network service", :n_label => "network services"})
+        if json_response['meta']
+          print_results_pagination(json_response, {:label => "network service", :n_label => "network services"})
+        else
+          print_results_pagination({'meta'=>{'total'=>rows.size,'size'=>rows.size,'max'=>options[:max] || rows.size,'offset'=>0}}, {:label => "network service", :n_label => "network services"})
+        end
       end
       print reset,"\n"
       return 0

data/lib/morpheus/cli/networks_command.rb

@@ -11,7 +11,8 @@ class Morpheus::Cli::NetworksCommand
   set_command_name :networks
 
   register_subcommands :list, :get, :add, :update, :remove #, :generate_pool
-  
+  register_subcommands :'types' => :list_types
+
   # set_default_subcommand :list
   
   def initialize()
@@ -21,6 +22,7 @@ class Morpheus::Cli::NetworksCommand
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
     @networks_interface = @api_client.networks
+    @network_types_interface = @api_client.network_types
     @clouds_interface = @api_client.clouds
     @options_interface = @api_client.options
   end
@@ -154,6 +156,7 @@ class Morpheus::Cli::NetworksCommand
         "Primary DNS" => 'dnsPrimary',
         "Secondary DNS" => 'dnsSecondary',
         "Pool" => lambda {|it| it['pool'] ? it['pool']['name'] : '' },
+        "VPC" => lambda {|it| it['zonePool'] ? it['zonePool']['name'] : '' },
         "DHCP" => lambda {|it| it['dhcpServer'] ? 'Yes' : 'No' },
         "Allow IP Override" => lambda {|it| it['allowStaticOverride'] ? 'Yes' : 'No' },
         "Visibility" => lambda {|it| it['visibility'].to_s.capitalize },
@@ -323,6 +326,22 @@ class Morpheus::Cli::NetworksCommand
         # allow arbitrary -O options
         payload['network'].deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
 
+         # Name
+        if options['name']
+          payload['network']['name'] = options['name']
+        else
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'description' => 'Name for this network.'}], options)
+          payload['network']['name'] = v_prompt['name']
+        end
+
+        # Description
+        if options['description']
+          payload['network']['description'] = options['description']
+        else
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text', 'required' => false, 'description' => 'Description of network.'}], options)
+          payload['network']['description'] = v_prompt['description']
+        end
+
         # Cloud
         cloud = nil
         if options[:cloud]
@@ -350,62 +369,92 @@ class Morpheus::Cli::NetworksCommand
         end
         payload['network']['type'] = {'id' => network_type_id.to_i }
 
-        # Name
-        if options['name']
-          payload['network']['name'] = options['name']
+        network_type = nil
+        json_response = @network_types_interface.get(network_type_id)
+        if json_response["networkType"]
+          network_type = json_response["networkType"]
         else
-          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'description' => 'Name for this network.'}], options)
-          payload['network']['name'] = v_prompt['name']
+          print_red_alert "Network Type not found by id '#{network_type_id}'"
+          return 1
         end
+        network_type_option_types = network_type['optionTypes']
+        if network_type_option_types && network_type_option_types.size > 0
+          # prompt for option types
+          # JD: 3.6.2 has fieldContext: 'domain' , which is wrong
+          network_type_option_types.each do |option_type|
+            # if option_type['fieldContext'] == 'domain'
+            #   option_type['fieldContext'] = 'network'
+            # end
+            option_type['fieldContext'] = nil
+          end
+          network_type_params = Morpheus::Cli::OptionTypes.prompt(network_type_option_types,options[:options],@api_client, {zoneId: cloud['id']})
+          payload['network'].deep_merge!(network_type_params)
 
-        # Description
-        if options['description']
-          payload['network']['description'] = options['description']
-        else
-          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text', 'required' => false, 'description' => 'Description of network.'}], options)
-          payload['network']['description'] = v_prompt['description']
-        end
+        #todo: special handling of type: 'aciVxlan'
 
-        # Gateway
-        if options['gateway']
-          payload['network']['gateway'] = options['gateway']
         else
-          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'gateway', 'fieldLabel' => 'Gateway', 'type' => 'text', 'required' => false, 'description' => ''}], options)
-          payload['network']['gateway'] = v_prompt['gateway']
-        end
+          # DEFAULT INPUTS
+
+          # Gateway
+          if options['gateway']
+            payload['network']['gateway'] = options['gateway']
+          else
+            v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'gateway', 'fieldLabel' => 'Gateway', 'type' => 'text', 'required' => false, 'description' => ''}], options)
+            payload['network']['gateway'] = v_prompt['gateway']
+          end
 
-        # DNS Primary
-        if options['dnsPrimary']
-          payload['network']['dnsPrimary'] = options['dnsPrimary']
-        else
-          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'dnsPrimary', 'fieldLabel' => 'DNS Primary', 'type' => 'text', 'required' => false, 'description' => ''}], options)
-          payload['network']['dnsPrimary'] = v_prompt['dnsPrimary']
-        end
+          # DNS Primary
+          if options['dnsPrimary']
+            payload['network']['dnsPrimary'] = options['dnsPrimary']
+          else
+            v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'dnsPrimary', 'fieldLabel' => 'DNS Primary', 'type' => 'text', 'required' => false, 'description' => ''}], options)
+            payload['network']['dnsPrimary'] = v_prompt['dnsPrimary']
+          end
 
-        # DNS Secondary
-        if options['dnsSecondary']
-          payload['network']['dnsSecondary'] = options['dnsSecondary']
-        else
-          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'dnsSecondary', 'fieldLabel' => 'DNS Secondary', 'type' => 'text', 'required' => false, 'description' => ''}], options)
-          payload['network']['dnsSecondary'] = v_prompt['dnsSecondary']
-        end
+          # DNS Secondary
+          if options['dnsSecondary']
+            payload['network']['dnsSecondary'] = options['dnsSecondary']
+          else
+            v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'dnsSecondary', 'fieldLabel' => 'DNS Secondary', 'type' => 'text', 'required' => false, 'description' => ''}], options)
+            payload['network']['dnsSecondary'] = v_prompt['dnsSecondary']
+          end
 
-        # CIDR
-        if options['cidr']
-          payload['network']['cidr'] = options['cidr']
-        else
-          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'cidr', 'fieldLabel' => 'CIDR', 'type' => 'text', 'required' => false, 'description' => ''}], options)
-          payload['network']['cidr'] = v_prompt['cidr']
-        end
+          # CIDR
+          if options['cidr']
+            payload['network']['cidr'] = options['cidr']
+          else
+            v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'cidr', 'fieldLabel' => 'CIDR', 'type' => 'text', 'required' => false, 'description' => ''}], options)
+            payload['network']['cidr'] = v_prompt['cidr']
+          end
+
+          # VLAN ID
+          if options['vlanId']
+            payload['network']['vlanId'] = options['vlanId']
+          else
+            v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'vlanId', 'fieldLabel' => 'VLAN ID', 'type' => 'number', 'required' => false, 'description' => ''}], options)
+            payload['network']['vlanId'] = v_prompt['vlanId']
+          end
+
+          # DHCP Server
+          if options['dhcpServer'] != nil
+            payload['network']['dhcpServer'] = options['dhcpServer']
+          else
+            v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'dhcpServer', 'fieldLabel' => 'DHCP Server', 'type' => 'checkbox', 'required' => false, 'description' => ''}], options)
+            payload['network']['dhcpServer'] = v_prompt['dhcpServer']
+          end
+
+          # Allow IP Override
+          if options['allowStaticOverride'] != nil
+            payload['network']['allowStaticOverride'] = options['allowStaticOverride']
+          else
+            v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'allowStaticOverride', 'fieldLabel' => 'Allow IP Override', 'type' => 'checkbox', 'required' => false, 'description' => ''}], options)
+            payload['network']['allowStaticOverride'] = v_prompt['allowStaticOverride']
+          end
 
-        # VLAN ID
-        if options['vlanId']
-          payload['network']['vlanId'] = options['vlanId']
-        else
-          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'vlanId', 'fieldLabel' => 'VLAN ID', 'type' => 'number', 'required' => false, 'description' => ''}], options)
-          payload['network']['vlanId'] = v_prompt['vlanId']
         end
 
+        ## IPAM Options
+
         # Network Pool
         if options['pool']
           payload['network']['pool'] = options['pool'].to_i
@@ -415,23 +464,9 @@ class Morpheus::Cli::NetworksCommand
           v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'pool', 'fieldLabel' => 'Network Pool', 'type' => 'text', 'required' => false, 'description' => ''}], options)
           payload['network']['pool'] = v_prompt['pool'].to_i if v_prompt['pool']
         end
-
-        # DHCP Server
-        if options['dhcpServer'] != nil
-          payload['network']['dhcpServer'] = options['dhcpServer']
-        else
-          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'dhcpServer', 'fieldLabel' => 'DHCP Server', 'type' => 'checkbox', 'required' => false, 'description' => ''}], options)
-          payload['network']['dhcpServer'] = v_prompt['dhcpServer']
-        end
-
-        # Allow IP Override
-        if options['allowStaticOverride'] != nil
-          payload['network']['allowStaticOverride'] = options['allowStaticOverride']
-        else
-          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'allowStaticOverride', 'fieldLabel' => 'Allow IP Override', 'type' => 'checkbox', 'required' => false, 'description' => ''}], options)
-          payload['network']['allowStaticOverride'] = v_prompt['allowStaticOverride']
-        end
         
+        ## Advanced Options
+
         # Network Domain
         if options['domain']
           payload['network']['networkDomain'] = {'id' => options['domain'].to_i}
@@ -909,10 +944,76 @@ class Morpheus::Cli::NetworksCommand
     end
   end
 
+  def list_types(args)
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage()
+      opts.on( '-c', '--cloud CLOUD', "Cloud Name or ID" ) do |val|
+        options[:cloud] = val
+      end
+      build_common_options(opts, options, [:list, :query, :json, :yaml, :csv, :fields, :dry_run, :remote])
+      opts.footer = "List host types."
+    end
+    optparse.parse!(args)
+    connect(options)
+    begin
+      params = {}
+      params.merge!(parse_list_options(options))
+      if options[:cloud]
+        #return network_types_for_cloud(options[:cloud], options)
+        zone = find_zone_by_name_or_id(nil, options[:cloud])
+        #params["zoneTypeId"] = zone['zoneTypeId']
+        params["zoneId"] = zone['id']
+        params["creatable"] = true
+      end
+      @network_types_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @network_types_interface.dry.list(params)
+        return
+      end
+      json_response = @network_types_interface.list(params)
+      
+      render_result = render_with_format(json_response, options, 'networkTypes')
+      return 0 if render_result
+
+      network_types = json_response['networkTypes']
+
+      title = "Morpheus network Types"
+      subtitles = []
+      subtitles += parse_list_subtitles(options)
+      if options[:cloud]
+        subtitles << "Cloud: #{options[:cloud]}"
+      end
+      print_h1 title, subtitles
+      if network_types.empty?
+        print cyan,"No network types found.",reset,"\n"
+      else
+        rows = network_types.collect do |network_type|
+          {
+            id: network_type['id'],
+            code: network_type['code'],
+            name: network_type['name']
+          }
+        end
+        columns = [:id, :name, :code]
+        print cyan
+        print as_pretty_table(rows, columns, options)
+        print reset
+        print_results_pagination(json_response)
+      end
+      print reset,"\n"
+      return 0
+
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
   private
 
 
- def find_network_by_name_or_id(val)
+  def find_network_by_name_or_id(val)
     if val.to_s =~ /\A\d{1,}\Z/
       return find_network_by_id(val)
     else

data/lib/morpheus/cli/option_types.rb

@@ -56,9 +56,13 @@ module Morpheus
           #   end
           # end
 
-          if option_type['fieldContext']
+          field_key = [option_type['fieldContext'], option_type['fieldName']].select {|it| it && it != '' }.join('.')
+          namespaces = field_key.split(".")
+          field_name = namespaces.pop
+
+          if field_key.include?(".")
             cur_namespace = options
-            namespaces = option_type['fieldContext'].split(".")
+
             namespaces.each do |ns|
               next if ns.empty?
               cur_namespace[ns.to_s] ||= {}
@@ -67,13 +71,13 @@ module Morpheus
               context_map = context_map[ns.to_s]
             end
             # use the value passed in the options map
-            if cur_namespace.key?(option_type['fieldName'])
-              value = cur_namespace[option_type['fieldName']]
+            if cur_namespace.key?(field_name)
+              value = cur_namespace[field_name]
               if option_type['type'] == 'number'
                 value = value.to_s.include?('.') ? value.to_f : value.to_i
               elsif option_type['type'] == 'select'
                 # this should just fall down through below, with the extra params no_prompt, use_value
-                value = select_prompt(option_type, api_client, api_params, true, value)
+                value = select_prompt(option_type, api_client, (api_params || {}).merge(results), true, value)
               end
               if options[:always_prompt] != true
                 value_found = true
@@ -81,8 +85,8 @@ module Morpheus
             end
           else
             # no fieldContext
-            if value_found == false && options.key?(option_type['fieldName'])
-              value = options[option_type['fieldName']]
+            if value_found == false && options.key?(field_key)
+              value = options[field_key]
               if option_type['type'] == 'number'
                 value = value.to_s.include?('.') ? value.to_f : value.to_i
               end
@@ -113,13 +117,13 @@ module Morpheus
                 # select type is special because it supports skipSingleOption
                 # and prints the available options on error
                 if option_type['type'] == 'select'
-                  value = select_prompt(option_type, api_client, api_params, true)
+                  value = select_prompt(option_type, api_client, (api_params || {}).merge(results), true)
                   value_found = !!value
                 end
                 if !value_found
                   if option_type['required']
                     print Term::ANSIColor.red, "\nMissing Required Option\n\n", Term::ANSIColor.reset
-                    print Term::ANSIColor.red, "  * #{option_type['fieldLabel']} [-O #{option_type['fieldContext'] ? (option_type['fieldContext']+'.') : ''}#{option_type['fieldName']}=] - #{option_type['description']}\n", Term::ANSIColor.reset
+                    print Term::ANSIColor.red, "  * #{option_type['fieldLabel']} [-O #{field_key}=] - #{option_type['description']}\n", Term::ANSIColor.reset
                     print "\n"
                     exit 1
                   else
@@ -150,10 +154,7 @@ module Morpheus
               # I suppose the entered value should take precedence
               # api_params = api_params.merge(options) # this might be good enough
               # dup it
-              select_api_params = {}.merge(api_params || {}).merge(results)
-              grails_select_api_params = grails_params(select_api_params)
-              
-            value = select_prompt(option_type,api_client, grails_select_api_params)
+              value = select_prompt(option_type,api_client, (api_params || {}).merge(results))
           elsif option_type['type'] == 'hidden'
             value = option_type['defaultValue']
             input = value
@@ -163,7 +164,7 @@ module Morpheus
             value = generic_prompt(option_type)
           end
         end
-        context_map[option_type['fieldName']] = value
+        context_map[field_name] = value
       end
 
       return results
@@ -248,7 +249,7 @@ module Morpheus
           if option_type['optionSource'] == 'list'
             select_options = load_source_options(option_type['optionSource'], api_client, {'optionTypeId' => option_type['id']})
           else
-            select_options = load_source_options(option_type['optionSource'], api_client, api_params)
+            select_options = load_source_options(option_type['optionSource'], api_client, grails_params(api_params || {}))
           end          
         else
           raise "select_prompt() requires selectOptions or optionSource!"