fog-aliyun 0.1.0 → 0.2.0

data/lib/fog/aliyun/models/compute/eip_address.rb

@@ -3,17 +3,16 @@ module Fog
   module Compute
     class Aliyun
       class EipAddress < Fog::Model
+        identity :id,             aliases: 'AllocationId'
 
-        identity :id,             :aliases => 'AllocationId'
-
-        attribute :allocated_at,  :aliases => 'AllocationTime'
-        attribute :bandwidth,     :aliases => 'Bandwidth'
-        attribute :server_id,     :aliases => 'InstanceId'
-        attribute :charge_type,   :aliases => 'InternetChargeType'
-        attribute :ip_address,    :aliases => ['IpAddress','EipAddress']
-        attribute :opertion_locks,:aliases => 'OperationLocks'
-        attribute :region_id,     :aliases => 'RegionId'
-        attribute :state,         :aliases => 'Status'
+        attribute :allocated_at,  aliases: 'AllocationTime'
+        attribute :bandwidth,     aliases: 'Bandwidth'
+        attribute :server_id,     aliases: 'InstanceId'
+        attribute :charge_type,   aliases: 'InternetChargeType'
+        attribute :ip_address,    aliases: %w(IpAddress EipAddress)
+        attribute :opertion_locks, aliases: 'OperationLocks'
+        attribute :region_id,     aliases: 'RegionId'
+        attribute :state,         aliases: 'Status'
 
         def destroy
           requires :id
@@ -26,38 +25,33 @@ module Fog
           state == 'Available'
         end
 
-        def save(options={})
+        def save(options = {})
           # raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if persisted?
           # requires :availability_zone
           options[:bandwidth] = bandwidth if bandwidth
-          options[:internet_charge_type]=charge_type if charge_type
-          
+          options[:internet_charge_type] = charge_type if charge_type
+
           data = Fog::JSON.decode(service.allocate_eip_address(options).body)
-          merge_attributes(data)         
+          merge_attributes(data)
           true
         end
 
-
-        def associate(new_server,options={})
-          unless persisted?
-            @server = new_server
-          else
+        def associate(new_server, options = {})
+          if persisted?
             @server = nil
             self.server_id = new_server.id
-            service.associate_eip_address(server_id,id,options)
+            service.associate_eip_address(server_id, id, options)
+          else
+            @server = new_server
           end
         end
 
-        def disassociate(new_server,options={})
-            @server = nil
-            self.server_id = new_server.id
-          if persisted?
-            service.unassociate_eip_address(server_id,id,options)
-          end
-          
+        def disassociate(new_server, options = {})
+          @server = nil
+          self.server_id = new_server.id
+          service.unassociate_eip_address(server_id, id, options) if persisted?
         end
-
       end
     end
   end
-end
+end

data/lib/fog/aliyun/models/compute/eip_addresses.rb

@@ -5,8 +5,7 @@ module Fog
   module Compute
     class Aliyun
       class EipAddresses < Fog::Collection
-
-        model Fog::Compute::Aliyun::EipAddress 
+        model Fog::Compute::Aliyun::EipAddress
 
         def all(filters_arg = {})
           data = Fog::JSON.decode(service.list_eip_addresses(filters_arg).body)['EipAddresses']['EipAddress']
@@ -20,11 +19,10 @@ module Fog
 
         def get(allocation_id)
           if allocation_id
-            self.class.new(:service => service).all(:allocation_id => allocation_id)[0]
+            self.class.new(service: service).all(allocation_id: allocation_id)[0]
           end
         end
-
       end
     end
   end
-end
+end

data/lib/fog/aliyun/models/compute/image.rb

@@ -3,40 +3,39 @@ module Fog
   module Compute
     class Aliyun
       class Image < Fog::Model
+        identity :id,                     aliases: 'ImageId'
 
-        identity :id,                     :aliases => 'ImageId'
-
-        attribute :description,           :aliases => 'Description'
-        attribute :product_code,          :aliases => 'ProductCode'
-        attribute :os_type,               :aliases => 'OSType'
-        attribute :architecture,          :aliases => 'Architecture'
-        attribute :os_name,               :aliases => 'OSName'
-        attribute :disk_device_mappings,  :aliases => 'DiskDeviceMappings'
-        attribute :owner_alias,           :aliases => 'ImageOwnerAlias'
-        attribute :progress,              :aliases => 'Progress'
-        attribute :usage,                 :aliases => 'Usage'
-        attribute :created_at,            :aliases => 'CreationTime'
-        attribute :tags,                  :aliases => 'Tags'
-        attribute :version,               :aliases => 'ImageVersion'
-        attribute :state,                 :aliases => 'Status'
-        attribute :name,                  :aliases => 'ImageName'
-        attribute :is_self_shared,        :aliases => 'IsSelfShared'
-        attribute :is_copied,             :aliases => 'IsCopied'
-        attribute :is_subscribed,         :aliases => 'IsSubscribed'
-        attribute :platform,              :aliases => 'Platform'
-        attribute :size,                  :aliases => 'Size'
-        attribute :snapshot_id,           :aliases => 'SnapshotId'
+        attribute :description,           aliases: 'Description'
+        attribute :product_code,          aliases: 'ProductCode'
+        attribute :os_type,               aliases: 'OSType'
+        attribute :architecture,          aliases: 'Architecture'
+        attribute :os_name,               aliases: 'OSName'
+        attribute :disk_device_mappings,  aliases: 'DiskDeviceMappings'
+        attribute :owner_alias,           aliases: 'ImageOwnerAlias'
+        attribute :progress,              aliases: 'Progress'
+        attribute :usage,                 aliases: 'Usage'
+        attribute :created_at,            aliases: 'CreationTime'
+        attribute :tags,                  aliases: 'Tags'
+        attribute :version,               aliases: 'ImageVersion'
+        attribute :state,                 aliases: 'Status'
+        attribute :name,                  aliases: 'ImageName'
+        attribute :is_self_shared,        aliases: 'IsSelfShared'
+        attribute :is_copied,             aliases: 'IsCopied'
+        attribute :is_subscribed,         aliases: 'IsSubscribed'
+        attribute :platform,              aliases: 'Platform'
+        attribute :size,                  aliases: 'Size'
+        attribute :snapshot_id,           aliases: 'SnapshotId'
 
         def initialize(attributes)
-          self.snapshot_id=attributes["DiskDeviceMappings"]["DiskDeviceMapping"][0]["SnapshotId"]
+          self.snapshot_id = attributes['DiskDeviceMappings']['DiskDeviceMapping'][0]['SnapshotId']
           super
         end
 
-        def save (options={})
+        def save(options = {})
           requires :snapshot_id
           options[:name] = name if name
-          options[:description]=description if description
-          data=Fog::JSON.decode(service.create_image(snapshot_id,options).body)
+          options[:description] = description if description
+          data = Fog::JSON.decode(service.create_image(snapshot_id, options).body)
           merge_attributes(data)
           true
         end
@@ -53,7 +52,7 @@ module Fog
 
         def snapshot
           requires :snapshot_id
-          Fog::Compute::Aliyun::Snapshots.new(:service=>service).all(:snapshotIds=>[snapshot_id])[0]
+          Fog::Compute::Aliyun::Snapshots.new(service: service).all(snapshotIds: [snapshot_id])[0]
         end
 
         private
@@ -61,7 +60,6 @@ module Fog
         def snapshot=(new_snapshot)
           self.snapshot_id = new_snapshot.id
         end
-
       end
     end
   end

data/lib/fog/aliyun/models/compute/images.rb

@@ -5,23 +5,19 @@ module Fog
   module Compute
     class Aliyun
       class Images < Fog::Collection
-
         model Fog::Compute::Aliyun::Image
 
-
         def all(filters_arg = {})
           unless filters_arg.is_a?(Hash)
             Fog::Logger.deprecation("all with #{filters_arg.class} param is deprecated, use all('diskIds' => []) instead [light_black](#{caller.first})[/]")
-            filters_arg = {:imageId => filters_arg}
+            filters_arg = { imageId: filters_arg }
           end
           data = Fog::JSON.decode(service.list_images(filters_arg).body)['Images']['Image']
           load(data)
         end
 
         def get(image_id)
-          if image_id
-            self.class.new(:service => service).all(:imageId => image_id)[0]
-          end
+          self.class.new(service: service).all(imageId: image_id)[0] if image_id
         end
       end
     end

data/lib/fog/aliyun/models/compute/route_entry.rb

@@ -3,26 +3,24 @@ module Fog
   module Compute
     class Aliyun
       class RouteEntry < Fog::Model
-
         # "RouteTables"=>{"RouteTable"=>[
         #  {"CreationTime"=>"2015-08-03T11:23:35Z", "RouteEntrys"=>{"RouteEntry"=>[
         #    {"Status"=>"Available", "Type"=>"System", "InstanceId"=>"", "RouteTableId"=>"vtb-2504onoxh", "DestinationCidrBlock"=>"172.16.0.0/24"},
-        #    {"Status"=>"Available", "Type"=>"System", "InstanceId"=>"", "RouteTableId"=>"vtb-2504onoxh", "DestinationCidrBlock"=>"172.16.1.0/24"}, 
-        #    {"Status"=>"Available", "Type"=>"System", "InstanceId"=>"", "RouteTableId"=>"vtb-2504onoxh", "DestinationCidrBlock"=>"172.16.2.0/24"}, 
-        #    {"Status"=>"Available", "Type"=>"System", "InstanceId"=>"", "RouteTableId"=>"vtb-2504onoxh", "DestinationCidrBlock"=>"100.64.0.0/10"}, 
+        #    {"Status"=>"Available", "Type"=>"System", "InstanceId"=>"", "RouteTableId"=>"vtb-2504onoxh", "DestinationCidrBlock"=>"172.16.1.0/24"},
+        #    {"Status"=>"Available", "Type"=>"System", "InstanceId"=>"", "RouteTableId"=>"vtb-2504onoxh", "DestinationCidrBlock"=>"172.16.2.0/24"},
+        #    {"Status"=>"Available", "Type"=>"System", "InstanceId"=>"", "RouteTableId"=>"vtb-2504onoxh", "DestinationCidrBlock"=>"100.64.0.0/10"},
         #    {"Status"=>"Available", "Type"=>"System", "InstanceId"=>"", "RouteTableId"=>"vtb-2504onoxh", "DestinationCidrBlock"=>"10.0.0.0/8"}]},
         #  "RouteTableId"=>"vtb-2504onoxh", "RouteTableType"=>"System", "VRouterId"=>"vrt-25azmd2wm"}]}
-        identity :cidr_block,         :aliases => 'DestinationCidrBlock'
-        attribute :state,             :aliases => 'Status'
-        attribute :server_id,         :aliases => 'InstanceId'
-        attribute :type,              :aliases => 'Type'
-        attribute :route_table_id,    :aliases => 'RouteTableId'
+        identity :cidr_block,         aliases: 'DestinationCidrBlock'
+        attribute :state,             aliases: 'Status'
+        attribute :server_id,         aliases: 'InstanceId'
+        attribute :type,              aliases: 'Type'
+        attribute :route_table_id,    aliases: 'RouteTableId'
 
         # def save
         #   requires :cidr_block,:route_table_id
         #   if(cidr_block)
-
       end
     end
   end
-end
+end

data/lib/fog/aliyun/models/compute/route_entrys.rb

@@ -9,20 +9,20 @@ module Fog
 
         model Fog::Compute::Aliyun::RouteEntry
 
-        def all(options={})
+        def all(options = {})
           requires :route_table
-          options[:routeTableId]=route_table.id
-          data = Fog::JSON.decode(service.list_route_tables(route_table.v_router_id, options).body)['RouteTables']['RouteTable'][0]["RouteEntrys"]["RouteEntry"]
+          options[:routeTableId] = route_table.id
+          data = Fog::JSON.decode(service.list_route_tables(route_table.v_router_id, options).body)['RouteTables']['RouteTable'][0]['RouteEntrys']['RouteEntry']
           load(data)
         end
 
         def get(cidr_block)
           requires :route_table
-          data=self.class.new(:service=>service,:route_table=>route_table).all()
-          result=nil
+          data = self.class.new(service: service, route_table: route_table).all
+          result = nil
           data.each do |i|
-            if i.cidr_block==cidr_block
-              result=i
+            if i.cidr_block == cidr_block
+              result = i
               break
             end
           end

data/lib/fog/aliyun/models/compute/route_table.rb

@@ -3,29 +3,28 @@ module Fog
   module Compute
     class Aliyun
       class RouteTable < Fog::Model
-
         # "RouteTables"=>{"RouteTable"=>[
         # {"CreationTime"=>"2015-08-03T11:23:35Z", "RouteEntrys"=>{"RouteEntry"=>[
         #   {"Status"=>"Available", "Type"=>"System", "InstanceId"=>"", "RouteTableId"=>"vtb-2504onoxh", "DestinationCidrBlock"=>"172.16.0.0/24"},
-        #   {"Status"=>"Available", "Type"=>"System", "InstanceId"=>"", "RouteTableId"=>"vtb-2504onoxh", "DestinationCidrBlock"=>"172.16.1.0/24"}, 
-        #   {"Status"=>"Available", "Type"=>"System", "InstanceId"=>"", "RouteTableId"=>"vtb-2504onoxh", "DestinationCidrBlock"=>"172.16.2.0/24"}, 
-        #   {"Status"=>"Available", "Type"=>"System", "InstanceId"=>"", "RouteTableId"=>"vtb-2504onoxh", "DestinationCidrBlock"=>"100.64.0.0/10"}, 
+        #   {"Status"=>"Available", "Type"=>"System", "InstanceId"=>"", "RouteTableId"=>"vtb-2504onoxh", "DestinationCidrBlock"=>"172.16.1.0/24"},
+        #   {"Status"=>"Available", "Type"=>"System", "InstanceId"=>"", "RouteTableId"=>"vtb-2504onoxh", "DestinationCidrBlock"=>"172.16.2.0/24"},
+        #   {"Status"=>"Available", "Type"=>"System", "InstanceId"=>"", "RouteTableId"=>"vtb-2504onoxh", "DestinationCidrBlock"=>"100.64.0.0/10"},
         #   {"Status"=>"Available", "Type"=>"System", "InstanceId"=>"", "RouteTableId"=>"vtb-2504onoxh", "DestinationCidrBlock"=>"10.0.0.0/8"}]},
         #  "RouteTableId"=>"vtb-2504onoxh", "RouteTableType"=>"System", "VRouterId"=>"vrt-25azmd2wm"}]}
-        identity :id,             :aliases => 'RouteTableId'
-        attribute :created_at,    :aliases => 'CreationTime'
-        attribute :type,          :aliases => 'RouteTableType'
-        attribute :v_router_id,   :aliases => 'VRouterId'
+        identity :id,             aliases: 'RouteTableId'
+        attribute :created_at,    aliases: 'CreationTime'
+        attribute :type,          aliases: 'RouteTableType'
+        attribute :v_router_id,   aliases: 'VRouterId'
         # collection Fog::Compute::Aliyun::RouteEntrys
         def route_entrys
           @route_entrys ||= begin
             Fog::Compute::Aliyun::RouteEntrys.new(
-              :route_table    => self,
-              :service   => service
+              route_table: self,
+              service: service
             )
           end
         end
       end
     end
   end
-end
+end

data/lib/fog/aliyun/models/compute/route_tables.rb

@@ -9,7 +9,7 @@ module Fog
 
         model Fog::Compute::Aliyun::RouteTable
 
-        def all(options={})
+        def all(options = {})
           requires :v_router
           data = Fog::JSON.decode(service.list_route_tables(v_router.id, options).body)['RouteTables']['RouteTable']
           load(data)
@@ -18,7 +18,7 @@ module Fog
         def get(routeTableId)
           requires :v_router
           if routeTableId
-            self.class.new(:service => service,:v_router=>v_router).all(:routeTableId=>routeTableId)[0]
+            self.class.new(service: service, v_router: v_router).all(routeTableId: routeTableId)[0]
           end
         end
       end

data/lib/fog/aliyun/models/compute/security_group.rb

@@ -4,11 +4,11 @@ module Fog
   module Compute
     class Aliyun
       class SecurityGroup < Fog::Model
-        identity  :id,           :aliases =>"SecurityGroupId"
-        attribute :name,         :aliases => "SecurityGroupName"
-        attribute :description,  :aliases => "Description"
-        attribute :created_at,   :aliases => "CreationTime"
-        attribute :vpc_id,       :aliases => "VpcId"
+        identity  :id,           aliases: 'SecurityGroupId'
+        attribute :name,         aliases: 'SecurityGroupName'
+        attribute :description,  aliases: 'Description'
+        attribute :created_at,   aliases: 'CreationTime'
+        attribute :vpc_id,       aliases: 'VpcId'
 
         def vpc
           requires :vpc_id
@@ -20,7 +20,7 @@ module Fog
           service.security_group_rules.get(id)
         end
 
-        def save(options={})
+        def save(options = {})
           options[:vpcId] = vpc_id if vpc_id
           options[:name] = name if name
           options[:description] = description if description
@@ -34,44 +34,44 @@ module Fog
           true
         end
 
-        def authorize_security_group_sg_rule(group_id,direction="ingress",options={})
+        def authorize_security_group_sg_rule(group_id, direction = 'ingress', options = {})
           requires :id
-          if direction=="egress"
-            service.create_security_group_egress_sg_rule(id,group_id,options)
+          if direction == 'egress'
+            service.create_security_group_egress_sg_rule(id, group_id, options)
           else
-            service.create_security_group_sg_rule(id,group_id,options)
+            service.create_security_group_sg_rule(id, group_id, options)
           end
           true
         end
 
-        def authorize_security_group_ip_rule(cidr_ip,direction="ingress",options={})
+        def authorize_security_group_ip_rule(cidr_ip, direction = 'ingress', options = {})
           requires :id
-          nic_type = options.fetch(:nic_type, "internet")
-          if direction=="egress"
-            service.create_security_group_egress_ip_rule(id,cidr_ip,nic_type,options)
+          nic_type = options.fetch(:nic_type, 'internet')
+          if direction == 'egress'
+            service.create_security_group_egress_ip_rule(id, cidr_ip, nic_type, options)
           else
-            service.create_security_group_ip_rule(id,cidr_ip,nic_type,options)
+            service.create_security_group_ip_rule(id, cidr_ip, nic_type, options)
           end
           true
         end
 
-        def revoke_seurity_group_sg_rule(group_id,direction="ingress",options={})
+        def revoke_seurity_group_sg_rule(group_id, direction = 'ingress', options = {})
           requires :id
-          if direction=="egress"
-            service.delete_security_group_egress_sg_rule(id,group_id,options)
+          if direction == 'egress'
+            service.delete_security_group_egress_sg_rule(id, group_id, options)
           else
-            service.delete_security_group_sg_rule(id,group_id,options)
+            service.delete_security_group_sg_rule(id, group_id, options)
           end
           true
         end
 
-        def revoke_security_group_ip_rule(cidr_ip,direction="ingress",options={})
+        def revoke_security_group_ip_rule(cidr_ip, direction = 'ingress', options = {})
           requires :id
-          nic_type = options.fetch(:nic_type, "internet")
-          if direction=="egress"
-            service.delete_security_group_egress_ip_rule(id,cidr_ip,nic_type,options)
+          nic_type = options.fetch(:nic_type, 'internet')
+          if direction == 'egress'
+            service.delete_security_group_egress_ip_rule(id, cidr_ip, nic_type, options)
           else
-            service.delete_security_group_ip_rule(id,cidr_ip,nic_type,options)
+            service.delete_security_group_ip_rule(id, cidr_ip, nic_type, options)
           end
           true
         end

data/lib/fog/aliyun/models/compute/security_group_rule.rb

@@ -4,40 +4,40 @@ module Fog
   module Compute
     class Aliyun
       class SecurityGroupRule < Fog::Model
-        attribute :security_group_id,         :aliases => 'SecurityGroupId'
-        attribute :source_cidr_ip,            :aliases => 'SourceCidrIp'
-        attribute :source_owner,              :aliases => 'SourceGroupOwnerAccount'
-        attribute :source_group_id,           :aliases => 'SourceGroupId'
-        attribute :ip_protocol,               :aliases => 'IpProtocol'
-        attribute :dest_cidr_ip,              :aliases => 'DestCidrIp'
-        attribute :dest_owner,                :aliases => 'DestGroupOwnerAccount'
-        attribute :dest_group_id,             :aliases => 'DestGroupId'
-        attribute :nic_type,                  :aliases => 'NicType'
-        attribute :policy,                    :aliases => 'Policy'
-        attribute :port_range,                :aliases => 'PortRange'
-        attribute :direction,                 :aliases => 'Direction'
-        attribute :priority,                  :aliases => 'Priority'
+        attribute :security_group_id,         aliases: 'SecurityGroupId'
+        attribute :source_cidr_ip,            aliases: 'SourceCidrIp'
+        attribute :source_owner,              aliases: 'SourceGroupOwnerAccount'
+        attribute :source_group_id,           aliases: 'SourceGroupId'
+        attribute :ip_protocol,               aliases: 'IpProtocol'
+        attribute :dest_cidr_ip,              aliases: 'DestCidrIp'
+        attribute :dest_owner,                aliases: 'DestGroupOwnerAccount'
+        attribute :dest_group_id,             aliases: 'DestGroupId'
+        attribute :nic_type,                  aliases: 'NicType'
+        attribute :policy,                    aliases: 'Policy'
+        attribute :port_range,                aliases: 'PortRange'
+        attribute :direction,                 aliases: 'Direction'
+        attribute :priority,                  aliases: 'Priority'
 
         def save
-          requires :security_group_id,:ip_protocol,:port_range,:direction
-          options={}
+          requires :security_group_id, :ip_protocol, :port_range, :direction
+          options = {}
           options[:portRange] = port_range if port_range
           options[:policy] = policy if policy
           options[:priority] = priority if port_range
           options[:protocol] = ip_protocol if ip_protocol
-          if direction=="egress"
+          if direction == 'egress'
             if dest_cidr_ip
-              service.create_security_group_egress_ip_rule(security_group_id,dest_cidr_ip,nic_type,options)
+              service.create_security_group_egress_ip_rule(security_group_id, dest_cidr_ip, nic_type, options)
             elsif dest_group_id
               options[:destGroupOwnerAccount] = dest_owner if dest_owner
-              service.create_security_group_egress_sg_rule(security_group_id,dest_group_id,options)
+              service.create_security_group_egress_sg_rule(security_group_id, dest_group_id, options)
             end
           else
             if source_cidr_ip
-              service.create_security_group_ip_rule(security_group_id,source_cidr_ip,nic_type,options)
+              service.create_security_group_ip_rule(security_group_id, source_cidr_ip, nic_type, options)
             elsif source_group_id
               options[:sourceGroupOwnerAccount] = source_owner if source_owner
-              service.create_security_group_sg_rule(security_group_id,source_group_id,options)
+              service.create_security_group_sg_rule(security_group_id, source_group_id, options)
             end
           end
         end