crowbar-client 3.1.4 → 3.1.5
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +12 -1
- data/lib/crowbar/client/app/batch.rb +0 -56
- data/lib/crowbar/client/app/entry.rb +5 -3
- data/lib/crowbar/client/app/upgrade.rb +25 -0
- data/lib/crowbar/client/command/batch.rb +0 -3
- data/lib/crowbar/client/command/upgrade.rb +3 -0
- data/lib/crowbar/client/command/upgrade/backup.rb +14 -1
- data/lib/crowbar/client/command/{batch/build.rb → upgrade/cancel.rb} +8 -26
- data/lib/crowbar/client/command/upgrade/crowbar.rb +5 -1
- data/lib/crowbar/client/command/upgrade/nodes.rb +5 -1
- data/lib/crowbar/client/command/upgrade/prechecks.rb +4 -0
- data/lib/crowbar/client/command/upgrade/prepare.rb +5 -1
- data/lib/crowbar/client/command/upgrade/repocheck.rb +13 -1
- data/lib/crowbar/client/command/upgrade/services.rb +5 -1
- data/lib/crowbar/client/config.rb +16 -0
- data/lib/crowbar/client/mixin.rb +3 -0
- data/lib/crowbar/client/mixin/upgrade_error.rb +38 -0
- data/lib/crowbar/client/request/base.rb +1 -1
- data/lib/crowbar/client/request/batch.rb +0 -3
- data/lib/crowbar/client/request/rest.rb +2 -1
- data/lib/crowbar/client/request/upgrade.rb +3 -0
- data/lib/crowbar/client/request/{batch/build.rb → upgrade/cancel.rb} +14 -13
- data/lib/crowbar/client/version.rb +1 -1
- data/spec/crowbar/client/command/{batch/build_spec.rb → upgrade/cancel_spec.rb} +4 -8
- data/spec/crowbar/client/request/{batch/build_spec.rb → upgrade/cancel_spec.rb} +8 -16
- metadata +9 -8
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: b52f82374a184794b7a9d44dfd87ff5f775b7947
|
4
|
+
data.tar.gz: 280a86b9d621c85687fb9126e4fe77e40677845f
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 89ddab179dba573d99a7adfdcc6ebfa004cc30f9dd8334f4669fa501eca0853e9654bb68d61aad2b32d7333427b2631540daa52b6f00e6e2bee7cae1a3520d04
|
7
|
+
data.tar.gz: 8b2b59b6d16ed7d629a881452356be3bbab3f5d62a9203360ce13a9ffbd621daf67778e24e6b5ce046281409d6b11f8098b013703be9e4619ebb8915421e4e44
|
data/CHANGELOG.md
CHANGED
@@ -1,11 +1,22 @@
|
|
1
1
|
# Changelog
|
2
2
|
|
3
|
+
## [3.1.5](https://github.com/crowbar/crowbar-client/releases/tag/v3.1.5) - 2016-12-06
|
4
|
+
|
5
|
+
* BUGFIX
|
6
|
+
* Handover timeout to the rest-client (@MaximilianMeister)
|
7
|
+
* ENHANCEMENT
|
8
|
+
* Improve upgrade precheck output (@MaximilianMeister)
|
9
|
+
* Improve upgrade error output (@MaximilianMeister)
|
10
|
+
* Add subcommand to cancel upgrade (@MaximilianMeister)
|
11
|
+
* Drop batch build command (@MaximilianMeister)
|
12
|
+
* Mark upgrade subcommand as experimental (@rsalevsky)
|
13
|
+
|
3
14
|
## [3.1.4](https://github.com/crowbar/crowbar-client/releases/tag/v3.1.4) - 2016-11-14
|
4
15
|
|
5
16
|
* ENHANCEMENT
|
6
17
|
* Add database subcommand for fresh cloud installations (@MaximilianMeister)
|
7
18
|
* Update database parameter validations (@MaximilianMeister)
|
8
|
-
* Adapting request
|
19
|
+
* Adapting request urls to various API changes (@MaximilianMeister)
|
9
20
|
|
10
21
|
## [3.1.3](https://github.com/crowbar/crowbar-client/releases/tag/v3.1.3) - 2016-10-18
|
11
22
|
|
@@ -21,62 +21,6 @@ module Crowbar
|
|
21
21
|
# A Thor based CLI wrapper for batch commands
|
22
22
|
#
|
23
23
|
class Batch < Base
|
24
|
-
desc "build FILE",
|
25
|
-
"Build proposals from file or stdin"
|
26
|
-
|
27
|
-
long_desc <<-LONGDESC
|
28
|
-
`build FILE` will create/edit/commit proposals defined in
|
29
|
-
an YAML format. You can directly provide a path to a file or
|
30
|
-
just pipe the content from stdin. To pipe the content from
|
31
|
-
stdin you should just write a `-` instead of a specific
|
32
|
-
filename.
|
33
|
-
|
34
|
-
With --includes BARCLAMP[.PROPOSAL] option you can process
|
35
|
-
only a specific part from the provided YAML file structure,
|
36
|
-
the `default` proposal will be taken if you don't provide a
|
37
|
-
proposal name. This option allows multiple values, separated
|
38
|
-
by a `,` from each other.
|
39
|
-
|
40
|
-
With --excludes BARCLAMP[.PROPOSAL] option you exclude
|
41
|
-
specific parts from the provided YAML file structure to be
|
42
|
-
processed, the `default` proposal will be taken if you don't
|
43
|
-
provide a proposal name. This option allows multiple values,
|
44
|
-
separated by a `,` from each other.
|
45
|
-
LONGDESC
|
46
|
-
|
47
|
-
method_option :includes,
|
48
|
-
type: :array,
|
49
|
-
default: [],
|
50
|
-
banner: "BARCLAMP[.PROPOSAL]",
|
51
|
-
desc: "Include a specific barclamp or proposal for processing"
|
52
|
-
|
53
|
-
method_option :excludes,
|
54
|
-
type: :array,
|
55
|
-
default: [],
|
56
|
-
banner: "BARCLAMP[.PROPOSAL]",
|
57
|
-
desc: "Exclude a specific barclamp or proposal for processing"
|
58
|
-
|
59
|
-
#
|
60
|
-
# Batch build command
|
61
|
-
#
|
62
|
-
# It will create/edit/commit proposals defined in an YAML format. You
|
63
|
-
# can directly provide a path to a file or just pipe the content
|
64
|
-
# from stdin. To pipe the content from stdin you should just write
|
65
|
-
# a `-` instead of a specific filename.
|
66
|
-
#
|
67
|
-
# @param file [String] the path to the file
|
68
|
-
# @return [String] a formatted response from the server
|
69
|
-
#
|
70
|
-
def build(file)
|
71
|
-
Command::Batch::Build.new(
|
72
|
-
*command_params(
|
73
|
-
file: file
|
74
|
-
)
|
75
|
-
).execute
|
76
|
-
rescue => e
|
77
|
-
catch_errors(e)
|
78
|
-
end
|
79
|
-
|
80
24
|
desc "export [FILE]",
|
81
25
|
"Export proposals to file or stdout"
|
82
26
|
|
@@ -149,9 +149,11 @@ module Crowbar
|
|
149
149
|
"Installer specific commands, call without params for help"
|
150
150
|
subcommand "installer", Crowbar::Client::App::Installer
|
151
151
|
|
152
|
-
|
153
|
-
"
|
154
|
-
|
152
|
+
if !(Crowbar::Client::Util::ApiVersion.default == 1.0) || Config.options.experimental
|
153
|
+
desc "upgrade [COMMANDS]",
|
154
|
+
"Upgrade specific commands, call without params for help"
|
155
|
+
subcommand "upgrade", Crowbar::Client::App::Upgrade
|
156
|
+
end
|
155
157
|
|
156
158
|
desc "database [COMMANDS]",
|
157
159
|
"Database specific commands, call without params for help"
|
@@ -354,6 +354,31 @@ module Crowbar
|
|
354
354
|
rescue => e
|
355
355
|
catch_errors(e)
|
356
356
|
end
|
357
|
+
|
358
|
+
desc "cancel",
|
359
|
+
"Cancel Crowbar upgrade"
|
360
|
+
|
361
|
+
long_desc <<-LONGDESC
|
362
|
+
`cancel` will reset the nodes to ready state
|
363
|
+
|
364
|
+
This is only possible during the upgrade steps:
|
365
|
+
|
366
|
+
* prechecks
|
367
|
+
* prepare
|
368
|
+
* backup crowbar
|
369
|
+
* repocheck crowbar
|
370
|
+
|
371
|
+
Once the admin server upgrade has started, cancelling the upgrade is not possible anymore.
|
372
|
+
|
373
|
+
LONGDESC
|
374
|
+
|
375
|
+
def cancel
|
376
|
+
Command::Upgrade::Prepare.new(
|
377
|
+
*command_params
|
378
|
+
).execute
|
379
|
+
rescue => e
|
380
|
+
catch_errors(e)
|
381
|
+
end
|
357
382
|
end
|
358
383
|
end
|
359
384
|
end
|
@@ -22,6 +22,8 @@ module Crowbar
|
|
22
22
|
# Implementation for the upgrade backup command
|
23
23
|
#
|
24
24
|
class Backup < Base
|
25
|
+
include Mixin::UpgradeError
|
26
|
+
|
25
27
|
def request
|
26
28
|
@request ||= Request::Upgrade::Backup.new(
|
27
29
|
args
|
@@ -34,7 +36,18 @@ module Crowbar
|
|
34
36
|
when 200
|
35
37
|
say "Successfully created backup for #{args.component}"
|
36
38
|
else
|
37
|
-
|
39
|
+
case args.component
|
40
|
+
when "crowbar"
|
41
|
+
err format_error(
|
42
|
+
request.parsed_response["error"], "admin_backup"
|
43
|
+
)
|
44
|
+
when "openstack"
|
45
|
+
err format_error(
|
46
|
+
request.parsed_response["error"], "nodes_db_dump"
|
47
|
+
)
|
48
|
+
else
|
49
|
+
request.parsed_response["error"]
|
50
|
+
end
|
38
51
|
end
|
39
52
|
end
|
40
53
|
end
|
@@ -1,5 +1,5 @@
|
|
1
1
|
#
|
2
|
-
# Copyright
|
2
|
+
# Copyright 2016, SUSE Linux GmbH
|
3
3
|
#
|
4
4
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
5
5
|
# you may not use this file except in compliance with the License.
|
@@ -14,36 +14,16 @@
|
|
14
14
|
# limitations under the License.
|
15
15
|
#
|
16
16
|
|
17
|
-
require "easy_diff"
|
18
|
-
|
19
17
|
module Crowbar
|
20
18
|
module Client
|
21
19
|
module Command
|
22
|
-
module
|
20
|
+
module Upgrade
|
23
21
|
#
|
24
|
-
# Implementation for the
|
22
|
+
# Implementation for the upgrade cancel command
|
25
23
|
#
|
26
|
-
class
|
24
|
+
class Cancel < Base
|
27
25
|
def request
|
28
|
-
|
29
|
-
includes: options.includes,
|
30
|
-
excludes: options.excludes
|
31
|
-
)
|
32
|
-
|
33
|
-
args.file =
|
34
|
-
case args.file
|
35
|
-
when "-"
|
36
|
-
stdin.to_io
|
37
|
-
when File
|
38
|
-
args.file
|
39
|
-
else
|
40
|
-
File.new(
|
41
|
-
args.file,
|
42
|
-
File::RDONLY
|
43
|
-
)
|
44
|
-
end
|
45
|
-
|
46
|
-
@request ||= Request::Batch::Build.new(
|
26
|
+
@request ||= Request::Upgrade::Cancel.new(
|
47
27
|
args
|
48
28
|
)
|
49
29
|
end
|
@@ -52,7 +32,9 @@ module Crowbar
|
|
52
32
|
request.process do |request|
|
53
33
|
case request.code
|
54
34
|
when 200
|
55
|
-
say "
|
35
|
+
say "Canceled the upgrade process"
|
36
|
+
when 406
|
37
|
+
err "Not allowed to cancel the upgrade at this stage; Please refer to help output."
|
56
38
|
else
|
57
39
|
err request.parsed_response["error"]
|
58
40
|
end
|
@@ -22,6 +22,8 @@ module Crowbar
|
|
22
22
|
# Implementation for the upgrade crowbar command
|
23
23
|
#
|
24
24
|
class Crowbar < Base
|
25
|
+
include Mixin::UpgradeError
|
26
|
+
|
25
27
|
def request
|
26
28
|
@request ||= Request::Upgrade::Crowbar.new(
|
27
29
|
args
|
@@ -34,7 +36,9 @@ module Crowbar
|
|
34
36
|
when 200
|
35
37
|
say "Triggered Crowbar operating system upgrade"
|
36
38
|
else
|
37
|
-
err
|
39
|
+
err format_error(
|
40
|
+
request.parsed_response["error"], "admin_upgrade"
|
41
|
+
)
|
38
42
|
end
|
39
43
|
end
|
40
44
|
end
|
@@ -22,6 +22,8 @@ module Crowbar
|
|
22
22
|
# Implementation for the upgrade nodes command
|
23
23
|
#
|
24
24
|
class Nodes < Base
|
25
|
+
include Mixin::UpgradeError
|
26
|
+
|
25
27
|
def request
|
26
28
|
@request ||= Request::Upgrade::Nodes.new(
|
27
29
|
args
|
@@ -34,7 +36,9 @@ module Crowbar
|
|
34
36
|
when 200
|
35
37
|
say "Successfully triggered the upgrade of the nodes"
|
36
38
|
else
|
37
|
-
err
|
39
|
+
err format_error(
|
40
|
+
request.parsed_response["error"], "nodes_upgrade"
|
41
|
+
)
|
38
42
|
end
|
39
43
|
end
|
40
44
|
end
|
@@ -60,6 +60,10 @@ module Crowbar
|
|
60
60
|
def content_from(request)
|
61
61
|
[].tap do |row|
|
62
62
|
request.parsed_response["checks"].each do |check_id, values|
|
63
|
+
# make the check_id server agnostic
|
64
|
+
# the check_id could be named differently in the server response
|
65
|
+
check_id = values["errors"].keys.first if values["errors"].any?
|
66
|
+
|
63
67
|
row.push(
|
64
68
|
check_id: check_id,
|
65
69
|
passed: values["passed"],
|
@@ -22,6 +22,8 @@ module Crowbar
|
|
22
22
|
# Implementation for the upgrade prepare command
|
23
23
|
#
|
24
24
|
class Prepare < Base
|
25
|
+
include Mixin::UpgradeError
|
26
|
+
|
25
27
|
def request
|
26
28
|
@request ||= Request::Upgrade::Prepare.new(
|
27
29
|
args
|
@@ -34,7 +36,9 @@ module Crowbar
|
|
34
36
|
when 200
|
35
37
|
say "Setting nodes to upgrade state"
|
36
38
|
else
|
37
|
-
err
|
39
|
+
err format_error(
|
40
|
+
request.parsed_response["error"], "upgrade_prepare"
|
41
|
+
)
|
38
42
|
end
|
39
43
|
end
|
40
44
|
end
|
@@ -24,6 +24,7 @@ module Crowbar
|
|
24
24
|
class Repocheck < Base
|
25
25
|
include Mixin::Format
|
26
26
|
include Mixin::Filter
|
27
|
+
include Mixin::UpgradeError
|
27
28
|
|
28
29
|
def request
|
29
30
|
@request ||= Request::Upgrade::Repocheck.new(
|
@@ -50,7 +51,18 @@ module Crowbar
|
|
50
51
|
say formatter.result
|
51
52
|
end
|
52
53
|
else
|
53
|
-
|
54
|
+
case args.component
|
55
|
+
when "crowbar"
|
56
|
+
err format_error(
|
57
|
+
request.parsed_response["error"], "admin_repo_checks"
|
58
|
+
)
|
59
|
+
when "nodes"
|
60
|
+
err format_error(
|
61
|
+
request.parsed_response["error"], "nodes_repo_checks"
|
62
|
+
)
|
63
|
+
else
|
64
|
+
err request.parsed_response["error"]
|
65
|
+
end
|
54
66
|
end
|
55
67
|
end
|
56
68
|
end
|
@@ -22,6 +22,8 @@ module Crowbar
|
|
22
22
|
# Implementation for the upgrade services command
|
23
23
|
#
|
24
24
|
class Services < Base
|
25
|
+
include Mixin::UpgradeError
|
26
|
+
|
25
27
|
def request
|
26
28
|
@request ||= Request::Upgrade::Services.new(
|
27
29
|
args
|
@@ -34,7 +36,9 @@ module Crowbar
|
|
34
36
|
when 200
|
35
37
|
say "Stopping related services on all nodes"
|
36
38
|
else
|
37
|
-
err
|
39
|
+
err format_error(
|
40
|
+
request.parsed_response["error"], "nodes_services"
|
41
|
+
)
|
38
42
|
end
|
39
43
|
end
|
40
44
|
end
|
@@ -58,6 +58,7 @@ module Crowbar
|
|
58
58
|
timeout: default_timeout,
|
59
59
|
anonymous: default_anonymous,
|
60
60
|
apiversion: default_apiversion,
|
61
|
+
experimental: default_experimental,
|
61
62
|
debug: default_debug
|
62
63
|
)
|
63
64
|
end
|
@@ -168,6 +169,21 @@ module Crowbar
|
|
168
169
|
end
|
169
170
|
end
|
170
171
|
|
172
|
+
#
|
173
|
+
# Define a experimental api version
|
174
|
+
#
|
175
|
+
# @return [String] the default experimental flag
|
176
|
+
#
|
177
|
+
def default_experimental
|
178
|
+
if ENV["CROWBAR_EXPERIMENTAL"].present?
|
179
|
+
[
|
180
|
+
true, 1, "1", "t", "T", "true", "TRUE"
|
181
|
+
].include? ENV["CROWBAR_EXPERIMENTAL"]
|
182
|
+
else
|
183
|
+
false
|
184
|
+
end
|
185
|
+
end
|
186
|
+
|
171
187
|
#
|
172
188
|
# Define a default debug flag
|
173
189
|
#
|
data/lib/crowbar/client/mixin.rb
CHANGED
@@ -0,0 +1,38 @@
|
|
1
|
+
#
|
2
|
+
# Copyright 2016, SUSE Linux GmbH
|
3
|
+
#
|
4
|
+
# Licensed under the Apache License, Version 2.0 (the "License");
|
5
|
+
# you may not use this file except in compliance with the License.
|
6
|
+
# You may obtain a copy of the License at
|
7
|
+
#
|
8
|
+
# http://www.apache.org/licenses/LICENSE-2.0
|
9
|
+
#
|
10
|
+
# Unless required by applicable law or agreed to in writing, software
|
11
|
+
# distributed under the License is distributed on an "AS IS" BASIS,
|
12
|
+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
13
|
+
# See the License for the specific language governing permissions and
|
14
|
+
# limitations under the License.
|
15
|
+
#
|
16
|
+
|
17
|
+
require "active_support/concern"
|
18
|
+
|
19
|
+
module Crowbar
|
20
|
+
module Client
|
21
|
+
module Mixin
|
22
|
+
#
|
23
|
+
# A mixin with upgrade error related helpers
|
24
|
+
#
|
25
|
+
module UpgradeError
|
26
|
+
extend ActiveSupport::Concern
|
27
|
+
|
28
|
+
included do
|
29
|
+
def format_error(response, step)
|
30
|
+
JSON.parse(response.body)["errors"][step]["data"]
|
31
|
+
rescue
|
32
|
+
"Unable to format error response for #{step}"
|
33
|
+
end
|
34
|
+
end
|
35
|
+
end
|
36
|
+
end
|
37
|
+
end
|
38
|
+
end
|
@@ -1,5 +1,5 @@
|
|
1
1
|
#
|
2
|
-
# Copyright
|
2
|
+
# Copyright 2016, SUSE Linux GmbH
|
3
3
|
#
|
4
4
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
5
5
|
# you may not use this file except in compliance with the License.
|
@@ -19,18 +19,19 @@ require "easy_diff"
|
|
19
19
|
module Crowbar
|
20
20
|
module Client
|
21
21
|
module Request
|
22
|
-
module
|
22
|
+
module Upgrade
|
23
23
|
#
|
24
|
-
# Implementation for the
|
24
|
+
# Implementation for the upgrade cancel request
|
25
25
|
#
|
26
|
-
class
|
27
|
-
|
26
|
+
class Cancel < Base
|
27
|
+
#
|
28
|
+
# Override the request headers
|
29
|
+
#
|
30
|
+
# @return [Hash] the headers for the request
|
31
|
+
#
|
32
|
+
def headers
|
28
33
|
super.easy_merge!(
|
29
|
-
|
30
|
-
includes: attrs.includes,
|
31
|
-
excludes: attrs.excludes,
|
32
|
-
file: attrs.file
|
33
|
-
}
|
34
|
+
::Crowbar::Client::Util::ApiVersion.new(2.0).headers
|
34
35
|
)
|
35
36
|
end
|
36
37
|
|
@@ -50,9 +51,9 @@ module Crowbar
|
|
50
51
|
#
|
51
52
|
def url
|
52
53
|
[
|
53
|
-
"
|
54
|
-
"
|
55
|
-
"
|
54
|
+
"api",
|
55
|
+
"upgrade",
|
56
|
+
"cancel"
|
56
57
|
].join("/")
|
57
58
|
end
|
58
59
|
end
|
@@ -1,5 +1,5 @@
|
|
1
1
|
#
|
2
|
-
# Copyright
|
2
|
+
# Copyright 2016, SUSE Linux GmbH
|
3
3
|
#
|
4
4
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
5
5
|
# you may not use this file except in compliance with the License.
|
@@ -16,19 +16,15 @@
|
|
16
16
|
|
17
17
|
require_relative "../../../../spec_helper"
|
18
18
|
|
19
|
-
describe "Crowbar::Client::Command::
|
19
|
+
describe "Crowbar::Client::Command::Upgrade::Cancel" do
|
20
20
|
include_context "command_context"
|
21
21
|
|
22
22
|
it_behaves_like "a command class", true do
|
23
23
|
subject do
|
24
|
-
::Crowbar::Client::Command::
|
24
|
+
::Crowbar::Client::Command::Upgrade::Cancel.new(
|
25
25
|
stdin,
|
26
26
|
stdout,
|
27
|
-
stderr
|
28
|
-
{},
|
29
|
-
file: fixture_path(
|
30
|
-
"batch.yml"
|
31
|
-
)
|
27
|
+
stderr
|
32
28
|
)
|
33
29
|
end
|
34
30
|
end
|
@@ -1,5 +1,6 @@
|
|
1
|
+
|
1
2
|
#
|
2
|
-
# Copyright
|
3
|
+
# Copyright 2016, SUSE Linux GmbH
|
3
4
|
#
|
4
5
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
5
6
|
# you may not use this file except in compliance with the License.
|
@@ -16,29 +17,21 @@
|
|
16
17
|
|
17
18
|
require_relative "../../../../spec_helper"
|
18
19
|
|
19
|
-
describe "Crowbar::Client::Request::
|
20
|
-
it_behaves_like "a request class",
|
20
|
+
describe "Crowbar::Client::Request::Upgrade::Cancel" do
|
21
|
+
it_behaves_like "a request class", true do
|
21
22
|
subject do
|
22
|
-
::Crowbar::Client::Request::
|
23
|
+
::Crowbar::Client::Request::Upgrade::Cancel.new(
|
23
24
|
attrs
|
24
25
|
)
|
25
26
|
end
|
26
27
|
|
27
28
|
let!(:attrs) do
|
28
29
|
{
|
29
|
-
file: fixture_path(
|
30
|
-
"batch.yml"
|
31
|
-
).open
|
32
30
|
}
|
33
31
|
end
|
34
32
|
|
35
33
|
let!(:params) do
|
36
34
|
{
|
37
|
-
query: {
|
38
|
-
includes: nil,
|
39
|
-
excludes: nil,
|
40
|
-
file: attrs[:file]
|
41
|
-
}
|
42
35
|
}
|
43
36
|
end
|
44
37
|
|
@@ -47,14 +40,13 @@ describe "Crowbar::Client::Request::Batch::Build" do
|
|
47
40
|
end
|
48
41
|
|
49
42
|
let!(:url) do
|
50
|
-
"
|
43
|
+
"api/upgrade/cancel"
|
51
44
|
end
|
52
45
|
|
53
46
|
let!(:headers) do
|
54
47
|
{
|
55
|
-
"
|
56
|
-
"
|
57
|
-
"Content-Type" => "multipart/form-data; boundary=-----------RubyMultipartPost"
|
48
|
+
"Content-Type" => "application/vnd.crowbar.v2.0+json",
|
49
|
+
"Accept" => "application/vnd.crowbar.v2.0+json"
|
58
50
|
}
|
59
51
|
end
|
60
52
|
end
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: crowbar-client
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 3.1.
|
4
|
+
version: 3.1.5
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Thomas Boerger
|
@@ -10,7 +10,7 @@ authors:
|
|
10
10
|
autorequire:
|
11
11
|
bindir: bin
|
12
12
|
cert_chain: []
|
13
|
-
date: 2016-
|
13
|
+
date: 2016-12-06 00:00:00.000000000 Z
|
14
14
|
dependencies:
|
15
15
|
- !ruby/object:Gem::Dependency
|
16
16
|
name: bundler
|
@@ -261,7 +261,6 @@ files:
|
|
261
261
|
- lib/crowbar/client/command/barclamp/list.rb
|
262
262
|
- lib/crowbar/client/command/base.rb
|
263
263
|
- lib/crowbar/client/command/batch.rb
|
264
|
-
- lib/crowbar/client/command/batch/build.rb
|
265
264
|
- lib/crowbar/client/command/batch/export.rb
|
266
265
|
- lib/crowbar/client/command/database.rb
|
267
266
|
- lib/crowbar/client/command/database/connect.rb
|
@@ -318,6 +317,7 @@ files:
|
|
318
317
|
- lib/crowbar/client/command/server/check.rb
|
319
318
|
- lib/crowbar/client/command/upgrade.rb
|
320
319
|
- lib/crowbar/client/command/upgrade/backup.rb
|
320
|
+
- lib/crowbar/client/command/upgrade/cancel.rb
|
321
321
|
- lib/crowbar/client/command/upgrade/crowbar.rb
|
322
322
|
- lib/crowbar/client/command/upgrade/database.rb
|
323
323
|
- lib/crowbar/client/command/upgrade/nodes.rb
|
@@ -345,6 +345,7 @@ files:
|
|
345
345
|
- lib/crowbar/client/mixin/database.rb
|
346
346
|
- lib/crowbar/client/mixin/filter.rb
|
347
347
|
- lib/crowbar/client/mixin/format.rb
|
348
|
+
- lib/crowbar/client/mixin/upgrade_error.rb
|
348
349
|
- lib/crowbar/client/request.rb
|
349
350
|
- lib/crowbar/client/request/backup.rb
|
350
351
|
- lib/crowbar/client/request/backup/create.rb
|
@@ -357,7 +358,6 @@ files:
|
|
357
358
|
- lib/crowbar/client/request/barclamp/list.rb
|
358
359
|
- lib/crowbar/client/request/base.rb
|
359
360
|
- lib/crowbar/client/request/batch.rb
|
360
|
-
- lib/crowbar/client/request/batch/build.rb
|
361
361
|
- lib/crowbar/client/request/batch/export.rb
|
362
362
|
- lib/crowbar/client/request/database.rb
|
363
363
|
- lib/crowbar/client/request/database/connect.rb
|
@@ -417,6 +417,7 @@ files:
|
|
417
417
|
- lib/crowbar/client/request/server/check.rb
|
418
418
|
- lib/crowbar/client/request/upgrade.rb
|
419
419
|
- lib/crowbar/client/request/upgrade/backup.rb
|
420
|
+
- lib/crowbar/client/request/upgrade/cancel.rb
|
420
421
|
- lib/crowbar/client/request/upgrade/crowbar.rb
|
421
422
|
- lib/crowbar/client/request/upgrade/database.rb
|
422
423
|
- lib/crowbar/client/request/upgrade/nodes.rb
|
@@ -441,7 +442,6 @@ files:
|
|
441
442
|
- spec/crowbar/client/command/backup/restore_spec.rb
|
442
443
|
- spec/crowbar/client/command/backup/upload_spec.rb
|
443
444
|
- spec/crowbar/client/command/barclamp/list_spec.rb
|
444
|
-
- spec/crowbar/client/command/batch/build_spec.rb
|
445
445
|
- spec/crowbar/client/command/batch/export_spec.rb
|
446
446
|
- spec/crowbar/client/command/database/connect_spec.rb
|
447
447
|
- spec/crowbar/client/command/database/create_spec.rb
|
@@ -488,6 +488,7 @@ files:
|
|
488
488
|
- spec/crowbar/client/command/server/api_spec.rb
|
489
489
|
- spec/crowbar/client/command/server/check_spec.rb
|
490
490
|
- spec/crowbar/client/command/upgrade/backup_spec.rb
|
491
|
+
- spec/crowbar/client/command/upgrade/cancel_spec.rb
|
491
492
|
- spec/crowbar/client/command/upgrade/crowbar_spec.rb
|
492
493
|
- spec/crowbar/client/command/upgrade/database_spec.rb
|
493
494
|
- spec/crowbar/client/command/upgrade/nodes_spec.rb
|
@@ -511,7 +512,6 @@ files:
|
|
511
512
|
- spec/crowbar/client/request/backup/restore_spec.rb
|
512
513
|
- spec/crowbar/client/request/backup/upload_spec.rb
|
513
514
|
- spec/crowbar/client/request/barclamp/list_spec.rb
|
514
|
-
- spec/crowbar/client/request/batch/build_spec.rb
|
515
515
|
- spec/crowbar/client/request/batch/export_spec.rb
|
516
516
|
- spec/crowbar/client/request/database/connect_spec.rb
|
517
517
|
- spec/crowbar/client/request/database/create_spec.rb
|
@@ -551,6 +551,7 @@ files:
|
|
551
551
|
- spec/crowbar/client/request/server/api_spec.rb
|
552
552
|
- spec/crowbar/client/request/server/check_spec.rb
|
553
553
|
- spec/crowbar/client/request/upgrade/backup_spec.rb
|
554
|
+
- spec/crowbar/client/request/upgrade/cancel_spec.rb
|
554
555
|
- spec/crowbar/client/request/upgrade/crowbar_spec.rb
|
555
556
|
- spec/crowbar/client/request/upgrade/database_spec.rb
|
556
557
|
- spec/crowbar/client/request/upgrade/nodes_spec.rb
|
@@ -604,7 +605,6 @@ test_files:
|
|
604
605
|
- spec/crowbar/client/command/backup/restore_spec.rb
|
605
606
|
- spec/crowbar/client/command/backup/upload_spec.rb
|
606
607
|
- spec/crowbar/client/command/barclamp/list_spec.rb
|
607
|
-
- spec/crowbar/client/command/batch/build_spec.rb
|
608
608
|
- spec/crowbar/client/command/batch/export_spec.rb
|
609
609
|
- spec/crowbar/client/command/database/connect_spec.rb
|
610
610
|
- spec/crowbar/client/command/database/create_spec.rb
|
@@ -651,6 +651,7 @@ test_files:
|
|
651
651
|
- spec/crowbar/client/command/server/api_spec.rb
|
652
652
|
- spec/crowbar/client/command/server/check_spec.rb
|
653
653
|
- spec/crowbar/client/command/upgrade/backup_spec.rb
|
654
|
+
- spec/crowbar/client/command/upgrade/cancel_spec.rb
|
654
655
|
- spec/crowbar/client/command/upgrade/crowbar_spec.rb
|
655
656
|
- spec/crowbar/client/command/upgrade/database_spec.rb
|
656
657
|
- spec/crowbar/client/command/upgrade/nodes_spec.rb
|
@@ -674,7 +675,6 @@ test_files:
|
|
674
675
|
- spec/crowbar/client/request/backup/restore_spec.rb
|
675
676
|
- spec/crowbar/client/request/backup/upload_spec.rb
|
676
677
|
- spec/crowbar/client/request/barclamp/list_spec.rb
|
677
|
-
- spec/crowbar/client/request/batch/build_spec.rb
|
678
678
|
- spec/crowbar/client/request/batch/export_spec.rb
|
679
679
|
- spec/crowbar/client/request/database/connect_spec.rb
|
680
680
|
- spec/crowbar/client/request/database/create_spec.rb
|
@@ -714,6 +714,7 @@ test_files:
|
|
714
714
|
- spec/crowbar/client/request/server/api_spec.rb
|
715
715
|
- spec/crowbar/client/request/server/check_spec.rb
|
716
716
|
- spec/crowbar/client/request/upgrade/backup_spec.rb
|
717
|
+
- spec/crowbar/client/request/upgrade/cancel_spec.rb
|
717
718
|
- spec/crowbar/client/request/upgrade/crowbar_spec.rb
|
718
719
|
- spec/crowbar/client/request/upgrade/database_spec.rb
|
719
720
|
- spec/crowbar/client/request/upgrade/nodes_spec.rb
|