saklient 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea3d7d1ce2e74631267fa33bef7aea4976c5e100
-  data.tar.gz: 884896e9ea1cf5a42fd6e593977253d4c13abca0
+  metadata.gz: 888caa1a7e16911a83fc233a258817fe3fd23bf7
+  data.tar.gz: 9886629e6022f3c4a8ea5313fec7039e2f65999c
 SHA512:
-  metadata.gz: e85eb5d462b07c79246dec157a0c350df22175c3239f541ef8fa597393afa0f400d708fddf4d18f7eb1534b030a3e1edb4aae3e9c6efde7f480d39bcd4acaec7
-  data.tar.gz: 0d1877f0c22d22d7c9cecbb570fda2c8c59e0c16da9230d25dd4f4f8b48c71b8d647b090e5d676c480fdc8692dabbaffd0b6bc58dde0a828b7849dc0347a763c
+  metadata.gz: 59cd3006140c4e5c9afa72f6d8c287ede4c20eebf3f99925801ad6ab1623bc9e71dc01d988eab0691c6575b4bebbafbd28e04dbf491d444765c83a38a7092d73
+  data.tar.gz: dd0b47152232d3caae9e29aaa3cbe4043be34b6257851e9cc60fc897c03ba3fa0ce639bca43a2096000954b4e993803cc6466eaa680bd02c895ef62640bafa88

data/lib/saklient/cloud/client.rb

@@ -78,7 +78,7 @@ module Saklient
 
         extra_headers = {
           'Content-Type'     => 'application/x-www-form-urlencoded',
-          'User-Agent'       => 'saklient.ruby ver-0.0.7 rev-bab628f6f4c2a9d37b38c634b4a514cb66467939',
+          'User-Agent'       => 'saklient.ruby ver-0.0.8 rev-bab628f6f4c2a9d37b38c634b4a514cb66467939',
           'X-Requested-With' => 'XMLHttpRequest',
           'X-Sakura-HTTP-Method' => method,
           'X-Sakura-Error-Level' => 'warning',

data/lib/saklient/cloud/resources/server.rb

@@ -167,6 +167,7 @@ module Saklient
         # ディスクのコピー中は待機し, 完了してからreturnします.
         #
         #                      共有セグメントに接続されている場合はAPIによって自動的に割り当てられるため, 省略またはnullを指定してください.
+        #                      文字列 "skip" を指定すると, ディスク修正処理をスキップします.
         #                   trueを指定した場合は, 複製元の現在のディスク#1から直接クローンします.
         #                   省略またはnullを指定した場合は, 複製元のディスク#1が作成された時のコピー元リソースから再度クローンを試みます.
         #                   既に削除されている場合は, 複製元の現在のディスク#1からの直接クローンにフォールバックします.
@@ -188,6 +189,8 @@ module Saklient
           server = Saklient::Cloud::Resources::Server.new(@_client, nil)
           names = []
           hostNames = []
+          skipConfig = userIpAddress == 'skip'
+          userIpAddress = nil if skipConfig
           if (name).nil? || (hostName).nil?
             model = Saklient::Util::create_class_instance('saklient.cloud.models.Model_Server', [@_client])
             servers = model.limit(0).find
@@ -209,31 +212,38 @@ module Saklient
           if 0 < self.ifaces.length
             iface = self.ifaces[0]
             iface.reload
-            if (iface.ip_address).nil?
-              raise Saklient::Errors::SaklientException.new('invalid_data', 'Setting an IP address to the disconnected interface is not allowed') if (userIpAddress).nil? && (iface.swytch_id).nil?
-            else
-              raise Saklient::Errors::SaklientException.new('invalid_data', 'Setting an IP address to the interface connected to a shared segment is not allowed') if !(userIpAddress).nil?
+            if !(userIpAddress).nil?
+              if (iface.ip_address).nil?
+                raise Saklient::Errors::SaklientException.new('invalid_data', 'Setting an IP address to the disconnected interface is not allowed') if (iface.swytch_id).nil?
+              else
+                raise Saklient::Errors::SaklientException.new('invalid_data', 'Setting an IP address to the interface connected to a shared segment is not allowed')
+              end
             end
           end
           srcDisks = find_disks
           if 0 < srcDisks.length
-            direct = Saklient::Util::are_same(diskSource, true)
-            if (diskSource).nil? || direct
-              diskSource = srcDisks[0].source
-              if !direct
-                if diskSource.is_a?(Saklient::Cloud::Resources::Archive)
-                  begin
-                    diskSource.reload
-                  rescue Saklient::Errors::HttpNotFoundException
-                    diskSource = srcDisks[0]
-                  end
+            if Saklient::Util::are_same(diskSource, true)
+              diskSource = srcDisks[0]
+            else
+              if (diskSource).nil?
+                diskSource = srcDisks[0].source
+                if (diskSource).nil?
+                  diskSource = srcDisks[0]
                 else
-                  if diskSource.is_a?(Saklient::Cloud::Resources::Disk)
+                  if diskSource.is_a?(Saklient::Cloud::Resources::Archive)
                     begin
                       diskSource.reload
                     rescue Saklient::Errors::HttpNotFoundException
                       diskSource = srcDisks[0]
                     end
+                  else
+                    if diskSource.is_a?(Saklient::Cloud::Resources::Disk)
+                      begin
+                        diskSource.reload
+                      rescue Saklient::Errors::HttpNotFoundException
+                        diskSource = srcDisks[0]
+                      end
+                    end
                   end
                 end
               end
@@ -281,21 +291,23 @@ module Saklient
           end
           if !(disk).nil?
             disk.sleep_while_copying
-            diskconf = disk.create_config
-            diskconf.host_name = hostName
-            diskconf.ssh_key = sshKey
-            diskconf.ip_address = userIpAddress
-            if !(userSwytch).nil?
-              if 0 < userSwytch.ipv4_nets.length
-                net = userSwytch.ipv4_nets[0]
-                diskconf.default_route = net.default_route
-                diskconf.network_mask_len = net.mask_len
-              else
-                diskconf.default_route = userSwytch.user_default_route
-                diskconf.network_mask_len = userSwytch.user_mask_len
+            if !skipConfig
+              diskconf = disk.create_config
+              diskconf.host_name = hostName
+              diskconf.ssh_key = sshKey
+              diskconf.ip_address = userIpAddress
+              if !(userSwytch).nil?
+                if 0 < userSwytch.ipv4_nets.length
+                  net = userSwytch.ipv4_nets[0]
+                  diskconf.default_route = net.default_route
+                  diskconf.network_mask_len = net.mask_len
+                else
+                  diskconf.default_route = userSwytch.user_default_route
+                  diskconf.network_mask_len = userSwytch.user_mask_len
+                end
               end
+              diskconf.write
             end
-            diskconf.write
           end
           server.reload
           return server

data/lib/saklient/version.rb

@@ -1,5 +1,5 @@
 # -*- encoding: UTF-8 -*-
 
 module Saklient
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/spec/server_spec.rb

@@ -3,13 +3,15 @@ require 'saklient/cloud/api'
 require 'date'
 require 'SecureRandom'
 
+SKIPS_SERVER_BOOT = true
 TESTS_EASY_DUPLICATE = true
 TESTS_DISK_EXPANSION = false
 
 BREAKS_AFTER_SERVER_UP = false
 BREAKS_AFTER_EASY_DUPLICATE = true
 
-USE_READYMADE_SERVER_ID = 112800244655 # For TESTS_EASY_DUPLICATE
+USE_READYMADE_SERVER_ID = nil # 112800244655 # For TESTS_EASY_DUPLICATE
+CREATES_EMPTY_DISK = true
 
 
 
@@ -77,7 +79,7 @@ describe 'Server' do
   
   
   it 'should be CRUDed' do
-    name = '!ruby_rspec-' + DateTime.now.strftime('%Y%m%d_%H%M%S') + '-' + SecureRandom.uuid[0, 8]
+    name = '!ruby_rspec-' + DateTime.now.strftime('%Y%m%d_%H%M%S') + '-' + SecureRandom.uuid[0, 8] + "-001"
     description = 'This instance was created by saklient.ruby rspec'
     tag = 'saklient-test'
     cpu = 1
@@ -134,7 +136,11 @@ describe 'Server' do
       disk.description = 'This instance was created by saklient.ruby rspec'
       disk.tags = ['saklient-test']
       disk.plan = @api.product.disk.ssd
-      disk.source = archive
+      if CREATES_EMPTY_DISK
+        disk.size_gib = archive.size_gib
+      else
+        disk.source = archive
+      end
       disk.save
       # p disk.dump
       
@@ -182,8 +188,10 @@ describe 'Server' do
       # p disk.dump
       disk.source = nil
       disk.reload
-      expect(disk.source).to be_an_instance_of Saklient::Cloud::Resources::Archive
-      expect(disk.source.id).to eq archive.id
+      unless CREATES_EMPTY_DISK
+        expect(disk.source).to be_an_instance_of Saklient::Cloud::Resources::Archive
+        expect(disk.source.id).to eq archive.id
+      end
       expect(disk.size_gib).to eq archive.size_gib
       
       # connect the disk to the server
@@ -196,91 +204,106 @@ describe 'Server' do
       expect(ip_address).not_to be_empty
       
       # config the disk
-      puts 'writing configuration to the disk...'
-      diskconf = disk.create_config
-      diskconf.host_name = 'saklient-test'
-      diskconf.password = password
-      diskconf.ssh_key = ssh_public_key
-      diskconf.ssh_keys.unshift(additional_ssh_public_key) if !additional_ssh_public_key.empty?
-      diskconf.scripts.push(script)
-      diskconf.write
-      
-      # boot
-      puts 'booting the server...'
-      server.boot
-      sleep 3
-      server.reload
-      expect(server.instance.status).to eq Saklient::Cloud::Enums::EServerInstanceStatus::up
-      
-      # boot conflict
-      puts 'checking the server power conflicts...'
-      ok = false
-      begin
-        server.boot
-      rescue Saklient::Errors::HttpConflictException
-        ok = true
+      unless CREATES_EMPTY_DISK
+        puts 'writing configuration to the disk...'
+        diskconf = disk.create_config
+        diskconf.host_name = 'saklient-test'
+        diskconf.password = password
+        diskconf.ssh_key = ssh_public_key
+        diskconf.ssh_keys.unshift(additional_ssh_public_key) if !additional_ssh_public_key.empty?
+        diskconf.scripts.push(script)
+        diskconf.write
       end
-      fail 'サーバ起動中の起動試行時は HttpConflictException がスローされなければなりません' unless ok
       
-      # ssh
-      cmd = '| ssh -oStrictHostKeyChecking=no -oUserKnownHostsFile=/dev/null -i' + ssh_private_key_file +
-            ' root@' + ip_address + ' hostname 2>/dev/null'
-      ssh_success = false
-      puts 'trying to SSH to the server...'
-      for i in 0..9 do
-        sleep 5
-        sh = open cmd
-        host_name_got = ''
-        while !sh.eof
-          host_name_got += sh.gets
+      unless SKIPS_SERVER_BOOT
+        
+        # boot
+        puts 'booting the server...'
+        server.boot
+        sleep 3
+        server.reload
+        expect(server.instance.status).to eq Saklient::Cloud::Enums::EServerInstanceStatus::up
+        
+        # boot conflict
+        puts 'checking the server power conflicts...'
+        ok = false
+        begin
+          server.boot
+        rescue Saklient::Errors::HttpConflictException
+          ok = true
         end
-        sh.close
-        host_name_got.strip!
-        next unless host_name == host_name_got
-        ssh_success = true
-        break
-      end
-      fail '作成したサーバへ正常にSSHできません' unless ssh_success
-      
-      fail 'SSHに成功後、処理を中断しました' if BREAKS_AFTER_SERVER_UP
-      
-      # stop
-      sleep 1
-      puts 'stopping the server...'
-      server.stop
-      fail 'サーバが正常に停止しません' unless server.sleep_until_down
-      
-      # activity
-      for sample in server.activity.fetch.samples do
-        expect(sample.at).to be_an_instance_of DateTime
+        fail 'サーバ起動中の起動試行時は HttpConflictException がスローされなければなりません' unless ok
+        
+        # ssh
+        unless CREATES_EMPTY_DISK
+          cmd = '| ssh -oStrictHostKeyChecking=no -oUserKnownHostsFile=/dev/null -i' + ssh_private_key_file +
+                ' root@' + ip_address + ' hostname 2>/dev/null'
+          ssh_success = false
+          puts 'trying to SSH to the server...'
+          for i in 0..9 do
+            sleep 5
+            sh = open cmd
+            host_name_got = ''
+            while !sh.eof
+              host_name_got += sh.gets
+            end
+            sh.close
+            host_name_got.strip!
+            next unless host_name == host_name_got
+            ssh_success = true
+            break
+          end
+          fail '作成したサーバへ正常にSSHできません' unless ssh_success
+        end
+          
+        fail 'サーバを起動後、処理を中断しました' if BREAKS_AFTER_SERVER_UP
+        
+        # stop
+        sleep 1
+        puts 'stopping the server...'
+        server.stop
+        fail 'サーバが正常に停止しません' unless server.sleep_until_down
+        
+        # activity
+        for sample in server.activity.fetch.samples do
+          expect(sample.at).to be_an_instance_of DateTime
+        end
+        
       end
       
     end
       
     if TESTS_EASY_DUPLICATE
       puts 'running easy duplicate...'
-      server2 = server.easy_duplicate()
+      server1 = server
+      server2 = server1.easy_duplicate(CREATES_EMPTY_DISK ? 'skip' : nil)
       
       # check the server properties
       expect(server2.id.to_i).to be > 0
-      expect(server2.name.gsub(/-\d+/, '')).to eq name.gsub(/-\d+/, '')
-      expect(server2.host_name.gsub(/-\d+/, '')).to eq host_name.gsub(/-\d+/, '')
-      expect(server2.description).to eq description
+      expect(server2.name.gsub(/-\d+/, '')).to eq server1.name.gsub(/-\d+/, '')
+      expect(server2.host_name.gsub(/-\d+/, '')).to eq server1.host_name.gsub(/-\d+/, '')
+      expect(server2.description).to eq server1.description
       expect(server2.tags).to be_an_instance_of Array
-      expect(server2.tags.length).to eq 1
-      expect(server2.tags[0]).to eq tag
-      expect(server2.plan.cpu).to eq cpu
-      expect(server2.plan.memory_gib).to eq mem
+      expect(server2.tags.length).to eq server1.tags.length
+      expect(server2.tags[0]).to eq server1.tags[0]
+      expect(server2.plan.cpu).to eq server1.plan.cpu
+      expect(server2.plan.memory_gib).to eq server1.plan.memory_gib
       
-      expect(server2.ifaces.length).to eq 1
+      expect(server2.ifaces.length).to eq server1.ifaces.length
       expect(server2.ifaces[0]).to be_an_instance_of Saklient::Cloud::Resources::Iface
       expect(server2.ifaces[0].id.to_i).to be > 0
-      expect(server2.ifaces[0].ip_address).not_to eq server.ifaces[0].ip_address 
+      expect(server2.ifaces[0].ip_address).not_to eq server1.ifaces[0].ip_address 
       
+      disks1 = server1.find_disks()
       disks2 = server2.find_disks()
-      expect(disks2.length).to eq 1
-      expect(disks2[0].size_gib).to eq disk.size_gib
-      expect(disks2[0].source.id).to eq disk.source.id
+      expect(disks2.length).to eq disks1.length
+      expect(disks2[0].size_gib).to eq disks1[0].size_gib
+      expect(disks2[0].source).not_to be_nil
+      if CREATES_EMPTY_DISK
+        expect(disks2[0].source.id).to eq disks1[0].id
+      else
+        expect(disks2[0].source.id).to eq disks1[0].source.id
+      end
       
       next if BREAKS_AFTER_EASY_DUPLICATE
       
@@ -288,14 +311,18 @@ describe 'Server' do
       server2.destroy()
     end
     
-    # disconnect the disk from the server
-    puts 'disconnecting the disk from the server...'
-    disk.disconnect
-    
-    # delete the server
-    puts 'deleting the server...'
-    server.destroy
+    if USE_READYMADE_SERVER_ID.nil? then
     
+      # disconnect the disk from the server
+      puts 'disconnecting the disk from the server...'
+      disk.disconnect
+      
+      # delete the server
+      puts 'deleting the server...'
+      server.destroy
+      
+    end
+      
     if TESTS_DISK_EXPANSION
       
       # duplicate the disk
@@ -323,9 +350,11 @@ describe 'Server' do
       
     end
     
-    # delete the disks
-    puts 'deleting the disk...'
-    disk.destroy
+    if USE_READYMADE_SERVER_ID.nil? then
+      # delete the disks
+      puts 'deleting the disk...'
+      disk.destroy
+    end
     
   end
   

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: saklient
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - townewgokgok
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-04 00:00:00.000000000 Z
+date: 2016-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec