mos-sdk 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 455d1131325499109ae500a832783420c65cb5e3
-  data.tar.gz: f54ef15c9b4fd39a55aa1933cde9d0117a9ce55c
+  metadata.gz: 744eaa67cc35169c21dd0145f63f49c87d9e4687
+  data.tar.gz: 5682b1b940f1bb0ef548357826ea5fd50632e64b
 SHA512:
-  metadata.gz: 6be66b8c213a809dadab92a00e8efdfc5c988a6c773d582a8f2be4eb7032007b2bf42502510ae433a216613ed185a0f51a294b188ebd8524d50645fe2f7430fd
-  data.tar.gz: b4c6d0405b982f9fb1b0c5c02b9a622ca25a0c1b6c8adfdd32f2687994fc15a9756cfb474adf2ee90a3156093f6dfd623e1c1f5330d64f0c1a23c90689944502
+  metadata.gz: f76d1dde43fe25c6eaf6638de7867c37afd3295367278bf77716dc9f58d37a90bbbe18aa1c3660d8dd60649d2d0abbfa9270d017492837aaf99b2bf6a67d2665
+  data.tar.gz: 21b5dc14afc1559d1e8e721fffbbdaf919bf1057c25624ff6c6c63646a0bb72dc150d7386a9a8016e7d11b93e21c669a5e2e031aa0264c0a3b18fe541c0de358

data/lib/mos-sdk.rb

@@ -113,7 +113,7 @@ class MOS::Client
   # - @param [Integer] datadisk 指定创建虚拟机使用的额外数据盘，单位为1GB
   # - @param [Integer] bandwidth 指定创建虚拟机使用的额外带宽，单位为Mbps
   # - @return [Hash]   创建成功的虚拟机信息
-  def create_instance(imageid, itype, duration=nil, name=nil, keypair=nil, datadisk=nil, bandwidth=nil)
+  def create_instance(imageid, itype, duration=nil, name=nil, keypair=nil, secgroup=nil, datadisk=nil, bandwidth=nil, zone=nil)
     kwargs = {}
     kwargs['ImageId'] = imageid
     kwargs['InstanceType'] = itype
@@ -125,6 +125,8 @@ class MOS::Client
     kwargs['KeyName'] = keypair unless keypair.nil?
     kwargs['ExtraExtDisksize'] = datadisk unless datadisk.nil?
     kwargs['ExtraExtBandwidth'] = bandwidth unless bandwidth.nil?
+    kwargs['GroupId'] = secgroup unless secgroup.nil?
+    kwargs['AvailabilityZoneId'] = zone unless zone.nil?
     val = self.request('CreateInstance', *kwargs)
     val['Instance']
   end
@@ -312,4 +314,4 @@ class MOS::Client
     kwargs['TemplateId'] = tid
     self.request('DeleteTemplate', *kwargs)
   end
-end
+end

data/lib/mos-sdk/base.rb

@@ -72,8 +72,11 @@ class MOS::Base
 
     uri = URI.parse(self.url)
     http = Net::HTTP.new(uri.host, uri.port)
-    http.use_ssl=true
-    http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+    http.open_timeout=@timeout
+    if (uri.scheme == 'https')
+      http.use_ssl=true
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+    end
     http.request_post('/', data, headers)
   end
 

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: mos-sdk
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - yangcs2009
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-20 00:00:00.000000000 Z
+date: 2016-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 description: Ruby SDK for MOS.
@@ -57,17 +57,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Ruby SDK for MOS.