fog-oraclecloud 0.1.12 → 0.1.13

data/lib/fog/oraclecloud/requests/compute/update_image.rb

@@ -1,27 +1,27 @@
-module Fog
-  module Compute
-    class OracleCloud
-      class Real
-      	def update_image (name, options={})
-          # Just in case it's already set
-          name.sub! "/Compute-#{@identity_domain}/#{@username}/", ''
-          body_data     = {
-            'name'             		=> "/Compute-#{@identity_domain}/#{@username}/#{name}",
-            'description'					=> options[:description],
-            'default'					   	=> options[:default]
-          }
-          body_data = body_data.reject {|key, value| value.nil?}
-          request(
-            :method   => 'PUT',
-            :expects  => 200,
-            :path     => "/imagelist/Compute-#{@identity_domain}/#{@username}/#{name}",
-            :body     => Fog::JSON.encode(body_data),
-            :headers  => {
-              'Content-Type' => 'application/oracle-compute-v3+json'
-            }
-          )
-      	end
-      end
-    end
-  end
-end
+module Fog
+  module Compute
+    class OracleCloud
+      class Real
+      	def update_image (name, options={})
+          # Just in case it's already set
+          name.sub! "/Compute-#{@identity_domain}/#{@username}/", ''
+          body_data     = {
+            'name'             		=> "/Compute-#{@identity_domain}/#{@username}/#{name}",
+            'description'					=> options[:description],
+            'default'					   	=> options[:default]
+          }
+          body_data = body_data.reject {|key, value| value.nil?}
+          request(
+            :method   => 'PUT',
+            :expects  => 200,
+            :path     => "/imagelist/Compute-#{@identity_domain}/#{@username}/#{name}",
+            :body     => Fog::JSON.encode(body_data),
+            :headers  => {
+              'Content-Type' => 'application/oracle-compute-v3+json'
+            }
+          )
+      	end
+      end
+    end
+  end
+end

data/lib/fog/oraclecloud/requests/compute/update_image_list.rb

@@ -1,27 +1,27 @@
-module Fog
-  module Compute
-    class OracleCloud
-      class Real
-      	def update_image_list (name, options={})
-          # Just in case it's already set
-          name.sub! "/Compute-#{@identity_domain}/#{@username}/", ''
-          body_data     = {
-            'name'             		=> "/Compute-#{@identity_domain}/#{@username}/#{name}",
-            'description'					=> options[:description],
-            'default'					   	=> options[:default]
-          }
-          body_data = body_data.reject {|key, value| value.nil?}
-          request(
-            :method   => 'PUT',
-            :expects  => 200,
-            :path     => "/imagelist/Compute-#{@identity_domain}/#{@username}/#{name}",
-            :body     => Fog::JSON.encode(body_data),
-            :headers  => {
-              'Content-Type' => 'application/oracle-compute-v3+json'
-            }
-          )
-      	end
-      end
-    end
-  end
-end
+module Fog
+  module Compute
+    class OracleCloud
+      class Real
+      	def update_image_list (name, options={})
+          # Just in case it's already set
+          name.sub! "/Compute-#{@identity_domain}/#{@username}/", ''
+          body_data     = {
+            'name'             		=> "/Compute-#{@identity_domain}/#{@username}/#{name}",
+            'description'					=> options[:description],
+            'default'					   	=> options[:default]
+          }
+          body_data = body_data.reject {|key, value| value.nil?}
+          request(
+            :method   => 'PUT',
+            :expects  => 200,
+            :path     => "/imagelist/Compute-#{@identity_domain}/#{@username}/#{name}",
+            :body     => Fog::JSON.encode(body_data),
+            :headers  => {
+              'Content-Type' => 'application/oracle-compute-v3+json'
+            }
+          )
+      	end
+      end
+    end
+  end
+end

data/lib/fog/oraclecloud/requests/compute/update_orchestration.rb

@@ -1,80 +1,80 @@
-module Fog
-  module Compute
-    class OracleCloud
-      class Real
-      	def update_orchestration (name, oplans, options={})
-
-          # Clean up names in case they haven't provided the fully resolved names
-          if !name.start_with?("/Compute-") then
-            # They haven't provided a well formed name, add their name in
-            name = "/Compute-#{@identity_domain}/#{@username}/#{name}"
-          end   
-          oplans.map do |oplan|
-            oplan['objects'].map do |object|
-              if oplan['obj_type'] == 'launchplan' then
-                object['instances'].map do |instance|
-                  if !instance['name'].start_with?("/Compute-") then
-                    instance['name'] = "/Compute-#{@identity_domain}/#{@username}/#{instance['name']}"
-                  end
-                end
-              else
-                if !object['name'].start_with?("/Compute-") then
-                  object['name'] = "/Compute-#{@identity_domain}/#{@username}/#{object['name']}"
-                end
-              end
-            end
-          end
-          body_data     = {
-            'name' 		      => name,
-            'oplans'        => oplans,
-            'relationships' => options[:relationships],
-            'description'   => options[:description],
-            'account'       => options[:account],
-            'schedule'      => options[:schedule]
-          }
-          body_data = body_data.reject {|key, value| value.nil?}
-          request(
-            :method   => 'PUT',
-            :expects  => 200,
-            :path     => "/orchestration#{name}",
-            :body     => Fog::JSON.encode(body_data),
-            :headers  => {
-              'Content-Type' => 'application/oracle-compute-v3+json'
-            }
-          )
-      	end
-      end
-
-      class Mock
-        def update_orchestration (name, oplans, options={})
-          response = Excon::Response.new
-          clean_name = name.sub "/Compute-#{@identity_domain}/#{@username}/", ''
-          if orchestration = self.data[:orchestrations][clean_name] 
-            oplans.map do |oplan|
-              oplan['objects'].map do |object|
-                if oplan['obj_type'] == 'launchplan' then
-                  object['instances'].map do |instance|
-                    if !instance['name'].start_with?("/Compute-") then
-                      instance['name'] = "/Compute-#{@identity_domain}/#{@username}/#{instance['name']}"
-                    end
-                  end
-                else
-                  if !object['name'].start_with?("/Compute-") then
-                    object['name'] = "/Compute-#{@identity_domain}/#{@username}/#{object['name']}"
-                  end
-                end
-              end
-            end
-            self.data[:orchestrations][clean_name].merge!(options)
-            self.data[:orchestrations][clean_name]['oplans'] = oplans
-            response.status = 200
-            response.body = self.data[:orchestrations][clean_name]
-            response
-          else;
-            raise Fog::Compute::OracleCloud::NotFound.new("Orchestration #{name} does not exist");
-          end
-        end
-      end
-    end
-  end
-end
+module Fog
+  module Compute
+    class OracleCloud
+      class Real
+      	def update_orchestration (name, oplans, options={})
+
+          # Clean up names in case they haven't provided the fully resolved names
+          if !name.start_with?("/Compute-") then
+            # They haven't provided a well formed name, add their name in
+            name = "/Compute-#{@identity_domain}/#{@username}/#{name}"
+          end   
+          oplans.map do |oplan|
+            oplan['objects'].map do |object|
+              if oplan['obj_type'] == 'launchplan' then
+                object['instances'].map do |instance|
+                  if !instance['name'].start_with?("/Compute-") then
+                    instance['name'] = "/Compute-#{@identity_domain}/#{@username}/#{instance['name']}"
+                  end
+                end
+              else
+                if !object['name'].start_with?("/Compute-") then
+                  object['name'] = "/Compute-#{@identity_domain}/#{@username}/#{object['name']}"
+                end
+              end
+            end
+          end
+          body_data     = {
+            'name' 		      => name,
+            'oplans'        => oplans,
+            'relationships' => options[:relationships],
+            'description'   => options[:description],
+            'account'       => options[:account],
+            'schedule'      => options[:schedule]
+          }
+          body_data = body_data.reject {|key, value| value.nil?}
+          request(
+            :method   => 'PUT',
+            :expects  => 200,
+            :path     => "/orchestration#{name}",
+            :body     => Fog::JSON.encode(body_data),
+            :headers  => {
+              'Content-Type' => 'application/oracle-compute-v3+json'
+            }
+          )
+      	end
+      end
+
+      class Mock
+        def update_orchestration (name, oplans, options={})
+          response = Excon::Response.new
+          clean_name = name.sub "/Compute-#{@identity_domain}/#{@username}/", ''
+          if orchestration = self.data[:orchestrations][clean_name] 
+            oplans.map do |oplan|
+              oplan['objects'].map do |object|
+                if oplan['obj_type'] == 'launchplan' then
+                  object['instances'].map do |instance|
+                    if !instance['name'].start_with?("/Compute-") then
+                      instance['name'] = "/Compute-#{@identity_domain}/#{@username}/#{instance['name']}"
+                    end
+                  end
+                else
+                  if !object['name'].start_with?("/Compute-") then
+                    object['name'] = "/Compute-#{@identity_domain}/#{@username}/#{object['name']}"
+                  end
+                end
+              end
+            end
+            self.data[:orchestrations][clean_name].merge!(options)
+            self.data[:orchestrations][clean_name]['oplans'] = oplans
+            response.status = 200
+            response.body = self.data[:orchestrations][clean_name]
+            response
+          else;
+            raise Fog::Compute::OracleCloud::NotFound.new("Orchestration #{name} does not exist");
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/oraclecloud/requests/compute/update_ssh_key.rb

@@ -1,49 +1,49 @@
-module Fog
-  module Compute
-    class OracleCloud
-      class Real
-      	def update_ssh_key (name, enabled, key)
-          if !name.start_with?("/Compute-") then
-            # They haven't provided a well formed name, add their name in
-            name = "/Compute-#{@identity_domain}/#{@username}/#{name}"
-          end   
-          body_data     = {
-            'name'             		=> name,
-            'enabled'					    => enabled,
-            'key'					        => key
-          }
-          body_data = body_data.reject {|key, value| value.nil?}
-          request(
-            :method   => 'PUT',
-            :expects  => 200,
-            :path     => "/sshkey#{name}",
-            :body     => Fog::JSON.encode(body_data),
-            :headers  => {
-              'Content-Type' => 'application/oracle-compute-v3+json'
-            }
-          )
-      	end
-      end
-
-      class Mock
-        def update_ssh_key (name, enabled, key)
-          response = Excon::Response.new
-          clean_name = name.sub "/Compute-#{@identity_domain}/#{@username}/", ''
-          if sshkey = self.data[:sshkeys][clean_name] 
-            self.data[:sshkeys][clean_name].merge!({
-              'name' => "/Compute-#{@identity_domain}/#{@username}/#{clean_name}",
-              'enabled' => enabled,
-              'key' => key,
-              'uri' => "#{@api_endpoint}sshkey/#{clean_name}"              
-            })
-            response.status = 200
-            response.body = self.data[:sshkeys][clean_name]
-            response
-          else;
-            raise Fog::Compute::OracleCloud::NotFound.new("SSHKey #{name} does not exist");
-          end
-        end
-      end
-    end
-  end
-end
+module Fog
+  module Compute
+    class OracleCloud
+      class Real
+      	def update_ssh_key (uri, name, enabled, key)
+          if !name.start_with?("/Compute-") then
+            # They haven't provided a well formed name, add their name in
+            name = "/Compute-#{@identity_domain}/#{@username}/#{name}"
+          end   
+          body_data     = {
+            'name'             		=> name,
+            'enabled'					    => enabled,
+            'key'					        => key
+          }
+          body_data = body_data.reject {|key, value| value.nil?}
+          request(
+            :method   => 'PUT',
+            :expects  => 200,
+            :path     => "/sshkey#{name}",
+            :body     => Fog::JSON.encode(body_data),
+            :headers  => {
+              'Content-Type' => 'application/oracle-compute-v3+json'
+            }
+          )
+      	end
+      end
+
+      class Mock
+        def update_ssh_key (uri, name, enabled, key)
+          response = Excon::Response.new
+          clean_name = name.sub "/Compute-#{@identity_domain}/#{@username}/", ''
+          if sshkey = self.data[:sshkeys][clean_name] 
+            self.data[:sshkeys][clean_name].merge!({
+              'name' => "/Compute-#{@identity_domain}/#{@username}/#{clean_name}",
+              'enabled' => enabled,
+              'key' => key,
+              'uri' => "#{@api_endpoint}sshkey/#{clean_name}"              
+            })
+            response.status = 200
+            response.body = self.data[:sshkeys][clean_name]
+            response
+          else;
+            raise Fog::Compute::OracleCloud::NotFound.new("SSHKey #{name} does not exist");
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/oraclecloud/requests/database/backup_instance.rb

@@ -1,45 +1,45 @@
-module Fog
-  module OracleCloud
-    class Database
-      class Real
-
-      	def backup_instance(service_name)
-          # Oracle Cloud requires an empty JSON object in the body
-          body_data     = {}
-        
-          response = request(
-            :method   => 'POST',
-            :expects  => 202,
-            :path     => "/paas/service/dbcs/api/v1.1/instances/#{@identity_domain}/#{service_name}/backups",
-            :body     => Fog::JSON.encode(body_data),
-          )
-          response.database_id = service_name
-          response
-        end
-      end
-
-      class Mock
-        def backup_instance(service_name)
-      		response = Excon::Response.new
-
-          if !self.data[:backups][service_name].is_a? Array 
-            self.data[:backups][service_name] = []
-          end
-          self.data[:backups][service_name].push({
-            'backupCompleteDate'=>Time.now.strftime('%d-%b-%Y %H:%M:%S UTC'),
-            'dbTag'=>'TAG' + Time.now.strftime('%Y%m%dT%H%M%S'),
-            'status'=>'IN PROGRESS',
-            'database_id'=>service_name
-          })
-          if !self.data[:created_at][:backups] 
-            self.data[:created_at][:backups] = {}
-            self.data[:created_at][:backups][service_name] = []
-          end
-          self.data[:created_at][:backups][service_name].push(Time.now)
-          response.status = 202
-          response
-      	end
-      end
-    end
-  end
-end
+module Fog
+  module OracleCloud
+    class Database
+      class Real
+
+      	def backup_instance(service_name)
+          # Oracle Cloud requires an empty JSON object in the body
+          body_data     = {}
+        
+          response = request(
+            :method   => 'POST',
+            :expects  => 202,
+            :path     => "/paas/service/dbcs/api/v1.1/instances/#{@identity_domain}/#{service_name}/backups",
+            :body     => Fog::JSON.encode(body_data),
+          )
+          response.database_id = service_name
+          response
+        end
+      end
+
+      class Mock
+        def backup_instance(service_name)
+      		response = Excon::Response.new
+
+          if !self.data[:backups][service_name].is_a? Array 
+            self.data[:backups][service_name] = []
+          end
+          self.data[:backups][service_name].push({
+            'backupCompleteDate'=>Time.now.strftime('%d-%b-%Y %H:%M:%S UTC'),
+            'dbTag'=>'TAG' + Time.now.strftime('%Y%m%dT%H%M%S'),
+            'status'=>'IN PROGRESS',
+            'database_id'=>service_name
+          })
+          if !self.data[:created_at][:backups] 
+            self.data[:created_at][:backups] = {}
+            self.data[:created_at][:backups][service_name] = []
+          end
+          self.data[:created_at][:backups][service_name].push(Time.now)
+          response.status = 202
+          response
+      	end
+      end
+    end
+  end
+end