Update Compute to use provider::service syntax

sethboyles · sethboyles · commit 54a20c403100 · 2022-01-26T12:14:35.000-08:00
Authored-by: Seth Boyles &lt;sboyles@pivotal.io&gt;
diff --git a/lib/fog/aliyun/compute.rb b/lib/fog/aliyun/compute.rb
@@ -313,7 +313,7 @@ def request(params)
           rescue Excon::Errors::HTTPStatusError => error
             raise case error
                   when Excon::Errors::NotFound
-                    Fog::Compute::Aliyun::NotFound.slurp(error)
+                    Fog::Aliyun::Compute::NotFound.slurp(error)
                   else
                     error
                   end
@@ -336,7 +336,7 @@ def VPCrequest(params)
           rescue Excon::Errors::HTTPStatusError => error
             raise case error
                   when Excon::Errors::NotFound
-                    Fog::Compute::Aliyun::NotFound.slurp(error)
+                    Fog::Aliyun::Compute::NotFound.slurp(error)
                   else
                     error
                   end
diff --git a/lib/fog/aliyun/models/compute/eip_address.rb b/lib/fog/aliyun/models/compute/eip_address.rb
@@ -2,8 +2,8 @@
 
 require 'fog/core/model'
 module Fog
-  module Compute
-    class Aliyun
+  module Aliyun
+    class Compute
       class EipAddress < Fog::Model
         identity :id, aliases: 'AllocationId'
 
diff --git a/lib/fog/aliyun/models/compute/eip_addresses.rb b/lib/fog/aliyun/models/compute/eip_addresses.rb
@@ -4,10 +4,10 @@
 require 'fog/aliyun/models/compute/eip_address'
 
 module Fog
-  module Compute
-    class Aliyun
+  module Aliyun
+    class Compute
       class EipAddresses < Fog::Collection
-        model Fog::Compute::Aliyun::EipAddress
+        model Fog::Aliyun::Compute::EipAddress
 
         def all(filters_arg = {})
           data = Fog::JSON.decode(service.list_eip_addresses(filters_arg).body)['EipAddresses']['EipAddress']
diff --git a/lib/fog/aliyun/models/compute/flavor.rb b/lib/fog/aliyun/models/compute/flavor.rb
@@ -1,8 +1,8 @@
 require 'fog/core/model'
 
 module Fog
-  module Compute
-    class Aliyun
+  module Aliyun
+    class Compute
       class Flavor < Fog::Model
         attribute :base_line_credit, aliases: 'BaseLineCredit'
         attribute :cpu_core_count, aliases: 'CpuCoreCount'
diff --git a/lib/fog/aliyun/models/compute/flavors.rb b/lib/fog/aliyun/models/compute/flavors.rb
@@ -1,8 +1,8 @@
 module Fog
-  module Compute
-    class Aliyun
+  module Aliyun
+    class Compute
       class Flavors < Fog::Collection
-        model Fog::Compute::Aliyun::Flavor
+        model Fog::Aliyun::Compute::Flavor
         def all
           data = Fog::JSON.decode(service.list_server_types.body)['InstanceTypes']['InstanceType']
           load(data)
diff --git a/lib/fog/aliyun/models/compute/image.rb b/lib/fog/aliyun/models/compute/image.rb
@@ -2,8 +2,8 @@
 
 require 'fog/core/model'
 module Fog
-  module Compute
-    class Aliyun
+  module Aliyun
+    class Compute
       class Image < Fog::Model
         identity :id, aliases: 'ImageId'
 
@@ -56,7 +56,7 @@ def ready?
 
         def snapshot
           requires :snapshot_id
-          Fog::Compute::Aliyun::Snapshots.new(service: service).all(snapshotIds: [snapshot_id])[0]
+          Fog::Aliyun::Compute::Snapshots.new(service: service).all(snapshotIds: [snapshot_id])[0]
         end
 
         private
diff --git a/lib/fog/aliyun/models/compute/images.rb b/lib/fog/aliyun/models/compute/images.rb
@@ -4,10 +4,10 @@
 require 'fog/aliyun/models/compute/image'
 
 module Fog
-  module Compute
-    class Aliyun
+  module Aliyun
+    class Compute
       class Images < Fog::Collection
-        model Fog::Compute::Aliyun::Image
+        model Fog::Aliyun::Compute::Image
 
         def all(filters_arg = {})
           unless filters_arg.is_a?(Hash)
diff --git a/lib/fog/aliyun/models/compute/route_entry.rb b/lib/fog/aliyun/models/compute/route_entry.rb
@@ -2,8 +2,8 @@
 
 require 'fog/core/model'
 module Fog
-  module Compute
-    class Aliyun
+  module Aliyun
+    class Compute
       class RouteEntry < Fog::Model
         # "RouteTables"=>{"RouteTable"=>[
         #  {"CreationTime"=>"2015-08-03T11:23:35Z", "RouteEntrys"=>{"RouteEntry"=>[
diff --git a/lib/fog/aliyun/models/compute/route_entrys.rb b/lib/fog/aliyun/models/compute/route_entrys.rb
@@ -4,12 +4,12 @@
 require 'fog/aliyun/models/compute/route_entry'
 
 module Fog
-  module Compute
-    class Aliyun
+  module Aliyun
+    class Compute
       class RouteEntrys < Fog::Collection
         attribute :route_table
 
-        model Fog::Compute::Aliyun::RouteEntry
+        model Fog::Aliyun::Compute::RouteEntry
 
         def all(options = {})
           requires :route_table
diff --git a/lib/fog/aliyun/models/compute/route_table.rb b/lib/fog/aliyun/models/compute/route_table.rb
@@ -2,8 +2,8 @@
 
 require 'fog/core/model'
 module Fog
-  module Compute
-    class Aliyun
+  module Aliyun
+    class Compute
       class RouteTable < Fog::Model
         # "RouteTables"=>{"RouteTable"=>[
         # {"CreationTime"=>"2015-08-03T11:23:35Z", "RouteEntrys"=>{"RouteEntry"=>[
@@ -17,10 +17,10 @@ class RouteTable < Fog::Model
         attribute :created_at, aliases: 'CreationTime'
         attribute :type, aliases: 'RouteTableType'
         attribute :v_router_id, aliases: 'VRouterId'
-        # collection Fog::Compute::Aliyun::RouteEntrys
+        # collection Fog::Aliyun::Compute::RouteEntrys
         def route_entrys
           @route_entrys ||= begin
-            Fog::Compute::Aliyun::RouteEntrys.new(
+            Fog::Aliyun::Compute::RouteEntrys.new(
               route_table: self,
               service: service
             )
diff --git a/lib/fog/aliyun/models/compute/route_tables.rb b/lib/fog/aliyun/models/compute/route_tables.rb
@@ -4,12 +4,12 @@
 require 'fog/aliyun/models/compute/route_table'
 
 module Fog
-  module Compute
-    class Aliyun
+  module Aliyun
+    class Compute
       class RouteTables < Fog::Collection
         attribute :v_router
 
-        model Fog::Compute::Aliyun::RouteTable
+        model Fog::Aliyun::Compute::RouteTable
 
         def all(options = {})
           requires :v_router
diff --git a/lib/fog/aliyun/models/compute/security_group.rb b/lib/fog/aliyun/models/compute/security_group.rb
@@ -3,8 +3,8 @@
 require 'fog/core/model'
 
 module Fog
-  module Compute
-    class Aliyun
+  module Aliyun
+    class Compute
       class SecurityGroup < Fog::Model
         identity :id, aliases: 'SecurityGroupId'
         attribute :name, aliases: 'SecurityGroupName'
diff --git a/lib/fog/aliyun/models/compute/security_group_rule.rb b/lib/fog/aliyun/models/compute/security_group_rule.rb
@@ -3,8 +3,8 @@
 require 'fog/core/model'
 
 module Fog
-  module Compute
-    class Aliyun
+  module Aliyun
+    class Compute
       class SecurityGroupRule < Fog::Model
         attribute :security_group_id, aliases: 'SecurityGroupId'
         attribute :source_cidr_ip, aliases: 'SourceCidrIp'
diff --git a/lib/fog/aliyun/models/compute/security_group_rules.rb b/lib/fog/aliyun/models/compute/security_group_rules.rb
@@ -4,10 +4,10 @@
 require 'fog/aliyun/models/compute/security_group_rule'
 
 module Fog
-  module Compute
-    class Aliyun
+  module Aliyun
+    class Compute
       class SecurityGroupRules < Fog::Collection
-        model Fog::Compute::Aliyun::SecurityGroupRule
+        model Fog::Aliyun::Compute::SecurityGroupRule
         attribute :security_group_id
 
         def get(security_group_id, options = {})
diff --git a/lib/fog/aliyun/models/compute/security_groups.rb b/lib/fog/aliyun/models/compute/security_groups.rb
@@ -4,10 +4,10 @@
 require 'fog/aliyun/models/compute/security_group'
 
 module Fog
-  module Compute
-    class Aliyun
+  module Aliyun
+    class Compute
       class SecurityGroups < Fog::Collection
-        model Fog::Compute::Aliyun::SecurityGroup
+        model Fog::Aliyun::Compute::SecurityGroup
 
         def all(options = {})
           data = Fog::JSON.decode(service.list_security_groups(options).body)['SecurityGroups']['SecurityGroup']
diff --git a/lib/fog/aliyun/models/compute/server.rb b/lib/fog/aliyun/models/compute/server.rb
@@ -3,8 +3,8 @@
 require 'fog/compute/models/server'
 
 module Fog
-  module Compute
-    class Aliyun
+  module Aliyun
+    class Compute
       class Server < Fog::Compute::Server
         identity :id, aliases: 'InstanceId'
         attribute :image_id, aliases: 'ImageId'
@@ -40,12 +40,12 @@ class Server < Fog::Compute::Server
 
         def image
           requires :image_id
-          Fog::Compute::Aliyun::Image.new(service: service).all(imageId: image_id)[0]
+          Fog::Aliyun::Compute::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::Aliyun::Compute::Vpcs.new(service: service).all('vpcId' => vpc_id)[0]
         end
 
         def save(options = {})
diff --git a/lib/fog/aliyun/models/compute/servers.rb b/lib/fog/aliyun/models/compute/servers.rb
@@ -4,10 +4,10 @@
 require 'fog/aliyun/models/compute/server'
 
 module Fog
-  module Compute
-    class Aliyun
+  module Aliyun
+    class Compute
       class Servers < Fog::Collection
-        model Fog::Compute::Aliyun::Server
+        model Fog::Aliyun::Compute::Server
 
         def all(options = {})
           data = Fog::JSON.decode(service.list_servers(options).body)['Instances']['Instance']
diff --git a/lib/fog/aliyun/models/compute/snapshot.rb b/lib/fog/aliyun/models/compute/snapshot.rb
@@ -2,8 +2,8 @@
 
 require 'fog/core/model'
 module Fog
-  module Compute
-    class Aliyun
+  module Aliyun
+    class Compute
       class Snapshot < Fog::Model
         identity :id, aliases: 'SnapshotId'
         attribute :name, aliases: 'SnapshotName'
@@ -40,7 +40,7 @@ def save(options = {})
 
         def volume
           requires :volume_id
-          Fog::Compute::Aliyun::Volumes.new(service: service).all(diskIds: [volume_id])[0]
+          Fog::Aliyun::Compute::Volumes.new(service: service).all(diskIds: [volume_id])[0]
         end
 
         private
diff --git a/lib/fog/aliyun/models/compute/snapshots.rb b/lib/fog/aliyun/models/compute/snapshots.rb
@@ -4,11 +4,11 @@
 require 'fog/aliyun/models/compute/snapshot'
 
 module Fog
-  module Compute
-    class Aliyun
+  module Aliyun
+    class Compute
       class Snapshots < Fog::Collection
         # attribute :filters
-        model Fog::Compute::Aliyun::Snapshot
+        model Fog::Aliyun::Compute::Snapshot
 
         # def initialize(attributes)
         #   self.filters ||= {}
diff --git a/lib/fog/aliyun/models/compute/volume.rb b/lib/fog/aliyun/models/compute/volume.rb
@@ -2,8 +2,8 @@
 
 require 'fog/core/model'
 module Fog
-  module Compute
-    class Aliyun
+  module Aliyun
+    class Compute
       class Volume < Fog::Model
         # "ImageId": "",
         # "InstanceId": "",
@@ -75,17 +75,17 @@ def save(options = {})
 
         def image
           requires :image_id
-          Fog::Compute::Aliyun::Images.new(service: service).all(imageId: image_id)[0]
+          Fog::Aliyun::Compute::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::Aliyun::Compute::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::Aliyun::Compute::Snapshots.new(service: service).all(snapshotIds: [snapshot_id])[0]
         end
 
         private
diff --git a/lib/fog/aliyun/models/compute/volumes.rb b/lib/fog/aliyun/models/compute/volumes.rb
@@ -4,10 +4,10 @@
 require 'fog/aliyun/models/compute/volume'
 
 module Fog
-  module Compute
-    class Aliyun
+  module Aliyun
+    class Compute
       class Volumes < Fog::Collection
-        model Fog::Compute::Aliyun::Volume
+        model Fog::Aliyun::Compute::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:
         # Aliyun.volumes.create(:size => 10)
@@ -37,9 +37,9 @@ class Volumes < Fog::Collection
         # ==== Returns
         #
         # >>Aliyun.volumes.all
-        # <Fog::Compute::Aliyun::Volumes
+        # <Fog::Aliyun::Compute::Volumes
         #   [
-        #                 <Fog::Compute::Aliyun::Volume
+        #                 <Fog::Aliyun::Compute::Volume
         #       id="d-25ohde62o",
         #       region_id="cn-beijing",
         #       zone_id="cn-beijing-a",
@@ -96,7 +96,7 @@ def all(filters_arg = {})
         # ==== Returns
         #
         # >> Aliyun.volumes.get('d-25ohde62o')
-        #   <Fog::Compute::Aliyun::Volume
+        #   <Fog::Aliyun::Compute::Volume
         #       id="d-25ohde62o",
         #       region_id="cn-beijing",
         #       zone_id="cn-beijing-a",
diff --git a/lib/fog/aliyun/models/compute/vpc.rb b/lib/fog/aliyun/models/compute/vpc.rb
@@ -2,8 +2,8 @@
 
 require 'fog/core/model'
 module Fog
-  module Compute
-    class Aliyun
+  module Aliyun
+    class Compute
       class VPC < Fog::Model
         identity :id, aliases: 'VpcId'
         attribute :name, aliases: 'VpcName'
@@ -39,7 +39,7 @@ def destroy
 
         def vswitches
           @vswitches ||= begin
-            Fog::Compute::Aliyun::Vswitches.new(
+            Fog::Aliyun::Compute::Vswitches.new(
               vpc: self,
               service: service
             )
@@ -48,12 +48,12 @@ def vswitches
 
         def vrouter
           requires :v_router_id
-          Fog::Compute::Aliyun::Vrouters.new(service: service).all('vRouterId' => v_router_id)[0]
+          Fog::Aliyun::Compute::Vrouters.new(service: service).all('vRouterId' => v_router_id)[0]
         end
 
         def security_groups
           requires :id
-          Fog::Compute::Aliyun::SecurityGroups.new(service: service).all(vpcId: id)
+          Fog::Aliyun::Compute::SecurityGroups.new(service: service).all(vpcId: id)
         end
         # Create a vpc
         #
diff --git a/lib/fog/aliyun/models/compute/vpcs.rb b/lib/fog/aliyun/models/compute/vpcs.rb
diff --git a/lib/fog/aliyun/models/compute/vrouter.rb b/lib/fog/aliyun/models/compute/vrouter.rb
diff --git a/lib/fog/aliyun/models/compute/vrouters.rb b/lib/fog/aliyun/models/compute/vrouters.rb
diff --git a/lib/fog/aliyun/models/compute/vswitch.rb b/lib/fog/aliyun/models/compute/vswitch.rb
diff --git a/lib/fog/aliyun/models/compute/vswitches.rb b/lib/fog/aliyun/models/compute/vswitches.rb
diff --git a/lib/fog/bin/aliyun.rb b/lib/fog/bin/aliyun.rb
