fog-oraclecloud 0.1.12 → 0.1.13

data/lib/fog/oraclecloud/requests/soa/get_job_status.rb

@@ -1,23 +1,23 @@
-module Fog
-  module OracleCloud
-    class SOA
-      class Real
-
-      	def get_job_status(type, job_id)
- 					response = request(
-            :expects  => 200,
-            :method   => 'GET',
-            :path     => "/paas/service/soa/api/v1.1/instances/#{@identity_domain}/status/#{type}/job/#{job_id}"
-          )
-          response.body['message']
-        end
-      end
-
-      class Mock
-        def get_job_status(type, job_id)
-          ['Creation job succeded']
-        end
-      end
-    end
-  end
+module Fog
+  module OracleCloud
+    class SOA
+      class Real
+
+      	def get_job_status(type, job_id)
+ 					response = request(
+            :expects  => 200,
+            :method   => 'GET',
+            :path     => "/paas/service/soa/api/v1.1/instances/#{@identity_domain}/status/#{type}/job/#{job_id}"
+          )
+          response.body['message']
+        end
+      end
+
+      class Mock
+        def get_job_status(type, job_id)
+          ['Creation job succeded']
+        end
+      end
+    end
+  end
 end

data/lib/fog/oraclecloud/requests/soa/list_instances.rb

@@ -1,29 +1,29 @@
-module Fog
-  module OracleCloud
-    class SOA
-      class Real
-      	def list_instances
-          response = request(
-            :expects  => 200,
-            :method   => 'GET',
-            :path     => "/paas/service/soa/api/v1.1/instances/#{@identity_domain}?outputLevel=verbose"
-          )
-          response
-        end
-      end
-
-      class Mock
-        def list_instances
-          response = Excon::Response.new
-
-          instances = self.data[:instances].values
-
-          response.body = {
-            'services' => instances
-          }
-          response
-        end
-      end
-    end
-  end
-end
+module Fog
+  module OracleCloud
+    class SOA
+      class Real
+      	def list_instances
+          response = request(
+            :expects  => 200,
+            :method   => 'GET',
+            :path     => "/paas/service/soa/api/v1.1/instances/#{@identity_domain}?outputLevel=verbose"
+          )
+          response
+        end
+      end
+
+      class Mock
+        def list_instances
+          response = Excon::Response.new
+
+          instances = self.data[:instances].values
+
+          response.body = {
+            'services' => instances
+          }
+          response
+        end
+      end
+    end
+  end
+end

data/lib/fog/oraclecloud/requests/storage/create_container.rb

@@ -1,41 +1,41 @@
-require 'securerandom'
-
-module Fog
-  module Storage
-    class OracleCloud
-      class Real
-
-      	def create_container(name)
-          request({
-            :method   => 'PUT',
-            :expects  => [201,202],
-            :path     => "/v1/Storage-#{@identity_domain}/#{name}"
-          }, false)
-        end
-
-      end
-
-      class Mock
-      	def create_container (name)
-          response = Excon::Response.new
-
-          self.data[:containers][name] = {
-            'name' => name,
-            'count' => 0,
-            'bytes' => 0
-          }
-          response.status = 201
-          response.headers = {
-            'Content-Length' => 0,
-            'X-Container-Bytes-Used' => 0,
-            'X-Container-Object-Count' => 0,
-            'Date'=>Time.now.strftime('%Y-%m-%dT%H:%M:%S'),
-            'X-Timestamp'=>Time.now.to_i,
-            'X-Trans-id'=>SecureRandom.uuid
-          }
-          response
-        end
-      end
-    end
-  end
-end
+require 'securerandom'
+
+module Fog
+  module Storage
+    class OracleCloud
+      class Real
+
+      	def create_container(name)
+          request({
+            :method   => 'PUT',
+            :expects  => [201,202],
+            :path     => "/v1/Storage-#{@identity_domain}/#{name}"
+          }, false)
+        end
+
+      end
+
+      class Mock
+      	def create_container (name)
+          response = Excon::Response.new
+
+          self.data[:containers][name] = {
+            'name' => name,
+            'count' => 0,
+            'bytes' => 0
+          }
+          response.status = 201
+          response.headers = {
+            'Content-Length' => 0,
+            'X-Container-Bytes-Used' => 0,
+            'X-Container-Object-Count' => 0,
+            'Date'=>Time.now.strftime('%Y-%m-%dT%H:%M:%S'),
+            'X-Timestamp'=>Time.now.to_i,
+            'X-Trans-id'=>SecureRandom.uuid
+          }
+          response
+        end
+      end
+    end
+  end
+end

data/lib/fog/oraclecloud/requests/storage/delete_container.rb

@@ -1,15 +1,15 @@
-module Fog
-  module Storage
-    class OracleCloud
-      class Real
-      	def delete_container (name)
-          request(
-            :method   => 'DELETE',
-            :expects  => 204,
-            :path     => "/v1/Storage-#{@identity_domain}/#{name}"
-          )
-      	end
-      end
-    end
-  end
-end
+module Fog
+  module Storage
+    class OracleCloud
+      class Real
+      	def delete_container (name)
+          request(
+            :method   => 'DELETE',
+            :expects  => 204,
+            :path     => "/v1/Storage-#{@identity_domain}/#{name}"
+          )
+      	end
+      end
+    end
+  end
+end

data/lib/fog/oraclecloud/requests/storage/get_container.rb

@@ -1,63 +1,63 @@
-module Fog
-  module Storage
-    class OracleCloud
-      class Real
-      	def get_container(name)
-          response = request(
-            :expects  => [204],
-            :method   => 'HEAD',
-            :path     => "/v1/Storage-#{@identity_domain}/#{name}"
-          )
-          response
-        end
-        def get_container_with_objects(name)
-          response = request(
-            :expects  => [204,200],
-            :method   => 'GET',
-            :path     => "/v1/Storage-#{@identity_domain}/#{name}?format=json"
-          )
-          response
-        end
-      end
-
-      class Mock
-        def get_container(name)
-          response = Excon::Response.new
-
-          if container = self.data[:containers][name] 
-            response.status = 200
-            response.body = container
-            response
-          else;
-            raise Fog::Compute::OracleCloud::NotFound.new("Storage Container #{name} does not exist");
-          end
-        end
-
-        def get_container_with_objects(name)
-          response = Excon::Response.new
-
-          if container = self.data[:containers][name] 
-            response.status = 200
-            response.body = [{
-              "hash": "aea0077f346227c91cd68e955721e262",
-              "last_modified": "2016-07-30T03:39:24.477480",
-              "bytes": 513,
-              "name": "Ausemon/1df0886e-3133-498f-9472-79632485b311/logs/web.1/36322757-7666-429a-87cc-3c320caf8afa/server.out.zip",
-              "content_type": "application/zip"
-            },
-            {
-              "hash": "2c35a8adaf8e7a3375e1354264135f94",
-              "last_modified": "2016-07-30T12:51:26.124600",
-              "bytes": 6524,
-              "name": "Ausemon/1df0886e-3133-498f-9472-79632485b311/logs/web.1/6ad56533-791f-4a79-8e5d-bbef854a2b50/server.out.zip",
-              "content_type": "application/zip"
-            }]
-            response
-          else;
-            raise Fog::Compute::OracleCloud::NotFound.new("Storage Container #{name} does not exist");
-          end 
-        end
-      end
-    end
-  end
-end
+module Fog
+  module Storage
+    class OracleCloud
+      class Real
+      	def get_container(name)
+          response = request(
+            :expects  => [204],
+            :method   => 'HEAD',
+            :path     => "/v1/Storage-#{@identity_domain}/#{name}"
+          )
+          response
+        end
+        def get_container_with_objects(name)
+          response = request(
+            :expects  => [204,200],
+            :method   => 'GET',
+            :path     => "/v1/Storage-#{@identity_domain}/#{name}?format=json"
+          )
+          response
+        end
+      end
+
+      class Mock
+        def get_container(name)
+          response = Excon::Response.new
+
+          if container = self.data[:containers][name] 
+            response.status = 200
+            response.body = container
+            response
+          else;
+            raise Fog::Compute::OracleCloud::NotFound.new("Storage Container #{name} does not exist");
+          end
+        end
+
+        def get_container_with_objects(name)
+          response = Excon::Response.new
+
+          if container = self.data[:containers][name] 
+            response.status = 200
+            response.body = [{
+              "hash": "aea0077f346227c91cd68e955721e262",
+              "last_modified": "2016-07-30T03:39:24.477480",
+              "bytes": 513,
+              "name": "Ausemon/1df0886e-3133-498f-9472-79632485b311/logs/web.1/36322757-7666-429a-87cc-3c320caf8afa/server.out.zip",
+              "content_type": "application/zip"
+            },
+            {
+              "hash": "2c35a8adaf8e7a3375e1354264135f94",
+              "last_modified": "2016-07-30T12:51:26.124600",
+              "bytes": 6524,
+              "name": "Ausemon/1df0886e-3133-498f-9472-79632485b311/logs/web.1/6ad56533-791f-4a79-8e5d-bbef854a2b50/server.out.zip",
+              "content_type": "application/zip"
+            }]
+            response
+          else;
+            raise Fog::Compute::OracleCloud::NotFound.new("Storage Container #{name} does not exist");
+          end 
+        end
+      end
+    end
+  end
+end

data/lib/fog/oraclecloud/requests/storage/list_containers.rb

@@ -1,27 +1,27 @@
-module Fog
-  module Storage
-    class OracleCloud
-      class Real
-      	def list_containers
-          response = request(
-            :expects  => 200,
-            :method   => 'GET',
-            :path     => "/v1/Storage-#{@identity_domain}?format=json"
-          )
-          response
-        end
-      end
-
-      class Mock
-        def list_containers
-          response = Excon::Response.new
-
-          containers = self.data[:containers].values
-
-          response.body = containers
-          response
-        end
-      end
-    end
-  end
-end
+module Fog
+  module Storage
+    class OracleCloud
+      class Real
+      	def list_containers
+          response = request(
+            :expects  => 200,
+            :method   => 'GET',
+            :path     => "/v1/Storage-#{@identity_domain}?format=json"
+          )
+          response
+        end
+      end
+
+      class Mock
+        def list_containers
+          response = Excon::Response.new
+
+          containers = self.data[:containers].values
+
+          response.body = containers
+          response
+        end
+      end
+    end
+  end
+end

data/lib/fog/oraclecloud/soa.rb

@@ -1,106 +1,106 @@
-module Fog
-  module OracleCloud
-    class SOA < Fog::Service
-      requires :oracle_username, :oracle_password, :oracle_domain
-      recognizes :oracle_region
-
-      model_path	'fog/oraclecloud/models/soa'
-      model				:instance
-      collection	:instances
-
-			request_path 'fog/oraclecloud/requests/soa'
-      request :list_instances
-      request :create_instance
-      request :get_instance
-      request :delete_instance
-      request :get_job_status
-
-      class Real
-
-      	def initialize(options={})
-      		@username = options[:oracle_username]
-      		@password = options[:oracle_password]
-      		@identity_domain   = options[:oracle_domain]
-          region_url = options[:oracle_region] == 'emea' ? 'https://jcs.emea.oraclecloud.com' : 'https://jaas.oraclecloud.com'
-          Excon.ssl_verify_peer = false
-
-          @connection = Fog::XML::Connection.new(region_url)
-        end
-
-        def username
-          @username
-        end
-
-        def password
-          @password
-        end
-
-      	def auth_header
-        	auth_header ||= 'Basic ' + Base64.encode64("#{@username}:#{@password}").gsub("\n",'')
-      	end
-
-        def request(params, parse_json = true, &block)
-
-					begin
-						response = @connection.request(params.merge!({
-							:headers  => {
-								'Authorization' => auth_header,
-								'X-ID-TENANT-NAME' => @identity_domain,
-                'Content-Type' => 'application/json',
-                'Accept'       => 'application/json'
-							}.merge!(params[:headers] || {})
-						}), &block)
-					rescue Excon::Errors::HTTPStatusError => error
-						raise case error
-						when Excon::Errors::NotFound
-							Fog::OracleCloud::SOA::NotFound.slurp(error)
-						else
-							error
-						end
-					end
-					if !response.body.empty? && parse_json
-						# The Oracle Cloud doesn't return the Content-Type header as application/json, rather as application/vnd.com.oracle.oracloud.provisioning.Pod+json
-						# Should add check here to validate, but not sure if this might change in future
-            response.body = Fog::JSON.decode(response.body)
-          end
-          response
-        end
-      end
-
-      class Mock
-
-        def initialize(options={})
-          @username = options[:oracle_username]
-          @password = options[:oracle_password]
-          @identity_domain   = options[:oracle_domain]
-          @region_url = options[:oracle_region] == 'emea' ? 'https://jcs.emea.oraclecloud.com' : 'https://jaas.oraclecloud.com'
-        end
-
-        def username
-          @username
-        end
-
-        def password
-          @password
-        end
-
-        def self.data 
-          @data ||= {
-            :instances => {},
-            :servers => {},
-            :deleted_at => {},
-            :created_at => {}
-          }
-        end
-
-        def self.reset
-          @data = nil
-        end
-
-        def data 
-          self.class.data
-        end
-      end
-    end
-  end
-end
+module Fog
+  module OracleCloud
+    class SOA < Fog::Service
+      requires :oracle_username, :oracle_password, :oracle_domain
+      recognizes :oracle_region
+
+      model_path	'fog/oraclecloud/models/soa'
+      model				:instance
+      collection	:instances
+
+			request_path 'fog/oraclecloud/requests/soa'
+      request :list_instances
+      request :create_instance
+      request :get_instance
+      request :delete_instance
+      request :get_job_status
+
+      class Real
+
+      	def initialize(options={})
+      		@username = options[:oracle_username]
+      		@password = options[:oracle_password]
+      		@identity_domain   = options[:oracle_domain]
+          region_url = options[:oracle_region] == 'emea' ? 'https://jcs.emea.oraclecloud.com' : 'https://jaas.oraclecloud.com'
+          Excon.ssl_verify_peer = false
+
+          @connection = Fog::XML::Connection.new(region_url)
+        end
+
+        def username
+          @username
+        end
+
+        def password
+          @password
+        end
+
+      	def auth_header
+        	auth_header ||= 'Basic ' + Base64.encode64("#{@username}:#{@password}").gsub("\n",'')
+      	end
+
+        def request(params, parse_json = true, &block)
+
+					begin
+						response = @connection.request(params.merge!({
+							:headers  => {
+								'Authorization' => auth_header,
+								'X-ID-TENANT-NAME' => @identity_domain,
+                'Content-Type' => 'application/json',
+                'Accept'       => 'application/json'
+							}.merge!(params[:headers] || {})
+						}), &block)
+					rescue Excon::Errors::HTTPStatusError => error
+						raise case error
+						when Excon::Errors::NotFound
+							Fog::OracleCloud::SOA::NotFound.slurp(error)
+						else
+							error
+						end
+					end
+					if !response.body.empty? && parse_json
+						# The Oracle Cloud doesn't return the Content-Type header as application/json, rather as application/vnd.com.oracle.oracloud.provisioning.Pod+json
+						# Should add check here to validate, but not sure if this might change in future
+            response.body = Fog::JSON.decode(response.body)
+          end
+          response
+        end
+      end
+
+      class Mock
+
+        def initialize(options={})
+          @username = options[:oracle_username]
+          @password = options[:oracle_password]
+          @identity_domain   = options[:oracle_domain]
+          @region_url = options[:oracle_region] == 'emea' ? 'https://jcs.emea.oraclecloud.com' : 'https://jaas.oraclecloud.com'
+        end
+
+        def username
+          @username
+        end
+
+        def password
+          @password
+        end
+
+        def self.data 
+          @data ||= {
+            :instances => {},
+            :servers => {},
+            :deleted_at => {},
+            :created_at => {}
+          }
+        end
+
+        def self.reset
+          @data = nil
+        end
+
+        def data 
+          self.class.data
+        end
+      end
+    end
+  end
+end