fog-aliyun 0.1.0 → 0.2.0

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

@@ -4,49 +4,32 @@ module Fog
       class Real
         # {Aliyun API Reference}[https://docs.aliyun.com/?spm=5176.100054.3.1.DGkmH7#/pub/ecs/open-api/vpc&deletevpc]
         def delete_vpc(vpc_id)
-          
           action = 'DeleteVpc'
-          sigNonce = randonStr()
+          sigNonce = randonStr
           time = Time.new.utc
 
           parameters = defalutParameters(action, sigNonce, time)
           pathUrl    = defaultAliyunUri(action, sigNonce, time)
 
           if vpc_id
-            parameters["VpcId"] = vpc_id
+            parameters['VpcId'] = vpc_id
             pathUrl += '&VpcId='
-            pathUrl += vpc_id	
+            pathUrl += vpc_id
           else
-            raise ArgumentError, "Missing required vpc_id"
+            raise ArgumentError, 'Missing required vpc_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
-
-          response = Excon::Response.new
-          response.status = 202
-          response.headers = {
-            "Content-Type" => "text/html; charset=UTF-8",
-            "Content-Length" => "0",
-            "Date" => Date.new
-          }
-          response.body = {}
-          response
-        end
-      end # mock
     end # aliyun
   end # compute
-end #fog
+end # fog

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

@@ -5,47 +5,31 @@ module Fog
         def delete_vswitch(vswitch_id)
           # {Aliyun API Reference}[https://docs.aliyun.com/?spm=5176.100054.3.1.DGkmH7#/pub/ecs/open-api/vswitch&deletevswitch]
           action = 'DeleteVSwitch'
-          sigNonce = randonStr()
+          sigNonce = randonStr
           time = Time.new.utc
 
           parameters = defalutParameters(action, sigNonce, time)
           pathUrl    = defaultAliyunUri(action, sigNonce, time)
 
           if vswitch_id
-            parameters["VSwitchId"] = vswitch_id
+            parameters['VSwitchId'] = vswitch_id
             pathUrl += '&VSwitchId='
-            pathUrl += vswitch_id	
+            pathUrl += vswitch_id
           else
-            raise ArgumentError, "Missing required vswitch_id"
+            raise ArgumentError, 'Missing required vswitch_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
-
-          response = Excon::Response.new
-          response.status = 202
-          response.headers = {
-            "Content-Type" => "text/html; charset=UTF-8",
-            "Content-Length" => "0",
-            "Date" => Date.new
-          }
-          response.body = {}
-          response
-        end
-      end # mock
     end # aliyun
   end # compute
-end #fog
+end # fog

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

@@ -3,54 +3,38 @@ module Fog
     class Aliyun
       class Real
         # {Aliyun API Reference}[https://docs.aliyun.com/?spm=5176.100054.3.1.DGkmH7#/pub/ecs/open-api/disk&detachdisk]
-        def detach_disk(instanceId, diskId,options={})
+        def detach_disk(instanceId, diskId, _options = {})
           action   = 'DetachDisk'
-          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
 
           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)
           pathUrl += '&Signature='
           pathUrl += signature
 
           request(
-            :expects  => [200, 203],
-            :method   => 'GET',
-            :path     => pathUrl
+            expects: [200, 203],
+            method: 'GET',
+            path: pathUrl
           )
         end
       end
-
-      class Mock
-        def attach_volume(volume_id, server_id, device)
-          response = Excon::Response.new
-          response.status = 200
-          data = {
-             'id'       => volume_id,
-             'volumeId' => volume_id,
-             'serverId' => server_id,
-             'device'   => device
-          }
-          self.data[:volumes][volume_id]['attachments'] << data
-          response.body = { 'volumeAttachment' => data }
-          response
-        end
-      end
     end
   end
 end

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

@@ -4,33 +4,32 @@ module Fog
       class Real
         # {Aliyun API Reference}[https://docs.aliyun.com/?spm=5176.100054.3.1.DGkmH7#/pub/ecs/open-api/instance&joinsecuritygroup]
         def join_security_group(server_id, group_id)
-
           _action = 'JoinSecurityGroup'
-          _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
-            
-          _parameters['SecurityGroupId']=group_id
-          _pathURL += '&SecurityGroupId='+group_id
-          
+          _pathURL = defaultAliyunUri(_action, _sigNonce, _time)
+
+          _parameters['InstanceId'] = server_id
+          _pathURL += '&InstanceId=' + server_id
+
+          _parameters['SecurityGroupId'] = group_id
+          _pathURL += '&SecurityGroupId=' + group_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
 
       class Mock
-        def join_security_group(server_id, group_id)
+        def join_security_group(_server_id, _group_id)
           response = Excon::Response.new
           response.status = 200
           response

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

@@ -4,33 +4,32 @@ module Fog
       class Real
         # {Aliyun API Reference}[https://docs.aliyun.com/?spm=5176.100054.3.1.DGkmH7#/pub/ecs/open-api/instance&leavesecuritygroup]
         def leave_security_group(server_id, group_id)
-
           _action = 'LeaveSecurityGroup'
-          _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
-            
-          _parameters['SecurityGroupId']=group_id
-          _pathURL += '&SecurityGroupId='+group_id
-          
+          _pathURL = defaultAliyunUri(_action, _sigNonce, _time)
+
+          _parameters['InstanceId'] = server_id
+          _pathURL += '&InstanceId=' + server_id
+
+          _parameters['SecurityGroupId'] = group_id
+          _pathURL += '&SecurityGroupId=' + group_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
 
       class Mock
-        def add_security_group(server_id, group_name)
+        def add_security_group(_server_id, _group_name)
           response = Excon::Response.new
           response.status = 200
           response

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

@@ -14,7 +14,7 @@ module Fog
         #     * :snapshotId - id of snapshot which used to create disk.
         #     * :name - name of disk
         #     * :portable - If ture, can exist dependently,which means it can be mount or umont in available zones.
-        #           Else, it must be created or destroyed with a instance. 
+        #           Else, it must be created or destroyed with a instance.
         #           The value for ocal disks and system disks on the cloud and cloud disks paid by month must be false.
         #     * :delWithIns - If ture, the disk will be released when the instance is released.
         #     * :delAutoSna - If ture, the auto created snapshot will be destroyed when the disk is destroyed
@@ -27,9 +27,9 @@ module Fog
         #     * 'Disks'<~Hash> - list of Disk,and the parameter of disk refer to the Volume model
         #
         # {Aliyun API Reference}[https://docs.aliyun.com/?spm=5176.100054.3.1.DGkmH7#/pub/ecs/open-api/disk&describedisks]
-        def list_disks(options={})
+        def list_disks(options = {})
           action = 'DescribeDisks'
-          sigNonce = randonStr()
+          sigNonce = randonStr
           time = Time.new.utc
 
           parameters = defalutParameters(action, sigNonce, time)
@@ -51,116 +51,97 @@ module Fog
           diskChargeType = options[:diskChargeType]
 
           if diskChargeType
-            parameters["DiskChargeType"] = diskChargeType
+            parameters['DiskChargeType'] = diskChargeType
             pathUrl += '&DiskChargeType='
             pathUrl += diskChargeType
           end
 
           if enAutoSna
-            parameters["EnableAutoSnapshot"] = enAutoSna
+            parameters['EnableAutoSnapshot'] = enAutoSna
             pathUrl += '&EnableAutoSnapshot='
             pathUrl += enAutoSna
           end
 
           if delAutoSna
-            parameters["DeleteAutoSnapshot"] = delAutoSna
+            parameters['DeleteAutoSnapshot'] = delAutoSna
             pathUrl += '&DeleteAutoSnapshot='
             pathUrl += delAutoSna
           end
 
           if delWithIns
-            parameters["DeleteWithInstance"] = delWithIns
+            parameters['DeleteWithInstance'] = delWithIns
             pathUrl += '&DeleteWithInstance='
             pathUrl += delWithIns
           end
 
           if portable
-            parameters["Portable"] = portable
+            parameters['Portable'] = portable
             pathUrl += '&Portable='
             pathUrl += portable
           end
 
           if name
-            parameters["DiskName"] = name
+            parameters['DiskName'] = name
             pathUrl += '&DiskName='
             pathUrl += name
           end
 
           if snapshotId
-            parameters["SnapshotId"] = snapshotId
+            parameters['SnapshotId'] = snapshotId
             pathUrl += '&SnapshotId='
             pathUrl += snapshotId
           end
 
           if state
-            parameters["Status"] = state
+            parameters['Status'] = state
             pathUrl += '&Status='
             pathUrl += state
           end
 
           if category
-            parameters["DiskType"] = diskType
+            parameters['DiskType'] = diskType
             pathUrl += '&DiskType='
             pathUrl += diskType
           end
 
           if category
-            parameters["Category"] = category
+            parameters['Category'] = category
             pathUrl += '&Category='
             pathUrl += category
           end
 
           if instanceId
-            parameters["InstanceId"] = instanceId
+            parameters['InstanceId'] = instanceId
             pathUrl += '&InstanceId='
             pathUrl += instanceId
           end
 
           if diskIds
-            parameters["DiskIds"] = Fog::JSON.encode(diskIds)
+            parameters['DiskIds'] = Fog::JSON.encode(diskIds)
             pathUrl += '&DiskIds='
             pathUrl += Fog::JSON.encode(diskIds)
           end
-          
+
           if pageNumber
-            parameters["PageNumber"] = pageNumber
+            parameters['PageNumber'] = pageNumber
             pathUrl += '&PageNumber='
             pathUrl += pageNumber
           end
 
-          pageSize   = options[:pageSize]
-          unless pageSize
-            pageSize = '50'   
-          end
-          parameters["PageSize"] = pageSize  
+          pageSize = options[: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
-          )
-        end
-      end
-
-      class Mock
-        def list_zones(*args)
-          Excon::Response.new(
-            :body   => { "availabilityZoneInfo" => [
-                  {
-                      "zoneState" => {
-                          "available" => true
-                      },
-                      "hosts" => nil,
-                      "zoneName" => "nova"
-                  }
-              ] },
-            :status => 200
+            expects: [200, 203],
+            method: 'GET',
+            path: pathUrl
           )
         end
       end

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

@@ -3,79 +3,53 @@ module Fog
     class Aliyun
       class Real
         # {Aliyun API Reference}[https://docs.aliyun.com/?spm=5176.100054.3.1.DGkmH7#/pub/ecs/open-api/network&describeeipaddress]
-        def list_eip_addresses(options={})
-          
+        def list_eip_addresses(options = {})
           _action = 'DescribeEipAddresses'
-          _sigNonce = randonStr()
+          _sigNonce = randonStr
           _time = Time.new.utc
 
           _parameters = defalutParameters(_action, _sigNonce, _time)
-          _pathURL  = defaultAliyunUri(_action, _sigNonce, _time)
-          
+          _pathURL = defaultAliyunUri(_action, _sigNonce, _time)
+
           _Status = options[:state]
           if _Status
-            _parameters['Status']=_Status
-            _pathURL += '&Status='+_Status
+            _parameters['Status'] = _Status
+            _pathURL += '&Status=' + _Status
           end
-          
+
           _EipAddress = options[:ip_address]
           if _EipAddress
-            _parameters['EipAddress']=_EipAddress
-            _pathURL += '&EipAddress='+_EipAddress
+            _parameters['EipAddress'] = _EipAddress
+            _pathURL += '&EipAddress=' + _EipAddress
           end
-          
+
           _AllocationId = options[:allocation_id]
           if _AllocationId
-            _parameters['AllocationId']=_AllocationId
-            _pathURL += '&AllocationId='+_AllocationId
+            _parameters['AllocationId'] = _AllocationId
+            _pathURL += '&AllocationId=' + _AllocationId
           end
-          
+
           _PageNumber = options[:page_number]
           if _PageNumber
-            _parameters['PageNumber']=_PageNumber
-            _pathURL += '&PageNumber='+_PageNumber
+            _parameters['PageNumber'] = _PageNumber
+            _pathURL += '&PageNumber=' + _PageNumber
           end
 
-          _PageSize   = options[:page_size]
-          unless _PageSize
-            _PageSize = '50'
-          end
-          _parameters['PageSize']=_PageSize
-          _pathURL += '&PageSize='+_PageSize
-          
+          _PageSize = options[:page_size]
+          _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, 204],
-            :method => 'GET',
-            :path   => _pathURL
+            expects: [200, 204],
+            method: 'GET',
+            path: _pathURL
           )
         end
       end
-
-      class Mock
-        def allocate_address(pool = nil)
-          response = Excon::Response.new
-          response.status = 200
-          response.headers = {
-            "X-Compute-Request-Id" => "req-d4a21158-a86c-44a6-983a-e25645907f26",
-            "Content-Type" => "application/json",
-            "Content-Length" => "105",
-            "Date"=> Date.new
-          }
-          response.body = {
-            "floating_ip" => {
-              "instance_id" => nil,
-              "ip" => "192.168.27.132",
-              "fixed_ip" => nil,
-              "id" => 4,
-              "pool"=>"nova"
-            }
-          }
-          response
-        end
-      end # mock
     end # aliyun
-  end #compute
+  end # compute
 end