crowbar-client 3.6.1 → 3.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f96242929ff4f63474c38f48779c047d71c06674f51f73b6b48dd939f2de6c90
-  data.tar.gz: bea1ac00753c5d93e682299bc66c9e375faba6384e0d08db72d59ad6ee0a7c93
+  metadata.gz: e428d67fddb2605dc6e67286978de425bcdb5ebd45a932b31b1e13d570446a01
+  data.tar.gz: 31c88554931ea3a50ffb69dff36a65ae13f7b6791d9d5fd2c7f59ed213f437f5
 SHA512:
-  metadata.gz: d279752db885d75556c6c4bb6d6c08793995fa67a07258da904bad1789769b47f223bd2074c0a18b20445eab7d3c9f80b37c39d14449e20d896745f77bbf266b
-  data.tar.gz: 41976f4fc7189ac6cf208f1958fddb3db0919a8e6d4628c6d10ecbb93d70fc651c2461389b049522b7b724f3d17d32edb614e173f0f447e84030a4d924948080
+  metadata.gz: a09a55cde22dc377eafea92a9379c660443c6543376b37a81346ebfc472c2bc6bda346a205ee7526447fd75c58c14d8296735af757121899ac39c2b8207e9a3b
+  data.tar.gz: a1b8116be6e1c8d3653e6b4c284e861b2a4ff71c67a66243190a95b36de9c0c7863c15ee3692161d1c40df621bb575659e641fc212563b7caf69bb3485610ed5

data/CHANGELOG.md

@@ -1,5 +1,38 @@
 # Changelog
 
+## [3.9.3](https://github.com/crowbar/crowbar-client/releases/tag/v3.9.2) - 2020-09-02
+
+* ENHANCEMENT
+  * Enable restricted commands for Cloud 7 (bsc#1117080)
+
+## [3.9.2](https://github.com/crowbar/crowbar-client/releases/tag/v3.9.2) - 2020-03-09
+
+* ENHANCEMENT
+  * Enable SES commands in Cloud8 (SOC-11122)
+
+## [3.9.1](https://github.com/crowbar/crowbar-client/releases/tag/v3.9.1) - 2019-07-01
+
+* BUGFIX
+  * Fix repocheck table output (SOC-10718)
+  * Enable restricted commands for Cloud8 (bsc#1117080)
+
+## [3.9.0](https://github.com/crowbar/crowbar-client/releases/tag/v3.9.0) - 2019-04-05
+
+* ENHANCEMENT
+  * Add support for the restricted APIs
+  * Add --raw to "proposal show" & "proposal edit"
+  * Correctly parse error messages that we don't handle natively
+
+## [3.8.0](https://github.com/crowbar/crowbar-client/releases/tag/v3.8.0) - 2019-04-02
+
+* ENHANCEMENT
+  * Add 'ses' subcommand to upload SES configuration file to crowbar (@skazi0)
+
+## [3.7.0](https://github.com/crowbar/crowbar-client/releases/tag/v3.7.0) - 2018-12-14
+
+* ENHANCEMENT
+  * Better upgrade repocheck output
+
 ## [3.6.1](https://github.com/crowbar/crowbar-client/releases/tag/v3.6.1) - 2018-12-07
 
 * BUGFIX

data/lib/crowbar/client/app.rb

@@ -59,9 +59,15 @@ module Crowbar
       autoload :Repository,
         File.expand_path("../app/repository", __FILE__)
 
+      autoload :Restricted,
+        File.expand_path("../app/restricted", __FILE__)
+
       autoload :Role,
         File.expand_path("../app/role", __FILE__)
 
+      autoload :Ses,
+        File.expand_path("../app/ses", __FILE__)
+
       autoload :Server,
         File.expand_path("../app/server", __FILE__)
 

data/lib/crowbar/client/app/entry.rb

@@ -166,6 +166,19 @@ module Crowbar
         desc "services [COMMANDS]",
           "Services specific commands, call without params for help"
         subcommand "services", Crowbar::Client::App::Services
+
+        desc "ses [COMMANDS]",
+          "SES (Ceph) specific commands, call without params for help"
+        subcommand "ses", Crowbar::Client::App::Ses
+
+        desc "restricted [COMMANDS]",
+          "Commands specifc to restricted clients, call without params for help"
+        subcommand "restricted", Crowbar::Client::App::Restricted
+
+        # hide SES command in older versions
+        remove_command :ses unless Config.defaults[:cloud_version].to_i >= 8
+        # hide Restricted command in older versions
+        remove_command :restricted unless Config.defaults[:cloud_version].to_i >= 7
       end
     end
   end

data/lib/crowbar/client/app/proposal.rb

@@ -98,6 +98,10 @@ module Crowbar
           With --filter <filter> option you can limit the result of
           printed out elements. You can use any substring that is part
           of the found elements.
+
+          With --raw option you can ensure that the program will not
+          automatically alter the proposal (to remove non-existing
+          nodes, for instance).
         LONGDESC
 
         method_option :format,
@@ -130,6 +134,12 @@ module Crowbar
           banner: "<filter>",
           desc: "Filter by criteria, display only data that contains filter"
 
+        method_option :raw,
+          type: :boolean,
+          default: false,
+          aliases: ["-r"],
+          desc: "Do not automatically edit the content of the proposal data"
+
         def show(barclamp, proposal)
           Command::Proposal::Show.new(
             *command_params(
@@ -221,6 +231,10 @@ module Crowbar
 
           With --merge option you can deep merge the provided data with
           the preloaded proposal.
+
+          With --raw option you can ensure that the program will not
+          automatically alter the proposal (to remove non-existing
+          nodes, for instance).
         LONGDESC
 
         method_option :data,
@@ -241,6 +255,12 @@ module Crowbar
           aliases: ["-m"],
           desc: "Merge input loaded from server with proposal data"
 
+        method_option :raw,
+          type: :boolean,
+          default: false,
+          aliases: ["-r"],
+          desc: "Do not automatically edit the content of the proposal data"
+
         def edit(barclamp, proposal)
           Command::Proposal::Edit.new(
             *command_params(

data/lib/crowbar/client/app/restricted.rb

@@ -0,0 +1,136 @@
+#
+# Copyright 2019, SUSE
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+module Crowbar
+  module Client
+    module App
+      #
+      # A Thor based CLI wrapper for restricted commands
+      #
+      class Restricted < Base
+        desc "allocate NAME_OR_ALIAS",
+          "Allocate the specified node"
+
+        long_desc <<-LONGDESC
+          `allocate NAME_OR_ALIAS` will try to allocate the specified
+          node.
+        LONGDESC
+
+        def allocate(name)
+          Command::Restricted::Allocate.new(
+            *command_params(
+              name: name
+            )
+          ).execute
+        rescue => e
+          catch_errors(e)
+        end
+
+        desc "ping",
+          "Ping the administration server"
+
+        long_desc <<-LONGDESC
+          `ping` will check that the administration server is up.
+        LONGDESC
+
+        def ping
+          Command::Restricted::Ping.new(
+            *command_params
+          ).execute
+        rescue => e
+          catch_errors(e)
+        end
+
+        desc "show NAME_OR_ALIAS",
+          "Show restricted data for a specific node"
+
+        long_desc <<-LONGDESC
+          `show NAME_OR_ALIAS` will try to fetch the restricted data
+          for the specified node. If you just want to see a specific
+          subset of the restricted data you can provide the --filter
+          option separated by a dot for every element.
+
+          With --format <format> option you can choose an output format
+          with the available options table, json or plain. You can also
+          use the shortcut options --table, --json or --plain.
+
+          With --filter <filter> option you can limit the result of
+          printed out elements. You can use any substring that is part
+          of the found elements.
+        LONGDESC
+
+        method_option :format,
+          type: :string,
+          default: "table",
+          banner: "<format>",
+          desc: "Format of the output, valid formats are table, json or plain"
+
+        method_option :table,
+          type: :boolean,
+          default: false,
+          aliases: [],
+          desc: "Format output as table, a shortcut for --format table option"
+
+        method_option :json,
+          type: :boolean,
+          default: false,
+          aliases: [],
+          desc: "Format output as json, a shortcut for --format json option"
+
+        method_option :plain,
+          type: :boolean,
+          default: false,
+          aliases: [],
+          desc: "Format output as plain text, a shortcut for --format plain option"
+
+        method_option :filter,
+          type: :string,
+          default: nil,
+          banner: "<filter>",
+          desc: "Filter by criteria, display only data that contains filter"
+
+        def show(name)
+          Command::Restricted::Show.new(
+            *command_params(
+              name: name
+            )
+          ).execute
+        rescue => e
+          catch_errors(e)
+        end
+
+        desc "transition NAME_OR_ALIAS STATE",
+          "Transition a node to a specific state"
+
+        long_desc <<-LONGDESC
+          `transition NAME_OR_ALIAS STATE` will try to transition the
+          specified node into a specified state.
+        LONGDESC
+
+        def transition(name, state)
+          Command::Restricted::Transition.new(
+            *command_params(
+              name: name,
+              state: state
+            )
+          ).execute
+        rescue => e
+          catch_errors(e)
+        end
+      end
+    end
+  end
+end

data/lib/crowbar/client/app/ses.rb

@@ -0,0 +1,54 @@
+#
+# Copyright 2019, SUSE
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+module Crowbar
+  module Client
+    module App
+      #
+      # A Thor based CLI wrapper for SES commands
+      #
+      class Ses < Base
+        desc "upload FILE",
+          "Upload SES configuration file"
+
+        long_desc <<-LONGDESC
+          `upload FILE` will upload yaml file with SES configuration to the
+          server. Data inside this file could be used later for integrating
+          SES cluster with other services.
+        LONGDESC
+
+        #
+        # SES config upload command
+        #
+        # It will upload yaml file with SES configuration to the server.
+        # Data inside this file could be used later for integrating SES
+        # cluster with other services.
+        #
+        # @param file [String] the path to the file
+        #
+        def upload(file)
+          Command::Ses::Upload.new(
+            *command_params(
+              file: file
+            )
+          ).execute
+        rescue => e
+          catch_errors(e)
+        end
+      end
+    end
+  end
+end

data/lib/crowbar/client/command.rb

@@ -53,9 +53,15 @@ module Crowbar
       autoload :Repository,
         File.expand_path("../command/repository", __FILE__)
 
+      autoload :Restricted,
+        File.expand_path("../command/restricted", __FILE__)
+
       autoload :Role,
         File.expand_path("../command/role", __FILE__)
 
+      autoload :Ses,
+        File.expand_path("../command/ses", __FILE__)
+
       autoload :Server,
         File.expand_path("../command/server", __FILE__)
 

data/lib/crowbar/client/command/base.rb

@@ -58,6 +58,15 @@ module Crowbar
         end
 
         def err(message)
+          if message.is_a?(RestClient::Response)
+            begin
+              json = JSON.parse(message.to_s)
+              message = json.fetch("error", message)
+            rescue JSON::ParserError
+              # too bad, this is not what we expected, we'll print the ugly string
+              nil
+            end
+          end
           raise SimpleCatchableError, message
         end
       end

data/lib/crowbar/client/command/proposal/edit.rb

@@ -59,7 +59,11 @@ module Crowbar
 
             case result.code
             when 200
-              deployment_cleanup result.parsed_response
+              if options[:raw]
+                result.parsed_response
+              else
+                deployment_cleanup result.parsed_response
+              end
             when 404
               err "Failed to preload proposal"
             else

data/lib/crowbar/client/command/proposal/show.rb

@@ -40,13 +40,19 @@ module Crowbar
             request.process do |request|
               case request.code
               when 200
+                content = if options[:raw]
+                  content_from(request)
+                else
+                  deployment_cleanup(content_from(request))
+                end
+
                 formatter = Formatter::Nested.new(
                   format: provide_format,
                   path: provide_filter,
                   headings: ["Key", "Value"],
                   values: Filter::Subset.new(
                     filter: provide_filter,
-                    values: deployment_cleanup(content_from(request))
+                    values: content
                   ).result
                 )
 

data/lib/crowbar/client/command/restricted.rb

@@ -0,0 +1,38 @@
+#
+# Copyright 2019, SUSE
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+module Crowbar
+  module Client
+    module Command
+      #
+      # Module for the Restricted command implementations
+      #
+      module Restricted
+        autoload :Allocate,
+          File.expand_path("../restricted/allocate", __FILE__)
+
+        autoload :Ping,
+          File.expand_path("../restricted/ping", __FILE__)
+
+        autoload :Show,
+          File.expand_path("../restricted/show", __FILE__)
+
+        autoload :Transition,
+          File.expand_path("../restricted/transition", __FILE__)
+      end
+    end
+  end
+end

data/lib/crowbar/client/command/restricted/allocate.rb

@@ -0,0 +1,51 @@
+#
+# Copyright 2019, SUSE
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require "easy_diff"
+
+module Crowbar
+  module Client
+    module Command
+      module Restricted
+        #
+        # Implementation for the restricted allocate command
+        #
+        class Allocate < Base
+          def request
+            @request ||= Request::Restricted::Allocate.new(
+              args.easy_merge(
+                action: :allocate
+              )
+            )
+          end
+
+          def execute
+            request.process do |request|
+              case request.code
+              when 200
+                say "Successfully triggered allocate for #{args.name}"
+              when 404
+                err "Node does not exist"
+              else
+                err request.parsed_response["error"]
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end