fog-aliyun 0.1.0 → 0.2.0

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

@@ -3,31 +3,30 @@ module Fog
     class Aliyun
       class Real
         # {Aliyun API Reference}[https://docs.aliyun.com/?spm=5176.100054.3.1.DGkmH7#/pub/ecs/open-api/vpc&modifyvpcattribute]
-        def modify_vpc(vpcId,options={})
-
+        def modify_vpc(vpcId, options = {})
           action = 'ModifyVpcAttribute'
-          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 += URI.encode(vpcId,'/[^!*\'()\;?:@#&%=+$,{}[]<>`" ') 
+          pathUrl += URI.encode(vpcId, '/[^!*\'()\;?:@#&%=+$,{}[]<>`" ')
           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,19 +34,19 @@ module Fog
           pathUrl += signature
 
           request(
-            :expects  => [200, 203],
-            :method   => 'GET',
-            :path     => pathUrl
+            expects: [200, 203],
+            method: 'GET',
+            path: pathUrl
           )
         end
       end
 
       class Mock
-        def modify_vpc(vpcId, options={})
-          Fog::Identity::OpenStack.new(:openstack_auth_url => credentials[:openstack_auth_url])
+        def modify_vpc(_vpcId, _options = {})
+          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] = {
+          data[:security_groups][security_group_id.to_s] = {
             'tenant_id' => tenant_id,
             'rules'     => [],
             'id'        => security_group_id,
@@ -61,9 +60,10 @@ module Fog
             '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}
+            'Date'           => Date.new
+          }
           response.body = {
-            'security_group' => self.data[:security_groups][security_group_id.to_s]
+            'security_group' => data[:security_groups][security_group_id.to_s]
           }
           response
         end

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

@@ -3,31 +3,30 @@ module Fog
     class Aliyun
       class Real
         # {Aliyun API Reference}[https://docs.aliyun.com/?spm=5176.100054.3.1.DGkmH7#/pub/ecs/open-api/vswitch&modifyvswitchattribute]
-        def modify_vpc(vSwitchId,options={})
-
+        def modify_switch(vSwitchId, options = {})
           action = 'ModifyVSwitchAttribute'
-          sigNonce = randonStr()
+          sigNonce = randonStr
           time = Time.new.utc
 
           parameters = defalutParameters(action, sigNonce, time)
           pathUrl    = defaultAliyunUri(action, sigNonce, time)
 
-          parameters["VSwitchId"] = vSwitchId
+          parameters['VSwitchId'] = vSwitchId
           pathUrl += '&VSwitchId='
-          pathUrl += URI.encode(vpcId,'/[^!*\'()\;?:@#&%=+$,{}[]<>`" ') 
+          pathUrl += URI.encode(vpcId, '/[^!*\'()\;?:@#&%=+$,{}[]<>`" ')
           name = options[:name]
           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)
@@ -35,39 +34,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 modify_vpc(vpcId, options={})
-          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/reboot_server.rb

@@ -4,36 +4,35 @@ module Fog
       class Real
         # {Aliyun API Reference}[https://docs.aliyun.com/?spm=5176.100054.3.1.DGkmH7#/pub/ecs/open-api/instance&rebootinstance]
         def reboot_server(server_id, options = {})
-
           _action = 'RebootInstance'
-          _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
+
           _ForceStop = options[:aliyun_ForceStop]
           if _ForceStop
-            _parameters['ForceStop']=_ForceStop
-            _pathURL += '&ForceStop='+_ForceStop
+            _parameters['ForceStop'] = _ForceStop
+            _pathURL += '&ForceStop=' + _ForceStop
           end
-          
+
           _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 reboot_server(server_id, type = 'SOFT')
+        def reboot_server(_server_id, _type = 'SOFT')
           response = Excon::Response.new
           response.status = 202
           response

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

@@ -2,52 +2,28 @@ module Fog
   module Compute
     class Aliyun
       class Real
-         # {Aliyun API Reference}[https://docs.aliyun.com/?spm=5176.100054.3.1.DGkmH7#/pub/ecs/open-api/network&releaseeipaddress]
+        # {Aliyun API Reference}[https://docs.aliyun.com/?spm=5176.100054.3.1.DGkmH7#/pub/ecs/open-api/network&releaseeipaddress]
         def release_eip_address(allocationId)
-          
           _action = 'ReleaseEipAddress'
-          _sigNonce = randonStr()
+          _sigNonce = randonStr
           _time = Time.new.utc
 
           _parameters = defalutParameters(_action, _sigNonce, _time)
-          _pathURL  = defaultAliyunUri(_action, _sigNonce, _time)
-          
+          _pathURL = defaultAliyunUri(_action, _sigNonce, _time)
+
           _parameters['AllocationId'] = allocationId
-          _pathURL += '&AllocationId='+allocationId
-          
+          _pathURL += '&AllocationId=' + allocationId
+
           _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

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

@@ -8,35 +8,34 @@ module Fog
         # * server_id <~String> - The ID of the server to be started.
         # === Returns
         # * success <~Boolean>
-         # {Aliyun API Reference}[https://docs.aliyun.com/?spm=5176.100054.3.1.DGkmH7#/pub/ecs/open-api/instance&staetinstance]
+        # {Aliyun API Reference}[https://docs.aliyun.com/?spm=5176.100054.3.1.DGkmH7#/pub/ecs/open-api/instance&staetinstance]
         def start_server(server_id)
-          
           _action = 'StartInstance'
-          _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 # def start_server
       end # class Real
 
       class Mock
-        def start_server(server_id)
+        def start_server(_server_id)
           true
         end # def start_server
       end # class Mock
     end # class aliyun
   end # module Compute
-end # module Fog
+end # module Fog

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

@@ -10,33 +10,32 @@ module Fog
         # * success <~Boolean>
         # {Aliyun API Reference}[https://docs.aliyun.com/?spm=5176.100054.3.1.DGkmH7#/pub/ecs/open-api/instance&stopinstance]
         def stop_server(server_id)
-
           _action = 'StopInstance'
-          _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 # def stop_server
       end # class Real
 
       class Mock
-        def stop_server(server_id)
+        def stop_server(_server_id)
           true
         end # def stop_server
       end # class Mock
     end # class aliyun
   end # module Compute
-end # module Fog
+end # module Fog

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

@@ -13,62 +13,37 @@ module Fog
         #     * 'RequestId'<~String> - Id of the request
         #
         # {Aliyun API Reference}[https://docs.aliyun.com/?spm=5176.100054.201.106.DGkmH7#/pub/ecs/open-api/network&associateeipaddresss]
-        def unassociate_eip_address(server_id, allocationId, options={})
-          
+        def unassociate_eip_address(server_id, allocationId, options = {})
           _action = 'UnassociateEipAddress'
-          _sigNonce = randonStr()
+          _sigNonce = randonStr
           _time = Time.new.utc
 
-          type=options['instance_type']
+          type = options['instance_type']
 
           _parameters = defalutParameters(_action, _sigNonce, _time)
-          _pathURL  = defaultAliyunUri(_action, _sigNonce, _time)
-          
+          _pathURL = defaultAliyunUri(_action, _sigNonce, _time)
+
           _parameters['InstanceId'] = server_id
-          _pathURL += '&InstanceId='+server_id
-          
+          _pathURL += '&InstanceId=' + server_id
+
           _parameters['AllocationId'] = allocationId
-          _pathURL += '&AllocationId='+allocationId
+          _pathURL += '&AllocationId=' + allocationId
 
           if type
             _parameters['InstanceType'] = type
-            _pathURL += 'InstanceType='+type
+            _pathURL += 'InstanceType=' + type
           end
-          
+
           _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
-