Merge pull request #734 from agrare/update_fog_openstack_v1

Update fog-openstack to v1.0

Author: kbrock

app/models/manageiq/providers/openstack/inventory/parser/cloud_manager.rb

@@ -159,13 +159,13 @@ def placement_groups
       #
       #
       # For instance collector.placement_groups() returns
-      # [ <Fog::Compute::OpenStack::ServerGroup
+      # [ <Fog::OpenStack::Compute::ServerGroup
       #    id="a31f76c9-5ed6-43b4-86ae-7e2cbcf68302",
       #    name="Kuldip-VM-Affinity-Rule",
       #    policies=["affinity"],
       #    members=["2b5fb204-34ff-445b-aea4-a903d4b6143e"]
       #  >,
-      #   <Fog::Compute::OpenStack::ServerGroup
+      #   <Fog::OpenStack::Compute::ServerGroup
       #    id="1734c483-803b-4dcf-94e3-de058a6ddb87",
       #    name="jay-collection-rule",
       #    policies=["anti-affinity"],

lib/manageiq/providers/openstack/legacy/events/openstack_ceilometer_event_monitor.rb

@@ -133,9 +133,9 @@ def query_options
   def list_events(query_options)
     provider_connection.list_events(query_options).body.map do |event_hash|
       begin
-        Fog::Event::OpenStack::Event.new(event_hash)
+        Fog::OpenStack::Event::Event.new(event_hash)
       rescue NameError
-        Fog::Metering::OpenStack::Event.new(event_hash)
+        Fog::OpenStack::Metering::Event.new(event_hash)
       end
     end
   end

lib/manageiq/providers/openstack/legacy/openstack_handle/baremetal_delegate.rb

@@ -1,5 +1,5 @@
 module OpenstackHandle
-  class BaremetalDelegate < DelegateClass(Fog::Baremetal::OpenStack)
+  class BaremetalDelegate < DelegateClass(Fog::OpenStack::Baremetal)
     include OpenstackHandle::HandledList
     include Vmdb::Logging
 

lib/manageiq/providers/openstack/legacy/openstack_handle/compute_delegate.rb

@@ -1,5 +1,5 @@
 module OpenstackHandle
-  class ComputeDelegate < DelegateClass(Fog::Compute::OpenStack)
+  class ComputeDelegate < DelegateClass(Fog::OpenStack::Compute)
     include OpenstackHandle::HandledList
     include Vmdb::Logging
 

lib/manageiq/providers/openstack/legacy/openstack_handle/event_delegate.rb

@@ -1,5 +1,5 @@
 module OpenstackHandle
-  class EventDelegate < DelegateClass(Fog::Event::OpenStack)
+  class EventDelegate < DelegateClass(Fog::OpenStack::Event)
     include OpenstackHandle::HandledList
     include Vmdb::Logging
 

lib/manageiq/providers/openstack/legacy/openstack_handle/handle.rb

@@ -50,7 +50,6 @@ def self.raw_connect_try_ssl(username, password, address, port, service = "Compu
 
     def self.raw_connect(username, password, auth_url, service = "Compute", extra_opts = nil)
       opts = {
-        :provider                => 'OpenStack',
         :openstack_auth_url      => auth_url,
         :openstack_username      => username,
         :openstack_api_key       => password,
@@ -69,17 +68,15 @@ def self.raw_connect(username, password, auth_url, service = "Compute", extra_op
       end
 
       if service == "Planning"
-        # Special behaviour for Planning service Tuskar, since it is OpenStack specific service, there is no
-        # Fog::Planning module, only Fog::OpenStack::Planning
-        Fog::Openstack.const_get(service).new(opts)
+        Fog::OpenStack::Planning.new(opts)
       elsif service == "Workflow"
-        Fog::Workflow::OpenStack.new(opts)
+        Fog::OpenStack::Workflow.new(opts)
       elsif service == "Metric"
-        Fog::Metric::OpenStack.new(opts)
+        Fog::OpenStack::Metric.new(opts)
       elsif service == "Event"
-        Fog::Event::OpenStack.new(opts)
+        Fog::OpenStack::Event.new(opts)
       else
-        Fog.const_get(service).new(opts)
+        Fog::OpenStack.const_get(service).new(opts)
       end
     rescue Fog::OpenStack::Auth::Catalog::ServiceTypeError, Fog::Service::NotFound
       $fog_log.warn("MIQ(#{self.class.name}##{__method__}) "\
@@ -386,7 +383,7 @@ def service_for_each_accessible_tenant(service_name)
 
     def accessor_for_accessible_tenants(service, accessor, unique_id, array_accessor = true)
       results = []
-      not_found_error = Fog.const_get(service)::OpenStack::NotFound
+      not_found_error = Fog::OpenStack.const_get(service)::NotFound
       ::Parallel.each(service_for_each_accessible_tenant(service), :in_threads => thread_limit) do |svc, project|
 
         response = begin

lib/manageiq/providers/openstack/legacy/openstack_handle/identity_delegate.rb

@@ -1,5 +1,5 @@
 module OpenstackHandle
-  class IdentityDelegate < DelegateClass(Fog::Identity::OpenStack)
+  class IdentityDelegate < DelegateClass(Fog::OpenStack::Identity)
     include OpenstackHandle::HandledList
     include Vmdb::Logging
 
@@ -47,7 +47,7 @@ def visible_tenants_v2
         )
       end
       body = Fog::JSON.decode(response.body)
-      vtenants = Fog::Identity::OpenStack::V2::Tenants.new
+      vtenants = Fog::OpenStack::Identity::V2::Tenants.new
       vtenants.load(body['tenants'])
       vtenants
     end

lib/manageiq/providers/openstack/legacy/openstack_handle/image_delegate.rb

@@ -1,5 +1,5 @@
 module OpenstackHandle
-  class ImageDelegate < DelegateClass(Fog::Image::OpenStack)
+  class ImageDelegate < DelegateClass(Fog::OpenStack::Image)
     include OpenstackHandle::HandledList
     include Vmdb::Logging
 
@@ -17,9 +17,9 @@ def initialize(dobj, os_handle, name)
 
     def version
       case @delegated_object
-      when Fog::Image::OpenStack::V1::Real
+      when Fog::OpenStack::Image::V1::Real
         :v1
-      when Fog::Image::OpenStack::V2::Real
+      when Fog::OpenStack::Image::V2::Real
         :v2
       else
         raise "Non supported Glance version #{@delegated_object.class.name}"

lib/manageiq/providers/openstack/legacy/openstack_handle/introspection_delegate.rb

@@ -1,5 +1,5 @@
 module OpenstackHandle
-  class IntrospectionDelegate < DelegateClass(Fog::Introspection::OpenStack)
+  class IntrospectionDelegate < DelegateClass(Fog::OpenStack::Introspection)
     include OpenstackHandle::HandledList
     include Vmdb::Logging
 

lib/manageiq/providers/openstack/legacy/openstack_handle/metering_delegate.rb

@@ -1,5 +1,5 @@
 module OpenstackHandle
-  class MeteringDelegate < DelegateClass(Fog::Metering::OpenStack)
+  class MeteringDelegate < DelegateClass(Fog::OpenStack::Metering)
     include OpenstackHandle::HandledList
     include Vmdb::Logging