fog-oraclecloud 0.1.12 → 0.1.13

data/lib/fog/oraclecloud/models/compute/image.rb

@@ -1,43 +1,43 @@
-require 'fog/core/model'
-
-module Fog
-  module Compute
-  	class OracleCloud
-	    class Image < Fog::Model
-	      identity  :name
-
-	      attribute :account
-	      attribute :sizes
-	      attribute :hypervisor
-	      attribute :uri
-	     	attribute :quota
-	      attribute :platform
-	      attribute :no_upload
-	      attribute :state
-	      attribute :signed_by
-	      attribute :file
-	      attribute :signature
-	      attribute :checksums
-	      attribute :error_reason
-	      attribute :image_format
-	      attribute :audited
-
- 				def save
-          #identity ? update : create
-          create
-        end
-
-        def create
-        	requires :account, :name, :no_upload, :file, :sizes
-          
-          data = service.create_image(account, name, no_upload, file, sizes)
-        end
-
-        def delete
-        	requires :image_list_name
-        	service.delete_image(image_list_name, version)
-        end
-	    end
-	  end
-  end
-end
+require 'fog/core/model'
+
+module Fog
+  module Compute
+  	class OracleCloud
+	    class Image < Fog::Model
+	      identity  :name
+
+	      attribute :account
+	      attribute :sizes
+	      attribute :hypervisor
+	      attribute :uri
+	     	attribute :quota
+	      attribute :platform
+	      attribute :no_upload
+	      attribute :state
+	      attribute :signed_by
+	      attribute :file
+	      attribute :signature
+	      attribute :checksums
+	      attribute :error_reason
+	      attribute :image_format
+	      attribute :audited
+
+ 				def save
+          #identity ? update : create
+          create
+        end
+
+        def create
+        	requires :account, :name, :no_upload, :file, :sizes
+          
+          data = service.create_image(account, name, no_upload, file, sizes)
+        end
+
+        def delete
+        	requires :image_list_name
+        	service.delete_image(image_list_name, version)
+        end
+	    end
+	  end
+  end
+end

data/lib/fog/oraclecloud/models/compute/image_list.rb

@@ -1,39 +1,39 @@
-require 'fog/core/model'
-
-module Fog
-  module Compute
-  	class OracleCloud
-	    class ImageList < Fog::Model
-	      identity  :name
-
-	      attribute :uri
-	      attribute :default
-	      attribute :description
-	      attribute :entries
-
- 				def save
-          #identity ? update : create
-          create
-        end
-
-        def create
-        	requires :name, :description
-          
-          data = service.create_image_list(name, description,
-                                            :default => default)
-        end
-
-        def update
-        	requires :name
-
-        	data = service.update_image_list(name, :description=>description, :default=>default)
-        end
-
-        def delete
-        	requires :name
-        	service.delete_image_list(name)
-        end
-	    end
-	  end
-  end
-end
+require 'fog/core/model'
+
+module Fog
+  module Compute
+  	class OracleCloud
+	    class ImageList < Fog::Model
+	      identity  :name
+
+	      attribute :uri
+	      attribute :default
+	      attribute :description
+	      attribute :entries
+
+ 				def save
+          #identity ? update : create
+          create
+        end
+
+        def create
+        	requires :name, :description
+          
+          data = service.create_image_list(name, description,
+                                            :default => default)
+        end
+
+        def update
+        	requires :name
+
+        	data = service.update_image_list(name, :description=>description, :default=>default)
+        end
+
+        def delete
+        	requires :name
+        	service.delete_image_list(name)
+        end
+	    end
+	  end
+  end
+end

data/lib/fog/oraclecloud/models/compute/image_lists.rb

@@ -1,22 +1,22 @@
-require 'fog/core/collection'
-
-module Fog
-  module Compute
-  	class OracleCloud
-	    class ImageLists < Fog::Collection
-
-	    	model Fog::Compute::OracleCloud::ImageList
-				
-				def all
-					data = service.list_image_lists().body['result']
-					load(data)
-				end
-
- 				def get(name)
-          data = service.get_image_list(name).body
-          new(data)
-        end
-	    end
-	  end
-  end
-end
+require 'fog/core/collection'
+
+module Fog
+  module Compute
+  	class OracleCloud
+	    class ImageLists < Fog::Collection
+
+	    	model Fog::Compute::OracleCloud::ImageList
+				
+				def all
+					data = service.list_image_lists().body['result']
+					load(data)
+				end
+
+ 				def get(name)
+          data = service.get_image_list(name).body
+          new(data)
+        end
+	    end
+	  end
+  end
+end

data/lib/fog/oraclecloud/models/compute/images.rb

@@ -1,22 +1,22 @@
-require 'fog/core/collection'
-
-module Fog
-  module Compute
-  	class OracleCloud
-	    class Images < Fog::Collection
-
-	    	model Fog::Compute::OracleCloud::Image
-				
- 				def get(name)
-          data = service.get_image(name).body
-          new(data)
-        end
-
-				def all
-					data = service.list_images().body['result']
-					load(data)
-				end
-	    end
-	  end
-  end
-end
+require 'fog/core/collection'
+
+module Fog
+  module Compute
+  	class OracleCloud
+	    class Images < Fog::Collection
+
+	    	model Fog::Compute::OracleCloud::Image
+				
+ 				def get(name)
+          data = service.get_image(name).body
+          new(data)
+        end
+
+				def all
+					data = service.list_images().body['result']
+					load(data)
+				end
+	    end
+	  end
+  end
+end

data/lib/fog/oraclecloud/models/compute/instance.rb

@@ -1,69 +1,74 @@
-require 'fog/core/model'
-
-module Fog
-  module Compute
-  	class OracleCloud
-	    class Instance < Fog::Model
-	      identity  :name
-
-	      attribute :account
-	      attribute :boot_order
-	      attribute :disk_attach
-	      attribute :domain
-	     	attribute :entry
-	      attribute :error_reason
-	      attribute :fingerprint
-	      attribute :hostname
-	      attribute :hypervisor
-	      attribute :image_format
-	      attribute :imagelist
-	      attribute :ip
-	      attribute :label
-	      attribute :networking
-	      attribute :placement_requirements
-	      attribute :platform
-	      attribute :priority
-	      attribute :quota
-	      attribute :quota_reservation
-	      attribute :resolvers
-	      attribute :reverse_dns
-	      attribute :shape
-	      attribute :site
-	      attribute :sshkeys
-	      attribute :start_time
-	      attribute :state
-	      attribute :storage_attachments
-	      attribute :tags
-	      attribute :uri
-	      attribute :vcable_id
-	      attribute :virtio
-	      attribute :vnc 
-
-	      def ready?
-	      	state == 'running'
-	      end
-
-	      def clean_name 
-	      	name.sub %r{\/.*\/}, ''
-	      end
-
- 				def save
-          #identity ? update : create
-          create
-        end
-
-        def create
-        	requires :name, :shape, :imagelist, :sshkeys
-          
-          data = service.create_instance(name, shape, imagelist, label, sshkeys)
-          merge_attributes(data.body['instances'][0])
-        end
-
-        def destroy
-        	requires :name
-        	service.delete_instance(name)
-        end
-	    end
-	  end
-  end
-end
+require 'fog/core/model'
+
+module Fog
+  module Compute
+  	class OracleCloud
+	    class Instance < Fog::Model
+	      identity  :name
+
+	      attribute :account
+	      attribute :boot_order
+	      attribute :disk_attach
+	      attribute :domain
+	     	attribute :entry
+	      attribute :error_reason
+	      attribute :fingerprint
+	      attribute :hostname
+	      attribute :hypervisor
+	      attribute :image_format
+	      attribute :imagelist
+	      attribute :ip
+	      attribute :label
+	      attribute :networking
+	      attribute :placement_requirements
+	      attribute :platform
+	      attribute :priority
+	      attribute :quota
+	      attribute :quota_reservation
+	      attribute :resolvers
+	      attribute :reverse_dns
+	      attribute :shape
+	      attribute :site
+	      attribute :sshkeys
+	      attribute :start_time
+	      attribute :state
+	      attribute :storage_attachments
+	      attribute :tags
+	      attribute :uri
+	      attribute :vcable_id
+	      attribute :virtio
+	      attribute :vnc 
+
+	      def initialize(attributes={})
+	      	self.shape ||= 'oc3'
+	      	super
+	      end
+
+	      def ready?
+	      	state == 'running'
+	      end
+
+	      def clean_name 
+	      	name.sub %r{\/.*\/}, ''
+	      end
+
+ 				def save
+          #identity ? update : create
+          create
+        end
+
+        def create
+        	requires :name, :shape, :imagelist, :sshkeys
+          
+          data = service.create_instance(name, shape, imagelist, label, sshkeys)
+          merge_attributes(data.body['instances'][0])
+        end
+
+        def destroy
+        	requires :name
+        	service.delete_instance(name)
+        end
+	    end
+	  end
+  end
+end

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

@@ -1,22 +1,22 @@
-require 'fog/core/collection'
-
-module Fog
-  module Compute
-  	class OracleCloud
-	    class Instances < Fog::Collection
-
-	    	model Fog::Compute::OracleCloud::Instance
-				
- 				def get(name)
-          data = service.get_instance(name).body
-          new(data)
-        end
-
-				def all
-					data = service.list_instances().body['result']
-					load(data)
-				end
-	    end
-	  end
-  end
-end
+require 'fog/core/collection'
+
+module Fog
+  module Compute
+  	class OracleCloud
+	    class Instances < Fog::Collection
+
+	    	model Fog::Compute::OracleCloud::Instance
+				
+ 				def get(name)
+          data = service.get_instance(name).body
+          new(data)
+        end
+
+				def all
+					data = service.list_instances().body['result']
+					load(data)
+				end
+	    end
+	  end
+  end
+end

data/lib/fog/oraclecloud/models/compute/object_plan.rb

@@ -1,16 +1,16 @@
-module Fog
-  module Compute
-  	class OracleCloud
-	    class ObjectPlan < Fog::Model
-
-	      attribute :label
-	      attribute :obj_type
-	      attribute :objects
-
-	      def object_type
-					obj_type     	
-	      end   
-	    end
-	  end
-  end
-end
+module Fog
+  module Compute
+  	class OracleCloud
+	    class ObjectPlan < Fog::Model
+
+	      attribute :label
+	      attribute :obj_type
+	      attribute :objects
+
+	      def object_type
+					obj_type     	
+	      end   
+	    end
+	  end
+  end
+end