morpheus-cli 3.3.2.6.2 → 3.3.2.7

data/lib/morpheus/cli/network_domains_command.rb

@@ -41,23 +41,18 @@ class Morpheus::Cli::NetworkDomainsCommand
     optparse.parse!(args)
     connect(options)
     begin
-      [: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 @network_domains_interface.dry.list(params)
         return
       end
       json_response = @network_domains_interface.list(params)
       network_domains = json_response["networkDomains"]
-      if options[:include_fields]
-        json_response = {"networkDomains" => filter_data(network_domains, options[:include_fields]) }
-      end
       if options[:json]
-        puts as_json(json_response, options)
+        puts as_json(json_response, options, "networkDomains")
         return 0
       elsif options[:yaml]
-        puts as_yaml(json_response, options)
+        puts as_yaml(json_response, options, "networkDomains")
         return 0
       elsif options[:csv]
         puts records_as_csv(network_domains, options)
@@ -65,9 +60,7 @@ class Morpheus::Cli::NetworkDomainsCommand
       end
       title = "Morpheus Network Domains"
       subtitles = []
-      if params[:phrase]
-        subtitles << "Search: #{params[:phrase]}".strip
-      end
+      subtitles += parse_list_subtitles(options)
       print_h1 title, subtitles
       if network_domains.empty?
         print cyan,"No network domains found.",reset,"\n"
@@ -132,14 +125,12 @@ class Morpheus::Cli::NetworkDomainsCommand
       json_response = {'networkDomain' => network_domain}  # skip redundant request
       # json_response = @network_domains_interface.get(network_domain['id'])
       network_domain = json_response['networkDomain']
-      if options[:include_fields]
-        json_response = {'networkDomain' => filter_data(network_domain, options[:include_fields]) }
-      end
+      
       if options[:json]
-        puts as_json(json_response, options)
+        puts as_json(json_response, options, 'networkDomain')
         return 0
       elsif options[:yaml]
-        puts as_yaml(json_response, options)
+        puts as_yaml(json_response, options, 'networkDomain')
         return 0
       elsif options[:csv]
         puts records_as_csv([network_domain], options)

data/lib/morpheus/cli/network_groups_command.rb

@@ -41,23 +41,18 @@ class Morpheus::Cli::NetworkGroupsCommand
     optparse.parse!(args)
     connect(options)
     begin
-      [: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 @network_groups_interface.dry.list(params)
         return
       end
       json_response = @network_groups_interface.list(params)
       network_groups = json_response["networkGroups"]
-      if options[:include_fields]
-        json_response = {"networkGroups" => filter_data(network_groups, options[:include_fields]) }
-      end
       if options[:json]
-        puts as_json(json_response, options)
+        puts as_json(json_response, options, "networkGroups")
         return 0
       elsif options[:yaml]
-        puts as_yaml(json_response, options)
+        puts as_yaml(json_response, options, "networkGroups")
         return 0
       elsif options[:csv]
         puts records_as_csv(network_groups, options)
@@ -65,9 +60,7 @@ class Morpheus::Cli::NetworkGroupsCommand
       end
       title = "Morpheus Network Groups"
       subtitles = []
-      if params[:phrase]
-        subtitles << "Search: #{params[:phrase]}".strip
-      end
+      subtitles += parse_list_subtitles(options)
       print_h1 title, subtitles
       if network_groups.empty?
         print cyan,"No network groups found.",reset,"\n"
@@ -130,14 +123,11 @@ class Morpheus::Cli::NetworkGroupsCommand
       json_response = {'networkGroup' => network_group}  # skip redundant request
       # json_response = @network_groups_interface.get(network_group['id'])
       network_group = json_response['networkGroup']
-      if options[:include_fields]
-        json_response = {'networkGroup' => filter_data(network_group, options[:include_fields]) }
-      end
       if options[:json]
-        puts as_json(json_response, options)
+        puts as_json(json_response, options, "networkGroup")
         return 0
       elsif options[:yaml]
-        puts as_yaml(json_response, options)
+        puts as_yaml(json_response, options, "networkGroup")
         return 0
       elsif options[:csv]
         puts records_as_csv([network_group], options)

data/lib/morpheus/cli/network_pool_servers_command.rb

@@ -41,23 +41,18 @@ class Morpheus::Cli::NetworkPoolServersCommand
     optparse.parse!(args)
     connect(options)
     begin
-      [: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 @network_pool_servers_interface.dry.list(params)
         return
       end
       json_response = @network_pool_servers_interface.list(params)
       network_pool_servers = json_response["networkPoolServers"]
-      if options[:include_fields]
-        json_response = {"networkPoolServers" => filter_data(network_pool_servers, options[:include_fields]) }
-      end
       if options[:json]
-        puts as_json(json_response, options)
+        puts as_json(json_response, options, "networkPoolServers")
         return 0
       elsif options[:yaml]
-        puts as_yaml(json_response, options)
+        puts as_yaml(json_response, options, "networkPoolServers")
         return 0
       elsif options[:csv]
         puts records_as_csv(network_pool_servers, options)
@@ -65,9 +60,7 @@ class Morpheus::Cli::NetworkPoolServersCommand
       end
       title = "Morpheus Network Pool Servers"
       subtitles = []
-      if params[:phrase]
-        subtitles << "Search: #{params[:phrase]}".strip
-      end
+      subtitles += parse_list_subtitles(options)
       print_h1 title, subtitles
       if network_pool_servers.empty?
         print cyan,"No network pool servers found.",reset,"\n"
@@ -128,14 +121,11 @@ class Morpheus::Cli::NetworkPoolServersCommand
       json_response = {'networkPoolServer' => network_pool_server}  # skip redundant request
       # json_response = @network_pool_servers_interface.get(network_pool_server['id'])
       network_pool_server = json_response['networkPoolServer']
-      if options[:include_fields]
-        json_response = {'networkPoolServer' => filter_data(network_pool_server, options[:include_fields]) }
-      end
       if options[:json]
-        puts as_json(json_response, options)
+        puts as_json(json_response, options, 'networkPoolServer')
         return 0
       elsif options[:yaml]
-        puts as_yaml(json_response, options)
+        puts as_yaml(json_response, options, 'networkPoolServer')
         return 0
       elsif options[:csv]
         puts records_as_csv([network_pool_server], options)

data/lib/morpheus/cli/network_pools_command.rb

@@ -41,23 +41,18 @@ class Morpheus::Cli::NetworkPoolsCommand
     optparse.parse!(args)
     connect(options)
     begin
-      [: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 @network_pools_interface.dry.list(params)
         return
       end
       json_response = @network_pools_interface.list(params)
       network_pools = json_response["networkPools"]
-      if options[:include_fields]
-        json_response = {"networkPools" => filter_data(network_pools, options[:include_fields]) }
-      end
       if options[:json]
-        puts as_json(json_response, options)
+        puts as_json(json_response, options, "networkPools")
         return 0
       elsif options[:yaml]
-        puts as_yaml(json_response, options)
+        puts as_yaml(json_response, options, "networkPools")
         return 0
       elsif options[:csv]
         puts records_as_csv(network_pools, options)
@@ -65,9 +60,7 @@ class Morpheus::Cli::NetworkPoolsCommand
       end
       title = "Morpheus Network Pools"
       subtitles = []
-      if params[:phrase]
-        subtitles << "Search: #{params[:phrase]}".strip
-      end
+      subtitles += parse_list_subtitles(options)
       print_h1 title, subtitles
       if network_pools.empty?
         print cyan,"No network pools found.",reset,"\n"
@@ -131,14 +124,11 @@ class Morpheus::Cli::NetworkPoolsCommand
       json_response = {'networkPool' => network_pool}  # skip redundant request
       # json_response = @network_pools_interface.get(network_pool['id'])
       network_pool = json_response['networkPool']
-      if options[:include_fields]
-        json_response = {'networkPool' => filter_data(network_pool, options[:include_fields]) }
-      end
       if options[:json]
-        puts as_json(json_response, options)
+        puts as_json(json_response, options, "networkPool")
         return 0
       elsif options[:yaml]
-        puts as_yaml(json_response, options)
+        puts as_yaml(json_response, options, "networkPool")
         return 0
       elsif options[:csv]
         puts records_as_csv([network_pool], options)

data/lib/morpheus/cli/network_proxies_command.rb

@@ -41,23 +41,18 @@ class Morpheus::Cli::NetworkProxiesCommand
     optparse.parse!(args)
     connect(options)
     begin
-      [: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 @network_proxies_interface.dry.list(params)
         return
       end
       json_response = @network_proxies_interface.list(params)
       network_proxies = json_response["networkProxies"]
-      if options[:include_fields]
-        json_response = {"networkProxies" => filter_data(network_proxies, options[:include_fields]) }
-      end
       if options[:json]
-        puts as_json(json_response, options)
+        puts as_json(json_response, options, "networkProxies")
         return 0
       elsif options[:yaml]
-        puts as_yaml(json_response, options)
+        puts as_yaml(json_response, options, "networkProxies")
         return 0
       elsif options[:csv]
         puts records_as_csv(network_proxies, options)
@@ -65,9 +60,7 @@ class Morpheus::Cli::NetworkProxiesCommand
       end
       title = "Morpheus Network Proxies"
       subtitles = []
-      if params[:phrase]
-        subtitles << "Search: #{params[:phrase]}".strip
-      end
+      subtitles += parse_list_subtitles(options)
       print_h1 title, subtitles
       if network_proxies.empty?
         print cyan,"No network proxies found.",reset,"\n"
@@ -130,14 +123,11 @@ class Morpheus::Cli::NetworkProxiesCommand
       json_response = {'networkProxy' => network_proxy}  # skip redundant request
       # json_response = @network_proxies_interface.get(network_proxy['id'])
       network_proxy = json_response['networkProxy']
-      if options[:include_fields]
-        json_response = {'networkProxy' => filter_data(network_proxy, options[:include_fields]) }
-      end
       if options[:json]
-        puts as_json(json_response, options)
+        puts as_json(json_response, options, "networkProxy")
         return 0
       elsif options[:yaml]
-        puts as_yaml(json_response, options)
+        puts as_yaml(json_response, options, "networkProxy")
         return 0
       elsif options[:csv]
         puts records_as_csv([network_proxy], options)

data/lib/morpheus/cli/network_services_command.rb

@@ -42,23 +42,18 @@ class Morpheus::Cli::NetworkServicesCommand
     optparse.parse!(args)
     connect(options)
     begin
-      [: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 @network_services_interface.dry.list(params)
         return
       end
       json_response = @network_services_interface.list(params)
       network_services = json_response["networkServices"]
-      if options[:include_fields]
-        json_response = {"networkServices" => filter_data(network_services, options[:include_fields]) }
-      end
       if options[:json]
-        puts as_json(json_response, options)
+        puts as_json(json_response, options, "networkServices")
         return 0
       elsif options[:yaml]
-        puts as_yaml(json_response, options)
+        puts as_yaml(json_response, options, "networkServices")
         return 0
       elsif options[:csv]
         puts records_as_csv(network_services, options)
@@ -66,9 +61,7 @@ class Morpheus::Cli::NetworkServicesCommand
       end
       title = "Morpheus Network Services"
       subtitles = []
-      if params[:phrase]
-        subtitles << "Search: #{params[:phrase]}".strip
-      end
+      subtitles += parse_list_subtitles(options)
       print_h1 title, subtitles
       if network_services.empty?
         print cyan,"No network services found.",reset,"\n"

data/lib/morpheus/cli/networks_command.rb

@@ -44,23 +44,18 @@ class Morpheus::Cli::NetworksCommand
     optparse.parse!(args)
     connect(options)
     begin
-      [: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 @networks_interface.dry.list(params)
         return
       end
       json_response = @networks_interface.list(params)
       networks = json_response["networks"]
-      if options[:include_fields]
-        json_response = {"networks" => filter_data(networks, options[:include_fields]) }
-      end
       if options[:json]
-        puts as_json(json_response, options)
+        puts as_json(json_response, options, "networks")
         return 0
       elsif options[:yaml]
-        puts as_yaml(json_response, options)
+        puts as_yaml(json_response, options, "networks")
         return 0
       elsif options[:csv]
         puts records_as_csv(networks, options)
@@ -68,9 +63,7 @@ class Morpheus::Cli::NetworksCommand
       end
       title = "Morpheus Networks"
       subtitles = []
-      if params[:phrase]
-        subtitles << "Search: #{params[:phrase]}".strip
-      end
+      subtitles += parse_list_subtitles(options)
       print_h1 title, subtitles
       if networks.empty?
         print cyan,"No networks found.",reset,"\n"
@@ -135,14 +128,11 @@ class Morpheus::Cli::NetworksCommand
       json_response = {'network' => network}  # skip redundant request
       # json_response = @networks_interface.get(network['id'])
       network = json_response['network']
-      if options[:include_fields]
-        json_response = {'network' => filter_data(network, options[:include_fields]) }
-      end
       if options[:json]
-        puts as_json(json_response, options)
+        puts as_json(json_response, options, "network")
         return 0
       elsif options[:yaml]
-        puts as_yaml(json_response, options)
+        puts as_yaml(json_response, options, "network")
         return 0
       elsif options[:csv]
         puts records_as_csv([network], options)

data/lib/morpheus/cli/packages_command.rb

@@ -8,7 +8,7 @@ class Morpheus::Cli::LibraryPackagesCommand
 
   set_command_name :'packages'
   # register_subcommands :list, :get, :install, :update, :remove, :export
-  register_subcommands :export
+  register_subcommands :list, :search, :export
 
   # hide until this is released
   set_command_hidden
@@ -27,7 +27,125 @@ class Morpheus::Cli::LibraryPackagesCommand
   end
 
   def list(args)
-    raise "not yet implemented"
+    options = {}
+    params = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage()
+      build_common_options(opts, options, [:list, :query, :json, :yaml, :csv, :fields, :dry_run, :remote])
+      opts.footer = "List installed packages."
+    end
+    optparse.parse!(args)
+    connect(options)
+    begin
+      params.merge!(parse_list_options(options))
+
+      if options[:dry_run]
+        print_dry_run @packages_interface.dry.list(params)
+        return
+      end
+      json_response = @packages_interface.list(params)
+      if options[:json]
+        puts as_json(json_response, options, "packages")
+        return 0
+      elsif options[:yaml]
+        puts as_yaml(json_response, options, "packages")
+        return 0
+      elsif options[:csv]
+        puts records_as_csv(json_response["packages"], options)
+      else
+        installed_packages = json_response["packages"]
+        title = "Installed Packages"
+        subtitles = []
+        subtitles += parse_list_subtitles(options)
+        print_h1 title, subtitles
+        if installed_packages.empty?
+          print cyan,"No installed packages found",reset,"\n"
+        else
+          rows = installed_packages.collect {|package|
+            {
+              code: package['code'],
+              name: package['name'],
+              version: package['version'],
+              description: package['description'],
+            }
+          }
+          columns = [:code, :name, {:description => {:max_width => 50}}]
+          # custom pretty table columns ...
+          if options[:include_fields]
+            columns = options[:include_fields]
+          end
+          print cyan
+          print as_pretty_table(rows, columns, options)
+          print reset
+          print_results_pagination(json_response)
+        end
+        print reset,"\n"
+      end
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
+  def search(args)
+    options = {}
+    params = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage()
+      build_common_options(opts, options, [:list, :query, :json, :yaml, :csv, :fields, :dry_run, :remote])
+      opts.footer = "Search the marketplace for available packages."
+    end
+    optparse.parse!(args)
+    connect(options)
+    begin
+      params.merge!(parse_list_options(options))
+
+      if options[:dry_run]
+        print_dry_run @packages_interface.dry.search(params)
+        return
+      end
+      json_response = @packages_interface.search(params)
+      if options[:json]
+        puts as_json(json_response, options, "packages")
+        return 0
+      elsif options[:yaml]
+        puts as_yaml(json_response, options, "packages")
+        return 0
+      elsif options[:csv]
+        puts records_as_csv(json_response["packages"], options)
+      else
+        available_packages = json_response["packages"]
+        title = "Available Packages"
+        subtitles = []
+        subtitles += parse_list_subtitles(options)
+        print_h1 title, subtitles
+        if available_packages.empty?
+          print cyan,"No packages found",reset,"\n"
+        else
+          rows = available_packages.collect {|package|
+            {
+              code: package['code'],
+              name: package['name'],
+              version: package['version'],
+              description: package['description']
+            }
+          }
+          columns = [:code, :name, {:description => {:max_width => 50}}]
+          # custom pretty table columns ...
+          if options[:include_fields]
+            columns = options[:include_fields]
+          end
+          print cyan
+          print as_pretty_table(rows, columns, options)
+          print reset
+          print_results_pagination(json_response)
+        end
+        print reset,"\n"
+      end
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
   end
 
   def get(args)
@@ -62,7 +180,22 @@ class Morpheus::Cli::LibraryPackagesCommand
       opts.on('--file FILE', String, "Destination filepath for the downloaded .morpkg file.") do |val|
         outfile = val
       end
-      opts.on('--instance-types LIST', String, "Can be used to export multiple instance types in a single package.") do |val|
+      opts.on('--package-version VALUE', String, "Version number for package.") do |val|
+        params['version'] = val
+      end
+      opts.on('--organization NAME', String, "Organization for package.") do |val|
+        params['organization'] = val
+      end
+      opts.on('--code VALUE', String, "Code for package. Default comes from instance type.") do |val|
+        params['code'] = val
+      end
+      opts.on('--name VALUE', String, "Name for package. Default comes from the instance type name") do |val|
+        params['name'] = val
+      end
+      opts.on('--description VALUE', String, "Description of package.") do |val|
+        params['description'] = val
+      end
+      opts.on('--instance-types LIST', String, "Can be used to export multiple instance types as a single package.") do |val|
         instance_type_codes = []
         val.split(',').collect do |it|
           if !it.strip.empty?
@@ -90,20 +223,19 @@ class Morpheus::Cli::LibraryPackagesCommand
       end
       opts.on( '--open [PROG]', String, "Unzip the package and open the expanded directory with the specified program." ) do |val|
         unzip_and_open = true
-        if val.to_s.empty?
+        if !val.to_s.empty?
           open_prog = val.to_s
         else
-          open_prog = val.to_s
-        end
-        if RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/
-          open_prog = "start"
-        elsif RbConfig::CONFIG['host_os'] =~ /darwin/
-          open_prog = "open"
-        elsif RbConfig::CONFIG['host_os'] =~ /linux|bsd/
-          open_prog = "xdg-open"
+          if RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/
+            open_prog = "start"
+          elsif RbConfig::CONFIG['host_os'] =~ /darwin/
+            open_prog = "open"
+          elsif RbConfig::CONFIG['host_os'] =~ /linux|bsd/
+            open_prog = "xdg-open"
+          end
         end
       end
-      build_common_options(opts, options, [:dry_run, :quiet])
+      build_common_options(opts, options, [:options, :dry_run, :quiet])
       opts.footer = "Export one or many instance types as a morpheus library package (.morpkg) file.\n" + 
                     "[instance-type] is required. This is the instance type code." +
                     "--instance-types can bv. This is a list of instance type codes."
@@ -166,6 +298,9 @@ class Morpheus::Cli::LibraryPackagesCommand
         end
       end
 
+      # merge -O options into normally parsed options
+      params.deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
+
       if options[:dry_run]
         print_dry_run @packages_interface.dry.export(params, outfile), full_command_string
         return 1