crowbar-client 3.3.1 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4f61c21d5e2910d12bcd4830b825094526e1179
-  data.tar.gz: 663db27063201dc1e14589fc269ce83fa3184c50
+  metadata.gz: 83d51fd825a3ef94b457cf16266f10ba16818937
+  data.tar.gz: c3e8ac129f825621c7934a91af226338b57cd1e6
 SHA512:
-  metadata.gz: 9b81fe452995214b671f567d6a5f1d3d4619161748fe85cf856e13ac68df7e164ae5746de992a5ae4052bdec314906a7ade471f8a6d8e7bf94e24f5724e0a705
-  data.tar.gz: 1edb89c44aeab996151d306025570883684b95708f7c7df48a43a45a54155e525d425051ccfa9cd325f97a3a9cd31d89a8065549e22105712c1a7f3cdd753254
+  metadata.gz: 4f5cbb5e078d5714216ffb28518b54aad3578b22765b68fb12f2770c366ce8a7d4c6ba7c8117f738185873725196f02e4bdeacd778deb4c1c7f4eae43155967b
+  data.tar.gz: d1fedb5e476b78620907e30ae047b8222ab7467e2516a56af5835a1076af6db3edca9b0e6b04980b6c2157566e14342afe6bee7f0e8acfa4a1b0c42b1fa887e1

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## [3.4.0](https://github.com/crowbar/crowbar-client/releases/tag/v3.4.0) - 2017-10-08
+
+* BUGFIX
+  * Fix proposal create from file (bsc#1037374)
+  * Fix create proposal from data (bsc#1037374)
+
+* ENHANCEMENT
+  * Add filtering of proposal deployment lists
+
 ## [3.3.1](https://github.com/crowbar/crowbar-client/releases/tag/v3.3.1) - 2017-04-07
 
 * BUGFIX

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

@@ -141,7 +141,7 @@ module Crowbar
           catch_errors(e)
         end
 
-        desc "create BARCLAMP PROPOSAL",
+        desc "create BARCLAMP [PROPOSAL]",
           "Create a proposal for specific barclamp"
 
         long_desc <<-LONGDESC
@@ -163,6 +163,8 @@ module Crowbar
 
           With --merge option you can deep merge the provided data with
           the preloaded template.
+
+          Proposal name, if not provided, is 'default'
         LONGDESC
 
         method_option :data,
@@ -189,7 +191,7 @@ module Crowbar
           aliases: ["-m"],
           desc: "Merge input loaded from server with proposal data"
 
-        def create(barclamp, proposal)
+        def create(barclamp, proposal = "default")
           Command::Proposal::Create.new(
             *command_params(
               barclamp: barclamp,

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

@@ -76,6 +76,11 @@ module Crowbar
               err "Failed to parse JSON"
             end
 
+            if json["id"] != args.proposal
+              json["id"] = args.proposal
+              say "Using id(#{json["id"]}) as proposal name"
+            end
+
             if options[:merge]
               proposal_preload.easy_merge(
                 json
@@ -104,6 +109,11 @@ module Crowbar
               err "Failed to process file"
             end
 
+            if json["id"] != args.proposal
+              json["id"] = args.proposal
+              say "Using id(#{json["id"]}) as proposal name"
+            end
+
             if options[:merge]
               proposal_preload.easy_merge(
                 json

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

@@ -26,6 +26,7 @@ module Crowbar
         #
         class Edit < Base
           include Mixin::Barclamp
+          include Mixin::Proposal
 
           def request
             @request ||= Request::Proposal::Edit.new(
@@ -58,7 +59,7 @@ module Crowbar
 
             case result.code
             when 200
-              result.parsed_response
+              deployment_cleanup result.parsed_response
             when 404
               err "Failed to preload proposal"
             else

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

@@ -23,6 +23,7 @@ module Crowbar
         #
         class Show < Base
           include Mixin::Barclamp
+          include Mixin::Proposal
 
           include Mixin::Format
           include Mixin::Filter
@@ -45,7 +46,7 @@ module Crowbar
                   headings: ["Key", "Value"],
                   values: Filter::Subset.new(
                     filter: provide_filter,
-                    values: content_from(request)
+                    values: deployment_cleanup(content_from(request))
                   ).result
                 )
 

data/lib/crowbar/client/mixin.rb

@@ -37,6 +37,9 @@ module Crowbar
 
       autoload :SimpleError,
         File.expand_path("../mixin/simple_error", __FILE__)
+
+      autoload :Proposal,
+        File.expand_path("../mixin/proposal", __FILE__)
     end
   end
 end

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

@@ -0,0 +1,55 @@
+#
+# Copyright 2017, 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 "active_support/concern"
+
+module Crowbar
+  module Client
+    module Mixin
+      #
+      # A mixin with proposal related helpers
+      #
+      module Proposal
+        extend ActiveSupport::Concern
+
+        included do
+          protected
+
+          def valid_elements
+            # fetch node list
+            response = Request::Node::List.new.process
+            raise "error fetching node list" unless response.code == 200
+            nodes = response.parsed_response["nodes"].map { |node| node["name"] }
+            # fetch clusters list
+            response = Request::Cluster::List.new.process
+            raise "error fetching cluster list" unless response.code == 200
+            clusters = response.parsed_response.keys
+            nodes + clusters
+          end
+
+          def deployment_cleanup(proposal)
+            filter = valid_elements
+            # filter deployment elements
+            proposal["deployment"][args.barclamp]["elements"].each do |role, elements|
+              elements.select! { |element| filter.include? element }
+            end
+            proposal
+          end
+        end
+      end
+    end
+  end
+end

data/lib/crowbar/client/request.rb

@@ -32,6 +32,9 @@ module Crowbar
       autoload :Batch,
         File.expand_path("../request/batch", __FILE__)
 
+      autoload :Cluster,
+        File.expand_path("../request/cluster", __FILE__)
+
       autoload :Database,
         File.expand_path("../request/database", __FILE__)
 

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

@@ -0,0 +1,29 @@
+#
+# Copyright 2017, 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 Request
+      #
+      # Module for the cluster request implementations
+      #
+      module Cluster
+        autoload :List,
+          File.expand_path("../cluster/list", __FILE__)
+      end
+    end
+  end
+end

data/lib/crowbar/client/request/cluster/list.rb

@@ -0,0 +1,46 @@
+#
+# Copyright 2017, 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 Request
+      module Cluster
+        #
+        # Implementation for the cluster list request
+        #
+        class List < Base
+          #
+          # HTTP method that gets used by the request
+          #
+          # @return [Symbol] the method for the request
+          #
+          def method
+            :get
+          end
+
+          #
+          # Path to the API endpoint for the request
+          #
+          # @return [String] path to the API endpoint
+          #
+          def url
+            "clusters"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/crowbar/client/version.rb

@@ -28,12 +28,12 @@ module Crowbar
       #
       # Minor version
       #
-      MINOR = 3
+      MINOR = 4
 
       #
       # Patch version
       #
-      PATCH = 1
+      PATCH = 0
 
       #
       # Optional suffix

data/spec/crowbar/client/mixin/proposal_spec.rb

@@ -0,0 +1,183 @@
+#
+# Copyright 2017, 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_relative "../../../spec_helper"
+
+# monkey patch rest-client to make Travis happy
+# see: https://build.suse.de/package/view_file/SUSE:SLE-12-SP2:Update:Products:Cloud7:Update/rubygem-rest-client/add-digest-auth.patch?expand=1
+module RestClient
+  module AbstractResponse
+    def parsed_response
+      JSON.parse(self.body)
+    end
+  end
+end
+
+class ProposalMock
+  include ::Crowbar::Client::Mixin::Proposal
+  # expose protected methods
+  def test_valid_elements
+    valid_elements
+  end
+
+  def test_deployment_cleanup(proposal)
+    deployment_cleanup proposal
+  end
+
+  def test_nodes
+    [
+      "node1",
+      "node2"
+    ]
+  end
+
+  def test_clusters
+    [
+      "cluster1",
+      "cluster2"
+    ]
+  end
+end
+
+describe "Crowbar::Client::Mixin::Proposal" do
+  subject { ProposalMock.new }
+
+  let!(:proposal) do
+    {
+      "deployment" => {
+        "bctest" => {
+          "elements" => {
+            "role1" => [
+              "node1",
+              "oldnode1",
+              "oldnode2",
+              "cluster1",
+              "oldcluster1"
+            ],
+            "role2" => [
+              "node2",
+              "cluster2"
+            ]
+          }
+        }
+      }
+    }
+  end
+
+  before(:each) do
+    allow(subject).to receive_message_chain("args.barclamp") { "bctest" }
+  end
+
+  context "without clusters" do
+    before(:each) do
+      stub_request(:get, "http://crowbar/clusters")
+        .with(
+          headers: {
+            "Accept" => "application/json",
+            "Content-Type" => "application/json"
+          }
+        )
+        .to_return(
+          status: 200,
+          body: "{}",
+          headers: {
+            "Content-Type" => "application/json"
+          }
+        )
+      stub_request(:get, "http://crowbar/crowbar/machines/1.0")
+        .with(
+          headers: {
+            "Accept" => "application/json",
+            "Content-Type" => "application/json"
+          }
+        )
+        .to_return(
+          status: 200,
+          body: '{ "nodes": [{"name":"node1"}, {"name":"node2"}] }',
+          headers: {
+            "Content-Type" => "application/json"
+          }
+        )
+    end
+
+    it "valid_elements returns only nodes" do
+      expect(
+        subject.test_valid_elements
+      ).to eq(subject.test_nodes)
+    end
+
+    it "deployment_cleanup removes all clusters and outdated nodes" do
+      clean_proposal = subject.test_deployment_cleanup proposal
+      elements = clean_proposal["deployment"]["bctest"]["elements"]
+      expect(
+        elements["role1"]
+      ).to eq(["node1"])
+      expect(
+        elements["role2"]
+      ).to eq(["node2"])
+    end
+  end
+
+  context "with clusters" do
+    before(:each) do
+      stub_request(:get, "http://crowbar/clusters")
+        .with(
+          headers: {
+            "Accept" => "application/json",
+            "Content-Type" => "application/json"
+          }
+        )
+        .to_return(
+          status: 200,
+          body: '{"cluster1":{}, "cluster2":{}}',
+          headers: {
+            "Content-Type" => "application/json"
+          }
+        )
+      stub_request(:get, "http://crowbar/crowbar/machines/1.0")
+        .with(
+          headers: {
+            "Accept" => "application/json",
+            "Content-Type" => "application/json"
+          }
+        )
+        .to_return(
+          status: 200,
+          body: '{"nodes":[{"name":"node1"},{"name":"node2"}]}',
+          headers: {
+            "Content-Type" => "application/json"
+          }
+        )
+    end
+
+    it "valid_elements returns nodes and clusters" do
+      expect(
+        subject.test_valid_elements
+      ).to eq(subject.test_nodes + subject.test_clusters)
+    end
+
+    it "deployment_cleanup removes outdated clusters and nodes" do
+      clean_proposal = subject.test_deployment_cleanup proposal
+      elements = clean_proposal["deployment"]["bctest"]["elements"]
+      expect(
+        elements["role1"]
+      ).to eq(["node1", "cluster1"])
+      expect(
+        elements["role2"]
+      ).to eq(["node2", "cluster2"])
+    end
+  end
+end

data/spec/crowbar/client/request/cluster/list_spec.rb

@@ -0,0 +1,44 @@
+#
+# Copyright 2017, 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_relative "../../../../spec_helper"
+
+describe "Crowbar::Client::Request::Cluster::List" do
+  it_behaves_like "a request class", true do
+    subject do
+      ::Crowbar::Client::Request::Cluster::List.new
+    end
+
+    let!(:params) do
+      {}
+    end
+
+    let!(:method) do
+      :get
+    end
+
+    let!(:url) do
+      "clusters"
+    end
+
+    let!(:headers) do
+      {
+        "Content-Type" => "application/json",
+        "Accept" => "application/json"
+      }
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: crowbar-client
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.4.0
 platform: ruby
 authors:
 - Thomas Boerger
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-07 00:00:00.000000000 Z
+date: 2017-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -346,6 +346,7 @@ files:
 - lib/crowbar/client/mixin/database.rb
 - lib/crowbar/client/mixin/filter.rb
 - lib/crowbar/client/mixin/format.rb
+- lib/crowbar/client/mixin/proposal.rb
 - lib/crowbar/client/mixin/simple_error.rb
 - lib/crowbar/client/mixin/upgrade_error.rb
 - lib/crowbar/client/request.rb
@@ -361,6 +362,8 @@ files:
 - lib/crowbar/client/request/base.rb
 - lib/crowbar/client/request/batch.rb
 - lib/crowbar/client/request/batch/export.rb
+- lib/crowbar/client/request/cluster.rb
+- lib/crowbar/client/request/cluster/list.rb
 - lib/crowbar/client/request/database.rb
 - lib/crowbar/client/request/database/connect.rb
 - lib/crowbar/client/request/database/create.rb
@@ -509,6 +512,7 @@ files:
 - spec/crowbar/client/formatter/array_spec.rb
 - spec/crowbar/client/formatter/hash_spec.rb
 - spec/crowbar/client/formatter/nested_spec.rb
+- spec/crowbar/client/mixin/proposal_spec.rb
 - spec/crowbar/client/request/backup/create_spec.rb
 - spec/crowbar/client/request/backup/delete_spec.rb
 - spec/crowbar/client/request/backup/download_spec.rb
@@ -517,6 +521,7 @@ files:
 - spec/crowbar/client/request/backup/upload_spec.rb
 - spec/crowbar/client/request/barclamp/list_spec.rb
 - spec/crowbar/client/request/batch/export_spec.rb
+- spec/crowbar/client/request/cluster/list_spec.rb
 - spec/crowbar/client/request/database/connect_spec.rb
 - spec/crowbar/client/request/database/create_spec.rb
 - spec/crowbar/client/request/database/test_spec.rb
@@ -597,7 +602,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Crowbar commandline client
@@ -674,6 +679,7 @@ test_files:
 - spec/crowbar/client/formatter/array_spec.rb
 - spec/crowbar/client/formatter/hash_spec.rb
 - spec/crowbar/client/formatter/nested_spec.rb
+- spec/crowbar/client/mixin/proposal_spec.rb
 - spec/crowbar/client/request/backup/create_spec.rb
 - spec/crowbar/client/request/backup/delete_spec.rb
 - spec/crowbar/client/request/backup/download_spec.rb
@@ -682,6 +688,7 @@ test_files:
 - spec/crowbar/client/request/backup/upload_spec.rb
 - spec/crowbar/client/request/barclamp/list_spec.rb
 - spec/crowbar/client/request/batch/export_spec.rb
+- spec/crowbar/client/request/cluster/list_spec.rb
 - spec/crowbar/client/request/database/connect_spec.rb
 - spec/crowbar/client/request/database/create_spec.rb
 - spec/crowbar/client/request/database/test_spec.rb