fog-aliyun 0.1.0 → 0.2.0

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

@@ -8,12 +8,12 @@ module Fog
         model Fog::Compute::Aliyun::SecurityGroupRule
         attribute :security_group_id
 
-        def get(security_group_id,options={})
+        def get(security_group_id, options = {})
           data = Fog::JSON.decode(service.list_security_group_rules(security_group_id, options).body)
-          self.security_group_id = data["SecurityGroupId"]
-          permissions = data["Permissions"]["Permission"]
+          self.security_group_id = data['SecurityGroupId']
+          permissions = data['Permissions']['Permission']
           permissions.each do |permission|
-            permission["SecurityGroupId"] = self.security_group_id
+            permission['SecurityGroupId'] = self.security_group_id
           end
           load(permissions)
         end

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

@@ -7,26 +7,25 @@ module Fog
       class SecurityGroups < Fog::Collection
         model Fog::Compute::Aliyun::SecurityGroup
 
-        def all(options={})
+        def all(options = {})
           data = Fog::JSON.decode(service.list_security_groups(options).body)['SecurityGroups']['SecurityGroup']
           load(data)
-          #['Images']['Image']
+          # ['Images']['Image']
         end
 
         def get(security_group_id)
           if security_group_id
-            data=self.class.new(:service=>service).all()
-            result=nil
+            data = self.class.new(service: service).all
+            result = nil
             data.each do |i|
-              if(i.id==security_group_id)
-                result=i
+              if i.id == security_group_id
+                result = i
                 break
               end
             end
             result
           end
         end
-
       end
     end
   end

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

@@ -4,56 +4,56 @@ module Fog
   module Compute
     class Aliyun
       class Server < Fog::Compute::Server
-        identity :id,                 :aliases=>'InstanceId'
-        attribute :image_id,          :aliases => 'ImageId'
-        attribute :inner_ip,          :aliases => 'InnerIpAddress'
-        attribute :vlan_id,           :aliases => 'VlanId'
-        attribute :eip,               :aliases => 'EipAddress'
-        attribute :max_bandwidth_in,  :aliases => 'InternetMaxBandwidthIn'
-        attribute :zone_id,           :aliases => 'ZoneId'
-        attribute :internet_charge_type,       :aliases => 'InternetChargeType'
-        attribute :serial_number,     :aliases => 'SerialNumber'
-        attribute :io_optimized,      :aliases => 'IoOptimized'
-        attribute :max_bandwidth_out, :aliases => 'InternetMaxBandwidthOut'
-        attribute :vpc_attributes,    :aliases => 'VpcAttributes'
-        attribute :device_available,  :aliases => 'DeviceAvailable'
-        attribute :private_ip,        :aliases => 'PrivateIpAddress'
-        attribute :security_group_ids,:aliases => 'SecurityGroupIds'
-        attribute :name,              :aliases => 'InstanceName'
-        attribute :description,       :aliases => 'Description'
-        attribute :network_type,      :aliases => 'InstanceNetworkType'
-        attribute :public_ip,         :aliases => 'PublicIpAddress'
-        attribute :host_name,         :aliases => 'HostName'
-        attribute :type,              :aliases => 'InstanceType'
-        attribute :created_at,        :aliases => 'CreationTime'
-        attribute :state,             :aliases => 'Status'
-        attribute :cluster_id,        :aliases => 'ClusterId'
-        attribute :region_id,         :aliases => 'RegionId'
-        attribute :charge_type,       :aliases => 'InstanceChargeType'
-        attribute :operation_locks,   :aliases => 'OperationLocks'
-        attribute :expired_at,        :aliases => 'ExpiredTime'
-        
+        identity :id,                 aliases: 'InstanceId'
+        attribute :image_id,          aliases: 'ImageId'
+        attribute :inner_ip,          aliases: 'InnerIpAddress'
+        attribute :vlan_id,           aliases: 'VlanId'
+        attribute :eip,               aliases: 'EipAddress'
+        attribute :max_bandwidth_in,  aliases: 'InternetMaxBandwidthIn'
+        attribute :zone_id,           aliases: 'ZoneId'
+        attribute :internet_charge_type,       aliases: 'InternetChargeType'
+        attribute :serial_number,     aliases: 'SerialNumber'
+        attribute :io_optimized,      aliases: 'IoOptimized'
+        attribute :max_bandwidth_out, aliases: 'InternetMaxBandwidthOut'
+        attribute :vpc_attributes,    aliases: 'VpcAttributes'
+        attribute :device_available,  aliases: 'DeviceAvailable'
+        attribute :private_ip,        aliases: 'PrivateIpAddress'
+        attribute :security_group_ids, aliases: 'SecurityGroupIds'
+        attribute :name,              aliases: 'InstanceName'
+        attribute :description,       aliases: 'Description'
+        attribute :network_type,      aliases: 'InstanceNetworkType'
+        attribute :public_ip,         aliases: 'PublicIpAddress'
+        attribute :host_name,         aliases: 'HostName'
+        attribute :type,              aliases: 'InstanceType'
+        attribute :created_at,        aliases: 'CreationTime'
+        attribute :state,             aliases: 'Status'
+        attribute :cluster_id,        aliases: 'ClusterId'
+        attribute :region_id,         aliases: 'RegionId'
+        attribute :charge_type,       aliases: 'InstanceChargeType'
+        attribute :operation_locks,   aliases: 'OperationLocks'
+        attribute :expired_at,        aliases: 'ExpiredTime'
+
         def image
           requires image_id
-          Fog::Compute::Aliyun::Image.new(:service=>service).all(:imageId => image_id)[0]
+          Fog::Compute::Aliyun::Image.new(service: service).all(imageId: image_id)[0]
         end
 
         def vpc
           requires :vpc_id
-          $vpc=Fog::Compute::Aliyun::Vpcs.new(:service=>service).all('vpcId'=>vpc_id)[0]
+          $vpc = Fog::Compute::Aliyun::Vpcs.new(service: service).all('vpcId' => vpc_id)[0]
         end
 
-       # {"ImageId"=>"ubuntu1404_32_20G_aliaegis_20150325.vhd", "InnerIpAddress"=>{"IpAddress"=>["10.171.90.171"]},
-       #  "VlanId"=>"", "InstanceId"=>"i-25d1ry3jz", 
-       # "EipAddress"=>{"IpAddress"=>"", "AllocationId"=>"", "InternetChargeType"=>""}, 
-       # "InternetMaxBandwidthIn"=>-1, "ZoneId"=>"cn-beijing-a", "InternetChargeType"=>"PayByTraffic", 
-       # "SerialNumber"=>"9b332890-35e8-45c9-8e52-14e1156a4f58", "IoOptimized"=>false, "InternetMaxBandwidthOut"=>1, 
-       # "VpcAttributes"=>{"NatIpAddress"=>"", "PrivateIpAddress"=>{"IpAddress"=>[]}, "VSwitchId"=>"", "VpcId"=>""}, 
-       # "DeviceAvailable"=>true, "SecurityGroupIds"=>{"SecurityGroupId"=>["sg-25rgacf5p"]}, "InstanceName"=>"iZ25d1ry3jzZ", 
-       # "Description"=>"", "InstanceNetworkType"=>"classic", "PublicIpAddress"=>{"IpAddress"=>["123.57.73.19"]}, 
-       # "HostName"=>"iZ25d1ry3jzZ", "InstanceType"=>"ecs.t1.small", "CreationTime"=>"2015-10-13T14:57Z", "Status"=>"Stopped",
-       #  "ClusterId"=>"", "RegionId"=>"cn-beijing", "InstanceChargeType"=>"PostPaid", "OperationLocks"=>{
-       #  "LockReason"=>[{"LockReason"=>"financial"}]}, "ExpiredTime"=>"2015-10-14T20:53Z"}
+        # {"ImageId"=>"ubuntu1404_32_20G_aliaegis_20150325.vhd", "InnerIpAddress"=>{"IpAddress"=>["10.171.90.171"]},
+        #  "VlanId"=>"", "InstanceId"=>"i-25d1ry3jz",
+        # "EipAddress"=>{"IpAddress"=>"", "AllocationId"=>"", "InternetChargeType"=>""},
+        # "InternetMaxBandwidthIn"=>-1, "ZoneId"=>"cn-beijing-a", "InternetChargeType"=>"PayByTraffic",
+        # "SerialNumber"=>"9b332890-35e8-45c9-8e52-14e1156a4f58", "IoOptimized"=>false, "InternetMaxBandwidthOut"=>1,
+        # "VpcAttributes"=>{"NatIpAddress"=>"", "PrivateIpAddress"=>{"IpAddress"=>[]}, "VSwitchId"=>"", "VpcId"=>""},
+        # "DeviceAvailable"=>true, "SecurityGroupIds"=>{"SecurityGroupId"=>["sg-25rgacf5p"]}, "InstanceName"=>"iZ25d1ry3jzZ",
+        # "Description"=>"", "InstanceNetworkType"=>"classic", "PublicIpAddress"=>{"IpAddress"=>["123.57.73.19"]},
+        # "HostName"=>"iZ25d1ry3jzZ", "InstanceType"=>"ecs.t1.small", "CreationTime"=>"2015-10-13T14:57Z", "Status"=>"Stopped",
+        #  "ClusterId"=>"", "RegionId"=>"cn-beijing", "InstanceChargeType"=>"PostPaid", "OperationLocks"=>{
+        #  "LockReason"=>[{"LockReason"=>"financial"}]}, "ExpiredTime"=>"2015-10-14T20:53Z"}
 
         # @!attribute [rw] personality
         # @note This attribute is only used for server creation. This field will be nil on subsequent retrievals.
@@ -64,7 +64,6 @@ module Fog
         #                   }]
         # @see #create
         # @see http://docs.openstack.org/api/openstack-compute/2/content/Server_Personality-d1e2543.html
-       
       end
     end
   end

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

@@ -5,11 +5,10 @@ module Fog
   module Compute
     class Aliyun
       class Servers < Fog::Collection
-
         model Fog::Compute::Aliyun::Server
 
         def all(options = {})
-          data = Fog::JSON.decode(service.list_servers(options).body)['Instances']['Instance']
+          Fog::JSON.decode(service.list_servers(options).body)['Instances']['Instance']
         end
 
         # Creates a new server and populates ssh keys
@@ -25,19 +24,18 @@ module Fog
         #                             :public_key_path => '~/.ssh/fog_rsa.pub',
         #                             :private_key_path => '~/.ssh/fog_rsa'
         #
-#        def bootstrap(new_attributes = {})
-#          server = create(new_attributes)
-#          server.wait_for { ready? }
-#          server.setup(:password => server.password)
-#          server
-#        end
+        #        def bootstrap(new_attributes = {})
+        #          server = create(new_attributes)
+        #          server.wait_for { ready? }
+        #          server.setup(:password => server.password)
+        #          server
+        #        end
 
         def get(server_id)
-          if(server_id)
-            self.class.new(:service=>service).all(:instanceId=>server_id)[0]
+          if server_id
+            self.class.new(service: service).all(instanceId: server_id)[0]
           end
         end
-        
       end
     end
   end

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

@@ -3,18 +3,18 @@ module Fog
   module Compute
     class Aliyun
       class Snapshot < Fog::Model
-        identity  :id,          :aliases => 'SnapshotId'
-        attribute :name,        :aliases => 'SnapshotName'
-        attribute :description, :aliases => 'Description'
-        attribute :progress,    :aliases => 'Progress'
-        attribute :volume_id,     :aliases => 'SourceDiskId'
-        attribute :volume_size,   :aliases => 'SourceDiskSize'
-        attribute :volume_type,   :aliases => 'SourceDiskType'
-        attribute :product_code,:aliases => 'ProductCode'
-        attribute :created_at,  :aliases => 'CreationTime'
-        attribute :state,       :aliases => 'Status'
-        attribute :usage,       :aliases => 'Usage'
-        attribute :tags,        :aliases => 'Tags'
+        identity  :id,          aliases: 'SnapshotId'
+        attribute :name,        aliases: 'SnapshotName'
+        attribute :description, aliases: 'Description'
+        attribute :progress,    aliases: 'Progress'
+        attribute :volume_id,     aliases: 'SourceDiskId'
+        attribute :volume_size,   aliases: 'SourceDiskSize'
+        attribute :volume_type,   aliases: 'SourceDiskType'
+        attribute :product_code, aliases: 'ProductCode'
+        attribute :created_at,  aliases: 'CreationTime'
+        attribute :state,       aliases: 'Status'
+        attribute :usage,       aliases: 'Usage'
+        attribute :tags,        aliases: 'Tags'
 
         def destroy
           requires :id
@@ -26,11 +26,11 @@ module Fog
           state == 'accomplished'
         end
 
-        def save(options={})
+        def save(options = {})
           # raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if persisted?
           requires :volume_id
           options[:name] = name if name
-          options[:description]=description if description
+          options[:description] = description if description
           data = Fog::JSON.decode(service.create_snapshot(volume_id, options).body)
           merge_attributes(data)
           true
@@ -38,7 +38,7 @@ module Fog
 
         def volume
           requires :volume_id
-          Fog::Compute::Aliyun::Volumes.new(:service=>service).all(:diskIds=>[volume_id])[0]
+          Fog::Compute::Aliyun::Volumes.new(service: service).all(diskIds: [volume_id])[0]
         end
 
         private

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

@@ -13,27 +13,23 @@ module Fog
         #   super
         # end
 
-         def all(filters_arg = {})
+        def all(filters_arg = {})
           unless filters_arg.is_a?(Hash)
             Fog::Logger.deprecation("all with #{filters_arg.class} param is deprecated, use all('snapshotIds' => []) instead [light_black](#{caller.first})[/]")
-            filters_arg = {'snapshotIds' => [*filters_arg]}
+            filters_arg = { 'snapshotIds' => [*filters_arg] }
           end
           volume_id = filters_arg[:volume_id]
           volume_type = filters_arg[:volume_type]
-          if volume_id
-            filters_arg[:diskId]=volume_id
-          end
-          if volume_type
-            filters_arg[:sourseDiskType]=volume_type
-          end
+          filters_arg[:diskId] = volume_id if volume_id
+          filters_arg[:sourseDiskType] = volume_type if volume_type
           data = Fog::JSON.decode(service.list_snapshots(filters_arg).body)['Snapshots']['Snapshot']
           load(data)
         end
 
         def get(snapshot_id)
           if snapshot_id
-            snapshotIds=Array.new(1,snapshot_id)
-            self.class.new(:service => service).all(:snapshotIds => snapshotIds)[0]
+            snapshotIds = Array.new(1, snapshot_id)
+            self.class.new(service: service).all(snapshotIds: snapshotIds)[0]
           end
         end
       end

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

@@ -3,7 +3,6 @@ module Fog
   module Compute
     class Aliyun
       class Volume < Fog::Model
-
         # "ImageId": "",
         # "InstanceId": "",
         # "OperationLocks": {
@@ -17,32 +16,31 @@ module Fog
         # "Status": "Available",
         # "Type": "data",
 
-        identity  :id,                    :aliases => 'DiskId'
-        attribute :region_id,             :aliases => 'RegionId'
-        attribute :zone_id,               :aliases => 'ZoneId'
-        attribute :name,                  :aliases => 'DiskName'
-        attribute :description,           :aliases => 'Description'
-        attribute :type,                  :aliases => 'Type'
-        attribute :category,              :aliases => 'Category'
-        attribute :size,                  :aliases => 'Size'
-        attribute :image_id,              :aliases => 'ImageId'
-        attribute :snapshot_id,           :aliases => 'SourceSnapshotId'
-        attribute :product_code,          :aliases => 'ProductCode'
-        attribute :portable,              :aliases => 'Portable'
-        attribute :state,                 :aliases => 'Status'
-        attribute :operation_locks,       :aliases => 'OperationLocks'
-        attribute :server_id,             :aliases => 'InstanceId'
-        attribute :device,                :aliases => 'Device'
-        attribute :delete_with_instance,  :aliases => 'DeleteWithInstance'
-        attribute :delete_auto_snapshot,  :aliases => 'DeleteAutoSnapshot'
-        attribute :enable_auto_snapshot,  :aliases => 'EnableAutoSnapshot'
-        attribute :created_at,            :aliases => 'CreationTime'
-        attribute :attached_at,           :aliases => 'AttachedTime'
-        attribute :detached_at,           :aliases => 'DetachedTime'
-        attribute :expired_at,            :aliases => 'ExpiredTime'
-        attribute :charge_type,           :aliases => 'DiskChargeType'
-        attribute :tags,                  :aliases => 'Tags'
-        
+        identity  :id,                    aliases: 'DiskId'
+        attribute :region_id,             aliases: 'RegionId'
+        attribute :zone_id,               aliases: 'ZoneId'
+        attribute :name,                  aliases: 'DiskName'
+        attribute :description,           aliases: 'Description'
+        attribute :type,                  aliases: 'Type'
+        attribute :category,              aliases: 'Category'
+        attribute :size,                  aliases: 'Size'
+        attribute :image_id,              aliases: 'ImageId'
+        attribute :snapshot_id,           aliases: 'SourceSnapshotId'
+        attribute :product_code,          aliases: 'ProductCode'
+        attribute :portable,              aliases: 'Portable'
+        attribute :state,                 aliases: 'Status'
+        attribute :operation_locks,       aliases: 'OperationLocks'
+        attribute :server_id,             aliases: 'InstanceId'
+        attribute :device,                aliases: 'Device'
+        attribute :delete_with_instance,  aliases: 'DeleteWithInstance'
+        attribute :delete_auto_snapshot,  aliases: 'DeleteAutoSnapshot'
+        attribute :enable_auto_snapshot,  aliases: 'EnableAutoSnapshot'
+        attribute :created_at,            aliases: 'CreationTime'
+        attribute :attached_at,           aliases: 'AttachedTime'
+        attribute :detached_at,           aliases: 'DetachedTime'
+        attribute :expired_at,            aliases: 'ExpiredTime'
+        attribute :charge_type,           aliases: 'DiskChargeType'
+        attribute :tags,                  aliases: 'Tags'
 
         def destroy
           requires :id
@@ -56,50 +54,48 @@ 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
           requires_one :size, :snapshot_id
           options[:name] = name if name
-          options[:description]=description if description
+          options[:description] = description if description
           if snapshot_id
-            data=Fog::JSON.decode(service.create_disk_by_snapshot(snapshot_id,options).body)
+            data = Fog::JSON.decode(service.create_disk_by_snapshot(snapshot_id, options).body)
             merge_attributes(data)
           elsif size
-            data = Fog::JSON.decode(service.create_disk(size,options).body)
+            data = Fog::JSON.decode(service.create_disk(size, options).body)
             merge_attributes(data)
-          end          
-         
+          end
+
           true
         end
 
         def image
           requires :image_id
-          Fog::Compute::Aliyun::Images.new(:service=>service).all(:imageId=>image_id)[0]
-        end        
+          Fog::Compute::Aliyun::Images.new(service: service).all(imageId: image_id)[0]
+        end
 
         def snapshots
           requires :id
-          Fog::Compute::Aliyun::Snapshots.new(:service=>service).all(:volume_id=>id)
+          Fog::Compute::Aliyun::Snapshots.new(service: service).all(volume_id: id)
         end
 
         def source
           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
 
         def source=(new_source)
-          self.snapshot_id=new_source.id
+          self.snapshot_id = new_source.id
         end
 
         def image=(new_image)
           self.image_id = new_image.id
         end
-
       end
     end
   end
 end
-

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

@@ -5,7 +5,6 @@ module Fog
   module Compute
     class Aliyun
       class Volumes < Fog::Collection
-
         model Fog::Compute::Aliyun::Volume
 
         # Used to create a volume.  There are 3 arguments and availability_zone and size are required.  You can generate a new key_pair as follows:
@@ -13,7 +12,7 @@ module Fog
         #
         # ==== Returns
         #
-        #<Fog::AWS::Compute::Volume
+        # <Fog::AWS::Compute::Volume
         #  id="vol-1e2028b9",
         #  attached_at=nil,
         #  availability_zone="us-east-1a",
@@ -25,18 +24,17 @@ module Fog
         #  snapshot_id=nil,
         #  state="creating",
         #  tags=nil
-        #>
+        # >
         #
         # The volume can be retrieved by running Aliyun.volumes.get("d-25ohde62o").  See get method below.
         #
 
-
         # Used to return all volumes.
         # Aliyun.volumes.all
         #
         # ==== Returns
         #
-        #>>Aliyun.volumes.all
+        # >>Aliyun.volumes.all
         # <Fog::Compute::Aliyun::Volumes
         #   [
         #                 <Fog::Compute::Aliyun::Volume
@@ -76,7 +74,7 @@ module Fog
         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 = {'diskIds' => [*filters_arg]}
+            filters_arg = { 'diskIds' => [*filters_arg] }
           end
           data = Fog::JSON.decode(service.list_disks(filters_arg).body)['Disks']['Disk']
           load(data)
@@ -95,7 +93,7 @@ module Fog
         #
         # ==== Returns
         #
-        #>> Aliyun.volumes.get('d-25ohde62o')
+        # >> Aliyun.volumes.get('d-25ohde62o')
         #   <Fog::Compute::Aliyun::Volume
         #       id="d-25ohde62o",
         #       region_id="cn-beijing",
@@ -127,13 +125,11 @@ module Fog
 
         def get(volume_id)
           if volume_id
-            diskIds=Array.new(1,volume_id)
-            self.class.new(:service => service).all(:diskIds => diskIds)[0]
+            diskIds = Array.new(1, volume_id)
+            self.class.new(service: service).all(diskIds: diskIds)[0]
           end
         end
-
       end
     end
   end
 end
-