fog-aliyun 0.1.0 → 0.2.0

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

@@ -3,14 +3,13 @@ module Fog
     class Aliyun
       class Real
         # {Aliyun API Reference}[https://docs.aliyun.com/?spm=5176.100054.3.1.DGkmH7#/pub/ecs/open-api/instance&describeinstances]
-        def list_servers(options={})
-          
+        def list_servers(options = {})
           _action = 'DescribeInstances'
-          _sigNonce = randonStr()
+          _sigNonce = randonStr
           _time = Time.new.utc
 
           _parameters = defalutParameters(_action, _sigNonce, _time)
-          _pathURL  = defaultAliyunUri(_action, _sigNonce, _time)
+          _pathURL = defaultAliyunUri(_action, _sigNonce, _time)
 
           _InstanceId = options[:instanceId]
           _VpcId = options[:vpcId]
@@ -18,51 +17,49 @@ module Fog
           _PageNumber = options[:pageNumber]
           _PageSize = options[:pageSize]
 
-          if _InstanceId != nil
+          unless _InstanceId.nil?
             _InstanceStr = "[\"#{_InstanceId}\"]"
             _parameters['InstanceIds'] = _InstanceStr
-            _pathURL += '&InstanceIds='+_InstanceStr
+            _pathURL += '&InstanceIds=' + _InstanceStr
           end
 
-          if _VpcId != nil
+          unless _VpcId.nil?
             _parameters['VpcId'] = _VpcId
-            _pathURL += '&VpcId='+_VpcId
+            _pathURL += '&VpcId=' + _VpcId
           end
 
-          if _SecurityGroupId != nil
-            _parameters['SecurityGroupId']=_SecurityGroupId
-            _pathURL += '&SecurityGroupId='+_SecurityGroupId
-          end
-          
-          if _PageNumber != nil
-            _parameters['PageNumber']=_PageNumber
-            _pathURL += '&PageNumber='+_PageNumber
+          unless _SecurityGroupId.nil?
+            _parameters['SecurityGroupId'] = _SecurityGroupId
+            _pathURL += '&SecurityGroupId=' + _SecurityGroupId
           end
-          
-          unless _PageSize
-            _PageSize = '50'
+
+          unless _PageNumber.nil?
+            _parameters['PageNumber'] = _PageNumber
+            _pathURL += '&PageNumber=' + _PageNumber
           end
-          _parameters['PageSize']=_PageSize
-          _pathURL += '&PageSize='+_PageSize
+
+          _PageSize = '50' unless _PageSize
+          _parameters['PageSize'] = _PageSize
+          _pathURL += '&PageSize=' + _PageSize
 
           _signature = sign(@aliyun_accesskey_secret, _parameters)
-          _pathURL += '&Signature='+_signature
+          _pathURL += '&Signature=' + _signature
 
           request(
-            :expects  => [200, 203],
-            :method   => 'GET',
-            :path     => _pathURL
+            expects: [200, 203],
+            method: 'GET',
+            path: _pathURL
           )
         end
       end
 
       class Mock
-        def list_servers(options = {})
+        def list_servers(_options = {})
           response = Excon::Response.new
           data = list_servers_detail.body['servers']
           servers = []
           for server in data
-            servers << server.reject { |key, value| !['id', 'name', 'links'].include?(key) }
+            servers << server.reject { |key, _value| !%w(id name links).include?(key) }
           end
           response.status = [200, 203][rand(1)]
           response.body = { 'servers' => servers }
@@ -71,4 +68,4 @@ module Fog
       end
     end
   end
-end
+end

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

@@ -3,10 +3,9 @@ module Fog
     class Aliyun
       class Real
         # {Aliyun API Reference}[https://docs.aliyun.com/?spm=5176.100054.3.1.DGkmH7#/pub/ecs/open-api/snapshot&describesnapshots]
-        def list_snapshots(options={})
-          
+        def list_snapshots(options = {})
           action = 'DescribeSnapshots'
-          sigNonce = randonStr()
+          sigNonce = randonStr
           time = Time.new.utc
 
           parameters = defalutParameters(action, sigNonce, time)
@@ -24,91 +23,75 @@ module Fog
           usage = options[:usage]
 
           if usage
-            parameters["Usage"] = usage
+            parameters['Usage'] = usage
             pathUrl += '&Usage='
             pathUrl += usage
           end
 
           if type
-            parameters["SnapshotType"] = type
+            parameters['SnapshotType'] = type
             pathUrl += '&SnapshotType='
             pathUrl += type
           end
 
           if state
-            parameters["Status"] = state
+            parameters['Status'] = state
             pathUrl += '&Status='
             pathUrl += state
           end
 
           if name
-            parameters["SnapshotName"] = name
+            parameters['SnapshotName'] = name
             pathUrl += '&SnapshotName='
             pathUrl += name
           end
 
           if instanceId
-            parameters["InstanceId"] = instanceId
+            parameters['InstanceId'] = instanceId
             pathUrl += '&InstanceId='
             pathUrl += instanceId
           end
 
           if diskId
-            parameters["DiskId"] = diskId
+            parameters['DiskId'] = diskId
             pathUrl += '&DiskId='
             pathUrl += diskId
-          end          
+          end
 
           if snapshotId
-            parameters["SnapshotIds"] = Fog::JSON.encode(snapshotId)
+            parameters['SnapshotIds'] = Fog::JSON.encode(snapshotId)
             pathUrl += '&SnapshotIds='
             pathUrl += Fog::JSON.encode(snapshotId)
           end
-          
+
           if sourceDiskType
-            parameters["SourceDiskType"] = sourceDiskType
+            parameters['SourceDiskType'] = sourceDiskType
             pathUrl += '&SourceDiskType='
             pathUrl += sourceDiskType
           end
-          
+
           if pageNumber
-            parameters["PageNumber"] = pageNumber
+            parameters['PageNumber'] = pageNumber
             pathUrl += '&PageNumber='
             pathUrl += pageNumber
           end
 
-          unless pageSize
-            pageSize = '50'
-          end
-          parameters["PageSize"] = pageSize
+          pageSize = '50' unless pageSize
+          parameters['PageSize'] = pageSize
           pathUrl += '&PageSize='
-          pathUrl += pageSize	
+          pathUrl += pageSize
 
           signature = sign(@aliyun_accesskey_secret, parameters)
           pathUrl += '&Signature='
           pathUrl += signature
 
           request(
-            :expects  => [200, 203],
-            :method   => 'GET',
-            :path     => pathUrl
+            expects: [200, 203],
+            method: 'GET',
+            path: pathUrl
           )
         end
       end
-
-      class Mock
-        def list_images
-          response = Excon::Response.new
-          data = list_images_detail.body['images']
-          images = []
-          for image in data
-            images << image.reject { |key, value| !['id', 'name', 'links'].include?(key) }
-          end
-          response.status = [200, 203][rand(1)]
-          response.body = { 'images' => images }
-          response
-        end
-      end
     end
   end
 end

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

@@ -3,62 +3,45 @@ module Fog
     class Aliyun
       class Real
         # {Aliyun API Reference}[https://docs.aliyun.com/?spm=5176.100054.3.1.DGkmH7#/pub/ecs/open-api/vpc&describevpcs]
-        def list_vpcs(options={})
-          
+        def list_vpcs(options = {})
           action = 'DescribeVpcs'
-          sigNonce = randonStr()
+          sigNonce = randonStr
           time = Time.new.utc
 
           parameters = defalutParameters(action, sigNonce, time)
           pathUrl    = defaultAliyunUri(action, sigNonce, time)
 
-          _VpcId   = options[:vpcId]       
+          _VpcId = options[:vpcId]
           if _VpcId
-            parameters["VpcId"] = _VpcId
+            parameters['VpcId'] = _VpcId
             pathUrl += '&VpcId='
             pathUrl += _VpcId
           end
 
           pageNumber = options[:pageNumber]
-          pageSize   = options[:pageSize]				
+          pageSize   = options[:pageSize]
           if pageNumber
-            parameters["PageNumber"] = pageNumber
+            parameters['PageNumber'] = pageNumber
             pathUrl += '&PageNumber='
             pathUrl += pageNumber
           end
 
-          unless pageSize
-            pageSize = '50'
-          end
-          parameters["PageSize"] = pageSize
+          pageSize = '50' unless pageSize
+          parameters['PageSize'] = pageSize
           pathUrl += '&PageSize='
-          pathUrl += pageSize	
+          pathUrl += pageSize
 
           signature = sign(@aliyun_accesskey_secret, parameters)
           pathUrl += '&Signature='
           pathUrl += signature
 
           request(
-            :expects  => [200, 203],
-            :method   => 'GET',
-            :path     => pathUrl
+            expects: [200, 203],
+            method: 'GET',
+            path: pathUrl
           )
         end
       end
-
-      class Mock
-        def list_images
-          response = Excon::Response.new
-          data = list_images_detail.body['images']
-          images = []
-          for image in data
-            images << image.reject { |key, value| !['id', 'name', 'links'].include?(key) }
-          end
-          response.status = [200, 203][rand(1)]
-          response.body = { 'images' => images }
-          response
-        end
-      end
     end
   end
 end

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

@@ -3,45 +3,42 @@ module Fog
     class Aliyun
       class Real
         # {Aliyun API Reference}[https://docs.aliyun.com/?spm=5176.100054.3.1.DGkmH7#/pub/ecs/open-api/vpc&describevpcs]
-        def list_vrouters(options={})
-          
+        def list_vrouters(options = {})
           action = 'DescribeVrouters'
-          sigNonce = randonStr()
+          sigNonce = randonStr
           time = Time.new.utc
 
           parameters = defalutParameters(action, sigNonce, time)
           pathUrl    = defaultAliyunUri(action, sigNonce, time)
 
-          _VRouterId   = options[:vRouterId]       
+          _VRouterId = options[:vRouterId]
           if _VRouterId
-            parameters["VRouterId"] = _VRouterId
+            parameters['VRouterId'] = _VRouterId
             pathUrl += '&VRouterId='
             pathUrl += _VRouterId
           end
 
           pageNumber = options[:pageNumber]
-          pageSize   = options[:pageSize]				
+          pageSize   = options[:pageSize]
           if pageNumber
-            parameters["PageNumber"] = pageNumber
+            parameters['PageNumber'] = pageNumber
             pathUrl += '&PageNumber='
             pathUrl += pageNumber
           end
 
-          unless pageSize
-            pageSize = '50'
-          end
-          parameters["PageSize"] = pageSize
+          pageSize = '50' unless pageSize
+          parameters['PageSize'] = pageSize
           pathUrl += '&PageSize='
-          pathUrl += pageSize	
+          pathUrl += pageSize
 
           signature = sign(@aliyun_accesskey_secret, parameters)
           pathUrl += '&Signature='
           pathUrl += signature
 
           request(
-            :expects  => [200, 203],
-            :method   => 'GET',
-            :path     => pathUrl
+            expects: [200, 203],
+            method: 'GET',
+            path: pathUrl
           )
         end
       end
@@ -52,7 +49,7 @@ module Fog
           data = list_images_detail.body['VRouters']
           images = []
           for image in data
-            images << image.reject { |key, value| !['id', 'name', 'links'].include?(key) }
+            images << image.reject { |key, _value| !%w(id name links).include?(key) }
           end
           response.status = [200, 203][rand(1)]
           response.body = { 'VRouter' => images }

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

@@ -3,65 +3,48 @@ module Fog
     class Aliyun
       class Real
         # {Aliyun API Reference}[https://docs.aliyun.com/?spm=5176.100054.3.1.DGkmH7#/pub/ecs/open-api/vswitch&describevswitches]
-        def list_vswitchs(vpcid, options={})
-          
+        def list_vswitchs(vpcid, options = {})
           action = 'DescribeVSwitches'
-          sigNonce = randonStr()
+          sigNonce = randonStr
           time = Time.new.utc
 
           parameters = defalutParameters(action, sigNonce, time)
           pathUrl    = defaultAliyunUri(action, sigNonce, time)
 
-          parameters["VpcId"] = vpcid
+          parameters['VpcId'] = vpcid
           pathUrl += '&VpcId='
           pathUrl += vpcid
 
           pageNumber = options[:pageNumber]
-          pageSize   = options[:pageSize]		
-          vswitchId  = options[:vSwitchId]		
+          pageSize   = options[:pageSize]
+          vswitchId  = options[:vSwitchId]
           if vswitchId
-            parameters["VSwitchId"] = vswitchId
-            pathUrl +='&VSwitchId='
+            parameters['VSwitchId'] = vswitchId
+            pathUrl += '&VSwitchId='
             pathUrl += vswitchId
           end
           if pageNumber
-            parameters["PageNumber"] = pageNumber
+            parameters['PageNumber'] = pageNumber
             pathUrl += '&PageNumber='
             pathUrl += pageNumber
           end
 
-          unless pageSize
-            pageSize = '50'
-          end
-          parameters["PageSize"] = pageSize
+          pageSize = '50' unless pageSize
+          parameters['PageSize'] = pageSize
           pathUrl += '&PageSize='
-          pathUrl += pageSize	
+          pathUrl += pageSize
 
           signature = sign(@aliyun_accesskey_secret, parameters)
           pathUrl += '&Signature='
           pathUrl += signature
 
           request(
-            :expects  => [200, 203],
-            :method   => 'GET',
-            :path     => pathUrl
+            expects: [200, 203],
+            method: 'GET',
+            path: pathUrl
           )
         end
       end
-
-      class Mock
-        def list_images
-          response = Excon::Response.new
-          data = list_images_detail.body['images']
-          images = []
-          for image in data
-            images << image.reject { |key, value| !['id', 'name', 'links'].include?(key) }
-          end
-          response.status = [200, 203][rand(1)]
-          response.body = { 'images' => images }
-          response
-        end
-      end
     end
   end
 end

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

@@ -3,9 +3,9 @@ module Fog
     class Aliyun
       class Real
         # {Aliyun API Reference}[https://docs.aliyun.com/?spm=5176.100054.3.1.DGkmH7#/pub/ecs/open-api/region&describezones]
-        def list_zones()
+        def list_zones
           action = 'DescribeZones'
-          sigNonce = randonStr()
+          sigNonce = randonStr
           time = Time.new.utc
 
           parameters = defalutParameters(action, sigNonce, time)
@@ -16,26 +16,26 @@ module Fog
           pathUrl += signature
 
           request(
-            :expects  => [200, 203],
-            :method   => 'GET',
-            :path     => pathUrl
+            expects: [200, 203],
+            method: 'GET',
+            path: pathUrl
           )
         end
       end
 
       class Mock
-        def list_zones(*args)
+        def list_zones(*_args)
           Excon::Response.new(
-            :body   => { "availabilityZoneInfo" => [
-                  {
-                      "zoneState" => {
-                          "available" => true
-                      },
-                      "hosts" => nil,
-                      "zoneName" => "nova"
-                  }
-              ] },
-            :status => 200
+            body: { 'availabilityZoneInfo' => [
+              {
+                'zoneState' => {
+                  'available' => true
+                },
+                'hosts' => nil,
+                'zoneName' => 'nova'
+              }
+            ] },
+            status: 200
           )
         end
       end