crowbar-client 3.1.4 → 3.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67b522e56f1722b1a071200b46b86f0313a58ccc
-  data.tar.gz: 5112008338561b41b1e53dd419158d3e0b94e556
+  metadata.gz: b52f82374a184794b7a9d44dfd87ff5f775b7947
+  data.tar.gz: 280a86b9d621c85687fb9126e4fe77e40677845f
 SHA512:
-  metadata.gz: 2c4c4877c600883ec6e62e8c9de99d2c8def38e4715e0ff7c6bd64da0c6d20ae0b280e6e49ff01312be85580a6a4611aad881233a01e0ba6629346df1a407246
-  data.tar.gz: 11ccc7610a80b03102f42c320fc6d7b9c060e8da676d89e5d999d7c1202b62d8f77cd1627b78b801cdacdebd75a89648a2f52971f1f942fcdc8403a713263c89
+  metadata.gz: 89ddab179dba573d99a7adfdcc6ebfa004cc30f9dd8334f4669fa501eca0853e9654bb68d61aad2b32d7333427b2631540daa52b6f00e6e2bee7cae1a3520d04
+  data.tar.gz: 8b2b59b6d16ed7d629a881452356be3bbab3f5d62a9203360ce13a9ffbd621daf67778e24e6b5ce046281409d6b11f8098b013703be9e4619ebb8915421e4e44

data/CHANGELOG.md

@@ -1,11 +1,22 @@
 # Changelog
 
+## [3.1.5](https://github.com/crowbar/crowbar-client/releases/tag/v3.1.5) - 2016-12-06
+
+* BUGFIX
+  * Handover timeout to the rest-client (@MaximilianMeister)
+* ENHANCEMENT
+  * Improve upgrade precheck output (@MaximilianMeister)
+  * Improve upgrade error output (@MaximilianMeister)
+  * Add subcommand to cancel upgrade (@MaximilianMeister)
+  * Drop batch build command (@MaximilianMeister)
+  * Mark upgrade subcommand as experimental (@rsalevsky)
+
 ## [3.1.4](https://github.com/crowbar/crowbar-client/releases/tag/v3.1.4) - 2016-11-14
 
 * ENHANCEMENT
   * Add database subcommand for fresh cloud installations (@MaximilianMeister)
   * Update database parameter validations (@MaximilianMeister)
-  * Adapting request url's to various API changes (@MaximilianMeister)
+  * Adapting request urls to various API changes (@MaximilianMeister)
 
 ## [3.1.3](https://github.com/crowbar/crowbar-client/releases/tag/v3.1.3) - 2016-10-18
 

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

@@ -21,62 +21,6 @@ module Crowbar
       # A Thor based CLI wrapper for batch commands
       #
       class Batch < Base
-        desc "build FILE",
-          "Build proposals from file or stdin"
-
-        long_desc <<-LONGDESC
-          `build FILE` will create/edit/commit proposals defined in
-          an YAML format. You can directly provide a path to a file or
-          just pipe the content from stdin. To pipe the content from
-          stdin you should just write a `-` instead of a specific
-          filename.
-
-          With --includes BARCLAMP[.PROPOSAL] option you can process
-          only a specific part from the provided YAML file structure,
-          the `default` proposal will be taken if you don't provide a
-          proposal name. This option allows multiple values, separated
-          by a `,` from each other.
-
-          With --excludes BARCLAMP[.PROPOSAL] option you exclude
-          specific parts from the provided YAML file structure to be
-          processed, the `default` proposal will be taken if you don't
-          provide a proposal name. This option allows multiple values,
-          separated by a `,` from each other.
-        LONGDESC
-
-        method_option :includes,
-          type: :array,
-          default: [],
-          banner: "BARCLAMP[.PROPOSAL]",
-          desc: "Include a specific barclamp or proposal for processing"
-
-        method_option :excludes,
-          type: :array,
-          default: [],
-          banner: "BARCLAMP[.PROPOSAL]",
-          desc: "Exclude a specific barclamp or proposal for processing"
-
-        #
-        # Batch build command
-        #
-        # It will create/edit/commit proposals defined in an YAML format. You
-        # can directly provide a path to a file or just pipe the content
-        # from stdin. To pipe the content from stdin you should just write
-        # a `-` instead of a specific filename.
-        #
-        # @param file [String] the path to the file
-        # @return [String] a formatted response from the server
-        #
-        def build(file)
-          Command::Batch::Build.new(
-            *command_params(
-              file: file
-            )
-          ).execute
-        rescue => e
-          catch_errors(e)
-        end
-
         desc "export [FILE]",
           "Export proposals to file or stdout"
 

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

@@ -149,9 +149,11 @@ module Crowbar
           "Installer specific commands, call without params for help"
         subcommand "installer", Crowbar::Client::App::Installer
 
-        desc "upgrade [COMMANDS]",
-          "Upgrade specific commands, call without params for help"
-        subcommand "upgrade", Crowbar::Client::App::Upgrade
+        if !(Crowbar::Client::Util::ApiVersion.default == 1.0) || Config.options.experimental
+          desc "upgrade [COMMANDS]",
+            "Upgrade specific commands, call without params for help"
+          subcommand "upgrade", Crowbar::Client::App::Upgrade
+        end
 
         desc "database [COMMANDS]",
           "Database specific commands, call without params for help"

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

@@ -354,6 +354,31 @@ module Crowbar
         rescue => e
           catch_errors(e)
         end
+
+        desc "cancel",
+          "Cancel Crowbar upgrade"
+
+        long_desc <<-LONGDESC
+          `cancel` will reset the nodes to ready state
+
+          This is only possible during the upgrade steps:
+
+          * prechecks
+          * prepare
+          * backup crowbar
+          * repocheck crowbar
+
+          Once the admin server upgrade has started, cancelling the upgrade is not possible anymore.
+
+        LONGDESC
+
+        def cancel
+          Command::Upgrade::Prepare.new(
+            *command_params
+          ).execute
+        rescue => e
+          catch_errors(e)
+        end
       end
     end
   end

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

@@ -21,9 +21,6 @@ module Crowbar
       # Module for the batch command implementations
       #
       module Batch
-        autoload :Build,
-          File.expand_path("../batch/build", __FILE__)
-
         autoload :Export,
           File.expand_path("../batch/export", __FILE__)
       end

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

@@ -24,6 +24,9 @@ module Crowbar
         autoload :Backup,
           File.expand_path("../upgrade/backup", __FILE__)
 
+        autoload :Cancel,
+          File.expand_path("../upgrade/cancel", __FILE__)
+
         autoload :Crowbar,
           File.expand_path("../upgrade/crowbar", __FILE__)
 

data/lib/crowbar/client/command/upgrade/backup.rb

@@ -22,6 +22,8 @@ module Crowbar
         # Implementation for the upgrade backup command
         #
         class Backup < Base
+          include Mixin::UpgradeError
+
           def request
             @request ||= Request::Upgrade::Backup.new(
               args
@@ -34,7 +36,18 @@ module Crowbar
               when 200
                 say "Successfully created backup for #{args.component}"
               else
-                err request.parsed_response["error"]
+                case args.component
+                when "crowbar"
+                  err format_error(
+                    request.parsed_response["error"], "admin_backup"
+                  )
+                when "openstack"
+                  err format_error(
+                    request.parsed_response["error"], "nodes_db_dump"
+                  )
+                else
+                  request.parsed_response["error"]
+                end
               end
             end
           end

data/lib/crowbar/client/command/{batch/build.rb → upgrade/cancel.rb}

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, SUSE Linux GmbH
+# Copyright 2016, SUSE Linux GmbH
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,36 +14,16 @@
 # limitations under the License.
 #
 
-require "easy_diff"
-
 module Crowbar
   module Client
     module Command
-      module Batch
+      module Upgrade
         #
-        # Implementation for the batch build command
+        # Implementation for the upgrade cancel command
         #
-        class Build < Base
+        class Cancel < Base
           def request
-            args.easy_merge!(
-              includes: options.includes,
-              excludes: options.excludes
-            )
-
-            args.file =
-              case args.file
-              when "-"
-                stdin.to_io
-              when File
-                args.file
-              else
-                File.new(
-                  args.file,
-                  File::RDONLY
-                )
-              end
-
-            @request ||= Request::Batch::Build.new(
+            @request ||= Request::Upgrade::Cancel.new(
               args
             )
           end
@@ -52,7 +32,9 @@ module Crowbar
             request.process do |request|
               case request.code
               when 200
-                say "Successfully built batch"
+                say "Canceled the upgrade process"
+              when 406
+                err "Not allowed to cancel the upgrade at this stage; Please refer to help output."
               else
                 err request.parsed_response["error"]
               end

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

@@ -22,6 +22,8 @@ module Crowbar
         # Implementation for the upgrade crowbar command
         #
         class Crowbar < Base
+          include Mixin::UpgradeError
+
           def request
             @request ||= Request::Upgrade::Crowbar.new(
               args
@@ -34,7 +36,9 @@ module Crowbar
               when 200
                 say "Triggered Crowbar operating system upgrade"
               else
-                err request.parsed_response["error"]
+                err format_error(
+                  request.parsed_response["error"], "admin_upgrade"
+                )
               end
             end
           end

data/lib/crowbar/client/command/upgrade/nodes.rb

@@ -22,6 +22,8 @@ module Crowbar
         # Implementation for the upgrade nodes command
         #
         class Nodes < Base
+          include Mixin::UpgradeError
+
           def request
             @request ||= Request::Upgrade::Nodes.new(
               args
@@ -34,7 +36,9 @@ module Crowbar
               when 200
                 say "Successfully triggered the upgrade of the nodes"
               else
-                err request.parsed_response["error"]
+                err format_error(
+                  request.parsed_response["error"], "nodes_upgrade"
+                )
               end
             end
           end

data/lib/crowbar/client/command/upgrade/prechecks.rb

@@ -60,6 +60,10 @@ module Crowbar
           def content_from(request)
             [].tap do |row|
               request.parsed_response["checks"].each do |check_id, values|
+                # make the check_id server agnostic
+                # the check_id could be named differently in the server response
+                check_id = values["errors"].keys.first if values["errors"].any?
+
                 row.push(
                   check_id: check_id,
                   passed: values["passed"],

data/lib/crowbar/client/command/upgrade/prepare.rb

@@ -22,6 +22,8 @@ module Crowbar
         # Implementation for the upgrade prepare command
         #
         class Prepare < Base
+          include Mixin::UpgradeError
+
           def request
             @request ||= Request::Upgrade::Prepare.new(
               args
@@ -34,7 +36,9 @@ module Crowbar
               when 200
                 say "Setting nodes to upgrade state"
               else
-                err request.parsed_response["error"]
+                err format_error(
+                  request.parsed_response["error"], "upgrade_prepare"
+                )
               end
             end
           end

data/lib/crowbar/client/command/upgrade/repocheck.rb

@@ -24,6 +24,7 @@ module Crowbar
         class Repocheck < Base
           include Mixin::Format
           include Mixin::Filter
+          include Mixin::UpgradeError
 
           def request
             @request ||= Request::Upgrade::Repocheck.new(
@@ -50,7 +51,18 @@ module Crowbar
                   say formatter.result
                 end
               else
-                err request.parsed_response["error"]
+                case args.component
+                when "crowbar"
+                  err format_error(
+                    request.parsed_response["error"], "admin_repo_checks"
+                  )
+                when "nodes"
+                  err format_error(
+                    request.parsed_response["error"], "nodes_repo_checks"
+                  )
+                else
+                  err request.parsed_response["error"]
+                end
               end
             end
           end

data/lib/crowbar/client/command/upgrade/services.rb

@@ -22,6 +22,8 @@ module Crowbar
         # Implementation for the upgrade services command
         #
         class Services < Base
+          include Mixin::UpgradeError
+
           def request
             @request ||= Request::Upgrade::Services.new(
               args
@@ -34,7 +36,9 @@ module Crowbar
               when 200
                 say "Stopping related services on all nodes"
               else
-                err request.parsed_response["error"]
+                err format_error(
+                  request.parsed_response["error"], "nodes_services"
+                )
               end
             end
           end

data/lib/crowbar/client/config.rb

@@ -58,6 +58,7 @@ module Crowbar
           timeout: default_timeout,
           anonymous: default_anonymous,
           apiversion: default_apiversion,
+          experimental: default_experimental,
           debug: default_debug
         )
       end
@@ -168,6 +169,21 @@ module Crowbar
         end
       end
 
+      #
+      # Define a experimental api version
+      #
+      # @return [String] the default experimental flag
+      #
+      def default_experimental
+        if ENV["CROWBAR_EXPERIMENTAL"].present?
+          [
+            true, 1, "1", "t", "T", "true", "TRUE"
+          ].include? ENV["CROWBAR_EXPERIMENTAL"]
+        else
+          false
+        end
+      end
+
       #
       # Define a default debug flag
       #

data/lib/crowbar/client/mixin.rb

@@ -31,6 +31,9 @@ module Crowbar
 
       autoload :Filter,
         File.expand_path("../mixin/filter", __FILE__)
+
+      autoload :UpgradeError,
+        File.expand_path("../mixin/upgrade_error", __FILE__)
     end
   end
 end

data/lib/crowbar/client/mixin/upgrade_error.rb

@@ -0,0 +1,38 @@
+#
+# Copyright 2016, SUSE Linux GmbH
+#
+# 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 "active_support/concern"
+
+module Crowbar
+  module Client
+    module Mixin
+      #
+      # A mixin with upgrade error related helpers
+      #
+      module UpgradeError
+        extend ActiveSupport::Concern
+
+        included do
+          def format_error(response, step)
+            JSON.parse(response.body)["errors"][step]["data"]
+          rescue
+            "Unable to format error response for #{step}"
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -75,7 +75,7 @@ module Crowbar
             if e.class.superclass == RestClient::RequestFailed
               Hashie::Mash.new(
                 parsed_response: {
-                  error: e.message
+                  error: e.response
                 },
                 code: e.http_code
               )

data/lib/crowbar/client/request/batch.rb

@@ -21,9 +21,6 @@ module Crowbar
       # Module for the batch request implementations
       #
       module Batch
-        autoload :Build,
-          File.expand_path("../batch/build", __FILE__)
-
         autoload :Export,
           File.expand_path("../batch/export", __FILE__)
       end

data/lib/crowbar/client/request/rest.rb

@@ -36,7 +36,8 @@ module Crowbar
             ].join(""),
             user: user,
             password: password,
-            auth_type: auth_type
+            auth_type: auth_type,
+            timeout: Config.timeout
           )
         end
       end

data/lib/crowbar/client/request/upgrade.rb

@@ -24,6 +24,9 @@ module Crowbar
         autoload :Backup,
           File.expand_path("../upgrade/backup", __FILE__)
 
+        autoload :Cancel,
+          File.expand_path("../upgrade/cancel", __FILE__)
+
         autoload :Crowbar,
           File.expand_path("../upgrade/crowbar", __FILE__)
 

data/lib/crowbar/client/request/{batch/build.rb → upgrade/cancel.rb}

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, SUSE Linux GmbH
+# Copyright 2016, SUSE Linux GmbH
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,18 +19,19 @@ require "easy_diff"
 module Crowbar
   module Client
     module Request
-      module Batch
+      module Upgrade
         #
-        # Implementation for the batch build request
+        # Implementation for the upgrade cancel request
         #
-        class Build < Base
-          def content
+        class Cancel < Base
+          #
+          # Override the request headers
+          #
+          # @return [Hash] the headers for the request
+          #
+          def headers
             super.easy_merge!(
-              query: {
-                includes: attrs.includes,
-                excludes: attrs.excludes,
-                file: attrs.file
-              }
+              ::Crowbar::Client::Util::ApiVersion.new(2.0).headers
             )
           end
 
@@ -50,9 +51,9 @@ module Crowbar
           #
           def url
             [
-              "utils",
-              "batch",
-              "build"
+              "api",
+              "upgrade",
+              "cancel"
             ].join("/")
           end
         end

data/lib/crowbar/client/version.rb

@@ -33,7 +33,7 @@ module Crowbar
       #
       # Patch version
       #
-      PATCH = 4
+      PATCH = 5
 
       #
       # Optional suffix

data/spec/crowbar/client/command/{batch/build_spec.rb → upgrade/cancel_spec.rb}

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, SUSE Linux GmbH
+# Copyright 2016, SUSE Linux GmbH
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,19 +16,15 @@
 
 require_relative "../../../../spec_helper"
 
-describe "Crowbar::Client::Command::Batch::Build" do
+describe "Crowbar::Client::Command::Upgrade::Cancel" do
   include_context "command_context"
 
   it_behaves_like "a command class", true do
     subject do
-      ::Crowbar::Client::Command::Batch::Build.new(
+      ::Crowbar::Client::Command::Upgrade::Cancel.new(
         stdin,
         stdout,
-        stderr,
-        {},
-        file: fixture_path(
-          "batch.yml"
-        )
+        stderr
       )
     end
   end

data/spec/crowbar/client/request/{batch/build_spec.rb → upgrade/cancel_spec.rb}

@@ -1,5 +1,6 @@
+
 #
-# Copyright 2015, SUSE Linux GmbH
+# Copyright 2016, SUSE Linux GmbH
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,29 +17,21 @@
 
 require_relative "../../../../spec_helper"
 
-describe "Crowbar::Client::Request::Batch::Build" do
-  it_behaves_like "a request class", false do
+describe "Crowbar::Client::Request::Upgrade::Cancel" do
+  it_behaves_like "a request class", true do
     subject do
-      ::Crowbar::Client::Request::Batch::Build.new(
+      ::Crowbar::Client::Request::Upgrade::Cancel.new(
         attrs
       )
     end
 
     let!(:attrs) do
       {
-        file: fixture_path(
-          "batch.yml"
-        ).open
       }
     end
 
     let!(:params) do
       {
-        query: {
-          includes: nil,
-          excludes: nil,
-          file: attrs[:file]
-        }
       }
     end
 
@@ -47,14 +40,13 @@ describe "Crowbar::Client::Request::Batch::Build" do
     end
 
     let!(:url) do
-      "utils/batch/build"
+      "api/upgrade/cancel"
     end
 
     let!(:headers) do
       {
-        "Accept" => "application/json",
-        "Content-Length" => "694",
-        "Content-Type" => "multipart/form-data; boundary=-----------RubyMultipartPost"
+        "Content-Type" => "application/vnd.crowbar.v2.0+json",
+        "Accept" => "application/vnd.crowbar.v2.0+json"
       }
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: crowbar-client
 version: !ruby/object:Gem::Version
-  version: 3.1.4
+  version: 3.1.5
 platform: ruby
 authors:
 - Thomas Boerger
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-14 00:00:00.000000000 Z
+date: 2016-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -261,7 +261,6 @@ files:
 - lib/crowbar/client/command/barclamp/list.rb
 - lib/crowbar/client/command/base.rb
 - lib/crowbar/client/command/batch.rb
-- lib/crowbar/client/command/batch/build.rb
 - lib/crowbar/client/command/batch/export.rb
 - lib/crowbar/client/command/database.rb
 - lib/crowbar/client/command/database/connect.rb
@@ -318,6 +317,7 @@ files:
 - lib/crowbar/client/command/server/check.rb
 - lib/crowbar/client/command/upgrade.rb
 - lib/crowbar/client/command/upgrade/backup.rb
+- lib/crowbar/client/command/upgrade/cancel.rb
 - lib/crowbar/client/command/upgrade/crowbar.rb
 - lib/crowbar/client/command/upgrade/database.rb
 - lib/crowbar/client/command/upgrade/nodes.rb
@@ -345,6 +345,7 @@ files:
 - lib/crowbar/client/mixin/database.rb
 - lib/crowbar/client/mixin/filter.rb
 - lib/crowbar/client/mixin/format.rb
+- lib/crowbar/client/mixin/upgrade_error.rb
 - lib/crowbar/client/request.rb
 - lib/crowbar/client/request/backup.rb
 - lib/crowbar/client/request/backup/create.rb
@@ -357,7 +358,6 @@ files:
 - lib/crowbar/client/request/barclamp/list.rb
 - lib/crowbar/client/request/base.rb
 - lib/crowbar/client/request/batch.rb
-- lib/crowbar/client/request/batch/build.rb
 - lib/crowbar/client/request/batch/export.rb
 - lib/crowbar/client/request/database.rb
 - lib/crowbar/client/request/database/connect.rb
@@ -417,6 +417,7 @@ files:
 - lib/crowbar/client/request/server/check.rb
 - lib/crowbar/client/request/upgrade.rb
 - lib/crowbar/client/request/upgrade/backup.rb
+- lib/crowbar/client/request/upgrade/cancel.rb
 - lib/crowbar/client/request/upgrade/crowbar.rb
 - lib/crowbar/client/request/upgrade/database.rb
 - lib/crowbar/client/request/upgrade/nodes.rb
@@ -441,7 +442,6 @@ files:
 - spec/crowbar/client/command/backup/restore_spec.rb
 - spec/crowbar/client/command/backup/upload_spec.rb
 - spec/crowbar/client/command/barclamp/list_spec.rb
-- spec/crowbar/client/command/batch/build_spec.rb
 - spec/crowbar/client/command/batch/export_spec.rb
 - spec/crowbar/client/command/database/connect_spec.rb
 - spec/crowbar/client/command/database/create_spec.rb
@@ -488,6 +488,7 @@ files:
 - spec/crowbar/client/command/server/api_spec.rb
 - spec/crowbar/client/command/server/check_spec.rb
 - spec/crowbar/client/command/upgrade/backup_spec.rb
+- spec/crowbar/client/command/upgrade/cancel_spec.rb
 - spec/crowbar/client/command/upgrade/crowbar_spec.rb
 - spec/crowbar/client/command/upgrade/database_spec.rb
 - spec/crowbar/client/command/upgrade/nodes_spec.rb
@@ -511,7 +512,6 @@ files:
 - spec/crowbar/client/request/backup/restore_spec.rb
 - spec/crowbar/client/request/backup/upload_spec.rb
 - spec/crowbar/client/request/barclamp/list_spec.rb
-- spec/crowbar/client/request/batch/build_spec.rb
 - spec/crowbar/client/request/batch/export_spec.rb
 - spec/crowbar/client/request/database/connect_spec.rb
 - spec/crowbar/client/request/database/create_spec.rb
@@ -551,6 +551,7 @@ files:
 - spec/crowbar/client/request/server/api_spec.rb
 - spec/crowbar/client/request/server/check_spec.rb
 - spec/crowbar/client/request/upgrade/backup_spec.rb
+- spec/crowbar/client/request/upgrade/cancel_spec.rb
 - spec/crowbar/client/request/upgrade/crowbar_spec.rb
 - spec/crowbar/client/request/upgrade/database_spec.rb
 - spec/crowbar/client/request/upgrade/nodes_spec.rb
@@ -604,7 +605,6 @@ test_files:
 - spec/crowbar/client/command/backup/restore_spec.rb
 - spec/crowbar/client/command/backup/upload_spec.rb
 - spec/crowbar/client/command/barclamp/list_spec.rb
-- spec/crowbar/client/command/batch/build_spec.rb
 - spec/crowbar/client/command/batch/export_spec.rb
 - spec/crowbar/client/command/database/connect_spec.rb
 - spec/crowbar/client/command/database/create_spec.rb
@@ -651,6 +651,7 @@ test_files:
 - spec/crowbar/client/command/server/api_spec.rb
 - spec/crowbar/client/command/server/check_spec.rb
 - spec/crowbar/client/command/upgrade/backup_spec.rb
+- spec/crowbar/client/command/upgrade/cancel_spec.rb
 - spec/crowbar/client/command/upgrade/crowbar_spec.rb
 - spec/crowbar/client/command/upgrade/database_spec.rb
 - spec/crowbar/client/command/upgrade/nodes_spec.rb
@@ -674,7 +675,6 @@ test_files:
 - spec/crowbar/client/request/backup/restore_spec.rb
 - spec/crowbar/client/request/backup/upload_spec.rb
 - spec/crowbar/client/request/barclamp/list_spec.rb
-- spec/crowbar/client/request/batch/build_spec.rb
 - spec/crowbar/client/request/batch/export_spec.rb
 - spec/crowbar/client/request/database/connect_spec.rb
 - spec/crowbar/client/request/database/create_spec.rb
@@ -714,6 +714,7 @@ test_files:
 - spec/crowbar/client/request/server/api_spec.rb
 - spec/crowbar/client/request/server/check_spec.rb
 - spec/crowbar/client/request/upgrade/backup_spec.rb
+- spec/crowbar/client/request/upgrade/cancel_spec.rb
 - spec/crowbar/client/request/upgrade/crowbar_spec.rb
 - spec/crowbar/client/request/upgrade/database_spec.rb
 - spec/crowbar/client/request/upgrade/nodes_spec.rb