fog-aliyun 0.1.0 → 0.2.0

data/lib/fog/aliyun/requests/compute/create_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 create_security_group_egress_sg_rule(securitygroup_id, dest_group_id, option={})
+        def create_security_group_egress_sg_rule(securitygroup_id, dest_group_id, 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["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/create_security_group_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_ip_rule(securitygroup_id,sourceCidrIp, nicType, option={})
-
+        def create_security_group_ip_rule(securitygroup_id, sourceCidrIp, nicType, option = {})
           action   = 'AuthorizeSecurityGroup'
-          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
 
@@ -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

data/lib/fog/aliyun/requests/compute/create_security_group_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 create_security_group_sg_rule(securitygroup_id, source_securitygroup_id, option={})
+        def create_security_group_sg_rule(securitygroup_id, source_securitygroup_id, option = {})
           action   = 'AuthorizeSecurityGroup'
-          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/create_server.rb

@@ -4,93 +4,91 @@ module Fog
       class Real
         # {Aliyun API Reference}[https://docs.aliyun.com/?spm=5176.100054.3.1.DGkmH7#/pub/ecs/open-api/instance&createinstance]
         def create_server(imageId, securityGroupId, instanceType, options = {})
-          
           _action = 'CreateInstance'
-          _sigNonce = randonStr()
+          _sigNonce = randonStr
           _time = Time.new.utc
 
           _parameters = defalutParameters(_action, _sigNonce, _time)
-          _pathURL  = defaultAliyunUri(_action, _sigNonce, _time)
+          _pathURL = defaultAliyunUri(_action, _sigNonce, _time)
 
           _parameters['ImageId'] = imageId
-          _pathURL += '&ImageId='+imageId
+          _pathURL += '&ImageId=' + imageId
 
           _parameters['InstanceType'] = instanceType
-          _pathURL += '&InstanceType='+instanceType
-          
+          _pathURL += '&InstanceType=' + instanceType
+
           _parameters['SecurityGroupId'] = securityGroupId
-          _pathURL += '&SecurityGroupId='+securityGroupId
-          
+          _pathURL += '&SecurityGroupId=' + securityGroupId
+
           _ZoneId = options[:ZoneId]
           if _ZoneId
-            _parameters['ZoneId']=_ZoneId
-            _pathURL += '&ZoneId='+_ZoneId
+            _parameters['ZoneId'] = _ZoneId
+            _pathURL += '&ZoneId=' + _ZoneId
           end
 
           _InstanceName = options[:InstanceName]
           if _InstanceName
-            _parameters['InstanceName']=_InstanceName
-            _pathURL += '&InstanceName='+_InstanceName
+            _parameters['InstanceName'] = _InstanceName
+            _pathURL += '&InstanceName=' + _InstanceName
           end
-          
+
           _Description = options[:Description]
           if _Description
-            _parameters['Description']=_Description
-            _pathURL += '&Description='+_Description
+            _parameters['Description'] = _Description
+            _pathURL += '&Description=' + _Description
           end
-          
+
           _InternetChargeType = options[:InternetChargeType]
           if _InternetChargeType
-            _parameters['InternetChargeType']=_InternetChargeType
-            _pathURL += '&InternetChargeType='+_InternetChargeType
+            _parameters['InternetChargeType'] = _InternetChargeType
+            _pathURL += '&InternetChargeType=' + _InternetChargeType
           end
-          
+
           _HostName = options[:HostName]
           if _HostName
-            _parameters['HostName']=_HostName
-            _pathURL += '&HostName='+_HostName
+            _parameters['HostName'] = _HostName
+            _pathURL += '&HostName=' + _HostName
           end
-          
+
           _Password = options[:Password]
           if _Password
-            _parameters['Password']=_Password
-            _pathURL += '&Password='+_Password
+            _parameters['Password'] = _Password
+            _pathURL += '&Password=' + _Password
           end
-          
+
           _VSwitchId = options[:VSwitchId]
-          _PrivateIpAddress= options[:PrivateIpAddress]
+          _PrivateIpAddress = options[:PrivateIpAddress]
           if _VSwitchId
-            _parameters['VSwitchId']=_VSwitchId
-            _pathURL += '&VSwitchId='+_VSwitchId
+            _parameters['VSwitchId'] = _VSwitchId
+            _pathURL += '&VSwitchId=' + _VSwitchId
 
             if _PrivateIpAddress
-              _parameters['PrivateIpAddress']=_PrivateIpAddress
-              _pathURL += '&PrivateIpAddress='+_PrivateIpAddress
+              _parameters['PrivateIpAddress'] = _PrivateIpAddress
+              _pathURL += '&PrivateIpAddress=' + _PrivateIpAddress
             end
           else
 
             _InternetMaxBandwidthIn = options[:InternetMaxBandwidthIn]
             if _InternetMaxBandwidthIn
-              _parameters['InternetMaxBandwidthIn']=_InternetMaxBandwidthIn
-              _pathURL += '&InternetMaxBandwidthIn='+_InternetMaxBandwidthIn
+              _parameters['InternetMaxBandwidthIn'] = _InternetMaxBandwidthIn
+              _pathURL += '&InternetMaxBandwidthIn=' + _InternetMaxBandwidthIn
             end
-          
+
             _InternetMaxBandwidthOut = options[:InternetMaxBandwidthOut]
             if _InternetMaxBandwidthOut
-              _parameters['InternetMaxBandwidthOut']=_InternetMaxBandwidthOut
-              _pathURL += '&InternetMaxBandwidthOut='+_InternetMaxBandwidthOut
+              _parameters['InternetMaxBandwidthOut'] = _InternetMaxBandwidthOut
+              _pathURL += '&InternetMaxBandwidthOut=' + _InternetMaxBandwidthOut
             end
           end
 
           _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
 
@@ -100,86 +98,86 @@ module Fog
           response.status = 202
 
           server_id = Fog::Mock.random_numbers(6).to_s
-          identity = Fog::Identity::OpenStack.new :openstack_auth_url => credentials[:openstack_auth_url]
-          user = identity.users.find { |u|
+          identity = Fog::Identity::OpenStack.new openstack_auth_url: credentials[:openstack_auth_url]
+          user = identity.users.find do |u|
             u.name == @openstack_username
-          }
+          end
 
-          user_id = if user then
+          user_id = if user
                       user.id
                     else
-                       response = identity.create_user(@openstack_username,
-                         'password',
-                         "#{@openstack_username}@example.com")
-                       response.body["user"]["id"]
-                    end
+                      response = identity.create_user(@openstack_username,
+                                                      'password',
+                                                      "#{@openstack_username}@example.com")
+                      response.body['user']['id']
+          end
 
           mock_data = {
-            'addresses'    => {"Private" => [{"addr" => Fog::Mock.random_ip }]},
-            'flavor'       => {"id" => flavor_ref, "links"=>[{"href"=>"http://nova1:8774/admin/flavors/1", "rel"=>"bookmark"}]},
+            'addresses'    => { 'Private' => [{ 'addr' => Fog::Mock.random_ip }] },
+            'flavor'       => { 'id' => flavor_ref, 'links' => [{ 'href' => 'http://nova1:8774/admin/flavors/1', 'rel' => 'bookmark' }] },
             'id'           => server_id,
-            'image'        => {"id" => image_ref, "links"=>[{"href"=>"http://nova1:8774/admin/images/#{image_ref}", "rel"=>"bookmark"}]},
-            'links'        => [{"href"=>"http://nova1:8774/v1.1/admin/servers/5", "rel"=>"self"}, {"href"=>"http://nova1:8774/admin/servers/5", "rel"=>"bookmark"}],
-            'hostId'       => "123456789ABCDEF01234567890ABCDEF",
+            'image'        => { 'id' => image_ref, 'links' => [{ 'href' => "http://nova1:8774/admin/images/#{image_ref}", 'rel' => 'bookmark' }] },
+            'links'        => [{ 'href' => 'http://nova1:8774/v1.1/admin/servers/5', 'rel' => 'self' }, { 'href' => 'http://nova1:8774/admin/servers/5', 'rel' => 'bookmark' }],
+            'hostId'       => '123456789ABCDEF01234567890ABCDEF',
             'metadata'     => options['metadata'] || {},
             'name'         => name || "server_#{rand(999)}",
-            'accessIPv4'   => options['accessIPv4'] || "",
-            'accessIPv6'   => options['accessIPv6'] || "",
+            'accessIPv4'   => options['accessIPv4'] || '',
+            'accessIPv6'   => options['accessIPv6'] || '',
             'progress'     => 0,
             'status'       => 'BUILD',
             'created'      => '2012-09-27T00:04:18Z',
             'updated'      => '2012-09-27T00:04:27Z',
-            'user_id'      => @openstack_username,
-            'config_drive' => options['config_drive'] || '',
+            'user_id'      => user_id,
+            'config_drive' => options['config_drive'] || ''
           }
 
           if nics = options['nics']
-            nics.each do |nic|
-              mock_data["addresses"].merge!(
-                "Public" => [{ 'addr' => Fog::Mock.random_ip }]
+            nics.each do |_nic|
+              mock_data['addresses'].merge!(
+                'Public' => [{ 'addr' => Fog::Mock.random_ip }]
               )
             end
           end
 
           response_data = {}
-          if options['return_reservation_id'] == 'True' then
-            response_data = { 'reservation_id' => "r-#{Fog::Mock.random_numbers(6).to_s}" }
+          if options['return_reservation_id'] == 'True'
+            response_data = { 'reservation_id' => "r-#{Fog::Mock.random_numbers(6)}" }
           else
             response_data = {
               'adminPass'       => 'password',
               'id'              => server_id,
-              'links'           => mock_data['links'],
+              'links'           => mock_data['links']
             }
           end
 
-          if block_devices = options["block_device_mapping_v2"]
+          if block_devices = options['block_device_mapping_v2']
             block_devices.each { |bd| compute.volumes.get(bd[:uuid]).attach(server_id, bd[:device_name]) }
-          elsif block_device = options["block_device_mapping"]
+          elsif block_device = options['block_device_mapping']
             compute.volumes.get(block_device[:volume_id]).attach(server_id, block_device[:device_name])
           end
 
-          self.data[:last_modified][:servers][server_id] = Time.now
-          self.data[:servers][server_id] = mock_data
-          if security_groups = options['security_groups'] then
+          data[:last_modified][:servers][server_id] = Time.now
+          data[:servers][server_id] = mock_data
+          if options['security_groups']
             groups = Array(options['security_groups']).map do |sg|
-              if sg.is_a?(Fog::Compute::OpenStack::SecurityGroup) then
+              if sg.is_a?(Fog::Compute::OpenStack::SecurityGroup)
                 sg.name
               else
                 sg
               end
             end
 
-            self.data[:server_security_group_map][server_id] = groups
+            data[:server_security_group_map][server_id] = groups
             response_data['security_groups'] = groups
           end
 
-          self.data[:last_modified][:servers][server_id] = Time.now
-          self.data[:servers][server_id] = mock_data
-          if options['return_reservation_id'] == 'True' then
-            response.body = response_data
-          else
-            response.body = { 'server' => response_data }
-          end
+          data[:last_modified][:servers][server_id] = Time.now
+          data[:servers][server_id] = mock_data
+          response.body = if options['return_reservation_id'] == 'True'
+                            response_data
+                          else
+                            { 'server' => response_data }
+                          end
           response
         end
       end