oneview-sdk 2.1.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b40e3d92c074afcc638beeaa0e84ce4063cb0c9
-  data.tar.gz: 4d952bb15e6b69223bdde6904166c2c34aa2af63
+  metadata.gz: dd1ac219db19a7c03bf16b3df31b5cccf12e22eb
+  data.tar.gz: 0718886cb26a7ce15a2fe826f0b87bb68d79a06c
 SHA512:
-  metadata.gz: 237e62919555f75a09ac6799f84a22ada01b4f777689c1692dcfac884e1aa92334508b9da3c3f07d49482ea2b65d42c1935562266a4fb49eb3962d7b2b68135c
-  data.tar.gz: 294a44b270bbc152e482042d6b5339066145a34c5a744ba9fa57a3fc6713ffb4500d1934202d573a2334b17867bfd5b1f52984392cb13df60416dace119ae7f0
+  metadata.gz: 86766ecbc79b8bc588235fe3a4d9e0517bfbb7ad530a2f86830ab33efa27e057347da245022fd84a3620a20c500fdada9406696a8292643c8affa7dd1f8726a2
+  data.tar.gz: d43154cbc551777fb2e821c16123712d120c1ef4704046b752ebd6bd4c493e8834358813106cd11f0558883ca5512a31d19f1cccb8230eeb80f56ff218a8ef3b

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+#### v2.2.1
+ - Fixed issue #88 (firmware bundle file size). Uses multipart-post now
+
+### v2.2.0
+ - Added the 'rest' and 'update' commands to the CLI
+ - Removed the --force option from the create_from_file CLI command
+
 ### v2.1.0
  - Fixed issue with the :resource_named method for OneViewSDK::Resource in Ruby 2.3
 

data/README.md

@@ -101,7 +101,7 @@ Each OneView resource is exposed for usage with CRUD-like functionality.
 
 For example, once you instantiate a resource object, you can call intuitive methods such as `resource.create`, `resource.udpate` and `resource.delete`. In addition, resources respond to helpful methods such as `.each`, `.eql?(other_resource)`, `.like(other_resource)`, `.retrieve!`, and many others.
 
-Please see the [rubydoc.info](http://www.rubydoc.info/gems/oneview-sdk) documentation for the complete list and usage details, but here are a few examples to get you started:
+Please see the [rubydoc.info](http://www.rubydoc.info/gems/oneview-sdk) documentation for complete usage details and the [examples](examples/) directory for more examples and test-scripts, but here are a few examples to get you started:
 
 ##### Create a resource
 
@@ -264,6 +264,20 @@ $ oneview-sdk-ruby create_from_file /my-server-profile.json
 $ oneview-sdk-ruby delete_from_file /my-server-profile.json
 ```
 
+##### Update resources by name:
+
+```bash
+$ oneview-sdk-ruby update FCNetwork FC1 -h linkStabilityTime:20  # Using hash format
+$ oneview-sdk-ruby update Volume VOL_01 -j '{"shareable": true}' # Using json format
+```
+
+##### Make REST calls:
+
+```bash
+$ oneview-sdk-ruby rest get rest/fc-networks
+$ oneview-sdk-ruby rest PUT rest/enclosures/<id>/configuration
+```
+
 ##### Start an interactive console session with a OneView connection:
 
 ```bash

data/lib/oneview-sdk/cli.rb

@@ -1,7 +1,7 @@
-# (C) Copyright 2016 Hewlett Packard Enterprise Development LP
+# (c) Copyright 2016 Hewlett Packard Enterprise Development LP
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
-# You may not use this file except in compliance with 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
@@ -201,6 +201,80 @@ module OneviewSDK
       end
     end
 
+    method_option :format,
+      desc: 'Output format',
+      aliases: '-f',
+      enum: %w(json yaml raw),
+      default: 'json'
+    method_option :data,
+      desc: 'Data to pass in the request body (in JSON format)',
+      aliases: '-d'
+    rest_examples =  "\n  oneview-sdk-ruby rest GET rest/fc-networks"
+    rest_examples << "\n  oneview-sdk-ruby rest PUT rest/fc-networks/<id> -d '{\"linkStabilityTime\": 20, ...}'"
+    rest_examples << "\n  oneview-sdk-ruby rest PUT rest/enclosures/<id>/configuration"
+    desc 'rest METHOD URI', "Make REST call to the OneView API. Examples:#{rest_examples}"
+    def rest(method, uri)
+      client_setup('log_level' => :error)
+      uri_copy = uri.dup
+      uri_copy.prepend('/') unless uri_copy.start_with?('/')
+      if @options['data']
+        begin
+          data = { body: JSON.parse(@options['data']) }
+        rescue JSON::ParserError => e
+          fail_nice("Failed to parse data as JSON\n#{e.message}")
+        end
+      end
+      data ||= {}
+      response = @client.rest_api(method, uri_copy, data)
+      if response.code.to_i.between?(200, 299)
+        case @options['format']
+        when 'yaml'
+          puts JSON.parse(response.body).to_yaml
+        when 'json'
+          puts JSON.pretty_generate(JSON.parse(response.body))
+        else # raw
+          puts response.body
+        end
+      else
+        body = JSON.pretty_generate(JSON.parse(response.body)) rescue response.body
+        fail_nice("Request failed: #{response.inspect}\nHeaders: #{response.to_hash}\nBody: #{body}")
+      end
+    rescue OneviewSDK::InvalidRequest => e
+      fail_nice(e.message)
+    end
+
+    method_option :hash,
+      type: :hash,
+      desc: 'Hash of key/value pairs to update',
+      aliases: '-h'
+    method_option :json,
+      desc: 'JSON data to pass in the request body',
+      aliases: '-j'
+    update_examples =  "\n  oneview-sdk-ruby update FCNetwork FC1 -h linkStabilityTime:20"
+    update_examples << "\n  oneview-sdk-ruby update Volume VOL1 -j '{\"shareable\": true}'"
+    desc 'update TYPE NAME --[hash|json] <data>', "Update resource by name. Examples:#{update_examples}"
+    def update(type, name)
+      resource_class = parse_type(type)
+      client_setup
+      fail_nice 'Must set the hash or json option' unless @options['hash'] || @options['json']
+      fail_nice 'Must set the hash OR json option. Not both' if @options['hash'] && @options['json']
+      begin
+        data = @options['hash'] || JSON.parse(@options['json'])
+      rescue JSON::ParserError => e
+        fail_nice("Failed to parse json\n#{e.message}")
+      end
+      matches = resource_class.find_by(@client, name: name)
+      fail_nice 'Not Found' if matches.empty?
+      resource = matches.first
+      begin
+        resource[:uri] = '/rest/storage-volumes/57A22A70-73EC-43C1-91B9-9FABD1E'
+        resource.update(data)
+        output 'Updated Successfully!'
+      rescue StandardError => e
+        fail_nice "Failed to update #{resource.class.name.split('::').last} '#{name}': #{e}"
+      end
+    end
+
     method_option :force,
       desc: 'Delete without confirmation',
       type: :boolean,
@@ -245,17 +319,12 @@ module OneviewSDK
       end
     end
 
-    method_option :force,
-      desc: 'Overwrite without confirmation',
-      type: :boolean,
-      aliases: '-f'
     method_option :if_missing,
       desc: 'Only create if missing (Don\'t update)',
       type: :boolean,
       aliases: '-i'
-    desc 'create_from_file FILE_PATH', 'Create/Overwrite resource defined in file'
+    desc 'create_from_file FILE_PATH', 'Create/Update resource defined in file'
     def create_from_file(file_path)
-      fail_nice "Can't use the 'force' and 'if_missing' flags at the same time." if options['force'] && options['if_missing']
       client_setup
       resource = OneviewSDK::Resource.from_file(@client, file_path)
       resource[:uri] = nil
@@ -266,7 +335,6 @@ module OneviewSDK
           puts "Skipped: '#{resource[:name]}': #{resource.class.name.split('::').last} already exists."
           return
         end
-        fail_nice "#{resource.class.name.split('::').last} '#{resource[:name]}' already exists." unless options['force']
         begin
           resource.data.delete('uri')
           existing_resource.update(resource.data)
@@ -338,7 +406,8 @@ module OneviewSDK
         next unless klass.is_a?(Class) && klass < OneviewSDK::Resource
         valid_classes.push(klass.name.split('::').last)
       end
-      OneviewSDK.resource_named(type) || fail_nice("Invalid resource type: '#{type}'.\n  Valid options are #{valid_classes}")
+      vc = valid_classes.sort_by!(&:downcase).join("\n  ")
+      OneviewSDK.resource_named(type) || fail_nice("Invalid resource type: '#{type}'.  Valid options are:\n  #{vc}")
     end
 
     # Parse options hash from input. Handles chaining and keywords such as true/false & nil

data/lib/oneview-sdk/resource/firmware_bundle.rb

@@ -8,12 +8,13 @@
 # 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 'openssl'
+require 'net/http/post/multipart'
 
 module OneviewSDK
   # Firmware bundle resource implementation
   class FirmwareBundle
     BASE_URI = '/rest/firmware-bundles'.freeze
-    BOUNDARY = '----011000010111000001101001'.freeze
 
     # Uploads a firmware bundle file
     # @param [OneviewSDK::Client] client The client object for the OneView appliance
@@ -22,15 +23,28 @@ module OneviewSDK
     def self.add(client, file_path)
       fail NotFound, "ERROR: File '#{file_path}' not found!" unless File.file?(file_path)
       options = {}
-      options['Content-Type'] = "multipart/form-data; boundary=#{BOUNDARY}"
+      options['Content-Type'] = 'multipart/form-data'
+      options['X-Api-Version'] = client.api_version.to_s
+      options['auth'] = client.token
       options['uploadfilename'] = File.basename(file_path)
-      options['body'] = "--#{BOUNDARY}\r\n"
-      options['body'] << "Content-Disposition: form-data; name=\"file\"; filename=\"#{File.basename(file_path)}\"\r\n"
-      options['body'] << "Content-Type: application/octet-stream; Content-Transfer-Encoding: binary\r\n\r\n"
-      options['body'] << "#{IO.binread(file_path)}\r\n--#{BOUNDARY}--"
-      response = client.rest_post(BASE_URI, options)
-      data = client.response_handler(response)
-      OneviewSDK::FirmwareDriver.new(client, data)
+      url = URI.parse(URI.escape("#{client.url}#{BASE_URI}"))
+
+      File.open(file_path) do |file|
+        req = Net::HTTP::Post::Multipart.new(
+          url.path,
+          { 'file' => UploadIO.new(file, 'application/octet-stream', File.basename(file_path)) },
+          options
+        )
+
+        http_request = Net::HTTP.new(url.host, url.port)
+        http_request.use_ssl = true
+        http_request.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        http_request.start do |http|
+          response = http.request(req)
+          data = client.response_handler(response)
+          return OneviewSDK::FirmwareDriver.new(client, data)
+        end
+      end
     end
   end
 end

data/lib/oneview-sdk/rest.rb

@@ -180,7 +180,7 @@ module OneviewSDK
       when :delete
         request = Net::HTTP::Delete.new(uri.request_uri)
       else
-        fail InvalidRequest, "Invalid rest call: #{type}"
+        fail InvalidRequest, "Invalid rest method: #{type}. Valid methods are: get, post, put, patch, delete"
       end
 
       options['X-API-Version'] ||= api_ver

data/lib/oneview-sdk/version.rb

@@ -11,5 +11,5 @@
 
 # Gem version defined here
 module OneviewSDK
-  VERSION = '2.1.0'.freeze
+  VERSION = '2.2.1'.freeze
 end

data/oneview-sdk.gemspec

@@ -32,6 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'thor'
   spec.add_runtime_dependency 'highline'
   spec.add_runtime_dependency 'pry'
+  spec.add_runtime_dependency 'multipart-post'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rspec'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oneview-sdk
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Henrique Diomede
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-06 00:00:00.000000000 Z
+date: 2016-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -55,6 +55,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: multipart-post
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -212,7 +226,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Gem to interact with oneview API