crowbar-client 2.2.1 → 2.3.0

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

@@ -55,30 +55,51 @@ module Crowbar
           protected
 
           def headings
-            [].tap do |values|
-              values.push("Name") if options["names"]
-              values.push("Alias") if options["aliases"]
+            if options["meta"]
+              [
+                "Name",
+                "Alias",
+                "Group",
+                "Status"
+              ]
+            else
+              [
+                "Name"
+              ]
             end
           end
 
           def content_from(request)
-            [].tap do |row|
+            result = [].tap do |row|
               request.parsed_response["nodes"].each do |child|
-                values = {}
-                values[:name] = child["name"] if options["names"]
-                values[:alias] = child["alias"] if options["aliases"]
-
-                row.push(
-                  values
-                )
+                if options["meta"]
+                  row.push(
+                    child.slice(
+                      "name",
+                      "alias",
+                      "group",
+                      "status"
+                    )
+                  )
+                else
+                  row.push(
+                    child.slice(
+                      "name"
+                    )
+                  )
+                end
               end
             end
-          end
 
-          def checks
-            msg = "Please provide only names or aliases switch"
-            raise BadOptionsError,
-              msg unless options["names"] || options["aliases"]
+            result.sort do |x, y|
+              [
+                x["name"],
+                x["alias"]
+              ] <=> [
+                y["name"],
+                y["alias"]
+              ]
+            end
           end
         end
       end

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

@@ -24,6 +24,9 @@ module Crowbar
         autoload :Delete,
           File.expand_path("../node/delete", __FILE__)
 
+        autoload :Group,
+          File.expand_path("../node/group", __FILE__)
+
         autoload :Hardware,
           File.expand_path("../node/hardware", __FILE__)
 

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

@@ -0,0 +1,48 @@
+#
+# Copyright 2015, 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.
+#
+
+module Crowbar
+  module Client
+    module Command
+      module Proposal
+        class Reset < Base
+          include Mixin::Barclamp
+
+          def request
+            @request ||= Request::Proposal::Reset.new(
+              args
+            )
+          end
+
+          def execute
+            validate_barclamp! args.barclamp
+
+            request.process do |request|
+              case request.code
+              when 200
+                say "Successfully reset #{args.proposal} proposal"
+              when 404
+                say "Proposal does not exist"
+              else
+                err request.parsed_response["error"]
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -36,6 +36,9 @@ module Crowbar
         autoload :List,
           File.expand_path("../proposal/list", __FILE__)
 
+        autoload :Reset,
+          File.expand_path("../proposal/reset", __FILE__)
+
         autoload :Show,
           File.expand_path("../proposal/show", __FILE__)
       end

data/lib/crowbar/client/command.rb

@@ -17,6 +17,9 @@
 module Crowbar
   module Client
     module Command
+      autoload :Backup,
+        File.expand_path("../command/backup", __FILE__)
+
       autoload :Barclamp,
         File.expand_path("../command/barclamp", __FILE__)
 
@@ -44,9 +47,6 @@ module Crowbar
       autoload :Repository,
         File.expand_path("../command/repository", __FILE__)
 
-      autoload :Reset,
-        File.expand_path("../command/reset", __FILE__)
-
       autoload :Role,
         File.expand_path("../command/role", __FILE__)
 

data/lib/crowbar/client/config.rb

@@ -109,15 +109,15 @@ module Crowbar
       def merge
         result = {}.tap do |overwrite|
           defaults.keys.each do |key|
-            case
+            overwrite[key] = case
             when options[key] != defaults[key]
-              overwrite[key] = options[key]
+              options[key]
             when config[key].present?
-              overwrite[key] = config[key]
+              config[key]
             when options[key].present?
-              overwrite[key] = options[key]
+              options[key]
             else
-              overwrite[key] = defaults[key]
+              defaults[key]
             end
           end
         end

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

@@ -29,10 +29,7 @@ module Crowbar
           end
 
           def available_barclamps
-            @available_barclamps ||= Request::Barclamp::List
-              .new
-              .process
-              .keys
+            @available_barclamps ||= Request::Barclamp::List.new.process.keys
           end
         end
       end

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

@@ -0,0 +1,46 @@
+#
+# Copyright 2015, 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 "easy_diff"
+
+module Crowbar
+  module Client
+    module Request
+      module Backup
+        class Create < Base
+          def content
+            super.easy_merge!(
+              backup: {
+                name: attrs.backup
+              }
+            )
+          end
+
+          def method
+            :post
+          end
+
+          def url
+            [
+              "utils",
+              "backups"
+            ].join("/")
+          end
+        end
+      end
+    end
+  end
+end

data/lib/crowbar/client/request/{reset/proposal.rb → backup/delete.rb}

@@ -17,14 +17,18 @@
 module Crowbar
   module Client
     module Request
-      module Reset
-        class Proposal < Base
+      module Backup
+        class Delete < Base
           def method
-            :get
+            :delete
           end
 
           def url
-            [].join("/")
+            [
+              "utils",
+              "backups",
+              attrs.id
+            ].join("/")
           end
         end
       end

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

@@ -0,0 +1,47 @@
+#
+# Copyright 2015, 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 "easy_diff"
+
+module Crowbar
+  module Client
+    module Request
+      module Backup
+        class Download < Base
+          def headers
+            super.easy_merge!(
+              "Content-Type" => "application/octet-stream",
+              "Accept" => "application/octet-stream"
+            )
+          end
+
+          def method
+            :get
+          end
+
+          def url
+            [
+              "utils",
+              "backups",
+              attrs.id,
+              "download"
+            ].join("/")
+          end
+        end
+      end
+    end
+  end
+end

data/lib/crowbar/client/request/{reset/nodes.rb → backup/list.rb}

@@ -17,14 +17,17 @@
 module Crowbar
   module Client
     module Request
-      module Reset
-        class Nodes < Base
+      module Backup
+        class List < Base
           def method
             :get
           end
 
           def url
-            [].join("/")
+            [
+              "utils",
+              "backups"
+            ].join("/")
           end
         end
       end

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

@@ -0,0 +1,48 @@
+#
+# Copyright 2015, 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 "easy_diff"
+
+module Crowbar
+  module Client
+    module Request
+      module Backup
+        class Upload < Base
+          def params
+            {
+              headers: headers,
+              query: {
+                file: attrs.file
+              }
+            }
+          end
+
+          def method
+            :post
+          end
+
+          def url
+            [
+              "utils",
+              "backups",
+              "upload"
+            ].join("/")
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,38 @@
+#
+# Copyright 2015, 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.
+#
+
+module Crowbar
+  module Client
+    module Request
+      module Backup
+        autoload :Create,
+          File.expand_path("../backup/create", __FILE__)
+
+        autoload :Delete,
+          File.expand_path("../backup/delete", __FILE__)
+
+        autoload :Download,
+          File.expand_path("../backup/download", __FILE__)
+
+        autoload :List,
+          File.expand_path("../backup/list", __FILE__)
+
+        autoload :Upload,
+          File.expand_path("../backup/upload", __FILE__)
+      end
+    end
+  end
+end

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

@@ -36,13 +36,13 @@ module Crowbar
         end
 
         def headers
-          @headers ||= {}
+          @headers ||= {
+            "Content-Type" => "application/json",
+            "Accept" => "application/json"
+          }
         end
 
         def params
-          headers["Content-Type"] ||= "application/json"
-          headers["Accept"] ||= "application/json"
-
           {
             body: content.to_json,
             headers: headers

data/lib/crowbar/client/request/node/group.rb

@@ -0,0 +1,39 @@
+#
+# Copyright 2015, 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.
+#
+
+module Crowbar
+  module Client
+    module Request
+      module Node
+        class Group < Base
+          def method
+            :post
+          end
+
+          def url
+            [
+              "nodes",
+              "groups",
+              "1.0",
+              attrs.name,
+              attrs.value
+            ].join("/")
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -24,6 +24,9 @@ module Crowbar
         autoload :Delete,
           File.expand_path("../node/delete", __FILE__)
 
+        autoload :Group,
+          File.expand_path("../node/group", __FILE__)
+
         autoload :List,
           File.expand_path("../node/list", __FILE__)
 

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

@@ -14,13 +14,13 @@
 # limitations under the License.
 #
 
-require "httparty"
+require "httmultiparty"
 
 module Crowbar
   module Client
     module Request
       class Party
-        include HTTParty
+        include HTTMultiParty
 
         follow_redirects true
         format :json

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

@@ -0,0 +1,40 @@
+#
+# Copyright 2015, 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.
+#
+
+module Crowbar
+  module Client
+    module Request
+      module Proposal
+        class Reset < Base
+          def method
+            :post
+          end
+
+          def url
+            [
+              "crowbar",
+              attrs.barclamp,
+              "1.0",
+              "proposals",
+              "reset",
+              attrs.proposal
+            ].join("/")
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -36,6 +36,9 @@ module Crowbar
         autoload :List,
           File.expand_path("../proposal/list", __FILE__)
 
+        autoload :Reset,
+          File.expand_path("../proposal/reset", __FILE__)
+
         autoload :Show,
           File.expand_path("../proposal/show", __FILE__)
 

data/lib/crowbar/client/request.rb

@@ -17,6 +17,9 @@
 module Crowbar
   module Client
     module Request
+      autoload :Backup,
+        File.expand_path("../request/backup", __FILE__)
+
       autoload :Barclamp,
         File.expand_path("../request/barclamp", __FILE__)
 
@@ -47,9 +50,6 @@ module Crowbar
       autoload :Repository,
         File.expand_path("../request/repository", __FILE__)
 
-      autoload :Reset,
-        File.expand_path("../request/reset", __FILE__)
-
       autoload :Role,
         File.expand_path("../request/role", __FILE__)
 

data/lib/crowbar/client/version.rb

@@ -18,8 +18,8 @@ module Crowbar
   module Client
     class Version
       MAJOR = 2
-      MINOR = 2
-      PATCH = 1
+      MINOR = 3
+      PATCH = 0
 
       PRE = nil
 

data/spec/crowbar/client/command/backup/create_spec.rb

@@ -0,0 +1,42 @@
+#
+# Copyright 2015, 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_relative "../../../../spec_helper"
+
+describe "Crowbar::Client::Command::Backup::Create" do
+  include_context "command_context"
+
+  subject do
+    ::Crowbar::Client::Command::Backup::Create.new(
+      stdin,
+      stdout,
+      stderr,
+      backup: {
+        name: "test-backup"
+      }
+    )
+  end
+
+  it "should always return a request class" do
+    expect(subject.request).to(
+      be_a(
+        ::Crowbar::Client::Request::Backup::Create
+      )
+    )
+  end
+
+  pending
+end

data/spec/crowbar/client/command/backup/delete_spec.rb

@@ -0,0 +1,41 @@
+#
+# Copyright 2015, 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_relative "../../../../spec_helper"
+
+describe "Crowbar::Client::Command::Backup::Delete" do
+  include_context "command_context"
+
+  subject do
+    ::Crowbar::Client::Command::Backup::Delete.new(
+      stdin,
+      stdout,
+      stderr,
+      name: "test-backup",
+      created_at: "20150303-170203"
+    )
+  end
+
+  it "should always return a request class" do
+    expect(subject.request).to(
+      be_a(
+        ::Crowbar::Client::Request::Backup::Delete
+      )
+    )
+  end
+
+  pending
+end