fog-aliyun 0.1.0 → 0.2.0

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

@@ -3,63 +3,55 @@ 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 delete_security_group_egress_sg_rule(securitygroup_id, dest_group_id, option={})
+        def delete_security_group_egress_sg_rule(securitygroup_id, dest_group_id, option = {})
           action   = 'RevokeSecurityGroupEgress'
-          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["DestGroupId"] = dest_group_id
+          parameters['DestGroupId'] = dest_group_id
           pathUrl += '&DestGroupId='
           pathUrl += dest_group_id
 
           nicType = 'intranet'
-          parameters["NicType"] = 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
 
           destGOAccount = option[:destGroupOwnerAccount]
           if sourceGOAccount
-           parameters["DestGroupOwnerAccount"]=destGOAccount
-           pathUrl += '&DestGroupOwnerAccount='
-           pathUrl += destGOAccount
+            parameters['DestGroupOwnerAccount'] = destGOAccount
+            pathUrl += '&DestGroupOwnerAccount='
+            pathUrl += destGOAccount
           end
 
           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
 
@@ -68,42 +60,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

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

@@ -2,58 +2,48 @@ module Fog
   module Compute
     class Aliyun
       class Real
-        def delete_security_group_ip_rule(securitygroup_id,sourceCidrIp, nicType, option={})
+        def delete_security_group_ip_rule(securitygroup_id, sourceCidrIp, nicType, option = {})
           # {Aliyun API Reference}[https://docs.aliyun.com/?spm=5176.100054.3.1.DGkmH7#/pub/ecs/open-api/securitygroup&revokesecuritygroup]
           action   = 'RevokeSecurityGroup'
-          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["SourceCidrIp"] = sourceCidrIp
+          parameters['SourceCidrIp'] = sourceCidrIp
           pathUrl += '&SourceCidrIp='
-          pathUrl += URI.encode(sourceCidrIp,'/[^!*\'()\;?:@#&%=+$,{}[]<>`" ')	
-          unless nicType
-            nicType='intranet'
-          end
-          parameters["NicType"] = nicType
+          pathUrl += URI.encode(sourceCidrIp, '/[^!*\'()\;?:@#&%=+$,{}[]<>`" ')
+          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
 
@@ -62,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

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

@@ -2,64 +2,56 @@ module Fog
   module Compute
     class Aliyun
       class Real
-        def delete_security_group_sg_rule(securitygroup_id, source_securitygroup_id, option={})
+        def delete_security_group_sg_rule(securitygroup_id, source_securitygroup_id, option = {})
           # {Aliyun API Reference}[https://docs.aliyun.com/?spm=5176.100054.3.1.DGkmH7#/pub/ecs/open-api/securitygroup&revokesecuritygroup]
           action   = 'RevokeSecurityGroup'
-          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["SourceGroupId"] = source_securitygroup_id
+          parameters['SourceGroupId'] = source_securitygroup_id
           pathUrl += '&SourceGroupId='
           pathUrl += source_securitygroup_id
 
           nicType = 'intranet'
-          parameters["NicType"] = 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
 
           sourceGOAccount = option[:sourceGroupOwnerAccount]
           if sourceGOAccount
-           parameters["SourceGroupOwnerAccount"]=sourceGOAccount
-           pathUrl += '&SourceGroupOwnerAccount='
-           pathUrl += sourceGOAccount
+            parameters['SourceGroupOwnerAccount'] = sourceGOAccount
+            pathUrl += '&SourceGroupOwnerAccount='
+            pathUrl += sourceGOAccount
           end
 
           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
 
@@ -68,42 +60,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

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

@@ -5,22 +5,22 @@ module Fog
         def delete_server(server_id)
           # {Aliyun API Reference}[https://docs.aliyun.com/?spm=5176.100054.3.1.DGkmH7#/pub/ecs/open-api/instance&deleteinstance]
           _action = 'DeleteInstance'
-          _sigNonce = randonStr()
+          _sigNonce = randonStr
           _time = Time.new.utc
 
           _parameters = defalutParameters(_action, _sigNonce, _time)
-          _pathURL  = defaultAliyunUri(_action, _sigNonce, _time)
-          
-          _parameters['InstanceId']=server_id
-            _pathURL += '&InstanceId='+server_id
-            
+          _pathURL = defaultAliyunUri(_action, _sigNonce, _time)
+
+          _parameters['InstanceId'] = server_id
+          _pathURL += '&InstanceId=' + server_id
+
           _signature = sign(@aliyun_accesskey_secret, _parameters)
-          _pathURL += '&Signature='+_signature
-          
+          _pathURL += '&Signature=' + _signature
+
           request(
-            :expects => [200, 204],
-            :method => 'GET',
-            :path   => _pathURL
+            expects: [200, 204],
+            method: 'GET',
+            path: _pathURL
           )
         end
       end
@@ -28,13 +28,13 @@ module Fog
       class Mock
         def delete_server(server_id)
           response = Excon::Response.new
-          if server = list_servers_detail.body['servers'].find {|_| _['id'] == server_id}
+          if server = list_servers_detail.body['servers'].find { |_| _['id'] == server_id }
             if server['status'] == 'BUILD'
               response.status = 409
-              raise(Excon::Errors.status_error({:expects => 204}, response))
+              raise(Excon::Errors.status_error({ expects: 204 }, response))
             else
-              self.data[:last_modified][:servers].delete(server_id)
-              self.data[:servers].delete(server_id)
+              data[:last_modified][:servers].delete(server_id)
+              data[:servers].delete(server_id)
               response.status = 204
             end
             response

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

@@ -5,13 +5,13 @@ module Fog
         def delete_snapshot(snapshotId)
           # {Aliyun API Reference}[https://docs.aliyun.com/?spm=5176.100054.3.1.DGkmH7#/pub/ecs/open-api/snapshot&deletesnapshot]
           action = 'DeleteSnapshot'
-          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
 
@@ -20,26 +20,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 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