fog-aliyun 0.1.0 → 0.2.0

data/lib/fog/aliyun/requests/compute/attach_disk.rb

@@ -16,38 +16,35 @@ module Fog
         #     * 'RequestId'<~String> - Id of the request
         #
         # {Aliyun API Reference}[https://docs.aliyun.com/?spm=5176.100054.201.106.DGkmH7#/pub/ecs/open-api/disk&attachdisk]
-        def attach_disk(instanceId, diskId, options={})
+        def attach_disk(instanceId, diskId, options = {})
           action   = 'AttachDisk'
-          sigNonce = randonStr()
+          sigNonce = randonStr
           time     = Time.new.utc
 
           parameters = defalutParameters(action, sigNonce, time)
           pathUrl    = defaultAliyunUri(action, sigNonce, time)
-          
-          parameters["InstanceId"] = instanceId
+
+          parameters['InstanceId'] = instanceId
           pathUrl += '&InstanceId='
-          pathUrl += instanceId	
+          pathUrl += instanceId
 
-          parameters["DiskId"] = diskId
+          parameters['DiskId'] = diskId
           pathUrl += '&DiskId='
           pathUrl += diskId
-          
+
           deleteWithInstance = options[:deleteWithInstance]
           device             = options[:device]
-          
-          unless deleteWithInstance
-            deleteWithInstance = 'true' 
-          end
 
-          parameters["DeleteWithInstance"] = deleteWithInstance
+          deleteWithInstance = 'true' unless deleteWithInstance
+
+          parameters['DeleteWithInstance'] = deleteWithInstance
           pathUrl += '&DeleteWithInstance='
           pathUrl += deleteWithInstance
 
-
           if device
-            parameters["Device"] = device
+            parameters['Device'] = device
             pathUrl += '&Device='
-            pathUrl += URI.encode(device,'/[^!*\'()\;?:@#&%=+$,{}[]<>`" ')
+            pathUrl += URI.encode(device, '/[^!*\'()\;?:@#&%=+$,{}[]<>`" ')
           end
 
           signature = sign(@aliyun_accesskey_secret, parameters)
@@ -55,9 +52,9 @@ module Fog
           pathUrl += signature
 
           request(
-            :expects  => [200, 203],
-            :method   => 'GET',
-            :path     => pathUrl
+            expects: [200, 203],
+            method: 'GET',
+            path: pathUrl
           )
         end
       end
@@ -67,10 +64,10 @@ module Fog
           response = Excon::Response.new
           response.status = 200
           data = {
-             'id'       => volume_id,
-             'volumeId' => volume_id,
-             'serverId' => server_id,
-             'device'   => device
+            'id' => volume_id,
+            'volumeId' => volume_id,
+            'serverId' => server_id,
+            'device'   => device
           }
           self.data[:volumes][volume_id]['attachments'] << data
           response.body = { 'volumeAttachment' => data }

data/lib/fog/aliyun/requests/compute/create_disk.rb

@@ -7,7 +7,7 @@ module Fog
         # ==== Parameters
         # * size<~String> - the size of the disk (GB).--cloud:5~2000GB,cloud_efficiency: 20~2048GB,cloud_ssd:20~1024GB
         # * options<~hash>
-        #     * :name - The name of the disk,default nil. If not nil, it must start with english or chinise character. 
+        #     * :name - The name of the disk,default nil. If not nil, it must start with english or chinise character.
         #          The length should be within [2,128]. It can contain digits,'.','_' or '-'.It shouldn't start with 'http://' or 'https://'
         #     * :description - The name of the disk,default nil. If not nil, the length should be within [2,255].It shouldn't start with 'http://' or 'https://'
         #     * :category - Default 'cloud'. can be set to 'cloud','cloud_efficiency' or 'cloud_ssd'
@@ -18,42 +18,40 @@ module Fog
         #     * 'DiskId'<~String> - Id of the created disk
         #
         # {Aliyun API Reference}[https://docs.aliyun.com/?spm=5176.100054.201.106.DGkmH7#/pub/ecs/open-api/disk&createdisk]
-        def create_disk(size, options={})
-
+        def create_disk(size, options = {})
           action   = 'CreateDisk'
-          sigNonce = randonStr()
+          sigNonce = randonStr
           time     = Time.new.utc
 
           parameters = defalutParameters(action, sigNonce, time)
           pathUrl    = defaultAliyunUri(action, sigNonce, time)
 
-          parameters["ZoneId"] = @aliyun_zone_id
+          parameters['ZoneId'] = @aliyun_zone_id
           pathUrl += '&ZoneId='
-          pathUrl += @aliyun_zone_id	
-          
-          parameters["Size"] = size
+          pathUrl += @aliyun_zone_id
+
+          parameters['Size'] = size
           pathUrl += '&Size='
-          pathUrl += size	
+          pathUrl += size
 
           name  = options[:name]
           desc  = options[:description]
           category = options[:category]
 
-
           if name
-            parameters["DiskName"] = name
+            parameters['DiskName'] = name
             pathUrl += '&DiskName='
-            pathUrl += name	
+            pathUrl += name
           end
 
           if desc
-            parameters["Description"] = desc
+            parameters['Description'] = desc
             pathUrl += '&Description='
-            pathUrl += desc	
+            pathUrl += desc
           end
 
           if category
-            parameters["DiskCategory"] = category
+            parameters['DiskCategory'] = category
             pathUrl += 'DiskCategory'
             pathUrl += category
           end
@@ -63,17 +61,18 @@ module Fog
           pathUrl += signature
 
           request(
-            :expects  => [200, 203],
-            :method   => 'GET',
-            :path     => pathUrl
+            expects: [200, 203],
+            method: 'GET',
+            path: pathUrl
           ).merge(options)
         end
+
         # Create a disk By the snapshot with given snapshot_id.
         #
         # ==== Parameters
         # * snapshotId<~String> - the snapshot_id
         # * options<~hash>
-        #     * :name - The name of the disk,default nil. If not nil, it must start with english or chinise character. 
+        #     * :name - The name of the disk,default nil. If not nil, it must start with english or chinise character.
         #          The length should be within [2,128]. It can contain digits,'.','_' or '-'.It shouldn't start with 'http://' or 'https://'
         #     * :description - The name of the disk,default nil. If not nil, the length should be within [2,255].It shouldn't start with 'http://' or 'https://'
         #     * :category - Default 'cloud'. can be set to 'cloud','cloud_efficiency' or 'cloud_ssd'
@@ -84,41 +83,40 @@ module Fog
         #     * 'DiskId'<~String> - Id of the created disk
         #
         # {Aliyun API Reference}[https://docs.aliyun.com/?spm=5176.100054.201.106.DGkmH7#/pub/ecs/open-api/disk&createdisk]
-        def create_disk_by_snapshot(snapshotId, options={})
-
+        def create_disk_by_snapshot(snapshotId, options = {})
           action   = 'CreateDisk'
-          sigNonce = randonStr()
+          sigNonce = randonStr
           time     = Time.new.utc
 
           parameters = defalutParameters(action, sigNonce, time)
           pathUrl    = defaultAliyunUri(action, sigNonce, time)
 
-          parameters["ZoneId"] = @aliyun_zone_id
+          parameters['ZoneId'] = @aliyun_zone_id
           pathUrl += '&ZoneId='
-          pathUrl += @aliyun_zone_id  
-          
-          parameters["SnapshotId"] = snapshotId
+          pathUrl += @aliyun_zone_id
+
+          parameters['SnapshotId'] = snapshotId
           pathUrl += '&SnapshotId='
-          pathUrl += snapshotId 
+          pathUrl += snapshotId
 
           name  = options[:name]
           desc  = options[:description]
           category = options[:category]
 
           if name
-            parameters["DiskName"] = name
+            parameters['DiskName'] = name
             pathUrl += '&DiskName='
-            pathUrl += name 
+            pathUrl += name
           end
 
           if desc
-            parameters["Description"] = desc
+            parameters['Description'] = desc
             pathUrl += '&Description='
-            pathUrl += desc 
+            pathUrl += desc
           end
 
           if category
-            parameters["DiskCategory"] = category
+            parameters['DiskCategory'] = category
             pathUrl += 'DiskCategory'
             pathUrl += category
           end
@@ -128,40 +126,12 @@ module Fog
           pathUrl += signature
 
           request(
-            :expects  => [200, 203],
-            :method   => 'GET',
-            :path     => pathUrl
+            expects: [200, 203],
+            method: 'GET',
+            path: pathUrl
           )
         end
-        
       end
-
-      class Mock
-        def create_security_group(name, description)
-          Fog::Identity::OpenStack.new(:openstack_auth_url => credentials[:openstack_auth_url])
-          tenant_id = Fog::Identity::OpenStack::V2::Mock.data[current_tenant][:tenants].keys.first
-          security_group_id = Fog::Mock.random_numbers(2).to_i + 1
-          self.data[:security_groups][security_group_id.to_s] = {
-            'tenant_id' => tenant_id,
-            'rules'     => [],
-            'id'        => security_group_id,
-            'name'      => name,
-            'description' => description
-          }
-
-          response = Excon::Response.new
-          response.status = 200
-          response.headers = {
-            'X-Compute-Request-Id' => "req-#{Fog::Mock.random_hex(32)}",
-            'Content-Type'   => 'application/json',
-            'Content-Length' => Fog::Mock.random_numbers(3).to_s,
-            'Date'           => Date.new}
-          response.body = {
-            'security_group' => self.data[:security_groups][security_group_id.to_s]
-          }
-          response
-        end
-      end # mock
     end # aliyun
   end # compute
 end # fog

data/lib/fog/aliyun/requests/compute/create_image.rb

@@ -3,35 +3,35 @@ module Fog
     class Aliyun
       class Real
         # {Aliyun API Reference}[https://docs.aliyun.com/?spm=5176.100054.201.106.DGkmH7#/pub/ecs/open-api/image&createimage]
-        def create_image(snapshotId, options={})
+        def create_image(snapshotId, options = {})
           action = 'CreateImage'
-          sigNonce = randonStr()
+          sigNonce = randonStr
           time = Time.new.utc
 
           parameters = defalutParameters(action, sigNonce, time)
           pathUrl    = defaultAliyunUri(action, sigNonce, time)
 
-          parameters["SnapshotId"] = snapshotId
+          parameters['SnapshotId'] = snapshotId
           pathUrl += '&SnapshotId='
-          pathUrl += snapshotId	
-         
+          pathUrl += snapshotId
+
           name = options[:name]
           if name
-            parameters["ImageName"] = name
+            parameters['ImageName'] = name
             pathUrl += '&ImageName='
-            pathUrl += name	
+            pathUrl += name
           end
-          
+
           desc = options[:description]
           if desc
-            parameters["Description"] = desc
+            parameters['Description'] = desc
             pathUrl += '&Description='
             pathUrl += desc
           end
-          
+
           version = options[:version]
           if version
-            parameters["ImageVersion"] = version
+            parameters['ImageVersion'] = version
             pathUrl += '&ImageVersion='
             pathUrl += version
           end
@@ -41,32 +41,32 @@ module Fog
           pathUrl += signature
 
           request(
-            :expects  => [200, 203],
-            :method   => 'GET',
-            :path     => pathUrl
+            expects: [200, 203],
+            method: 'GET',
+            path: pathUrl
           )
         end
       end
 
       class Mock
-        def create_image(server_id, name, metadata={})
+        def create_image(server_id, name, metadata = {})
           response = Excon::Response.new
           response.status = 202
 
-          img_id=Fog::Mock.random_numbers(6).to_s
+          img_id = Fog::Mock.random_numbers(6).to_s
 
           data = {
-            'id'        => img_id,
-            'server'     => {"id"=>"3", "links"=>[{"href"=>"http://nova1:8774/admin/servers/#{server_id}", "rel"=>"bookmark"}]},
-            'links'     => [{"href"=>"http://nova1:8774/v1.1/admin/images/#{img_id}", "rel"=>"self"}, {"href"=>"http://nova1:8774/admin/images/#{img_id}", "rel"=>"bookmark"}],
+            'id' => img_id,
+            'server' => { 'id' => '3', 'links' => [{ 'href' => "http://nova1:8774/admin/servers/#{server_id}", 'rel' => 'bookmark' }] },
+            'links'     => [{ 'href' => "http://nova1:8774/v1.1/admin/images/#{img_id}", 'rel' => 'self' }, { 'href' => "http://nova1:8774/admin/images/#{img_id}", 'rel' => 'bookmark' }],
             'metadata'  => metadata || {},
             'name'      => name || "server_#{rand(999)}",
             'progress'  => 0,
             'status'    => 'SAVING',
             'minDisk'   => 0,
             'minRam'    => 0,
-            'updated'   => "",
-            'created'   => ""
+            'updated'   => '',
+            'created'   => ''
           }
           self.data[:last_modified][:images][data['id']] = Time.now
           self.data[:images][data['id']] = data

data/lib/fog/aliyun/requests/compute/create_security_group.rb

@@ -3,10 +3,9 @@ module Fog
     class Aliyun
       class Real
         # {Aliyun API Reference}[https://docs.aliyun.com/?spm=5176.100054.201.106.DGkmH7#/pub/ecs/open-api/securitygroup&createsecuritygroup]
-        def create_security_group(options={})
-
+        def create_security_group(options = {})
           action   = 'CreateSecurityGroup'
-          sigNonce = randonStr()
+          sigNonce = randonStr
           time     = Time.new.utc
 
           parameters = defalutParameters(action, sigNonce, time)
@@ -17,21 +16,21 @@ module Fog
           vpcid = options[:vpcId]
 
           if name
-            parameters["SecurityGroupName"] = name
+            parameters['SecurityGroupName'] = name
             pathUrl += '&SecurityGroupName='
-            pathUrl += name	
+            pathUrl += name
           end
 
           if desc
-            parameters["Description"] = desc
+            parameters['Description'] = desc
             pathUrl += '&Description='
-            pathUrl += desc	
+            pathUrl += desc
           end
 
           if vpcid
-            parameters["VpcId"] = vpcid
+            parameters['VpcId'] = vpcid
             pathUrl += '&VpcId='
-            pathUrl += vpcid	
+            pathUrl += vpcid
           end
 
           signature = sign(@aliyun_accesskey_secret, parameters)
@@ -39,19 +38,19 @@ module Fog
           pathUrl += signature
 
           request(
-            :expects  => [200, 203],
-            :method   => 'GET',
-            :path     => pathUrl
+            expects: [200, 203],
+            method: 'GET',
+            path: pathUrl
           )
         end
       end
 
       class Mock
         def create_security_group(name, description)
-          Fog::Identity::OpenStack.new(:openstack_auth_url => credentials[:openstack_auth_url])
+          Fog::Identity::OpenStack.new(openstack_auth_url: credentials[:openstack_auth_url])
           tenant_id = Fog::Identity::OpenStack::V2::Mock.data[current_tenant][:tenants].keys.first
           security_group_id = Fog::Mock.random_numbers(2).to_i + 1
-          self.data[:security_groups][security_group_id.to_s] = {
+          data[:security_groups][security_group_id.to_s] = {
             'tenant_id' => tenant_id,
             'rules'     => [],
             'id'        => security_group_id,
@@ -65,9 +64,10 @@ module Fog
             'X-Compute-Request-Id' => "req-#{Fog::Mock.random_hex(32)}",
             'Content-Type'   => 'application/json',
             'Content-Length' => Fog::Mock.random_numbers(3).to_s,
-            'Date'           => Date.new}
+            'Date'           => Date.new
+          }
           response.body = {
-            'security_group' => self.data[:security_groups][security_group_id.to_s]
+            'security_group' => data[:security_groups][security_group_id.to_s]
           }
           response
         end

data/lib/fog/aliyun/requests/compute/create_security_group_egress_ip_rule.rb

@@ -3,58 +3,47 @@ module Fog
     class Aliyun
       class Real
         # {Aliyun API Reference}[https://docs.aliyun.com/?spm=5176.100054.3.1.DGkmH7#/pub/ecs/open-api/securitygroup&authorizesecuritygroup]
-        def create_security_group_egress_ip_rule(securitygroup_id,destCidrIp, nicType, option={})
-
+        def create_security_group_egress_ip_rule(securitygroup_id, destCidrIp, nicType, option = {})
           action   = 'AuthorizeSecurityGroupEgress'
-          sigNonce = randonStr()
+          sigNonce = randonStr
           time     = Time.new.utc
 
           parameters = defalutParameters(action, sigNonce, time)
           pathUrl    = defaultAliyunUri(action, sigNonce, time)
-          
-          parameters["SecurityGroupId"] = securitygroup_id
+
+          parameters['SecurityGroupId'] = securitygroup_id
           pathUrl += '&SecurityGroupId='
           pathUrl += securitygroup_id
 
-          parameters["DestCidrIp"] = destCidrIp
+          parameters['DestCidrIp'] = destCidrIp
           pathUrl += '&DestCidrIp='
-          pathUrl += URI.encode(destCidrIp,'/[^!*\'()\;?:@#&%=+$,{}[]<>`" ')	
-          unless nicType
-            nicType='intranet'
-          end
-          parameters["NicType"] = nicType
+          pathUrl += URI.encode(destCidrIp, '/[^!*\'()\;?:@#&%=+$,{}[]<>`" ')
+          nicType = 'intranet' unless nicType
+          parameters['NicType'] = nicType
           pathUrl += '&NicType='
           pathUrl += nicType
-          
+
           portRange = option[:portRange]
-          unless portRange
-            portRange = '-1/-1'
-          end
-          parameters["PortRange"] = portRange
+          portRange = '-1/-1' unless portRange
+          parameters['PortRange'] = portRange
           pathUrl += '&PortRange='
-          pathUrl += URI.encode(portRange,'/[^!*\'()\;?:@#&%=+$,{}[]<>`" ')
-          
+          pathUrl += URI.encode(portRange, '/[^!*\'()\;?:@#&%=+$,{}[]<>`" ')
+
           protocol = option[:protocol]
-          unless protocol
-            protocol = 'all'
-          end
-          parameters["IpProtocol"] = protocol
+          protocol = 'all' unless protocol
+          parameters['IpProtocol'] = protocol
           pathUrl += '&IpProtocol='
           pathUrl += protocol
 
           policy = option[:policy]
-          unless policy
-            policy = 'accept'
-          end
-          parameters["Policy"] = policy
+          policy = 'accept' unless policy
+          parameters['Policy'] = policy
           pathUrl += '&Policy='
           pathUrl += policy
 
           priority = option[:priority]
-          unless priority
-            priority = '1'
-          end
-          parameters["Priority"] = priority
+          priority = '1' unless priority
+          parameters['Priority'] = priority
           pathUrl += '&Priority='
           pathUrl += priority
 
@@ -63,42 +52,12 @@ module Fog
           pathUrl += signature
 
           request(
-            :expects  => [200, 203],
-            :method   => 'GET',
-            :path     => pathUrl
+            expects: [200, 203],
+            method: 'GET',
+            path: pathUrl
           )
         end
       end
-
-      class Mock
-        def create_security_group_rule(parent_group_id, ip_protocol, from_port, to_port, cidr, group_id=nil)
-          parent_group_id = parent_group_id.to_i
-          response = Excon::Response.new
-          response.status = 200
-          response.headers = {
-            'X-Compute-Request-Id' => "req-#{Fog::Mock.random_hex(32)}",
-            'Content-Type'   => 'application/json',
-            'Content-Length' => Fog::Mock.random_numbers(3).to_s,
-            'Date' => Date.new
-          }
-          rule = {
-            'id' => Fog::Mock.random_numbers(2).to_i,
-            'from_port'   => from_port,
-            'group'       => group_id || {},
-            'ip_protocol' => ip_protocol,
-            'to_port'     => to_port,
-            'parent_group_id' => parent_group_id,
-            'ip_range' => {
-              'cidr'   => cidr
-            }
-          }
-          self.data[:security_groups][parent_group_id.to_s]['rules'].push(rule)
-          response.body = {
-            'security_group_rule' => rule
-          }
-          response
-        end
-      end # mock
     end # aliyun
   end # compute
 end # fog