crowbar-client 3.1.5 → 3.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b52f82374a184794b7a9d44dfd87ff5f775b7947
-  data.tar.gz: 280a86b9d621c85687fb9126e4fe77e40677845f
+  metadata.gz: db7753c52a0bdc07da4e50d90b7b14db6b31c165
+  data.tar.gz: c7ba06a39fe3368164264435f6f98c5ee364c162
 SHA512:
-  metadata.gz: 89ddab179dba573d99a7adfdcc6ebfa004cc30f9dd8334f4669fa501eca0853e9654bb68d61aad2b32d7333427b2631540daa52b6f00e6e2bee7cae1a3520d04
-  data.tar.gz: 8b2b59b6d16ed7d629a881452356be3bbab3f5d62a9203360ce13a9ffbd621daf67778e24e6b5ce046281409d6b11f8098b013703be9e4619ebb8915421e4e44
+  metadata.gz: 830a4bcb1d6276fc62d4c9d3f4a031ff4d59f64736befeaa626038f3fb4ef1efe34cbc7ed2e6bd792f427ec44af37f3ac52864dfd36ad2e7846e9c708c7c3194
+  data.tar.gz: 17811f67aeef2e2334e2388136eb0e2ad1d4e52dcc49fb0e429f5056504c00be3c6a1b7bbef25b6e38055458ed63b81a0a5602b26b77fb38686a86312cbd626c

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## [3.1.6](https://github.com/crowbar/crowbar-client/releases/tag/v3.1.6) - 2017-01-05
+
+* BUGFIX
+  * Catch error 406 when node alias is not unique (bsc#1011581) (@MaximilianMeister)
+  * Use cancel not prepare (@MaximilianMeister)
+* ENHANCEMENT
+  * Adapt http codes for upgrade cancel (@MaximilianMeister)
+  * Add SimpleError mixxin (@rsalevsky)
+  * Schema migration is included in the crowbar-init step now (@MaximilianMeister)
+  * Change endpoint of the openstack backup (@MaximilianMeister)
+
 ## [3.1.5](https://github.com/crowbar/crowbar-client/releases/tag/v3.1.5) - 2016-12-06
 
 * BUGFIX

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

@@ -373,7 +373,7 @@ module Crowbar
         LONGDESC
 
         def cancel
-          Command::Upgrade::Prepare.new(
+          Command::Upgrade::Cancel.new(
             *command_params
           ).execute
         rescue => e

data/lib/crowbar/client/command/node/rename.rb

@@ -35,6 +35,8 @@ module Crowbar
                 say "Successfully updated alias for #{args.name}"
               when 404
                 err "Node does not exist"
+              when 406
+                err "Rename for #{args.name} failed. Node alias not unique?"
               else
                 err request.parsed_response["error"]
               end

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

@@ -22,6 +22,7 @@ module Crowbar
         # Implementation for the proposal reset command
         #
         class Reset < Base
+          include Mixin::SimpleError
           include Mixin::Barclamp
 
           def request
@@ -40,7 +41,9 @@ module Crowbar
               when 404
                 say "Proposal does not exist"
               else
-                err request.parsed_response["error"]
+                err format_error(
+                  request.parsed_response["error"]
+                )
               end
             end
           end

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

@@ -33,8 +33,10 @@ module Crowbar
               case request.code
               when 200
                 say "Canceled the upgrade process"
-              when 406
-                err "Not allowed to cancel the upgrade at this stage; Please refer to help output."
+              when 422
+                err "Failed to cancel the upgrade process"
+              when 423
+                err "Not possible 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/database.rb

@@ -67,7 +67,6 @@ module Crowbar
             {
               database_setup: "Setup the Crowbar database",
               database_migration: "Migrate the Crowbar database",
-              schema_migration: "Migrate the schemas",
               crowbar_init: "Initialize Crowbar"
             }
           end

data/lib/crowbar/client/mixin.rb

@@ -34,6 +34,9 @@ module Crowbar
 
       autoload :UpgradeError,
         File.expand_path("../mixin/upgrade_error", __FILE__)
+
+      autoload :SimpleError,
+        File.expand_path("../mixin/simple_error", __FILE__)
     end
   end
 end

data/lib/crowbar/client/mixin/simple_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 error related helpers
+      #
+      module SimpleError
+        extend ActiveSupport::Concern
+
+        included do
+          def format_error(response)
+            JSON.parse(response.body)["error"]
+          rescue
+            "Unable to format error response"
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -73,8 +73,8 @@ module Crowbar
             when "openstack"
               [
                 "api",
-                "openstack",
-                "backup"
+                "upgrade",
+                "openstackbackup"
               ].join("/")
             end
           end

data/lib/crowbar/client/version.rb

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

data/spec/crowbar/client/request/upgrade/backup_spec.rb

@@ -40,7 +40,7 @@ describe "Crowbar::Client::Request::Upgrade::Backup" do
     end
 
     let!(:url) do
-      "api/openstack/backup"
+      "api/upgrade/openstackbackup"
     end
 
     let!(:headers) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: crowbar-client
 version: !ruby/object:Gem::Version
-  version: 3.1.5
+  version: 3.1.6
 platform: ruby
 authors:
 - Thomas Boerger
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-06 00:00:00.000000000 Z
+date: 2017-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -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/simple_error.rb
 - lib/crowbar/client/mixin/upgrade_error.rb
 - lib/crowbar/client/request.rb
 - lib/crowbar/client/request/backup.rb