hammer_cli_foreman 0.0.4 → 0.0.5

data/lib/hammer_cli_foreman/location.rb

@@ -1,17 +1,18 @@
 require 'hammer_cli'
 require 'foreman_api'
 require 'hammer_cli_foreman/commands'
+require 'hammer_cli_foreman/associating_commands'
 require 'hammer_cli_foreman/resource_supported_test'
 
 module HammerCLIForeman
 
-  class Location < HammerCLI::AbstractCommand
+  class Location < HammerCLI::Apipie::Command
+
+    resource ForemanApi::Resources::Location
 
     class ListCommand < HammerCLIForeman::ListCommand
       include HammerCLIForeman::ResourceSupportedTest
-      resource ForemanApi::Resources::Location, "index"
 
-      heading "Locations"
       output do
         from "location" do
           field :id, "Id"
@@ -25,13 +26,11 @@ module HammerCLIForeman
 
     class InfoCommand < HammerCLIForeman::InfoCommand
       include HammerCLIForeman::ResourceSupportedTest
-      resource ForemanApi::Resources::Location, "show"
 
-      heading "Location info"
       output ListCommand.output_definition do
         from "location" do
-          field :created_at, "Created at", HammerCLI::Output::Fields::Date
-          field :updated_at, "Updated at", HammerCLI::Output::Fields::Date
+          field :created_at, "Created at", Fields::Date
+          field :updated_at, "Updated at", Fields::Date
         end
       end
 
@@ -43,7 +42,6 @@ module HammerCLIForeman
 
       success_message "Location created"
       failure_message "Could not create the location"
-      resource ForemanApi::Resources::Location, "create"
 
       apipie_options
     end
@@ -54,7 +52,6 @@ module HammerCLIForeman
 
       success_message "Location updated"
       failure_message "Could not update the location"
-      resource ForemanApi::Resources::Location, "update"
 
       apipie_options
     end
@@ -65,16 +62,22 @@ module HammerCLIForeman
 
       success_message "Location deleted"
       failure_message "Could not delete the location"
-      resource ForemanApi::Resources::Location, "destroy"
 
       apipie_options
     end
 
-    subcommand "list", "List locations.", HammerCLIForeman::Location::ListCommand
-    subcommand "info", "Detailed info about an location.", HammerCLIForeman::Location::InfoCommand
-    subcommand "create", "Create new location.", HammerCLIForeman::Location::CreateCommand
-    subcommand "update", "Update an location.", HammerCLIForeman::Location::UpdateCommand
-    subcommand "delete", "Delete an location.", HammerCLIForeman::Location::DeleteCommand
+    include HammerCLIForeman::AssociatingCommands::Hostgroup
+    include HammerCLIForeman::AssociatingCommands::Environment
+    include HammerCLIForeman::AssociatingCommands::Domain
+    include HammerCLIForeman::AssociatingCommands::Medium
+    include HammerCLIForeman::AssociatingCommands::Subnet
+    include HammerCLIForeman::AssociatingCommands::ComputeResource
+    include HammerCLIForeman::AssociatingCommands::SmartProxy
+    include HammerCLIForeman::AssociatingCommands::User
+    include HammerCLIForeman::AssociatingCommands::ConfigTemplate
+    include HammerCLIForeman::AssociatingCommands::Organization
+
+    autoload_subcommands
   end
 
 end

data/lib/hammer_cli_foreman/media.rb

@@ -1,15 +1,15 @@
 require 'hammer_cli'
 require 'foreman_api'
 require 'hammer_cli_foreman/commands'
+require 'hammer_cli_foreman/associating_commands'
 
 module HammerCLIForeman
 
-  class Medium < HammerCLI::AbstractCommand
+  class Medium < HammerCLI::Apipie::Command
 
-    class ListCommand < HammerCLIForeman::ListCommand
-      resource ForemanApi::Resources::Medium, "index"
+    resource ForemanApi::Resources::Medium
 
-      heading "Installation Media"
+    class ListCommand < HammerCLIForeman::ListCommand
       output do
         from "medium" do
           field :id, "Id"
@@ -23,15 +23,12 @@ module HammerCLIForeman
 
 
     class InfoCommand < HammerCLIForeman::InfoCommand
-      resource ForemanApi::Resources::Medium, "show"
-
-      heading "Medium info"
       output ListCommand.output_definition do
         from "medium" do
           field :os_family, "OS Family"
-          field :operatingsystem_ids, "OS IDs"
-          field :created_at, "Created at", HammerCLI::Output::Fields::Date
-          field :updated_at, "Updated at", HammerCLI::Output::Fields::Date
+          field :operatingsystem_ids, "OS IDs", Fields::List
+          field :created_at, "Created at", Fields::Date
+          field :updated_at, "Updated at", Fields::Date
         end
       end
 
@@ -42,7 +39,6 @@ module HammerCLIForeman
 
       success_message "Installation medium created"
       failure_message "Could not create the installation medium"
-      resource ForemanApi::Resources::Medium, "create"
 
       apipie_options
 
@@ -61,7 +57,6 @@ module HammerCLIForeman
 
       success_message "Installation medium updated"
       failure_message "Could not update the installation media"
-      resource ForemanApi::Resources::Medium, "update"
 
       apipie_options
 
@@ -80,16 +75,14 @@ module HammerCLIForeman
 
       success_message "Installation medium deleted"
       failure_message "Could not delete the installation media"
-      resource ForemanApi::Resources::Medium, "destroy"
 
       apipie_options
     end
 
-    subcommand "list", "List installation media.", HammerCLIForeman::Medium::ListCommand
-    subcommand "info", "Detailed info about an installation medium.", HammerCLIForeman::Medium::InfoCommand
-    subcommand "create", "Create new installation medium.", HammerCLIForeman::Medium::CreateCommand
-    subcommand "update", "Update an installation medium.", HammerCLIForeman::Medium::UpdateCommand
-    subcommand "delete", "Delete an installation medium.", HammerCLIForeman::Medium::DeleteCommand
+
+    include HammerCLIForeman::AssociatingCommands::OperatingSystem
+
+    autoload_subcommands
   end
 
 end

data/lib/hammer_cli_foreman/model.rb

@@ -0,0 +1,66 @@
+require 'hammer_cli'
+require 'foreman_api'
+require 'hammer_cli_foreman/commands'
+
+module HammerCLIForeman
+
+  class Model < HammerCLI::Apipie::Command
+
+    resource ForemanApi::Resources::Model
+
+    class ListCommand < HammerCLIForeman::ListCommand
+
+      output do
+        from "model" do
+          field :id, "Id"
+          field :name, "Name"
+          field :vendor_class, "Vendor class"
+          field :hardware_model, "HW model"
+        end
+      end
+
+      apipie_options
+    end
+
+
+    class InfoCommand < HammerCLIForeman::InfoCommand
+
+      output ListCommand.output_definition do
+        from "model" do
+          field :info, "Info"
+          field :created_at, "Created at", Fields::Date
+          field :updated_at, "Updated at", Fields::Date
+        end
+      end
+
+    end
+
+
+    class CreateCommand < HammerCLIForeman::CreateCommand
+      success_message "Hardware model created"
+      failure_message "Could not create the hardware model"
+
+      apipie_options
+    end
+
+    class DeleteCommand < HammerCLIForeman::DeleteCommand
+      success_message "Hardware model deleted"
+      failure_message "Could not delete the hardware model"
+    end
+
+
+    class UpdateCommand < HammerCLIForeman::UpdateCommand
+      success_message "Hardware model updated"
+      failure_message "Could not update the hardware model"
+
+      apipie_options
+    end
+
+
+    autoload_subcommands
+  end
+
+end
+
+HammerCLI::MainCommand.subcommand 'model', "Manipulate Foreman's hardware models.", HammerCLIForeman::Model
+

data/lib/hammer_cli_foreman/operating_system.rb

@@ -1,20 +1,21 @@
 require 'hammer_cli'
 require 'foreman_api'
 require 'hammer_cli_foreman/commands'
+require 'hammer_cli_foreman/associating_commands'
 
 module HammerCLIForeman
 
-  class OperatingSystem < HammerCLI::AbstractCommand
+  class OperatingSystem < HammerCLI::Apipie::Command
+
+    resource ForemanApi::Resources::OperatingSystem
 
     class ListCommand < HammerCLIForeman::ListCommand
-      resource ForemanApi::Resources::OperatingSystem, "index"
 
-      heading "Operating systems"
       output do
         from "operatingsystem" do
           field :id, "Id"
         end
-        field :operatingsystem, "Name", HammerCLI::Output::Fields::OSName
+        field :operatingsystem, "Name", Fields::OSName
         from "operatingsystem" do
           field :release_name, "Release name"
           field :family, "Family"
@@ -26,20 +27,18 @@ module HammerCLIForeman
 
 
     class InfoCommand < HammerCLIForeman::InfoCommand
-      resource ForemanApi::Resources::OperatingSystem, "show"
 
       identifiers :id, :label
 
-      heading "Operating system info"
       output ListCommand.output_definition do
         from "operatingsystem" do
-          field :media_names, "Installation media", HammerCLI::Output::Fields::List
-          field :architecture_names, "Architectures", HammerCLI::Output::Fields::List
-          field :ptable_names, "Partition tables", HammerCLI::Output::Fields::List
-          field :config_template_names, "Config templates", HammerCLI::Output::Fields::List
+          field :media_names, "Installation media", Fields::List
+          field :architecture_names, "Architectures", Fields::List
+          field :ptable_names, "Partition tables", Fields::List
+          field :config_template_names, "Config templates", Fields::List
         end
         collection :parameters, "Parameters" do
-          field :parameter, nil, HammerCLI::Output::Fields::KeyValue
+          field :parameter, nil, Fields::KeyValue
         end
       end
 
@@ -67,7 +66,6 @@ module HammerCLIForeman
 
       success_message "Operating system created"
       failure_message "Could not create the operating system"
-      resource ForemanApi::Resources::OperatingSystem, "create"
 
       def request_params
         params = method_options
@@ -94,7 +92,6 @@ module HammerCLIForeman
 
       success_message "Operating system updated"
       failure_message "Could not update the operating system"
-      resource ForemanApi::Resources::OperatingSystem, "update"
 
       def request_params
         params = method_options
@@ -115,13 +112,14 @@ module HammerCLIForeman
 
       success_message "Operating system deleted"
       failure_message "Could not delete the operating system"
-      resource ForemanApi::Resources::OperatingSystem, "destroy"
 
       apipie_options
     end
 
     class SetParameterCommand < HammerCLIForeman::Parameter::SetCommand
 
+      desc "Create or update parameter for an operating system."
+
       #FIXME: add option --os-label when api supports it
       option "--os-id", "OS_ID", "id of the operating system the parameter is being set for"
 
@@ -144,6 +142,8 @@ module HammerCLIForeman
 
     class DeleteParameterCommand < HammerCLIForeman::Parameter::DeleteCommand
 
+      desc "Delete parameter for an operating system."
+
       #FIXME: add option --os-label when api supports it
       option "--os-id", "OS_ID", "id of the operating system the parameter is being deleted for"
       success_message "operating system parameter deleted"
@@ -160,13 +160,13 @@ module HammerCLIForeman
       end
     end
 
-    subcommand "list", "List operating systems.", HammerCLIForeman::OperatingSystem::ListCommand
-    subcommand "info", "Detailed info about an operating system.", HammerCLIForeman::OperatingSystem::InfoCommand
-    subcommand "create", "Create new operating system.", HammerCLIForeman::OperatingSystem::CreateCommand
-    subcommand "update", "Update an operating system.", HammerCLIForeman::OperatingSystem::UpdateCommand
-    subcommand "delete", "Delete an operating system.", HammerCLIForeman::OperatingSystem::DeleteCommand
-    subcommand "set_parameter", "Create or update parameter for an operating system.", HammerCLIForeman::OperatingSystem::SetParameterCommand
-    subcommand "delete_parameter", "Delete parameter for an operating system.", HammerCLIForeman::OperatingSystem::DeleteParameterCommand
+
+    include HammerCLIForeman::AssociatingCommands::Architecture
+    include HammerCLIForeman::AssociatingCommands::ConfigTemplate
+    include HammerCLIForeman::AssociatingCommands::PartitionTable
+
+
+    autoload_subcommands
   end
 
 end

data/lib/hammer_cli_foreman/organization.rb

@@ -1,17 +1,18 @@
 require 'hammer_cli'
 require 'foreman_api'
 require 'hammer_cli_foreman/commands'
+require 'hammer_cli_foreman/associating_commands'
 require 'hammer_cli_foreman/resource_supported_test'
 
 module HammerCLIForeman
 
-  class Organization < HammerCLI::AbstractCommand
+  class Organization < HammerCLI::Apipie::Command
+
+    resource ForemanApi::Resources::Organization
 
     class ListCommand < HammerCLIForeman::ListCommand
       include HammerCLIForeman::ResourceSupportedTest
-      resource ForemanApi::Resources::Organization, "index"
 
-      heading "Organizations"
       output do
         from "organization" do
           field :id, "Id"
@@ -25,13 +26,11 @@ module HammerCLIForeman
 
     class InfoCommand < HammerCLIForeman::InfoCommand
       include HammerCLIForeman::ResourceSupportedTest
-      resource ForemanApi::Resources::Organization, "show"
 
-      heading "Organization info"
       output ListCommand.output_definition do
         from "organization" do
-          field :created_at, "Created at", HammerCLI::Output::Fields::Date
-          field :updated_at, "Updated at", HammerCLI::Output::Fields::Date
+          field :created_at, "Created at", Fields::Date
+          field :updated_at, "Updated at", Fields::Date
         end
       end
 
@@ -43,7 +42,6 @@ module HammerCLIForeman
 
       success_message "Organization created"
       failure_message "Could not create the organization"
-      resource ForemanApi::Resources::Organization, "create"
 
       apipie_options
     end
@@ -54,7 +52,6 @@ module HammerCLIForeman
 
       success_message "Organization updated"
       failure_message "Could not update the organization"
-      resource ForemanApi::Resources::Organization, "update"
 
       apipie_options
     end
@@ -65,16 +62,21 @@ module HammerCLIForeman
 
       success_message "Organization deleted"
       failure_message "Could not delete the organization"
-      resource ForemanApi::Resources::Organization, "destroy"
 
       apipie_options
     end
 
-    subcommand "list", "List organizations.", HammerCLIForeman::Organization::ListCommand
-    subcommand "info", "Detailed info about an organization.", HammerCLIForeman::Organization::InfoCommand
-    subcommand "create", "Create new organization.", HammerCLIForeman::Organization::CreateCommand
-    subcommand "update", "Update an organization.", HammerCLIForeman::Organization::UpdateCommand
-    subcommand "delete", "Delete an organization.", HammerCLIForeman::Organization::DeleteCommand
+    include HammerCLIForeman::AssociatingCommands::Hostgroup
+    include HammerCLIForeman::AssociatingCommands::Environment
+    include HammerCLIForeman::AssociatingCommands::Domain
+    include HammerCLIForeman::AssociatingCommands::Medium
+    include HammerCLIForeman::AssociatingCommands::Subnet
+    include HammerCLIForeman::AssociatingCommands::ComputeResource
+    include HammerCLIForeman::AssociatingCommands::SmartProxy
+    include HammerCLIForeman::AssociatingCommands::User
+    include HammerCLIForeman::AssociatingCommands::ConfigTemplate
+
+    autoload_subcommands
   end
 
 end

data/lib/hammer_cli_foreman/output.rb

@@ -0,0 +1,2 @@
+require File.join(File.dirname(__FILE__), 'output/fields')
+require File.join(File.dirname(__FILE__), 'output/formatters')

data/lib/hammer_cli_foreman/output/fields.rb

@@ -0,0 +1,11 @@
+require 'hammer_cli'
+
+module Fields
+
+  class OSName < DataField
+  end
+
+  class Server < DataField
+  end
+
+end

data/lib/hammer_cli_foreman/output/formatters.rb

@@ -0,0 +1,23 @@
+module HammerCLIForeman::Output
+  module Formatters
+
+    class OSNameFormatter < HammerCLI::Output::Formatters::FieldFormatter
+      def format(os)
+        name = "%s %s" % [os[:name], os[:major]]
+        name += ".%s" % os[:minor] unless os[:minor].nil?
+        name
+      end
+    end
+
+    class ServerFormatter < HammerCLI::Output::Formatters::FieldFormatter
+      def format(server)
+        "%s (%s)" % [server[:name], server[:url]]
+      end
+    end
+
+    DEFAULT_FORMATTERS = HammerCLI::Output::Formatters::DEFAULT_FORMATTERS
+    DEFAULT_FORMATTERS.register_formatter(:OSName, OSNameFormatter.new)
+    DEFAULT_FORMATTERS.register_formatter(:Server, ServerFormatter.new)
+
+  end
+end