fix all services to support both implemented ways

lib/fog/account.rb

@@ -13,7 +13,11 @@ def self.new(attributes)
         Fog::Account::StormOnDemand.new(attributes)
       elsif providers.include?(provider)
         require "fog/#{provider}/account"
-        return Fog::Account.const_get(Fog.providers[provider]).new(attributes)
+        begin
+          Fog::Account.const_get(Fog.providers[provider])
+        rescue
+          Fog.const_get(Fog.providers[provider])::Account
+        end.new(attributes)
       else
         raise ArgumentError, "#{provider} has no account service"
       end

lib/fog/baremetal.rb

@@ -7,13 +7,16 @@ def self.[](provider)
     def self.new(attributes)
       attributes = attributes.dup # Prevent delete from having side effects
       provider = attributes.delete(:provider).to_s.downcase.to_sym
-
       if providers.include?(provider)
         require "fog/#{provider}/baremetal"
-        return Fog::Baremetal.const_get(Fog.providers[provider]).new(attributes)
+        begin
+          Fog::Baremetal.const_get(Fog.providers[provider])
+        rescue
+          Fog.const_get(Fog.providers[provider])::Baremetal
+        end.new(attributes)
+      else
+        raise ArgumentError, "#{provider} has no baremetal service"
       end
-
-      raise ArgumentError, "#{provider} has no baremetal service"
     end
 
     def self.providers

lib/fog/billing.rb

@@ -10,6 +10,13 @@ def self.new(attributes)
       if provider == :stormondemand
         require "fog/billing/storm_on_demand"
         Fog::Billing::StormOnDemand.new(attributes)
+      elsif providers.include?(provider)
+        require "fog/#{provider}/billing"
+        begin
+          Fog::Account.const_get(Fog.providers[provider])
+        rescue
+          Fog.const_get(Fog.providers[provider])::Account
+        end.new(attributes)
       else
         raise ArgumentError, "#{provider} has no billing service"
       end

lib/fog/cdn.rb

@@ -9,9 +9,14 @@ def self.new(attributes)
       provider = attributes.delete(:provider).to_s.downcase.to_sym
       if providers.include?(provider)
         require "fog/#{provider}/cdn"
-        return Fog::CDN.const_get(Fog.providers[provider]).new(attributes)
+        begin
+          Fog::CDN.const_get(Fog.providers[provider])
+        rescue
+          Fog.const_get(Fog.providers[provider])::CDN
+        end.new(attributes)
+      else
+        raise ArgumentError, "#{provider} has no cdn service"
       end
-      raise ArgumentError, "#{provider} is not a recognized cdn provider"
     end
 
     def self.providers

lib/fog/image.rb

@@ -9,9 +9,14 @@ def self.new(attributes)
       provider = attributes.delete(:provider).to_s.downcase.to_sym
       if providers.include?(provider)
         require "fog/#{provider}/image"
-        return Fog::Image.const_get(Fog.providers[provider]).new(attributes)
+        begin
+          Fog::Image.const_get(Fog.providers[provider])
+        rescue
+          Fog.const_get(Fog.providers[provider])::Image
+        end.new(attributes)
+      else
+        raise ArgumentError, "#{provider} has no image service"
       end
-      raise ArgumentError, "#{provider} has no image service"
     end
 
     def self.providers

lib/fog/metering.rb

@@ -9,10 +9,14 @@ def self.new(attributes)
       provider = attributes.delete(:provider).to_s.downcase.to_sym
       if providers.include?(provider)
         require "fog/#{provider}/metering"
-        return Fog::Metering.const_get(Fog.providers[provider]).new(attributes)
+        begin
+          Fog::Metering.const_get(Fog.providers[provider])
+        rescue
+          Fog.const_get(Fog.providers[provider])::Metering
+        end.new(attributes)
+      else
+        raise ArgumentError, "#{provider} has no metering service"
       end
-
-      raise ArgumentError, "#{provider} has no identity service"
     end
 
     def self.providers

lib/fog/monitoring.rb

@@ -10,6 +10,13 @@ def self.new(attributes)
       if provider == :stormondemand
         require "fog/monitoring/storm_on_demand"
         Fog::Monitoring::StormOnDemand.new(attributes)
+      elsif providers.include?(provider)
+        require "fog/#{provider}/monitoring"
+        begin
+          Fog::Monitoring.const_get(Fog.providers[provider])
+        rescue
+          Fog.const_get(Fog.providers[provider])::Monitoring
+        end.new(attributes)
       else
         raise ArgumentError, "#{provider} has no monitoring service"
       end

lib/fog/network.rb

@@ -13,10 +13,14 @@ def self.new(attributes)
         return Fog::Network::StormOnDemand.new(attributes)
       elsif providers.include?(provider)
         require "fog/#{provider}/network"
-        return Fog::Network.const_get(Fog.providers[provider]).new(attributes)
+        begin
+          Fog::Network.const_get(Fog.providers[provider])
+        rescue
+          Fog.const_get(Fog.providers[provider])::Network
+        end.new(attributes)
+      else
+        raise ArgumentError, "#{provider} has no network service"
       end
-
-      raise ArgumentError, "#{provider} has no network service"
     end
 
     def self.providers

lib/fog/orchestration.rb

@@ -7,13 +7,16 @@ def self.[](provider)
     def self.new(attributes)
       attributes = attributes.dup # Prevent delete from having side effects
       provider = attributes.delete(:provider).to_s.downcase.to_sym
-
       if providers.include?(provider)
         require "fog/#{provider}/orchestration"
-        return Fog::Orchestration.const_get(Fog.providers[provider]).new(attributes)
+        begin
+          Fog::Orchestration.const_get(Fog.providers[provider])
+        rescue
+          Fog.const_get(Fog.providers[provider])::Orchestration
+        end.new(attributes)
+      else
+        raise ArgumentError, "#{provider} has no orchestration service"
       end
-
-      raise ArgumentError, "#{provider} has no orchestration service"
     end
 
     def self.providers

lib/fog/support.rb

@@ -11,6 +11,13 @@ def self.new(attributes)
       if provider == :stormondemand
         require "fog/support/storm_on_demand"
         Fog::Support::StormOnDemand.new(attributes)
+      elsif providers.include?(provider)
+        require "fog/#{provider}/support"
+        begin
+          Fog::Support.const_get(Fog.providers[provider])
+        rescue
+          Fog.const_get(Fog.providers[provider])::Support
+        end.new(attributes)
       else
         raise ArgumentError, "#{provider} has no support service"
       end

lib/fog/volume.rb

@@ -9,10 +9,14 @@ def self.new(attributes)
       provider = attributes.delete(:provider).to_s.downcase.to_sym
       if providers.include?(provider)
         require "fog/#{provider}/volume"
-        return Fog::Volume.const_get(Fog.providers[provider]).new(attributes)
+        begin
+          Fog::Volume.const_get(Fog.providers[provider])
+        rescue
+          Fog.const_get(Fog.providers[provider])::Volume
+        end.new(attributes)
+      else
+        raise ArgumentError, "#{provider} has no volume service"
       end
-
-      raise ArgumentError, "#{provider} has no identity service"
     end
 
     def self.providers

lib/fog/vpn.rb

@@ -11,6 +11,13 @@ def self.new(attributes)
       if provider == :stormondemand
         require "fog/vpn/storm_on_demand"
         Fog::VPN::StormOnDemand.new(attributes)
+      elsif providers.include?(provider)
+        require "fog/#{provider}/vpn"
+        begin
+          Fog::VPN.const_get(Fog.providers[provider])
+        rescue
+          Fog.const_get(Fog.providers[provider])::VPN
+        end.new(attributes)
       else
         raise ArgumentError, "#{provider} has no vpn service"
       end