fog-oraclecloud 0.1.12 → 0.1.13

data/lib/fog/oraclecloud/models/soa/instances.rb

@@ -1,54 +1,54 @@
-require 'fog/core/collection'
-
-module Fog
-  module OracleCloud
-    class SOA
-      class Instances < Fog::Collection
-
-      	model Fog::OracleCloud::SOA::Instance
-
-      	def all
-          data = service.list_instances().body['services']
-          load(data)
-        end
-
-        def get(id)
-          new(service.get_instance(id).body) 
-        end
-
-        def create(attributes = {}, db_attributes = {})
-          if attributes[:db_service_name].nil?
-            # Attempt to create a database instance for them
-            db_name = db_attributes[:service_name] || "#{attributes[:service_name]}-DB"
-            db_attributes.merge!({
-              :service_name => "#{attributes[:service_name]}-DB",
-              :edition => 'EE',
-              :ssh_key => attributes[:ssh_key],
-              :shape => 'oc3',
-              :version => '12.1.0.2',
-              :admin_password => attributes[:admin_password],
-              :backup_destination => 'BOTH'
-            }) { |key, v1, v2| v1 }
-            # Check it doesn't exist already
-            begin
-              db = Fog::OracleCloud[:database].instances.get(db_name)
-            rescue Fog::OracleCloud::Database::NotFound => error
-              # Doesn't exist, create it first
-              db = Fog::OracleCloud[:database].instances.create(db_attributes)
-              db.wait_for { ready? }
-            end
-            attributes.merge!({
-              :dba_name => 'SYS',
-              :dba_password => db_attributes[:admin_password],
-              :db_service_name => db_name
-            })
-          end
-          # Now provision SOA
-          object = new(attributes)
-          object.save
-          object
-        end
-      end
-    end
-  end
-end
+require 'fog/core/collection'
+
+module Fog
+  module OracleCloud
+    class SOA
+      class Instances < Fog::Collection
+
+      	model Fog::OracleCloud::SOA::Instance
+
+      	def all
+          data = service.list_instances().body['services']
+          load(data)
+        end
+
+        def get(id)
+          new(service.get_instance(id).body) 
+        end
+
+        def create(attributes = {}, db_attributes = {})
+          if attributes[:db_service_name].nil?
+            # Attempt to create a database instance for them
+            db_name = db_attributes[:service_name] || "#{attributes[:service_name]}-DB"
+            db_attributes.merge!({
+              :service_name => "#{attributes[:service_name]}-DB",
+              :edition => 'EE',
+              :ssh_key => attributes[:ssh_key],
+              :shape => 'oc3',
+              :version => '12.1.0.2',
+              :admin_password => attributes[:admin_password],
+              :backup_destination => 'BOTH'
+            }) { |key, v1, v2| v1 }
+            # Check it doesn't exist already
+            begin
+              db = Fog::OracleCloud[:database].instances.get(db_name)
+            rescue Fog::OracleCloud::Database::NotFound => error
+              # Doesn't exist, create it first
+              db = Fog::OracleCloud[:database].instances.create(db_attributes)
+              db.wait_for { ready? }
+            end
+            attributes.merge!({
+              :dba_name => 'SYS',
+              :dba_password => db_attributes[:admin_password],
+              :db_service_name => db_name
+            })
+          end
+          # Now provision SOA
+          object = new(attributes)
+          object.save
+          object
+        end
+      end
+    end
+  end
+end

data/lib/fog/oraclecloud/models/storage/container.rb

@@ -1,33 +1,33 @@
-module Fog
-  module Storage
-    class OracleCloud
-      class Container < Fog::Model
-        identity  :name
-
-        attribute :count, :aliases => 'X-Container-Object-Count'
-        attribute :bytes, :aliases => 'X-Container-Bytes-Used'
-        attribute :deleteTimestamp
-        attribute :containerId
-        attribute :read_acl, :aliases => 'X-Container-Read'
-        attribute :write_acl, :aliases => 'X-Container-Write'
-        attribute :createdTimestamp, :aliases => 'X-Timestamp'
-
-        def objects
-          @objects ||= Fog::Storage::OracleCloud::Objects.new(:container=>self, :service=>service)
-        end
-
-        def save
-          requires :name
-          data = service.create_container(name)
-          merge_attributes(data.headers)
-        end 
-        
-        def destroy
-          requires :name
-          service.delete_container(name)
-        end
-
-      end
-    end
-  end
-end
+module Fog
+  module Storage
+    class OracleCloud
+      class Container < Fog::Model
+        identity  :name
+
+        attribute :count, :aliases => 'X-Container-Object-Count'
+        attribute :bytes, :aliases => 'X-Container-Bytes-Used'
+        attribute :deleteTimestamp
+        attribute :containerId
+        attribute :read_acl, :aliases => 'X-Container-Read'
+        attribute :write_acl, :aliases => 'X-Container-Write'
+        attribute :createdTimestamp, :aliases => 'X-Timestamp'
+
+        def objects
+          @objects ||= Fog::Storage::OracleCloud::Objects.new(:container=>self, :service=>service)
+        end
+
+        def save
+          requires :name
+          data = service.create_container(name)
+          merge_attributes(data.headers)
+        end 
+        
+        def destroy
+          requires :name
+          service.delete_container(name)
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/oraclecloud/models/storage/containers.rb

@@ -1,24 +1,24 @@
-module Fog
-  module Storage
-    class OracleCloud
-      class Containers < Fog::Collection
-
-      	model Fog::Storage::OracleCloud::Container
-
-      	def all
-          containers = service.list_containers().body
-          load(containers)
-        end
-
-        def get(name)
-          data = service.get_container(name).headers
-          # The storage cloud service doesn't actually return the name. Add it back in
-          data['name'] = name
-          new(data)
-        end
-
-      end
-    end
-
-  end
-end
+module Fog
+  module Storage
+    class OracleCloud
+      class Containers < Fog::Collection
+
+      	model Fog::Storage::OracleCloud::Container
+
+      	def all
+          containers = service.list_containers().body
+          load(containers)
+        end
+
+        def get(name)
+          data = service.get_container(name).headers
+          # The storage cloud service doesn't actually return the name. Add it back in
+          data['name'] = name
+          new(data)
+        end
+
+      end
+    end
+
+  end
+end

data/lib/fog/oraclecloud/models/storage/object.rb

@@ -1,27 +1,27 @@
-module Fog
-  module Storage
-    class OracleCloud
-      class Object < Fog::Model
-        identity  :name
-
-        attribute :content_type
-        attribute :bytes
-        attribute :last_modified
-        attribute :hash
-
-        def save
-          requires :name
-        #  data = service.create_container(name)
-         # pp data
-         # merge_attributes(data.headers)
-        end 
-        
-        def destroy
-          requires :name
-        #  service.delete_container(name)
-        end
-
-      end
-    end
-  end
-end
+module Fog
+  module Storage
+    class OracleCloud
+      class Object < Fog::Model
+        identity  :name
+
+        attribute :content_type
+        attribute :bytes
+        attribute :last_modified
+        attribute :hash
+
+        def save
+          requires :name
+        #  data = service.create_container(name)
+         # pp data
+         # merge_attributes(data.headers)
+        end 
+        
+        def destroy
+          requires :name
+        #  service.delete_container(name)
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/oraclecloud/models/storage/objects.rb

@@ -1,27 +1,27 @@
-module Fog
-  module Storage
-    class OracleCloud
-      class Objects < Fog::Collection
-
-        attribute :container
-
-      	model Fog::Storage::OracleCloud::Object
-
-      	def all
-          requires :container
-          objects = service.get_container_with_objects(container.name)
-          load(objects.body)
-        end
-
-        def get(name)
-          data = service.get_container(name).headers
-          # The storage cloud service doesn't actually return the name. Add it back in
-          data['name'] = name
-          new(data)
-        end
-
-      end
-    end
-
-  end
-end
+module Fog
+  module Storage
+    class OracleCloud
+      class Objects < Fog::Collection
+
+        attribute :container
+
+      	model Fog::Storage::OracleCloud::Object
+
+      	def all
+          requires :container
+          objects = service.get_container_with_objects(container.name)
+          load(objects.body)
+        end
+
+        def get(name)
+          data = service.get_container(name).headers
+          # The storage cloud service doesn't actually return the name. Add it back in
+          data['name'] = name
+          new(data)
+        end
+
+      end
+    end
+
+  end
+end

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

@@ -1,30 +1,30 @@
-module Fog
-  module Compute
-    class OracleCloud
-      class Real
-      	def create_image (account, name, no_upload, file, sizes)
-          # Just in case it's already set
-          name.sub! "/Compute-#{@identity_domain}/#{@username}/", ''
-          body_data     = {
-            'name'             		=> "/Compute-#{@identity_domain}/#{@username}/#{name}",
-            'account'					    => account,
-            'no_upload'					  => no_upload,
-            'file'                => file,
-            'sizes'               => sizes
-          }
-          body_data = body_data.reject {|key, value| value.nil?}
-
-          request(
-            :method   => 'POST',
-            :expects  => 201,
-            :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 create_image (account, name, no_upload, file, sizes)
+          # Just in case it's already set
+          name.sub! "/Compute-#{@identity_domain}/#{@username}/", ''
+          body_data     = {
+            'name'             		=> "/Compute-#{@identity_domain}/#{@username}/#{name}",
+            'account'					    => account,
+            'no_upload'					  => no_upload,
+            'file'                => file,
+            'sizes'               => sizes
+          }
+          body_data = body_data.reject {|key, value| value.nil?}
+
+          request(
+            :method   => 'POST',
+            :expects  => 201,
+            :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/create_image_list.rb

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