fog-aliyun 0.1.0 → 0.2.0

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

@@ -2,59 +2,45 @@ module Fog
   module Compute
     class Aliyun
       class Real
-        def create_snapshot(diskId, options={})
-        # {Aliyun API Reference}[https://docs.aliyun.com/?spm=5176.100054.3.1.DGkmH7#/pub/ecs/open-api/snapshot&createsnapshot]          
+        def create_snapshot(diskId, options = {})
+          # {Aliyun API Reference}[https://docs.aliyun.com/?spm=5176.100054.3.1.DGkmH7#/pub/ecs/open-api/snapshot&createsnapshot]
           action = 'CreateSnapshot'
-          sigNonce = randonStr()
+          sigNonce = randonStr
           time = Time.new.utc
 
           parameters = defalutParameters(action, sigNonce, time)
           pathUrl    = defaultAliyunUri(action, sigNonce, time)
-          
-          parameters["DiskId"] = diskId
+
+          parameters['DiskId'] = diskId
           pathUrl += '&DiskId='
           pathUrl += diskId
 
           name = options[:name]
           desc = options[:description]
-          
+
           if name
-            parameters["SnapshotName"] = name
+            parameters['SnapshotName'] = name
             pathUrl += '&SnapshotName='
             pathUrl += name
           end
 
           if desc
-            parameters["Description"] = desc
+            parameters['Description'] = desc
             pathUrl += '&Description='
             pathUrl += desc
-          end          
+          end
 
           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/create_vpc.rb

@@ -2,32 +2,32 @@ module Fog
   module Compute
     class Aliyun
       class Real
-        def create_vpc(cidrBlock, options={})
+        def create_vpc(cidrBlock, options = {})
           # {Aliyun API Reference}[https://docs.aliyun.com/?spm=5176.100054.3.1.DGkmH7#/pub/ecs/open-api/vpc&createvpc]
           action = 'CreateVpc'
-          sigNonce = randonStr()
+          sigNonce = randonStr
           time = Time.new.utc
 
           parameters = defalutParameters(action, sigNonce, time)
           pathUrl    = defaultAliyunUri(action, sigNonce, time)
 
-          parameters["CidrBlock"] = cidrBlock
+          parameters['CidrBlock'] = cidrBlock
           pathUrl += '&CidrBlock='
-          pathUrl += URI.encode(cidrBlock,'/[^!*\'()\;?:@#&%=+$,{}[]<>`" ')	
+          pathUrl += URI.encode(cidrBlock, '/[^!*\'()\;?:@#&%=+$,{}[]<>`" ')
 
           name = options[:name]
           desc = options[:description]
 
           if name
-            parameters["VpcName"] = name
+            parameters['VpcName'] = name
             pathUrl += '&VpcName='
-            pathUrl += name	
+            pathUrl += name
           end
 
           if desc
-            parameters["Description"] = desc
+            parameters['Description'] = desc
             pathUrl += '&Description='
-            pathUrl += desc	
+            pathUrl += desc
           end
 
           signature = sign(@aliyun_accesskey_secret, parameters)
@@ -35,39 +35,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_vswitch.rb

@@ -2,24 +2,24 @@ module Fog
   module Compute
     class Aliyun
       class Real
-        def create_vswitch(vpcId, cidrBlock, options={})
+        def create_vswitch(vpcId, cidrBlock, options = {})
           # {Aliyun API Reference}[https://docs.aliyun.com/?spm=5176.100054.3.1.DGkmH7#/pub/ecs/open-api/vswitch&createvswitch]
           action = 'CreateVSwitch'
-          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
 
-          parameters["CidrBlock"] = cidrBlock
+          parameters['CidrBlock'] = cidrBlock
           pathUrl += '&CidrBlock='
-          pathUrl += URI.encode(cidrBlock,'/[^!*\'()\;?:@#&%=+$,{}[]<>`" ')
+          pathUrl += URI.encode(cidrBlock, '/[^!*\'()\;?:@#&%=+$,{}[]<>`" ')
 
-          parameters["ZoneId"] = @aliyun_zone_id
+          parameters['ZoneId'] = @aliyun_zone_id
           pathUrl += '&ZoneId='
           pathUrl += @aliyun_zone_id
 
@@ -27,15 +27,15 @@ module Fog
           desc = options[:description]
 
           if name
-            parameters["VSwitchName"] = name
+            parameters['VSwitchName'] = name
             pathUrl += '&VSwitchName='
-            pathUrl += name	
+            pathUrl += name
           end
 
           if desc
-            parameters["Description"] = desc
+            parameters['Description'] = desc
             pathUrl += '&Description='
-            pathUrl += desc	
+            pathUrl += desc
           end
 
           signature = sign(@aliyun_accesskey_secret, parameters)
@@ -43,39 +43,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/delete_disk.rb

@@ -6,7 +6,7 @@ module Fog
         #
         # ==== Parameters
         # * diskId<~String> - the disk_id
-        # 
+        #
         # ==== Returns
         # * response<~Excon::Response>:
         #   * body<~Hash>:
@@ -15,54 +15,27 @@ module Fog
         # {Aliyun API Reference}[https://docs.aliyun.com/?spm=5176.100054.201.106.DGkmH7#/pub/ecs/open-api/disk&deletedisk]
         def delete_disk(diskId)
           action   = 'DeleteDisk'
-          sigNonce = randonStr()
+          sigNonce = randonStr
           time     = Time.new.utc
 
           parameters = defalutParameters(action, sigNonce, time)
           pathUrl    = defaultAliyunUri(action, sigNonce, time)
-          
-          parameters["DiskId"] = diskId
+
+          parameters['DiskId'] = diskId
           pathUrl += '&DiskId='
-          pathUrl += diskId	
+          pathUrl += diskId
 
           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 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/delete_image.rb

@@ -5,54 +5,27 @@ module Fog
         # {Aliyun API Reference}[https://docs.aliyun.com/?spm=5176.100054.201.106.DGkmH7#/pub/ecs/open-api/image&deleteimage]
         def delete_image(imageId)
           action = 'DeleteImage'
-          sigNonce = randonStr()
+          sigNonce = randonStr
           time = Time.new.utc
 
           parameters = defalutParameters(action, sigNonce, time)
           pathUrl    = defaultAliyunUri(action, sigNonce, time)
 
-          parameters["ImageId"] = imageId
+          parameters['ImageId'] = imageId
           pathUrl += '&ImageId='
-          pathUrl += imageId	
+          pathUrl += imageId
 
           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 create_image(server_id, name, metadata={})
-          response = Excon::Response.new
-          response.status = 202
-
-          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"}],
-            'metadata'  => metadata || {},
-            'name'      => name || "server_#{rand(999)}",
-            'progress'  => 0,
-            'status'    => 'SAVING',
-            'minDisk'   => 0,
-            'minRam'    => 0,
-            'updated'   => "",
-            'created'   => ""
-          }
-          self.data[:last_modified][:images][data['id']] = Time.now
-          self.data[:images][data['id']] = data
-          response.body = { 'image' => data }
-          response
-        end
-      end
     end
   end
 end

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

@@ -5,42 +5,42 @@ module Fog
         def delete_security_group(security_group_id)
           # {Aliyun API Reference}[https://docs.aliyun.com/?spm=5176.100054.3.1.DGkmH7#/pub/ecs/open-api/securitygroup&deletesecuritygroup]
           action = 'DeleteSecurityGroup'
-          sigNonce = randonStr()
+          sigNonce = randonStr
           time = Time.new.utc
 
           parameters = defalutParameters(action, sigNonce, time)
           pathUrl    = defaultAliyunUri(action, sigNonce, time)
 
           if security_group_id
-            parameters["SecurityGroupId"] = security_group_id
+            parameters['SecurityGroupId'] = security_group_id
             pathUrl += '&SecurityGroupId='
-            pathUrl += security_group_id	
+            pathUrl += security_group_id
           else
-            raise ArgumentError, "Missing required securyti id "
+            raise ArgumentError, 'Missing required securyti id '
           end
 
           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 delete_security_group(security_group_id)
-          self.data[:security_groups].delete security_group_id.to_s
+          data[:security_groups].delete security_group_id.to_s
 
           response = Excon::Response.new
           response.status = 202
           response.headers = {
-            "Content-Type" => "text/html; charset=UTF-8",
-            "Content-Length" => "0",
-            "Date" => Date.new
+            'Content-Type' => 'text/html; charset=UTF-8',
+            'Content-Length' => '0',
+            'Date' => Date.new
           }
           response.body = {}
           response
@@ -48,4 +48,4 @@ module Fog
       end # mock
     end # aliyun
   end # compute
-end #fog
+end # fog

data/lib/fog/aliyun/requests/compute/delete_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 delete_security_group_egress_ip_rule(securitygroup_id,destCidrIp, nicType, option={})
-
+        def delete_security_group_egress_ip_rule(securitygroup_id, destCidrIp, nicType, 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["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