crowbar-client 3.5.1 → 3.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c9a64b119a2dbd5c8337f1a4c9d8524cb145c16e0e15796ccb131170872ab47
-  data.tar.gz: 02e5f441dfe055079ed8474fc04c542439fbd6f214e34d5767f740b1bfcad038
+  metadata.gz: 46b7ba57caa745cb2c4b7b61f72fb3c4c44a6a9c23b8bf5437f5da433028ae44
+  data.tar.gz: a11888a2f0e8cd2276294e32da87479b542517bfbdd8e595bc76b9e3c687ec7f
 SHA512:
-  metadata.gz: a838722e1824b05d66fca1fb0f3e99c56161fa50c87f7ec00e4116d90cb08f941f00731ff7275ea467450fa44cbf534cbd2688eb6fec08745c9f060086b15b01
-  data.tar.gz: e9526302bc214792ea285193bd4971b5f9775b05f84131be7f201bba0030b0c554bdb41836ea9f06fd8149d024ed69011f401e8d1cdb7e5c392bd5ea3fbfc6f7
+  metadata.gz: 32da261c491ce8d2bfbf5303b36b0869f71d2fef7fb226371efc05fcaadc6e252650ed7eba8e730bc182cd3bb05efea6bc68dd0d15837829581945cabcb4f8d6
+  data.tar.gz: 086f06ec09baa46b080e64bc22f14dcafdc5438872778c9a38d1835b102fd6fccc9d6730b5de8eb498d8d66e9b07dbd79717a24b1b31d2938087df8d0570e801

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## [3.5.2](https://github.com/crowbar/crowbar-client/releases/tag/v3.5.2) - 2018-01-09
+
+* BUGFIX
+  * Display invalid nodes when editing proposal
+
 ## [3.5.1](https://github.com/crowbar/crowbar-client/releases/tag/v3.5.1) - 2017-12-05
 
 * BUGFIX

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

@@ -76,6 +76,9 @@ module Crowbar
               err "Failed to parse JSON"
             end
 
+            # check if the nodes in the configuration are in the list of nodes
+            check_nodes(json)
+
             if options[:merge]
               proposal_preload.easy_merge(
                 json
@@ -104,6 +107,9 @@ module Crowbar
               err "Failed to process file"
             end
 
+            # check if the nodes in the configuration are in the list of nodes
+            check_nodes(json)
+
             if options[:merge]
               proposal_preload.easy_merge(
                 json
@@ -116,8 +122,12 @@ module Crowbar
           def from_editor
             editor = Util::Editor.new content: proposal_preload
             editor.edit!
+            result = editor.result
 
-            editor.result
+            # check if the nodes in the configuration are in the list of nodes
+            check_nodes(result)
+
+            result
           rescue EditorAbortError => e
             err e.message
           rescue EditorStartupError => e
@@ -140,6 +150,36 @@ module Crowbar
               from_editor
             end
           end
+
+          def check_nodes(configuration)
+            invalid_nodes = []
+            nodes_and_clusters = valid_elements
+
+            configuration["deployment"].each do |service_name, service|
+              next if service["elements"].nil?
+
+              service["elements"].each do |role, nodes|
+                nodes.each do |node|
+                  unless nodes_and_clusters.include?(node)
+                    invalid_nodes << { "node" => node, "role" => role,
+                                       "service_name" => service_name }
+                  end
+                end
+              end
+            end
+
+            return if invalid_nodes.empty?
+
+            error_str = ""
+
+            invalid_nodes.each do |error|
+              error_str += "ERROR : #{error["node"]} is not available in the list of" \
+              " possible nodes and clusters. Added in role #{error["role"]}" \
+              " of service #{error["service_name"]}\r\n"
+            end
+
+            err error_str
+          end
         end
       end
     end

data/lib/crowbar/client/version.rb

@@ -33,7 +33,7 @@ module Crowbar
       #
       # Patch version
       #
-      PATCH = 1
+      PATCH = 2
 
       #
       # Optional suffix

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: crowbar-client
 version: !ruby/object:Gem::Version
-  version: 3.5.1
+  version: 3.5.2
 platform: ruby
 authors:
 - Thomas Boerger
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-05 00:00:00.000000000 Z
+date: 2018-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -621,7 +621,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: Crowbar commandline client