crowbar-client 3.1.3 → 3.1.4

data/lib/crowbar/client/command/database/test.rb

@@ -0,0 +1,59 @@
+#
+# 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 "easy_diff"
+
+module Crowbar
+  module Client
+    module Command
+      module Database
+        #
+        # Implementation for the database test command
+        #
+        class Test < Base
+          include Mixin::Database
+
+          def args_with_options
+            args.easy_merge!(
+              username: options.db_username,
+              password: options.db_password,
+              database: options.database,
+              host: options.host,
+              port: options.port
+            )
+          end
+
+          def request
+            @request ||= Request::Database::Test.new(
+              args_with_options
+            )
+          end
+
+          def execute
+            request.process do |request|
+              case request.code
+              when 200
+                say "Successfully tested connection to database"
+              else
+                err request.parsed_response["error"]
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -35,12 +35,12 @@ module Crowbar
             request.process do |request|
               case request.code
               when 200
-                formatter = Formatter::Nested.new(
+                formatter = Formatter::Hash.new(
                   format: provide_format,
-                  headings: ["Check", "Successful"],
-                  values: Filter::Subset.new(
+                  headings: ["Check ID", "Passed", "Required", "Errors", "Help"],
+                  values: Filter::Hash.new(
                     filter: provide_filter,
-                    values: request.parsed_response
+                    values: content_from(request)
                   ).result
                 )
 
@@ -54,6 +54,30 @@ module Crowbar
               end
             end
           end
+
+          protected
+
+          def content_from(request)
+            [].tap do |row|
+              request.parsed_response["checks"].each do |check_id, values|
+                row.push(
+                  check_id: check_id,
+                  passed: values["passed"],
+                  required: values["required"],
+                  errors: if values["errors"].key?(check_id)
+                            values["errors"][check_id]["data"].inspect
+                          else
+                            nil
+                          end,
+                  help: if values["errors"].key?(check_id)
+                          values["errors"][check_id]["help"].inspect
+                        else
+                          nil
+                        end
+                )
+              end
+            end
+          end
         end
       end
     end

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

@@ -29,7 +29,7 @@ module Crowbar
         REGEX_IPV4 = "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$".freeze
         REGEX_USERNAME = "(?=^.{4,63}$)(?=^[a-zA-Z0-9_]*$)".freeze
         REGEX_PASSWORD = "(?=^.{4,63}$)(?=^[a-zA-Z0-9_]*$)(?=[a-zA-Z0-9_$&+,:;=?@#|'<>.^*()%!-]*$)".freeze
-        REGEX_DATABASE = "(?=^.{1,63}$)(?=^[a-zA-Z0-9_]*$)(?=[a-zA-Z0-9_$&+,:;=?@#|'<>.^*()%!-]*$)".freeze
+        REGEX_DATABASE = "(?=^.{4,253}$)(?=^[a-zA-Z0-9_]*$)(?=[a-zA-Z0-9_$&+,:;=?@#|'<>.^*()%!-]*$)".freeze
         REGEX_PORT = "(?=^.{1,5}$)(?=^[0-9]*$)(?=^([1-9][0-9]{0,3}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])$)".freeze
 
         included do

data/lib/crowbar/client/request.rb

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

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

@@ -0,0 +1,35 @@
+#
+# 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.
+#
+
+module Crowbar
+  module Client
+    module Request
+      #
+      # Module for the database request implementations
+      #
+      module Database
+        autoload :Connect,
+          File.expand_path("../database/connect", __FILE__)
+
+        autoload :Create,
+          File.expand_path("../database/create", __FILE__)
+
+        autoload :Test,
+          File.expand_path("../database/test", __FILE__)
+      end
+    end
+  end
+end

data/lib/crowbar/client/request/database/connect.rb

@@ -0,0 +1,78 @@
+#
+# 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 "easy_diff"
+
+module Crowbar
+  module Client
+    module Request
+      module Database
+        #
+        # Implementation for the database connect request
+        #
+        class Connect < Base
+          #
+          # Override the request headers
+          #
+          # @return [Hash] the headers for the request
+          #
+          def headers
+            super.easy_merge!(
+              ::Crowbar::Client::Util::ApiVersion.new(2.0).headers
+            )
+          end
+
+          #
+          # Override the request content
+          #
+          # @return [Hash] the content for the request
+          #
+          def content
+            super.easy_merge!(
+              username: attrs.db_username,
+              password: attrs.db_password,
+              database: attrs.database,
+              host: attrs.host,
+              port: attrs.port
+            )
+          end
+
+          #
+          # HTTP method that gets used by the request
+          #
+          # @return [Symbol] the method for the request
+          #
+          def method
+            :post
+          end
+
+          #
+          # Path to the API endpoint for the request
+          #
+          # @return [String] path to the API endpoint
+          #
+          def url
+            [
+              "api",
+              "database",
+              "connect"
+            ].join("/")
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,75 @@
+#
+# 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 "easy_diff"
+
+module Crowbar
+  module Client
+    module Request
+      module Database
+        #
+        # Implementation for the database create request
+        #
+        class Create < Base
+          #
+          # Override the request headers
+          #
+          # @return [Hash] the headers for the request
+          #
+          def headers
+            super.easy_merge!(
+              ::Crowbar::Client::Util::ApiVersion.new(2.0).headers
+            )
+          end
+
+          #
+          # Override the request content
+          #
+          # @return [Hash] the content for the request
+          #
+          def content
+            super.easy_merge!(
+              username: attrs.db_username,
+              password: attrs.db_password
+            )
+          end
+
+          #
+          # HTTP method that gets used by the request
+          #
+          # @return [Symbol] the method for the request
+          #
+          def method
+            :post
+          end
+
+          #
+          # Path to the API endpoint for the request
+          #
+          # @return [String] path to the API endpoint
+          #
+          def url
+            [
+              "api",
+              "database",
+              "new"
+            ].join("/")
+          end
+        end
+      end
+    end
+  end
+end

data/lib/crowbar/client/request/database/test.rb

@@ -0,0 +1,78 @@
+#
+# 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 "easy_diff"
+
+module Crowbar
+  module Client
+    module Request
+      module Database
+        #
+        # Implementation for the database test request
+        #
+        class Test < Base
+          #
+          # Override the request headers
+          #
+          # @return [Hash] the headers for the request
+          #
+          def headers
+            super.easy_merge!(
+              ::Crowbar::Client::Util::ApiVersion.new(2.0).headers
+            )
+          end
+
+          #
+          # Override the request content
+          #
+          # @return [Hash] the content for the request
+          #
+          def content
+            super.easy_merge!(
+              username: attrs.db_username,
+              password: attrs.db_password,
+              database: attrs.database,
+              host: attrs.host,
+              port: attrs.port
+            )
+          end
+
+          #
+          # HTTP method that gets used by the request
+          #
+          # @return [Symbol] the method for the request
+          #
+          def method
+            :post
+          end
+
+          #
+          # Path to the API endpoint for the request
+          #
+          # @return [String] path to the API endpoint
+          #
+          def url
+            [
+              "api",
+              "database",
+              "test"
+            ].join("/")
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -67,8 +67,8 @@ module Crowbar
             when "crowbar"
               [
                 "api",
-                "crowbar",
-                "backups"
+                "upgrade",
+                "adminbackup"
               ].join("/")
             when "openstack"
               [

data/lib/crowbar/client/version.rb

@@ -33,7 +33,7 @@ module Crowbar
       #
       # Patch version
       #
-      PATCH = 3
+      PATCH = 4
 
       #
       # Optional suffix

data/spec/crowbar/client/command/database/connect_spec.rb

@@ -0,0 +1,31 @@
+#
+# 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_relative "../../../../spec_helper"
+
+describe "Crowbar::Client::Command::Database::Connect" do
+  include_context "command_context"
+
+  it_behaves_like "a command class", true do
+    subject do
+      ::Crowbar::Client::Command::Database::Connect.new(
+        stdin,
+        stdout,
+        stderr
+      )
+    end
+  end
+end