morpheus-cli 3.3.2.6.2 → 3.3.2.7

data/lib/morpheus/cli/containers_command.rb

@@ -56,16 +56,10 @@ class Morpheus::Cli::ContainersCommand
       #return 1 if container.nil?
       json_response = @containers_interface.get(arg.to_i)
       if options[:json]
-        if options[:include_fields]
-          json_response = {"container" => filter_data(json_response["container"], options[:include_fields]) }
-        end
-        puts as_json(json_response, options)
+        puts as_json(json_response, options, "container")
         return 0
       elsif options[:yaml]
-        if options[:include_fields]
-          json_response = {"container" => filter_data(json_response["container"], options[:include_fields]) }
-        end
-        puts as_yaml(json_response, options)
+        puts as_yaml(json_response, options, "container")
         return 0
       end
 

data/lib/morpheus/cli/hosts.rb

@@ -108,16 +108,12 @@ class Morpheus::Cli::Hosts
       json_response = @servers_interface.list(params)
 
       if options[:json]
-        if options[:include_fields]
-          json_response = {"servers" => filter_data(json_response["servers"], options[:include_fields]) }
-        end
-        puts as_json(json_response, options)
+        json_response.delete('stats') if options[:include_fields]
+        puts as_json(json_response, options, "servers")
         return 0
       elsif options[:yaml]
-        if options[:include_fields]
-          json_response = {"servers" => filter_data(json_response["servers"], options[:include_fields]) }
-        end
-        puts as_yaml(json_response, options)
+        json_response.delete('stats') if options[:include_fields]
+        puts as_yaml(json_response, options, "servers")
         return 0
       elsif options[:csv]
         # merge stats to be nice here..
@@ -263,16 +259,12 @@ class Morpheus::Cli::Hosts
       server = find_host_by_name_or_id(arg)
       json_response = @servers_interface.get(server['id'])
       if options[:json]
-        if options[:include_fields]
-          json_response = {"server" => filter_data(json_response["server"], options[:include_fields]) }
-        end
-        puts as_json(json_response, options)
+        json_response.delete('stats') if options[:include_fields]
+        puts as_json(json_response, options, "server")
         return 0
       elsif options[:yaml]
-        if options[:include_fields]
-          json_response = {"server" => filter_data(json_response["server"], options[:include_fields]) }
-        end
-        puts as_yaml(json_response, options)
+        json_response.delete('stats') if options[:include_fields]
+        puts as_yaml(json_response, options, "server")
         return 0
       end
       if options[:csv]
@@ -343,13 +335,10 @@ class Morpheus::Cli::Hosts
       server = find_host_by_name_or_id(arg)
       json_response = @servers_interface.get(server['id'])
       if options[:json]
-        print JSON.pretty_generate(json_response), "\n"
+        puts as_json(json_response, options, "stats")
         return 0
       elsif options[:yaml]
-        if options[:include_fields]
-          json_response = {"stats" => filter_data(json_response["stats"], options[:include_fields]) }
-        end
-        puts as_yaml(json_response, options)
+        puts as_yaml(json_response, options, "stats")
         return 0
       elsif options[:csv]
         puts records_as_csv([json_response['stats']], options)

data/lib/morpheus/cli/instance_types.rb

@@ -60,18 +60,15 @@ class Morpheus::Cli::InstanceTypes
       # do it
       json_response = @instance_types_interface.list(params)
       instance_types = json_response['instanceTypes']
-      if options[:include_fields]
-        json_response = {"instanceTypes" => filter_data(json_response["instanceTypes"], options[:include_fields]) }
-      end
       # print result and return output
       if options[:json]
-        puts as_json(json_response, options)
+        puts as_json(json_response, options, "instanceTypes")
         return 0
       elsif options[:csv]
         puts records_as_csv(json_response['instanceTypes'], options)
         return 0
       elsif options[:yaml]
-        puts as_yaml(json_response, options)
+        puts as_yaml(json_response, options, "instanceTypes")
         return 0
       end
       instance_types = json_response['instanceTypes']
@@ -134,14 +131,11 @@ class Morpheus::Cli::InstanceTypes
         instance_type = json_response['instanceType']
       end
 
-      if options[:include_fields]
-        json_response = {"instanceType" => filter_data(json_response["instanceType"], options[:include_fields]) }
-      end
       if options[:json]
-        puts as_json(json_response, options)
+        puts as_json(json_response, options, "instanceType")
         return 0
       elsif options[:yaml]
-        puts as_yaml(json_response, options)
+        puts as_yaml(json_response, options, "instanceType")
         return 0
       elsif options[:csv]
         puts records_as_csv([json_response['instanceType']], options)

data/lib/morpheus/cli/instances.rb

@@ -83,16 +83,12 @@ class Morpheus::Cli::Instances
       end
       json_response = @instances_interface.list(params)
       if options[:json]
-        if options[:include_fields]
-          json_response = {"instances" => filter_data(json_response["instances"], options[:include_fields]) }
-        end
-        puts as_json(json_response, options)
+        json_response.delete('stats') if options[:include_fields]
+        puts as_json(json_response, options, "instances")
         return 0
       elsif options[:yaml]
-        if options[:include_fields]
-          json_response = {"instances" => filter_data(json_response["instances"], options[:include_fields]) }
-        end
-        puts as_yaml(json_response, options)
+        json_response.delete('stats') if options[:include_fields]
+        puts as_yaml(json_response, options, "instances")
         return 0
       elsif options[:csv]
         # merge stats to be nice here..
@@ -467,13 +463,10 @@ class Morpheus::Cli::Instances
       end
       json_response = @instances_interface.get(instance['id'])
       if options[:json]
-        puts as_json(json_response, options)
+        puts as_json(json_response, options, "stats")
         return 0
       elsif options[:yaml]
-        if options[:include_fields]
-          json_response = {"stats" => filter_data(json_response["stats"], options[:include_fields]) }
-        end
-        puts as_yaml(json_response, options)
+        puts as_yaml(json_response, options, "stats")
         return 0
       end
       instance = json_response['instance']
@@ -648,16 +641,12 @@ class Morpheus::Cli::Instances
       instance = find_instance_by_name_or_id(arg)
       json_response = @instances_interface.get(instance['id'])
       if options[:json]
-        if options[:include_fields]
-          json_response = {"instance" => filter_data(json_response["instance"], options[:include_fields]) }
-        end
-        puts as_json(json_response, options)
+        json_response.delete('stats') if options[:include_fields]
+        puts as_json(json_response, options, "instance")
         return 0
       elsif options[:yaml]
-        if options[:include_fields]
-          json_response = {"instance" => filter_data(json_response["instance"], options[:include_fields]) }
-        end
-        puts as_yaml(json_response, options)
+        json_response.delete('stats') if options[:include_fields]
+        puts as_yaml(json_response, options, "instance")
         return 0
       end
 
@@ -839,16 +828,10 @@ class Morpheus::Cli::Instances
       end
       json_response = @instances_interface.containers(instance['id'])
       if options[:json]
-        if options[:include_fields]
-          json_response = {"containers" => filter_data(json_response["containers"], options[:include_fields]) }
-        end
-        puts as_json(json_response, options)
+        puts as_json(json_response, options, "containers")
         return 0
       elsif options[:yaml]
-        if options[:include_fields]
-          json_response = {"containers" => filter_data(json_response["containers"], options[:include_fields]) }
-        end
-        puts as_yaml(json_response, options)
+        puts as_yaml(json_response, options, "containers")
         return 0
       end
 
@@ -2006,14 +1989,11 @@ class Morpheus::Cli::Instances
       return 0
     end
     json_response = @instances_interface.threshold(instance['id'])
-    if options[:include_fields]
-      json_response = {"instanceThreshold" => filter_data(json_response["instanceThreshold"], options[:include_fields]) }
-    end
     if options[:json]
-      puts as_json(json_response, options)
+      puts as_json(json_response, options, "instanceThreshold")
       return 0
     elsif options[:yaml]
-      puts as_yaml(json_response, options)
+      puts as_yaml(json_response, options, "instanceThreshold")
       return 0
     elsif options[:csv]
       puts records_as_csv([json_response['instanceThreshold']], options)

data/lib/morpheus/cli/library_container_scripts_command.rb

@@ -41,19 +41,15 @@ class Morpheus::Cli::LibraryContainerScriptsCommand
       end
       # do it
       json_response = @container_scripts_interface.list(params)
-      container_scripts = json_response['containerScripts']
-      if options[:include_fields]
-        json_response = {"containerScripts" => filter_data(json_response["containerScripts"], options[:include_fields]) }
-      end
       # print result and return output
       if options[:json]
-        puts as_json(json_response, options)
+        puts as_json(json_response, options, "containerScripts")
         return 0
       elsif options[:csv]
         puts records_as_csv(json_response['containerScripts'], options)
         return 0
       elsif options[:yaml]
-        puts as_yaml(json_response, options)
+        puts as_yaml(json_response, options, "containerScripts")
         return 0
       end
       container_scripts = json_response['containerScripts']
@@ -107,17 +103,14 @@ class Morpheus::Cli::LibraryContainerScriptsCommand
       container_script = json_response['containerScript']
       instances = json_response['instances'] || []
       servers = json_response['servers'] || []
-      if options[:include_fields]
-        json_response = {"containerScript" => filter_data(json_response["containerScript"], options[:include_fields]) }
-      end
       if options[:json]
-        puts as_json(json_response, options)
+        puts as_json(json_response, options, "containerScript")
         return 0
       elsif options[:yaml]
-        puts as_yaml(json_response, options)
+        puts as_yaml(json_response, options, "containerScript")
         return 0
       elsif options[:csv]
-        puts records_as_csv([json_response['containerScript']], options)
+        puts records_as_csv([json_response["containerScript"]], options)
         return 0
       end
 

data/lib/morpheus/cli/library_container_templates_command.rb

@@ -38,17 +38,14 @@ class Morpheus::Cli::LibraryContainerTemplatesCommand
       end
 
       json_response = @container_templates_interface.list(params)
-      if options[:include_fields]
-        json_response = {"containerTemplates" => filter_data(json_response["containerTemplates"], options[:include_fields]) }
-      end
       if options[:json]
-        puts as_json(json_response, options)
+        puts as_json(json_response, options, "containerTemplates")
         return 0
       elsif options[:csv]
         puts records_as_csv(json_response['containerTemplates'], options)
         return 0
       elsif options[:yaml]
-        puts as_yaml(json_response, options)
+        puts as_yaml(json_response, options, "containerTemplates")
         return 0
       end
       container_templates = json_response['containerTemplates']
@@ -111,14 +108,11 @@ class Morpheus::Cli::LibraryContainerTemplatesCommand
       container_template = json_response['containerTemplate']
       instances = json_response['instances'] || []
       servers = json_response['servers'] || []
-      if options[:include_fields]
-        json_response = {"containerTemplate" => filter_data(json_response["containerTemplate"], options[:include_fields]) }
-      end
       if options[:json]
-        puts as_json(json_response, options)
+        puts as_json(json_response, options, "containerTemplate")
         return 0
       elsif options[:yaml]
-        puts as_yaml(json_response, options)
+        puts as_yaml(json_response, options, "containerTemplate")
         return 0
       elsif options[:csv]
         puts records_as_csv([json_response['containerTemplate']], options)

data/lib/morpheus/cli/library_container_types_command.rb

@@ -65,19 +65,16 @@ class Morpheus::Cli::LibraryContainerTypesCommand
       end
       # do it
       json_response = @library_container_types_interface.list(layout_id, params)
-      if options[:include_fields]
-        json_response = {"containerTypes" => filter_data(json_response["containerTypes"], options[:include_fields]) }
-      end
       # print and/or return result
       # return 0 if options[:quiet]
       if options[:json]
-        puts as_json(json_response, options)
+        puts as_json(json_response, options, "containerTypes")
         return 0
       elsif options[:csv]
         puts records_as_csv(json_response['containerTypes'], options)
         return 0
       elsif options[:yaml]
-        puts as_yaml(json_response, options)
+        puts as_yaml(json_response, options, "containerTypes")
         return 0
       end
       container_types = json_response['containerTypes']
@@ -140,14 +137,11 @@ class Morpheus::Cli::LibraryContainerTypesCommand
       #json_response = @library_container_types_interface.get(layout_id, container_type['id'])
       json_response = {'containerType' => container_type}
       #container_type = json_response['containerType']
-      if options[:include_fields]
-        json_response = {"containerType" => filter_data(json_response["containerType"], options[:include_fields]) }
-      end
       if options[:json]
-        puts as_json(json_response, options)
+        puts as_json(json_response, options, "containerType")
         return 0
       elsif options[:yaml]
-        puts as_yaml(json_response, options)
+        puts as_yaml(json_response, options, "containerType")
         return 0
       elsif options[:csv]
         puts records_as_csv([json_response['containerType']], options)

data/lib/morpheus/cli/library_instance_types_command.rb

@@ -62,17 +62,14 @@ class Morpheus::Cli::LibraryInstanceTypesCommand
       end
       # do it
       json_response = @library_instance_types_interface.list(params)
-      if options[:include_fields]
-        json_response = {"instanceTypes" => filter_data(json_response["instanceTypes"], options[:include_fields]) }
-      end
       if options[:json]
-        puts as_json(json_response, options)
+        puts as_json(json_response, options, "instanceTypes")
         return 0
       elsif options[:csv]
         puts records_as_csv(json_response['instanceTypes'], options)
         return 0
       elsif options[:yaml]
-        puts as_yaml(json_response, options)
+        puts as_yaml(json_response, options, "instanceTypes")
         return 0
       end
       instance_types = json_response['instanceTypes']
@@ -131,14 +128,11 @@ class Morpheus::Cli::LibraryInstanceTypesCommand
         instance_type = json_response['instanceType']
       end
       
-      if options[:include_fields]
-        json_response = {"instanceType" => filter_data(json_response["instanceType"], options[:include_fields]) }
-      end
       if options[:json]
-        puts as_json(json_response, options)
+        puts as_json(json_response, options, "instanceType")
         return 0
       elsif options[:yaml]
-        puts as_yaml(json_response, options)
+        puts as_yaml(json_response, options, "instanceType")
         return 0
       elsif options[:csv]
         puts records_as_csv([json_response['instanceType']], options)

data/lib/morpheus/cli/library_layouts_command.rb

@@ -70,17 +70,14 @@ class Morpheus::Cli::LibraryLayoutsCommand
       end
 
       json_response = @library_layouts_interface.list(instance_type_id, params)
-      if options[:include_fields]
-        json_response = {"instanceTypeLayouts" => filter_data(json_response["instanceTypeLayouts"], options[:include_fields]) }
-      end
       if options[:json]
-        puts as_json(json_response, options)
+        puts as_json(json_response, options, "instanceTypeLayouts")
         return 0
       elsif options[:csv]
         puts records_as_csv(json_response['instanceTypeLayouts'], options)
         return 0
       elsif options[:yaml]
-        puts as_yaml(json_response, options)
+        puts as_yaml(json_response, options, "instanceTypeLayouts")
         return 0
       end
       layouts = json_response['instanceTypeLayouts']
@@ -142,14 +139,11 @@ class Morpheus::Cli::LibraryLayoutsCommand
       #json_response = @library_layouts_interface.get(instance_type_id, layout['id'])
       json_response = {'instanceTypeLayout' => layout}
       #layout = json_response['instanceTypeLayout']
-      if options[:include_fields]
-        json_response = {"instanceTypeLayout" => filter_data(json_response["instanceTypeLayout"], options[:include_fields]) }
-      end
       if options[:json]
-        puts as_json(json_response, options)
+        puts as_json(json_response, options, "instanceTypeLayout")
         return 0
       elsif options[:yaml]
-        puts as_yaml(json_response, options)
+        puts as_yaml(json_response, options, "instanceTypeLayout")
         return 0
       elsif options[:csv]
         puts records_as_csv([json_response['instanceTypeLayout']], options)

data/lib/morpheus/cli/library_option_types_command.rb

@@ -120,14 +120,11 @@ class Morpheus::Cli::LibraryOptionTypesCommand
       option_type = find_option_type_by_name_or_id(id)
       exit 1 if option_type.nil?
 
-      if options[:include_fields]
-        json_response = {"optionType" => filter_data(json_response["optionType"], options[:include_fields]) }
-      end
       if options[:json]
-        puts as_json(json_response, options)
+        puts as_json(json_response, options, "optionType")
         return 0
       elsif options[:yaml]
-        puts as_yaml(json_response, options)
+        puts as_yaml(json_response, options, "optionType")
         return 0
       elsif options[:csv]
         puts records_as_csv([json_response['optionType']], options)

data/lib/morpheus/cli/library_upgrades_command.rb

@@ -75,17 +75,14 @@ class Morpheus::Cli::LibraryUpgradesCommand
       end
 
       json_response = @library_container_upgrades_interface.list(instance_type_id, params)
-      if options[:include_fields]
-        json_response = {"upgrades" => filter_data(json_response["upgrades"], options[:include_fields]) }
-      end
       if options[:json]
-        puts as_json(json_response, options)
+        puts as_json(json_response, options, "upgrades")
         return 0
       elsif options[:csv]
         puts records_as_csv(json_response['upgrades'], options)
         return 0
       elsif options[:yaml]
-        puts as_yaml(json_response, options)
+        puts as_yaml(json_response, options, "upgrades")
         return 0
       end
       upgrades = json_response['upgrades']
@@ -151,14 +148,11 @@ class Morpheus::Cli::LibraryUpgradesCommand
       #json_response = @library_container_upgrades_interface.get(instance_type_id, upgrade['id'])
       json_response = {'upgrade' => upgrade}
       #upgrade = json_response['upgrade']
-      if options[:include_fields]
-        json_response = {"upgrade" => filter_data(json_response["upgrade"], options[:include_fields]) }
-      end
       if options[:json]
-        puts as_json(json_response, options)
+        puts as_json(json_response, options, "upgrade")
         return 0
       elsif options[:yaml]
-        puts as_yaml(json_response, options)
+        puts as_yaml(json_response, options, "upgrade")
         return 0
       elsif options[:csv]
         puts records_as_csv([json_response['upgrade']], options)