nifty-cloud-sdk 1.8.beta1 → 1.9.beta1

data/test/test_Cloud_security_groups.rb

@@ -20,6 +20,8 @@ context "security_groups" do
 
     @valid_ip_protocol = %w(TCP UDP ICMP SSH HTTP HTTPS SMTP POP3 IMAP)
     @valid_in_out = %w(IN In in Out Out out)
+    @valid_course_update = [1, 2, '1', '2']
+    @valid_boolean = [true, false, 'true', 'false']
 
     @basic_ip_permissions = {:ip_protocol => 'HTTP', :group_name => 'gr2'}
     @basic_auth_security_params = {:group_name => 'gr1', :ip_permissions => @basic_ip_permissions}
@@ -85,6 +87,10 @@ context "security_groups" do
               <instanceId>server02</instanceId>    
             </member>      
           </instances>        
+          <groupRuleLimit>10</groupRuleLimit>
+          <groupLogLimit>1000</groupLogLimit>
+          <groupLogFilterNetBios>true</groupLogFilterNetBios>
+          <availabilityZone>east-11</availabilityZone>
         </item>          
       </securityGroupInfo>            
     </DescribeSecurityGroupsResponse>              
@@ -140,6 +146,21 @@ context "security_groups" do
 2011-01-09T11:21:53+09:00 Altor_VNF time=2297218603613 fw_id=4 src_ip=10.0.6.201 src_port=68 dst_ip=10.0.4.11  dst_port=67 ip_proto=17 action=accept vm_id=16853 rule_id=52 type=fw</log>
     </DescribeSecurityActivitiesResponse>                    
     RESPONSE
+
+    @update_security_group_option_response_body = <<-RESPONSE
+    <UpdateSecurityGroupOptionResponse xmlns="https://cp.cloud.nifty.com/api/">
+      <requestId>320fc738-a1c7-4a2f-abcb-20813a4e997c</requestId>
+      <return>true</return>
+    </UpdateSecurityGroupOptionResponse>
+    RESPONSE
+
+    @describe_security_group_option_response_body = <<-RESPONSE
+    <DescribeSecurityGroupOptionResponse xmlns="https://cp.cloud.nifty.com/api/">
+      <requestId>320fc738-a1c7-4a2f-abcb-20813a4e997c</requestId>
+      <course>2</course>
+      <securityGroupLimit>25</securityGroupLimit>
+    </DescribeSecurityGroupOptionResponse>
+    RESPONSE
   end
 
 
@@ -222,10 +243,12 @@ context "security_groups" do
     @api.stubs(:make_request).with("Action" => "UpdateSecurityGroup",
                                    "GroupName" => "a",
                                    "GroupNameUpdate" => "a",
-                                   "GroupDescriptionUpdate" => "a"
+                                   "GroupDescriptionUpdate" => "a",
+                                   "GroupLogLimitUpdate" => "1000",
+                                   "GroupLogFilterNetBios" => "true"
                                   ).returns stub(:body => @update_security_group_response_body, :is_a? => true)
     @api.stubs(:exec_request).returns stub(:body => @update_security_group_response_body, :is_a? => true)
-    response = @api.update_security_group(:group_name => "a", :group_name_update => "a", :group_description_update => "a")
+    response = @api.update_security_group(:group_name => "a", :group_name_update => "a", :group_description_update => "a", :group_log_limit_update => 1000, :group_log_filter_net_bios => true)
   end
 
   specify "update_security_group - :group_name正常" do
@@ -244,6 +267,20 @@ context "security_groups" do
     @api.stubs(:exec_request).returns stub(:body => @update_security_group_response_body, :is_a? => true)
     lambda { @api.update_security_group(:group_name => 'foo', :group_description_update => 'テスト') }.should.not.raise(NIFTY::ArgumentError)
   end
+
+  specify "update_security_group - :group_log_limit_update正常" do
+    @api.stubs(:exec_request).returns stub(:body => @update_security_group_response_body, :is_a? => true)
+    [1, 1000, '1', '1000'].each do |limit|
+      lambda { @api.update_security_group(:group_name => 'foo', :group_log_limit_update => limit) }.should.not.raise(NIFTY::ArgumentError)
+    end
+  end
+
+  specify "update_security_group - :group_log_filter_net_bios正常" do
+    @api.stubs(:exec_request).returns stub(:body => @update_security_group_response_body, :is_a? => true)
+    @valid_boolean.each do |boolean|
+      lambda { @api.update_security_group(:group_name => 'foo', :group_log_filter_net_bios => boolean) }.should.not.raise(NIFTY::ArgumentError)
+    end
+  end
   
   specify "update_security_group - :group_name未指定/不正" do
     lambda { @api.update_security_group }.should.raise(NIFTY::ArgumentError)
@@ -252,6 +289,20 @@ context "security_groups" do
     lambda { @api.update_security_group(:group_name => 'Group_name') }.should.raise(NIFTY::ArgumentError)
   end
 
+  specify "update_security_group - :group_log_limit_update不正" do
+    @api.stubs(:exec_request).returns stub(:body => @update_security_group_response_body, :is_a? => true)
+    ['hoge'].each do |limit|
+      lambda { @api.update_security_group(:group_name => 'foo', :group_log_limit_update => limit) }.should.raise(NIFTY::ArgumentError)
+    end
+  end
+
+  specify "update_security_group - :group_log_filter_net_bios不正" do
+    @api.stubs(:exec_request).returns stub(:body => @update_security_group_response_body, :is_a? => true)
+    [1, 'foobar'].each do |boolean|
+      lambda { @api.update_security_group(:group_name => 'foo', :group_log_filter_net_bios => boolean) }.should.raise(NIFTY::ArgumentError)
+    end
+  end
+
 
   # describe_security_groups
   specify "describe_security_groups - レスポンスを正しく解析できるか" do
@@ -275,6 +326,10 @@ context "security_groups" do
     response.securityGroupInfo.item[0].ipPermissions.item[1].groups.item[0].groupName.should.equal 'Web'
     response.securityGroupInfo.item[0].instances.member[0].instanceId[0].should.equal 'server01'
     response.securityGroupInfo.item[0].instances.member[0].instanceId[1].should.equal 'server02'
+    response.securityGroupInfo.item[0].groupRuleLimit.should.equal '10'
+    response.securityGroupInfo.item[0].groupLogLimit.should.equal '1000'
+    response.securityGroupInfo.item[0].groupLogFilterNetBios.should.equal 'true'
+    response.securityGroupInfo.item[0].availabilityZone.should.equal 'east-11'
   end
 
   specify "describe_security_groups - パラメータが正しく作られるか" do
@@ -697,4 +752,88 @@ context "security_groups" do
     lambda { @api.describe_security_activities(:group_name => 'foo', :range_end_number => 0) }.should.raise(NIFTY::ArgumentError)
     lambda { @api.describe_security_activities(:group_name => 'foo', :range_start_number => 5, :range_end_number => 1) }.should.raise(NIFTY::ArgumentError)
   end
+
+
+  # update_security_group_option
+  specify "update_security_group_option - レスポンスを正しく解析できるか" do
+    @api.stubs(:exec_request).returns stub(:body => @update_security_group_option_response_body, :is_a? => true)
+    response = @api.update_security_group_option(:group_name => 'default(Linux)')
+    response.requestId.should.equal '320fc738-a1c7-4a2f-abcb-20813a4e997c'
+    response.return.should.equal 'true'
+  end
+
+  specify "update_security_group_option - パラメータが正しく作られるか" do
+    @api.stubs(:make_request).with("Action" => "UpdateSecurityGroupOption",
+                                   "CourseUpdate" => "2",
+                                   "CourseUpdate.Agreement" => "true",
+                                   "SecurityGroupLimitUpdate" => "20"
+                                  ).returns stub(:body => @update_security_group_option_response_body, :is_a? => true)
+    @api.stubs(:exec_request).returns stub(:body => @update_security_group_option_response_body, :is_a? => true)
+    response = @api.update_security_group_option(:course_update => 2, :agreement => true, :security_group_limit_update => 20)
+  end
+
+  specify "update_security_group_option - :course_update正常" do
+    @api.stubs(:exec_request).returns stub(:body => @update_security_group_option_response_body, :is_a? => true)
+    @valid_course_update.each do |course_update|
+      lambda { @api.update_security_group_option(:course_update => course_update, :agreement => true) }.should.not.raise(NIFTY::ArgumentError)
+    end
+  end
+
+  specify "update_security_group_option - :agreement正常" do
+    @api.stubs(:exec_request).returns stub(:body => @update_security_group_option_response_body, :is_a? => true)
+    @valid_boolean.each do |agreement|
+      lambda { @api.update_security_group_option(:agreement => agreement) }.should.not.raise(NIFTY::ArgumentError)
+    end
+  end
+
+  specify "update_security_group_option - :security_group_limit_update正常" do
+    @api.stubs(:exec_request).returns stub(:body => @update_security_group_option_response_body, :is_a? => true)
+    [1, 1000, '1', '1000'].each do |limit|
+      lambda { @api.update_security_group_option(:security_group_limit_update => limit) }.should.not.raise(NIFTY::ArgumentError)
+    end
+  end
+
+  specify "update_security_group_option - :course_update不正" do
+    @api.stubs(:exec_request).returns stub(:body => @update_security_group_option_response_body, :is_a? => true)
+    [3 ,'hoge'].each do |course_update|
+      lambda { @api.update_security_group_option(:course_update => course_update, :agreement => true) }.should.raise(NIFTY::ArgumentError)
+    end
+  end
+
+  specify "update_security_group_option - :agreement不正" do
+    @api.stubs(:exec_request).returns stub(:body => @update_security_group_option_response_body, :is_a? => true)
+    [1, 'fuga'].each do |agreement|
+      lambda { @api.update_security_group_option(:agreement => agreement) }.should.raise(NIFTY::ArgumentError)
+    end
+  end
+
+  specify "update_security_group_option - :agreement未指定 - :course_update=2指定時" do
+    @api.stubs(:exec_request).returns stub(:body => @update_security_group_option_response_body, :is_a? => true)
+    [2, '2'].each do |x|
+      lambda { @api.update_security_group_option(:course_update => x) }.should.raise(NIFTY::ArgumentError)
+    end
+  end
+
+
+  specify "update_security_group_option - :security_group_limit_update不正" do
+    @api.stubs(:exec_request).returns stub(:body => @update_security_group_option_response_body, :is_a? => true)
+    ['foobar'].each do |limit|
+      lambda { @api.update_security_group_option(:security_group_limit_update => limit) }.should.raise(NIFTY::ArgumentError)
+    end
+  end
+
+  # describe_security_group_option
+  specify "describe_security_group_option - レスポンスを正しく解析できるか" do
+    @api.stubs(:exec_request).returns stub(:body => @describe_security_group_option_response_body, :is_a? => true)
+    response = @api.describe_security_group_option(:group_name => 'default(Linux)')
+    response.requestId.should.equal '320fc738-a1c7-4a2f-abcb-20813a4e997c'
+    response.course.should.equal '2'
+    response.securityGroupLimit.should.equal '25'
+  end
+
+  specify "describe_security_group_option - パラメータが正しく作られるか" do
+    @api.stubs(:make_request).with("Action" => "DescribeSecurityGroupOption").returns stub(:body => @describe_security_group_option_response_body, :is_a? => true)
+    @api.stubs(:exec_request).returns stub(:body => @describe_security_group_option_response_body, :is_a? => true)
+    response = @api.describe_security_group_option()
+  end
 end

data/test/test_Cloud_uploads.rb

@@ -0,0 +1,105 @@
+# coding:utf-8
+#--
+# ニフティクラウドSDK for Ruby
+#
+# Ruby Gem Name::  nifty-cloud-sdk
+# Author::    NIFTY Corporation
+# Copyright:: Copyright 2011 NIFTY Corporation All Rights Reserved.
+# License::   Distributes under the same terms as Ruby
+# Home::      http://cloud.nifty.com/api/
+#++
+
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+context "instances" do
+
+  before do
+    @api = NIFTY::Cloud::Base.new( :access_key_id => "not a key", :secret_access_key => "not a secret",
+                                    :server => 'cp.cloud.nifty.com', :path => '/api/1.7/', :user_agent => 'NIFTY Cloud API Ruby SDK',
+                                    :signature_version => '2', :signature_method => 'HmacSHA256')
+
+    @describe_uploads_response_body = <<-RESPONSE
+    <DescribeUploadsResponse xmlns="https://cp.cloud.nifty.com/api/">
+     <uploads>
+      <item>
+       <conversionTaskId>d6f1ba72-0a76-4b1d-8421-a4f6089d3d7a</conversionTaskId>
+       <expirationTime>2010-10-13T19:17:28.799+09:00</expirationTime>
+       <importInstance>
+        <availabilityZone>east-11</availabilityZone>
+        <image>
+         <format>VMDK</format>
+         <size>3489231321</size>
+        </image>
+        <instanceId>server01</instanceId>
+       </importInstance>
+      </item>
+     </uploads>
+    </DescribeUploadsResponse>
+    RESPONSE
+
+    @cancel_upload_response_body = <<-RESPONSE
+    <CancelUploadResponse xmlns="https://cp.cloud.nifty.com/api/">
+     <requestId>f6dd8353-eb6b-6b4fd32e4f05</requestId>
+     <return>true</return>
+    </CancelUploadResponse>
+    RESPONSE
+  end
+
+
+  # describe_uploads
+  specify "describe_uploads - レスポンスを正しく解析できるか" do
+    @api.stubs(:exec_request).returns stub(:body => @describe_uploads_response_body, :is_a? => true)
+
+    response = @api.describe_uploads( :conversion_task_id => "server01" )
+    response.uploads.item[0].conversionTaskId.should.equal "d6f1ba72-0a76-4b1d-8421-a4f6089d3d7a"
+    response.uploads.item[0].expirationTime.should.equal "2010-10-13T19:17:28.799+09:00"
+    response.uploads.item[0].importInstance.availabilityZone.should.equal "east-11"
+    response.uploads.item[0].importInstance.image.format.should.equal "VMDK"
+    response.uploads.item[0].importInstance.image["size"].should.equal "3489231321"
+    response.uploads.item[0].importInstance.instanceId.should.equal "server01"
+  end
+
+  specify "describe_uploads - パラメータが正しく作られるか" do
+    @api.stubs(:make_request).with('Action' => 'DescribeUploads', 
+                                   'ConversionTaskId.1' => 'd6f1ba72-0a76-4b1d-8421-a4f6089d3d7a',
+                                   'ConversionTaskId.2' => 'd6f1ba72-0a76-4b1d-8421-a4f6089d3d7b').returns stub(:body => @describe_uploads_response_body, :is_a? => true)
+    @api.stubs(:exec_request).returns stub(:body => @describe_uploads_response_body, :is_a? => true)
+    response = @api.describe_uploads( :conversion_task_id => %w(d6f1ba72-0a76-4b1d-8421-a4f6089d3d7a d6f1ba72-0a76-4b1d-8421-a4f6089d3d7b) )
+  end
+
+  specify "describe_uploads - :conversion_task_id正常" do
+    @api.stubs(:exec_request).returns stub(:body => @describe_uploads_response_body, :is_a? => true)
+    lambda { @api.describe_uploads }.should.not.raise(NIFTY::ArgumentError)
+    lambda { @api.describe_uploads(:conversion_task_id => 12345) }.should.not.raise(NIFTY::ArgumentError)
+    lambda { @api.describe_uploads(:conversion_task_id => %w(foo bar hoge)) }.should.not.raise(NIFTY::ArgumentError)
+  end
+
+
+  # cancel_upload
+  specify "cancel_upload - レスポンスを正しく解析できるか" do
+    @api.stubs(:exec_request).returns stub(:body => @cancel_upload_response_body, :is_a? => true)
+    response = @api.cancel_upload(:conversion_task_id => 'copyserver')
+    response.requestId.should.equal "f6dd8353-eb6b-6b4fd32e4f05"
+    response.return.should.equal "true"
+  end
+
+  specify "cancel_upload - パラメータが正しく作られるか" do
+    @api.stubs(:make_request).with('Action' => 'CancelUpload',
+                                   'ConversionTaskId' => 'd6f1ba72-0a76-4b1d-8421-a4f6089d3d7a1'
+                                  ).returns stub(:body => @cancel_upload_response_body, :is_a? => true)
+    @api.stubs(:exec_request).returns stub(:body => @cancel_upload_response_body, :is_a? => true)
+    response = @api.cancel_upload( :conversion_task_id => "d6f1ba72-0a76-4b1d-8421-a4f6089d3d7a1" )
+  end
+
+  specify "cancel_upload - :conversion_task_id正常" do
+    @api.stubs(:exec_request).returns stub(:body => @cancel_upload_response_body, :is_a? => true)
+    lambda { @api.cancel_upload(:conversion_task_id => 'foo') }.should.not.raise(NIFTY::ArgumentError)
+    lambda { @api.cancel_upload(:conversion_task_id => 12345) }.should.not.raise(NIFTY::ArgumentError)
+  end
+
+  specify "cancel_upload - :conversion_task_id未指定" do
+    lambda { @api.cancel_upload }.should.raise(NIFTY::ArgumentError)
+    lambda { @api.cancel_upload(:conversion_task_id => nil) }.should.raise(NIFTY::ArgumentError)
+    lambda { @api.cancel_upload(:conversion_task_id => '') }.should.raise(NIFTY::ArgumentError)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: nifty-cloud-sdk
 version: !ruby/object:Gem::Version 
-  hash: 62196225
+  hash: 62196233
   prerelease: 4
   segments: 
   - 1
-  - 8
+  - 9
   - beta
   - 1
-  version: 1.8.beta1
+  version: 1.9.beta1
 platform: ruby
 authors: 
 - NIFTY Corporation
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-12 00:00:00 +09:00
+date: 2012-11-24 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -150,7 +150,9 @@ files:
 - README.rdoc
 - lib/NIFTY/Cloud/certificates.rb
 - lib/NIFTY/Cloud/availability_zones.rb
+- lib/NIFTY/Cloud/resources.rb
 - lib/NIFTY/Cloud/images.rb
+- lib/NIFTY/Cloud/uploads.rb
 - lib/NIFTY/Cloud/security_groups.rb
 - lib/NIFTY/Cloud/instances.rb
 - lib/NIFTY/Cloud/keypairs.rb
@@ -213,6 +215,7 @@ files:
 - sample/load_balancers/describe-instance-health.rb
 - sample/load_balancers/register-instances-with-load-balancer.rb
 - test/test_Cloud.rb
+- test/test_Cloud_uploads.rb
 - test/test_Cloud_load_balancers.rb
 - test/test_Cloud_instances.rb
 - test/test_Cloud_responses.rb
@@ -221,6 +224,7 @@ files:
 - test/test_Cloud_availability_zones.rb
 - test/test_Cloud_images.rb
 - test/test_helper.rb
+- test/test_Cloud_resources.rb
 - test/test_Cloud_security_groups.rb
 - test/test_Cloud_keypairs.rb
 has_rdoc: true
@@ -267,6 +271,7 @@ specification_version: 3
 summary: NIFTY Cloud SDK for Ruby
 test_files: 
 - test/test_Cloud.rb
+- test/test_Cloud_uploads.rb
 - test/test_Cloud_load_balancers.rb
 - test/test_Cloud_instances.rb
 - test/test_Cloud_responses.rb
@@ -275,5 +280,6 @@ test_files:
 - test/test_Cloud_availability_zones.rb
 - test/test_Cloud_images.rb
 - test/test_helper.rb
+- test/test_Cloud_resources.rb
 - test/test_Cloud_security_groups.rb
 - test/test_Cloud_keypairs.rb