morpheus-cli 7.0.3.2 → 7.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c575768ed100dbe1ed0c3e6c54544b098b11dcb461011783f8f7a6e926a60053
-  data.tar.gz: 5eca0987802e1b4db68f3a179aaada0e4557bff802045816965f97abd11e1585
+  metadata.gz: 4ee9109e36c34c6c50f1c1053d9d183aa034e5aff2be97eb7494f1135213a209
+  data.tar.gz: 7cf3dfeb5794ae2457818d8bb3ec9a90068ab7a43397f9de31d773e7e8ff5b80
 SHA512:
-  metadata.gz: 7075f5a635d1a133d643246dbd2156d06eff8b885388e702f05214186a77a5a578c8b18677162c6fe6fc0699488039d5911c20b364ddf0c3fe9fafe46709732d
-  data.tar.gz: 9b1928f8760c9667700e5f27eaa4727eed8e776fe7f2972e4d1a34b4880fcd4e00843b544ae7b8b62a21ac71318d67749d599d0a5beaeac919bd51028e10c4fc
+  metadata.gz: 4a4afd65531974bb6142919beb435aa756c251821d96660c3a3d8e0baf25c8d3a22e7be7a8b955212777bc7798714db7d0a3c00cd9ec190124a819f5188b84f6
+  data.tar.gz: 5fed3b5ab9017681ee8aba610f23da663fa9ee84000df7d3efa33a696cb4d8f27030cd8c4cda81ecf87dae523cf7a39e26235461130b137715dc098e0a75ae0d

data/Dockerfile

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

data/Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
 # Fix for mismatched deps: https://github.com/ffi/ffi/issues/1103
-gem "ffi", "< 1.17.0"
+gem "ffi", "1.15.5"
 
 # Specify your gem's dependencies in morpheus-cli.gemspec
 gemspec

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

@@ -141,6 +141,7 @@ class Morpheus::Cli::ExecutionRequestCommand
     options = {}
     params = {}
     script_content = nil
+    send_keys = nil
     options[:refresh_until_finished] = true
     optparse = Morpheus::Cli::OptionParser.new do|opts|
       opts.banner = subcommand_usage("[options]")
@@ -159,14 +160,11 @@ class Morpheus::Cli::ExecutionRequestCommand
       opts.on('--script SCRIPT', "Script to be executed" ) do |val|
         script_content = val
       end
-      opts.on('--file FILE', "File containing the script. This can be used instead of --script" ) do |filename|
-        full_filename = File.expand_path(filename)
-        if File.exist?(full_filename)
-          script_content = File.read(full_filename)
-        else
-          print_red_alert "File not found: #{full_filename}"
-          exit 1
-        end
+      opts.on('--optionTypes [true|false]', String, "Include optionTypes in the response. Default is false.") do |val|
+        params['optionTypes'] = (val.to_s == '' || val.to_s == 'on' || val.to_s == 'true')
+      end
+      opts.on('--send-keys [true|false]', "Send key mappings to the hypervisor console so commands such as <LEFT>, <RIGHT> and <WAIT> can be used." ) do |val|
+        send_keys = val.to_s == 'on' || val.to_s == 'true' || val.to_s.empty?
       end
       opts.on('--refresh [SECONDS]', String, "Refresh until execution is finished. Default interval is #{default_refresh_interval} seconds.") do |val|
         options[:refresh_until_finished] = true
@@ -208,6 +206,9 @@ class Morpheus::Cli::ExecutionRequestCommand
           script_content = v_prompt['script']
         end
         payload['script'] = script_content
+        if !send_keys.nil?
+          payload['sendKeys'] = send_keys
+        end
       end
       @execution_request_interface.setopts(options)
       if options[:dry_run]

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

@@ -38,6 +38,8 @@ class Morpheus::Cli::NetworkServersCommand
       #   params['enabled'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s.empty?
       # end
       # ['name', 'serviceUsername', 'servicePassword', 'servicePort', 'serviceHost', 'serviceUrl', 'serviceMode', 'networkFilter', 'tenantMatch']
+      #build_option_type_options(opts, options, add_network_server_option_types)
+      build_option_type_options(opts, options, add_network_server_advanced_option_types)
       build_standard_add_options(opts, options)
       opts.footer = <<-EOT
 Create a new network server.
@@ -108,8 +110,19 @@ EOT
       # prompt options by type
       network_server_type = @network_server_types_interface.get(network_type_id.to_i)['networkServerType']
       # params['type'] = network_server_type['code']
+      type_options_types = network_server_type['optionTypes'] || []
+      type_options_types.reject! {|it| it['fieldName'] == 'visibility' } # skip visibility, its under advanced now
       option_result = prompt(network_server_type['optionTypes'], options.merge({:context_map => {'networkServer' => ''}}))
       params.deep_merge!(option_result)
+
+      # advanced options
+      advanced_option_types = add_network_server_advanced_option_types
+      if advanced_option_types && !advanced_option_types.empty?
+        v_prompt = Morpheus::Cli::OptionTypes.prompt(advanced_option_types, options[:options], @api_client, {})
+        v_prompt.deep_compact!
+        v_prompt.booleanize! # 'on' => true
+        params.deep_merge!(v_prompt)
+      end
       payload.deep_merge!({rest_object_key => params})
     end
     @network_servers_interface.setopts(options)
@@ -138,6 +151,8 @@ EOT
       #   params['enabled'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s.empty?
       # end
       # ['name', 'serviceUsername', 'servicePassword', 'servicePort', 'serviceHost', 'serviceUrl', 'serviceMode', 'networkFilter', 'tenantMatch']
+      #build_option_type_options(opts, options, update_network_server_option_types)
+      build_option_type_options(opts, options, update_network_server_advanced_option_types)
       build_standard_update_options(opts, options)
       opts.footer = <<-EOT
 Update a network server.
@@ -155,6 +170,16 @@ EOT
     # merge -O options into normally parsed options
     params.deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
 
+    # params['tenants'] = options['tenants'].collect {|it| {'id': it}}
+    # advanced options
+    advanced_option_types = update_network_server_advanced_option_types
+    if advanced_option_types && !advanced_option_types.empty?
+      v_prompt = Morpheus::Cli::OptionTypes.no_prompt(advanced_option_types, options[:options], @api_client, {})
+      v_prompt.deep_compact!
+      v_prompt.booleanize! # 'on' => true
+      params.deep_merge!(v_prompt)
+    end
+
     # construct payload
     payload = nil
     if options[:payload]
@@ -228,35 +253,13 @@ EOT
     'networkServer'
   end
 
-  # def render_response_for_get(json_response, options)
-  #   # load the type and show fields dynamically based on optionTypes
-  #   render_response(json_response, options, rest_object_key) do
-  #     type_record = rest_type_find_by_name_or_id(json_response[rest_object_key]['type']['id']) rescue nil
-  #     type_option_types = type_record ? (type_record['optionTypes'] || []) : []
-  #     record = json_response[rest_object_key]
-  #     print_h1 rest_label, [], options
-  #     print cyan
-  #     columns = rest_column_definitions(options)
-  #     if record['credential'] && record['credential']['type'] != 'local'
-  #       columns.delete("Username")
-  #       columns.delete("Password")
-  #     end
-  #     columns.delete("Throttle Rate") unless type_option_types.find {|it| it['fieldName'] == 'serviceThrottleRate' }
-  #     columns.delete("Disable SSL SNI") unless type_option_types.find {|it| it['fieldName'] == 'ignoreSsl' }
-  #     columns.delete("Network Filter") unless type_option_types.find {|it| it['fieldName'] == 'networkFilter' }
-  #     columns.delete("Zone Filter") unless type_option_types.find {|it| it['fieldName'] == 'zoneFilter' }
-  #     columns.delete("Tenant Match") unless type_option_types.find {|it| it['fieldName'] == 'tenantMatch' }
-  #     columns.delete("IP Mode") unless type_option_types.find {|it| it['fieldName'] == 'serviceMode' }
-  #     columns.delete("Extra Attributes") unless type_option_types.find {|it| it['fieldName'] == 'extraAttributes' }
-  #     columns.delete("App ID") unless type_option_types.find {|it| it['fieldName'] == 'appId' }
-  #     columns.delete("Inventory Existing") unless type_option_types.find {|it| it['fieldName'] == 'inventoryExisting' }
-  #     columns.delete("Enabled") if record['enabled'].nil? # was not always returned, so don't show false if not present..
-  #     print_description_list(columns, record, options)
-  #     print reset,"\n"
-  #   end
-  # end
+  def render_response_for_get(json_response, options)
+    record = json_response[rest_object_key]
+    options[:exclude_tenants] = record['tenants'].nil?
+    super(json_response, options)
+  end
 
- def find_network_server_by_name_or_id(val)
+  def find_network_server_by_name_or_id(val)
     if val.to_s =~ /\A\d{1,}\Z/
       return find_network_server_by_id(val)
     else
@@ -309,19 +312,31 @@ EOT
   end
 
   def add_network_server_advanced_option_types()
-    []
+    [
+      {'fieldName' => 'visibility', 'fieldLabel' => 'Visibility', 'type' => 'select', 'selectOptions' => [{'name' => 'Private', 'value' => 'private'},{'name' => 'Public', 'value' => 'public'}], 'required' => false, 'description' => 'Visibility', 'category' => 'permissions', 'defaultValue' => 'private'},
+      {'fieldName' => 'tenants', 'fieldLabel' => 'Tenants', 'fieldGroup' => 'Advanced', 'type' => 'multiSelect', 'resultValueField' => 'id', 'optionSource' => lambda { |api_client, api_params|
+        api_client.options.options_for_source("allTenants", {})['data']
+      }},
+    ]
   end
 
   def update_network_server_option_types()
-    [
-      {'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text'},
-      {'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text'},
-      {'fieldName' => 'enabled', 'fieldLabel' => 'Enabled', 'type' => 'checkbox'},
-    ]
+    list = add_network_server_option_types.collect {|it|
+      it.delete('required')
+      it.delete('defaultValue')
+      it
+    }
+    list = list.reject {|it| ["type"].include? it['fieldName'] }
+    list
   end
 
   def update_network_server_advanced_option_types()
-    []
+    list = add_network_server_advanced_option_types.collect {|it|
+      it.delete('required')
+      it.delete('defaultValue')
+      it
+    }
+    list
   end
 
   def network_server_list_column_definitions(options)
@@ -338,13 +353,12 @@ EOT
   end
 
   def network_server_column_definitions(options)
-    {
+    columns = {
       "ID" => 'id',
       "Name" => lambda {|it| it['name'] },
       "Type" => lambda {|it| it['type'] ? it['type']['name'] : '' },
       "URL" => lambda {|it| it['serviceUrl'] },
-      #todo: support credentials
-      #"Credentials" => lambda {|it| it['credential'] ? (it['credential']['type'] == 'local' ? '(Local)' : it['credential']['name']) : nil },
+      "Credentials" => lambda {|it| it['credential'] ? (it['credential']['type'] == 'local' ? '(Local)' : it['credential']['name']) : nil },
       "Username" => lambda {|it| it['serviceUsername'] },
       "Password" => lambda {|it| it['servicePassword'] },
       "Service Mode" => lambda {|it| it['serviceMode'] },
@@ -352,10 +366,16 @@ EOT
       "Network Filter" => lambda {|it| it['networkFilter'] },
       "Tenant Match" => lambda {|it| it['tenantMatch'] },
       #"Enabled" => lambda {|it| format_boolean(it['enabled']) },
+      "Visibility" => lambda {|it| it['visibility'] ? it['visibility'].capitalize() : '' },
+      "Tenants" => lambda { |it| it['tenants'].collect {|tenant| tenant['name']}.join(', ') rescue '' },
       "Status" => lambda {|it| format_network_server_status(it) },
-      "Date Created" => lambda {|it| format_local_dt(it['dateCreated']) },
-      "Last Updated" => lambda {|it| format_local_dt(it['lastUpdated']) },
+      "Created" => lambda {|it| format_local_dt(it['dateCreated']) },
+      "Updated" => lambda {|it| format_local_dt(it['lastUpdated']) }
     }
+    if options[:exclude_tenants]
+      columns.delete("Tenants")
+    end
+    columns
   end
 
   def format_network_server_status(network_server, return_color=cyan)

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "7.0.3.2"
+    VERSION = "7.0.4"
   end
 end

data/morpheus-cli.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.required_ruby_version = '>= 2.5.1' # according to http.rb doc
+  spec.add_dependency "ffi", "1.15.5" # Fix for mismatched deps: https://github.com/ffi/ffi/issues/1103
   spec.add_development_dependency "bundler", "~> 2.2"
   spec.add_development_dependency "rake"
   spec.add_dependency 'term-ansicolor', '~> 1.3.0'

data/test/cli/instances_test.rb

@@ -11,7 +11,8 @@ class MorpheusTest::InstancesTest < MorpheusTest::TestCase
     instance = client.instances.list({})['instances'][0]
     if instance
       assert_execute %(instances get "#{instance['id']}")
-      assert_execute %(instances get "#{escape_arg instance['name']}")
+      name_arg = instance['displayName'] || instance['name']
+      assert_execute %(instances get "#{escape_arg name_arg}")
     else
       puts "No instance found, unable to execute test `#{__method__}`"
     end

data/test/cli/network_routers_test.rb

@@ -8,7 +8,10 @@ class MorpheusTest::NetworkRoutersTest < MorpheusTest::TestCase
   end
 
   def test_network_routers_get
-    network_router = client.network_routers.list({})['networkRouters'][0]
+    # find one that does not have a duplicate name..so we can get it by name
+    #network_router = client.network_routers.list({})['networkRouters'][0]
+    network_routers = client.network_routers.list({})['networkRouters']
+    network_router = network_routers.find {|it| !(network_routers.find {|other| other['name'] == it['name'] }) }
     if network_router
       assert_execute %(network-routers get "#{network_router['id']}")
       assert_execute %(network-routers get "#{escape_arg network_router['name']}")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 7.0.3.2
+  version: 7.0.4
 platform: ruby
 authors:
 - David Estes
@@ -11,8 +11,22 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-17 00:00:00.000000000 Z
+date: 2024-07-19 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: ffi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.15.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.15.5
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement