fog-oraclecloud 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 723b71ff79264ce5b33642486c3ee7964af90673
-  data.tar.gz: 9fbd33b824585600ecf73dbccd0730362182b893
+  metadata.gz: dfdb853230afc1e89dba20e81a39ef494234917f
+  data.tar.gz: 757d5807cbb9f31ec133be9821a51d6b0b6c8cff
 SHA512:
-  metadata.gz: ee21600f5d7589284db68160004784d6060351f3852460125ce65766a703bb720dadfe46009c117ccd7df45e73d48c4d2b589e9cb096065aa06c300120f85765
-  data.tar.gz: 3ea277d567db75726c317d75cce0601b299120a5343769011816f4f619d4a555882e9d3123352f51833a86acba3a1149beda4b502339f038e4a1d4cfcb294bfa
+  metadata.gz: 060f7511d4454b87de04176b24488db21088b81a1568faeee3920499af9a928f6f0138f75d36e369e1f401c9641a0c57a0f252f0931faf4fee18cc4da0535e6f
+  data.tar.gz: 83395c4a62880b05ff56f18c854538a8c2df526489e2965fb060ff2a65ea0055f4221dbba70c6677a98811c67ba0d01603113bdcf0e09417396c6ed1d9c71070

data/lib/fog/oraclecloud/compute.rb

@@ -94,7 +94,6 @@ module Fog
       	end
 
       	def authenticate()
-
       		begin
             response = @connection.request({
             	:expects  => 204,
@@ -141,6 +140,33 @@ module Fog
           response
         end
       end
+
+      class Mock
+        def initialize(options={})
+          @username = options[:oracle_username]
+          @password = options[:oracle_password]
+          @identity_domain   = options[:oracle_domain]
+          @api_endpoint   = options[:oracle_compute_api]
+
+        end
+
+        def self.data 
+          @data ||= {
+            :instances => {},
+            :sshkeys => {},
+            :orchestrations => {},
+            :deleted_at => {}
+          }
+        end
+
+        def self.reset
+          @data = nil
+        end
+
+        def data 
+          self.class.data
+        end
+      end
     end
   end
 end

data/lib/fog/oraclecloud/database.rb

@@ -42,7 +42,7 @@ module Fog
           rescue Excon::Errors::HTTPStatusError => error
             raise case error
             when Excon::Errors::NotFound
-              Fog::Oracle::Database::NotFound.slurp(error)
+              Fog::OracleCloud::Database::NotFound.slurp(error)
             else
               error
             end
@@ -62,51 +62,22 @@ module Fog
           @username = options[:oracle_username]
           @password = options[:oracle_password]
           @identity_domain   = options[:oracle_domain]
-
-          @connection = Fog::XML::Connection.new("https://dbaas.oraclecloud.com")
         end
 
-        def self.data
-          @data ||= Hash.new do |hash, key|
-            hash[key] = {
-              :instances    => {}
-            }
-          end
+        def self.data 
+          @data ||= {
+            :instances => {},
+            :deleted_at => {},
+            :created_at => {}
+          }
         end
 
-        def data
-          self.class.data[@oracle_username]
-        end
-        
-        # Remove, jsut for testing
-        def auth_header
-          auth_header ||= 'Basic ' + Base64.encode64("#{@username}:#{@password}").gsub("\n",'')
+        def self.reset
+          @data = nil
         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::Database::NotFound.slurp(error)
-            else
-              error
-            end
-          end
-          #https://jaas.oraclecloud.com/paas/service/jcs/api/v1.1/instances/agriculture/status/create/job/2781084
-          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
+
+        def data 
+          self.class.data
         end
       end
     end

data/lib/fog/oraclecloud/java.rb

@@ -59,56 +59,28 @@ module Fog
       end
 
       class Mock
-				def initialize(options={})
-      		@username = options[:oracle_username]
-      		@password = options[:oracle_password]
-      		@identity_domain   = options[:oracle_domain]
-
-      		@connection = Fog::XML::Connection.new("https://jaas.oraclecloud.com")
-      	end
+        def initialize(options={})
+          @username = options[:oracle_username]
+          @password = options[:oracle_password]
+          @identity_domain   = options[:oracle_domain]
+        end
 
-      	def self.data
-          @data ||= Hash.new do |hash, key|
-            hash[key] = {
-              :instances    => {}
-            }
-          end
+        def self.data 
+          @data ||= {
+            :instances => {},
+            :deleted_at => {},
+            :created_at => {}
+          }
         end
 
-        def data
-          self.class.data[@oracle_username]
+        def self.reset
+          @data = nil
         end
-				
-        # Remove, jsut for testing
-				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::Errors::NotFound.new("Instance not found")
-            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
+
+        def data 
+          self.class.data
         end
-      end
+      end      
     end
   end
 end

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

@@ -37,12 +37,16 @@ module Fog
 	      attribute :uri
 	      attribute :vcable_id
 	      attribute :virtio
-	      attribute :vnc
-	       
+	      attribute :vnc 
+
 	      def ready?
 	      	state == 'running'
 	      end
 
+	      def clean_name 
+	      	name.sub %r{\/.*\/}, ''
+	      end
+
  				def save
           #identity ? update : create
           create

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

@@ -6,7 +6,6 @@ module Fog
       class Instance < Fog::Model
         identity  :service_name
 
-        attribute :service_name,                 :aliases => 'display_name'
         attribute :version
         attribute :status
         attribute :description
@@ -45,6 +44,9 @@ module Fog
         attribute :vmPublicKey
         attribute :parameters
 
+        def clean_name 
+          name.sub %r{\/.*\/}, ''
+        end
 
          def save
           #identity ? update : create
@@ -55,6 +57,14 @@ module Fog
           status == "Running"
         end
 
+        def stopping?
+          status == 'Maintenance' || status == 'Terminating'
+        end
+
+        def stopped?
+          status == 'Stopped'
+        end
+
         def ip_address
             # TODO: Replace with regex
             content_url.sub('http://', '')
@@ -68,14 +78,12 @@ module Fog
         private
 
         def create
-          requires :service_name, :edition, :vmPublicKey, :parameters 
-          data = service.create_instance(service_name, edition, vmPublicKey, parameters,
+          requires :service_name, :edition, :vmPublicKey, :shape, :version 
+          data = service.create_instance(service_name, edition, vmPublicKey, shape, version,
                                             :level => level,
                                             :subscriptionType => subscriptionType,
                                             :description => description,
-                                            :version => version,
-                                            :edition => edition,
-                                            :shape => shape)
+                                            :edition => edition)
 
         end
       end

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

@@ -13,11 +13,7 @@ module Fog
         end
 
         def get(id)
-          begin
-            new(service.get_instance(id).body)
-          rescue Fog::OracleCloud::Database::NotFound
-            nil
-          end
+          new(service.get_instance(id).body)
         end
 
       end

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

@@ -57,6 +57,7 @@ module Fog
         attribute :cloud_storage_user,        :aliases=>'cloudStorageUser'
         attribute :cloud_storage_password,    :aliases=>'cloudStoragePassword'
         attribute :admin_user_name,           :aliases=>'adminUserName'
+        attribute :vm_public_key,             :aliases=>'vmPublicKey'
 
         # The following are used to delete an instance and are not returned in the list action
         attribute :dba_name
@@ -80,6 +81,14 @@ module Fog
           status == "Running"
         end
 
+        def stopping?
+          status == 'Maintenance' || status == 'Terminating'
+        end
+
+        def stopped?
+          status == 'Stopped'
+        end
+
         def servers
           service.servers.all(service_name)
         end
@@ -92,11 +101,11 @@ module Fog
         private
 
         def create
-        	requires :service_name, :cloudStorageContainer, :cloudStorageUser, :cloudStoragePassword, :parameters 
+        	requires :service_name, :cloud_storage_container, :cloud_storage_user, :cloud_storage_password 
           
-          data = service.create_instance(service_name, cloudStorageContainer, cloudStorageUser, cloudStoragePassword, parameters,
+          data = service.create_instance(service_name, cloud_storage_container, cloud_storage_user, cloud_storage_password, dba_name, dba_password, db_servicename, shape, version, vm_public_key,
                                             :level => level,
-                                            :subscriptionType => subscriptionType,
+                                            :subscriptionType => subscription_type,
                                             :description => description)
 
         end

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

@@ -13,11 +13,7 @@ module Fog
         end
 
         def get(service_name)
-        	begin
-            new(service.get_instance(service_name).body)
-          rescue Fog::OracleCloud::Java::NotFound
-            nil
-          end
+          new(service.get_instance(service_name).body)
         end
 
       end

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

@@ -27,6 +27,27 @@ module Fog
           )
       	end
       end
+
+      class Mock
+        def create_instance (name, shape, imagelist, label, sshkeys)
+          response = Excon::Response.new
+          name.sub! "/Compute-#{@identity_domain}/#{@username}/", ''
+
+          self.data[:instances][name] = {
+            'name' => "/Compute-#{@identity_domain}/#{@username}/#{name}",
+            'shape' => shape,
+            'imagelist' => imagelist,
+            'label' => label,
+            'sshkeys' => sshkeys,
+            'state' => 'running'
+          }
+          response.status = 201
+          response.body = {
+            'instances' => [self.data[:instances][name]]
+          }
+          response
+        end
+      end
     end
   end
 end

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

@@ -41,6 +41,42 @@ module Fog
           )
       	end
       end
+
+      class Mock
+        def create_orchestration (name, oplans, options={})
+          response = Excon::Response.new
+          # Clean up names in case they haven't provided the fully resolved names
+          name.sub! "/Compute-#{@identity_domain}/#{@username}/", ''
+          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][name] = {
+            'name'          => "/Compute-#{@identity_domain}/#{@username}/#{name}",
+            'oplans'        => oplans,
+            'relationships' => options[:relationships],
+            'description'   => options[:description],
+            'account'       => options[:account],
+            'schedule'      => options[:schedule],
+            'status'        => 'stopped',
+            'uri'           => "#{@api_endpoint}orchestration/Compute-#{@identity_domain}/#{@username}/#{name}"
+          }
+          response.status = 201
+          response.body = self.data[:orchestrations][name]
+          response
+        end
+      end
     end
   end
 end

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

@@ -22,6 +22,25 @@ module Fog
           )
       	end
       end
+
+      class Mock
+        def create_ssh_key (name, enabled, key)
+          response = Excon::Response.new
+          name.sub! "/Compute-#{@identity_domain}/#{@username}/", ''
+
+          data = {
+            'name' => "/Compute-#{@identity_domain}/#{@username}/#{name}",
+            'enabled' => enabled,
+            'key' => key,
+            'uri' => "#{@api_endpoint}sshkey/#{name}"
+          }
+          self.data[:sshkeys][name] = data
+
+          response.status = 201
+          response.body = self.data[:sshkeys][name]
+          response
+        end
+      end
     end
   end
 end

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

@@ -17,6 +17,17 @@ module Fog
           )
       	end
       end
+
+      class Mock
+        def delete_instance(name)
+          response = Excon::Response.new
+          clean_name = name.sub "/Compute-#{@identity_domain}/#{@username}/", ''
+          self.data[:instances][clean_name]['state'] = 'stopping'
+          self.data[:deleted_at][clean_name] = Time.now
+          response.status = 204
+          response
+        end
+      end
     end
   end
 end

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

@@ -17,6 +17,16 @@ module Fog
           )
       	end
       end
+
+      class Mock
+        def delete_ssh_key (name)
+          response = Excon::Response.new
+          clean_name = name.sub "/Compute-#{@identity_domain}/#{@username}/", ''
+          self.data[:sshkeys].delete(clean_name)
+          response.status = 204
+          response
+        end
+      end
     end
   end
 end

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

@@ -19,6 +19,27 @@ module Fog
           response
         end
       end
+
+      class Mock
+        def get_instance(name)
+          response = Excon::Response.new
+          clean_name = name.sub "/Compute-#{@identity_domain}/#{@username}/", ''
+
+          if instance = self.data[:instances][clean_name] 
+            if instance['state'] == 'stopping'
+              if Time.now - self.data[:deleted_at][clean_name] >= Fog::Mock.delay
+                self.data[:deleted_at].delete(clean_name)
+                self.data[:instances].delete(clean_name)
+              end
+            end
+            response.status = 200
+            response.body = instance
+            response
+          else;
+            raise Fog::Compute::OracleCloud::NotFound.new("Instance #{name} does not exist");
+          end
+        end
+      end
     end
   end
 end

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

@@ -19,6 +19,21 @@ module Fog
           response
         end
       end
+
+      class Mock
+        def get_orchestration(name)
+          response = Excon::Response.new
+          clean_name = name.sub "/Compute-#{@identity_domain}/#{@username}/", ''
+
+          if instance = self.data[:orchestrations][clean_name] 
+            response.status = 200
+            response.body = instance
+            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/get_ssh_key.rb

@@ -19,6 +19,21 @@ module Fog
           response
         end
       end
+
+      class Mock
+        def get_ssh_key(name)
+          response = Excon::Response.new
+          clean_name = name.sub "/Compute-#{@identity_domain}/#{@username}/", ''
+
+          if sshkey = self.data[:sshkeys][clean_name] 
+            response.status = 200
+            response.body = sshkey
+            response
+          else;
+            raise Fog::Compute::OracleCloud::NotFound.new("SSHKey #{name} does not exist");
+          end
+        end
+      end
     end
   end
 end

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

@@ -11,6 +11,18 @@ module Fog
           response
         end
       end
+      class Mock
+        def list_instances
+          response = Excon::Response.new
+
+          instances = self.data[:instances].values
+
+          response.body = {
+            'result' => instances
+          }
+          response
+        end
+      end
     end
   end
 end

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

@@ -11,6 +11,19 @@ module Fog
           response
         end
       end
+
+      class Mock
+        def list_ssh_keys
+          response = Excon::Response.new
+
+          sshkeys = self.data[:sshkeys].values
+
+          response.body = {
+            'result' => sshkeys
+          }
+          response
+        end
+      end
     end
   end
 end

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

@@ -44,6 +44,37 @@ module Fog
           )
       	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

@@ -24,6 +24,26 @@ module Fog
           )
       	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

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

@@ -3,7 +3,7 @@ module Fog
     class Database
       class Real
 
-      	def create_instance(service_name, edition, vmPublicKey, parameters, options={})
+      	def create_instance(service_name, edition, vmPublicKey, shape, version, options={})
           body_data     = {
             'serviceName'             => service_name,
             'version'                 => options[:version],
@@ -13,7 +13,10 @@ module Fog
             'description'							=> options[:description],
             'shape'                   => options[:shape],
             'vmPublicKeyText'         => vmPublicKey,
-            'parameters'              => parameters
+            'parameters'              => {
+              'shape'                   => shape,
+              'version'                 => version
+            }
           }
           body_data = body_data.reject {|key, value| value.nil?}
         
@@ -31,13 +34,20 @@ module Fog
       end
 
       class Mock
-        def create_instance(service_name, edition, vmPublicKey, parameters, options={})
+        def create_instance(service_name, edition, vmPublicKey, shape, version, options={})
       		response = Excon::Response.new
 
-      		instance = Fog::OracleCloud::Mock.create_database_instance(service_name)
-          self.data[:instances][service_name] = instance
+          data = {
+            'service_name' => service_name,
+            'shape' => shape,
+            'edition' => edition,
+            'version' => version,
+            'status' => 'In Progress'
+          }.merge(options.select {|key, value| ["description"].include?(key) })
 
-      		response.status = 202
+          self.data[:instances][service_name] = data
+          self.data[:created_at][service_name] = Time.now
+          response.status = 202
           response
       	end
       end

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

@@ -12,17 +12,12 @@ module Fog
         end
       end
 
-      class Mock
-        def delete_instance(service_name)
+     class Mock
+        def delete_instance(name)
           response = Excon::Response.new
-            # remove from memoreeeez.
-          self.data[:instances].delete service_name
-          response.body = { 
-            'service_name' => service_name,
-            'status' => 'Terminating' 
-          }
-          response.status = 202
-      
+          self.data[:instances][name]['status'] = 'Terminating'
+          self.data[:deleted_at][name] = Time.now
+          response.status = 204
           response
         end
       end

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

@@ -14,22 +14,30 @@ module Fog
       end
 
       class Mock
-        def get_instance(instance_id)
+        def get_instance(name)
           response = Excon::Response.new
-          if instance_exists? instance_id
+
+          if instance = self.data[:instances][name]
+            case instance['status']
+            when 'Terminating'
+              if Time.now - self.data[:deleted_at][name] >= Fog::Mock.delay
+                self.data[:deleted_at].delete(name)
+                self.data[:instances].delete(name)
+              end
+            when 'In Progress'
+              if Time.now - self.data[:created_at][name] >= Fog::Mock.delay
+                self.data[:instances][name]['status'] = 'Running'
+                instance = self.data[:instances][name]
+                self.data[:created_at].delete(name)
+              end
+            end
             response.status = 200
-            response.body   = self.data[:instances][instance_id]
+            response.body = instance
+            response
           else
-            raise Fog::Oracle::Database::NotFound
+            raise Fog::OracleCloud::Database::NotFound.new("Database #{name} does not exist");
           end
-          response
-        end
-
-        # Checks if an instance exists
-        def instance_exists?(instance_id)
-          self.data[:instances].key? instance_id
         end
-        
       end
     end
   end

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

@@ -11,6 +11,19 @@ module Fog
           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/java/create_instance.rb

@@ -3,7 +3,7 @@ module Fog
     class Java
       class Real
 
-      	def create_instance(service_name, cloudStorageContainer, cloudStorageUser, cloudStoragePassword, parameters, options={})
+        def create_instance(service_name, cloudStorageContainer, cloudStorageUser, cloudStoragePassword, dbaName, dbaPassword, dbServiceName, shape, version, vmPublicKey, options={})
           if !cloudStorageContainer.start_with?("/Storage-") then
             # They haven't provided a well formed container name, add their details in
             name = "/Storage-#{@identity_domain}/#{@username}/#{cloudStorageContainer}"
@@ -33,18 +33,23 @@ module Fog
         end
 
       end
-
       class Mock
-      	def create_instance(service_name, cloudStorageContainer, cloudStorageUser, cloudStoragePassword, parameters, options={})
-      		response = Excon::Response.new
+        def create_instance(service_name, cloudStorageContainer, cloudStorageUser, cloudStoragePassword, dbaName, dbaPassword, dbServiceName, shape, version, vmPublicKey, options={})
+          response = Excon::Response.new
 
-      		instance = Fog::OracleCloud::Mock.create_java_instance(service_name, parameters)
-          self.data[:instances][service_name] = instance
+          data = {
+            'service_name' => service_name,
+            'db_service_name' => dbServiceName,
+            'shape' => shape,
+            'version' => version,
+            'status' => 'In Progress'
+          }.merge(options.select {|key, value| ["description"].include?(key) })
 
-      		response.status = 202
-          response.headers['Location'] =  "https://jaas.oraclecloud.com/paas/service/jcs/api/v1.1/instances/agriculture/status/create/job/2781084"
+          self.data[:instances][service_name] = data
+          self.data[:created_at][service_name] = Time.now
+          response.status = 202
           response
-      	end
+        end
       end
     end
   end

data/lib/fog/oraclecloud/requests/java/delete_instance.rb

@@ -24,16 +24,11 @@ module Fog
       end
 
       class Mock
-        def delete_instance(service_name, dba_name, dba_password, options={})
+        def delete_instance(name, dba_name, dba_password, options={})
           response = Excon::Response.new
-            # remove from memoreeeez.
-          self.data[:instances].delete service_name
-          response.body = { 
-            'service_name' => service_name,
-            'status' => 'Terminating' 
-          }
-          response.status = 202
-      
+          self.data[:instances][name]['status'] = 'Terminating'
+          self.data[:deleted_at][name] = Time.now
+          response.status = 204
           response
         end
       end

data/lib/fog/oraclecloud/requests/java/get_instance.rb

@@ -14,23 +14,30 @@ module Fog
       end
 
       class Mock
- 				def get_instance(instance_id)
-
+        def get_instance(name)
           response = Excon::Response.new
-          if instance_exists? instance_id
+
+          if instance = self.data[:instances][name]
+            case instance['status']
+            when 'Terminating'
+              if Time.now - self.data[:deleted_at][name] >= Fog::Mock.delay
+                self.data[:deleted_at].delete(name)
+                self.data[:instances].delete(name)
+              end
+            when 'In Progress'
+              if Time.now - self.data[:created_at][name] >= Fog::Mock.delay
+                self.data[:instances][name]['status'] = 'Running'
+                instance = self.data[:instances][name]
+                self.data[:created_at].delete(name)
+              end
+            end
             response.status = 200
-            response.body   = self.data[:instances][instance_id]
+            response.body = instance
+            response
           else
-            raise Fog::OracleCloud::Java::NotFound
+            raise Fog::OracleCloud::Java::NotFound.new("Java #{name} does not exist");
           end
-          response
-        end
-
-        # Checks if an instance exists
-        def instance_exists?(instance_id)
-          self.data[:instances].key? instance_id
         end
-        
       end
     end
   end

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

@@ -11,6 +11,19 @@ module Fog
           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/java/list_servers.rb

@@ -12,18 +12,7 @@ module Fog
         end
       end
 
-      class Mock
-        def list_servers(service_name)
-          # TODO: Remove, implement proper Mock
-          response = request(
-            :expects  => 200,
-            :method   => 'GET',
-            :path     => "/paas/service/jcs/api/v1.1/instances/#{@identity_domain}/#{service_name}/servers"
-          )
-          response
-        end
-        
-      end
+     
     end
   end
 end

data/lib/fog/oraclecloud/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module OracleCloud
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

data/tests/helper.rb

@@ -1 +1,3 @@
-require File.expand_path('../../lib/fog/oraclecloud', __FILE__)
+require File.expand_path('../../lib/fog/oraclecloud', __FILE__)
+
+require File.expand_path(File.join(File.dirname(__FILE__), 'helpers', 'mock_helper'))

data/tests/helpers/mock_helper.rb

@@ -0,0 +1,15 @@
+# Use so you can run in mock mode from the command line
+#
+# FOG_MOCK=true fog
+
+if ENV["FOG_MOCK"] == "true"
+  Fog.mock!
+end
+
+puts "Mock: #{Fog.mock?}"
+# if in mocked mode, fill in some fake credentials for us
+if Fog.mock?
+  Fog.credentials = {
+  	:oracle_compute_api => 'https://api.compute.us0.oraclecloud.com'
+  }.merge(Fog.credentials)
+end

data/tests/requests/database_tests.rb

@@ -2,33 +2,28 @@ require 'pp'
 
 Shindo.tests('Fog::Database[oraclecloud] | database requests', 'database') do
 	
-	#tests("#java-create", "create") do
-	#	sshkey = Fog::Compute[:oracle].ssh_keys.first.name
-	#	new_instance = Fog::Compute[:oracle].instances.create(
-	#		:name=>'Test123', 
-	#		:shape=>'oc3', 
-	#		:imagelist=>'/oracle/public/oel_6.4_2GB_v1',
-	#		:label=>'dev-vm',
-	#		:sshkeys=>[sshkey]
-	#	)
-	#	test "can create an instance" do
-	#		new_instance.is_a? Fog::Compute::Oracle::Instance
-	#	end
-	#	test "is being built" do
-	#		new_instance.state != "running"
-	#	end
-	#	new_instance.wait_for { ready? }
-#
-	#	test "is built" do
-	#		new_instance.state == 'running'
-	#	end
-#
-	#	new_instance.destroy()
-	#	test "can delete instance" do
-	#		check = Fog::Compute[:oracle].instances.get(new_instance.name)
-	#		check.state == 'stopping'
-	#	end
-	#end
+	tests("#database-create", "create") do
+		db = Fog::OracleCloud[:database].instances.create(
+			:service_name => 'TestDB',
+			:description => 'A new database',
+			:edition => 'SE',
+			:vmPublicKey => 'ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAkNNQ4ri2oUW46mBO/4CHMGCOALciumwGvFEMDLGNnlDbUSqU4IRrqgj+znLClfb29Oer0devdarM6DilsZVgZ2YbI5ZD5vICR/O9J0c28dArwbtFeIjcV2TCWyj5xKEXF1r+OrJMexHQa0fW1URGrU8QODpJNC/9eCVGcEXddL31xTZYpjoVOCVx66kNa6lSHEVV3T4zaCby9Oe5QI4gZe1+xyxHPNEW5wogwS3dlKSyL2CfBP0aUKOmJ5Nrl8+y0GqJQXdGjZ9FIknmwWueRW/6qPQvZocjOZ8YiPZgAP0RNy6lL+u8mnAazj/mrEdmB5QUzpDAllIr5Tn/xaddZQ==',
+			:shape => 'oc3',
+			:version => '12.1.0.2'
+		)
+		test "can create a database" do
+			db.is_a? Fog::OracleCloud::Database::Instance
+		end	
+
+		test "is being built" do
+			!db.ready?
+		end
+		db.wait_for { ready? }
+
+		test "is built" do
+			db.ready?
+		end
+	end
 
 	tests('#database-read') do
 		instances = Fog::OracleCloud[:database].instances
@@ -49,4 +44,13 @@ Shindo.tests('Fog::Database[oraclecloud] | database requests', 'database') do
 			instance.service_name.is_a? String
 		end
 	end
+
+	tests("#database-delete", "create") do
+		db = Fog::OracleCloud[:database].instances.get('TestDB')
+		db.destroy()
+		db.wait_for { stopping? }
+		tests("should actually delete instance").raises(Fog::OracleCloud::Database::NotFound) do
+			db.wait_for { stopped? } 
+		end
+	end
 end

data/tests/requests/instance_tests.rb

@@ -3,31 +3,32 @@ require 'pp'
 Shindo.tests('Fog::Compute[oraclecloud] | instance requests', 'instances') do
 	
 	tests("#instance-create", "create") do
-		sshkey = Fog::Compute[:oraclecloud].ssh_keys.first.name
+		#sshkey = Fog::Compute[:oraclecloud].ssh_keys.first.name
+		begin
+			sshkey = Fog::Compute[:oraclecloud].ssh_keys.get('Test123Key')
+		rescue Fog::Compute::OracleCloud::NotFound
+			sshkey = Fog::Compute[:oraclecloud].ssh_keys.create(
+				:name 		=> 'TestSSHKey2',
+				:enabled 	=> false,
+				:key			=> 'ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAkNNQ4ri2oUW46mBO/4CHMGCOALciumwGvFEMDLGNnlDbUSqU4IRrqgj+znLClfb29Oer0devdarM6DilsZVgZ2YbI5ZD5vICR/O9J0c28dArwbtFeIjcV2TCWyj5xKEXF1r+OrJMexHQa0fW1URGrU8QODpJNC/9eCVGcEXddL31xTZYpjoVOCVx66kNa6lSHEVV3T4zaCby9Oe5QI4gZe1+xyxHPNEW5wogwS3dlKSyL2CfBP0aUKOmJ5Nrl8+y0GqJQXdGjZ9FIknmwWueRW/6qPQvZocjOZ8YiPZgAP0RNy6lL+u8mnAazj/mrEdmB5QUzpDAllIr5Tn/xaddZQ=='
+			)
+		end
+
 		new_instance = Fog::Compute[:oraclecloud].instances.create(
 			:name=>'Test123', 
 			:shape=>'oc3', 
 			:imagelist=>'/oracle/public/oel_6.4_2GB_v1',
 			:label=>'dev-vm',
-			:sshkeys=>[sshkey]
+			:sshkeys=>[sshkey.name]
 		)
 		test "can create an instance" do
-			new_instance.is_a? Fog::Compute::Oracle::Instance
-		end
-		test "is being built" do
-			new_instance.state != "running"
+			new_instance.is_a? Fog::Compute::OracleCloud::Instance
 		end
 		new_instance.wait_for { ready? }
 
 		test "is built" do
 			new_instance.state == 'running'
 		end
-
-		new_instance.destroy()
-		test "can delete instance" do
-			check = Fog::Compute[:oraclecloud].instances.get(new_instance.name)
-			check.state == 'stopping'
-		end
 	end
 
 	tests('#instances-read') do
@@ -36,7 +37,7 @@ Shindo.tests('Fog::Compute[oraclecloud] | instance requests', 'instances') do
 			instances.is_a? Array
 		end
 		instances.each do |ins|
-			puts "#{ins.name} - #{ins.state}"
+			puts "#{ins.clean_name} - #{ins.state}"
 		end
 		test "should return records" do
 			instances.size >= 1
@@ -51,4 +52,13 @@ Shindo.tests('Fog::Compute[oraclecloud] | instance requests', 'instances') do
 			instance.name.is_a? String
 		end
 	end
+
+	tests("#instance-delete", "create") do
+		instance = Fog::Compute[:oraclecloud].instances.get('Test123')
+		instance.destroy()
+		instance.wait_for { state == 'stopping' }
+		tests("should actually delete instance").raises(Fog::Compute::OracleCloud::NotFound) do
+			instance.wait_for { state == 'stopped' } 
+		end
+	end
 end

data/tests/requests/java_tests.rb

@@ -2,33 +2,33 @@ require 'pp'
 
 Shindo.tests('Fog::Java[oraclecloud] | java requests', 'java') do
 	
-	#tests("#java-create", "create") do
-	#	sshkey = Fog::Compute[:oracle].ssh_keys.first.name
-	#	new_instance = Fog::Compute[:oracle].instances.create(
-	#		:name=>'Test123', 
-	#		:shape=>'oc3', 
-	#		:imagelist=>'/oracle/public/oel_6.4_2GB_v1',
-	#		:label=>'dev-vm',
-	#		:sshkeys=>[sshkey]
-	#	)
-	#	test "can create an instance" do
-	#		new_instance.is_a? Fog::Compute::Oracle::Instance
-	#	end
-	#	test "is being built" do
-	#		new_instance.state != "running"
-	#	end
-	#	new_instance.wait_for { ready? }
-#
-	#	test "is built" do
-	#		new_instance.state == 'running'
-	#	end
-#
-	#	new_instance.destroy()
-	#	test "can delete instance" do
-	#		check = Fog::Compute[:oracle].instances.get(new_instance.name)
-	#		check.state == 'stopping'
-	#	end
-	#end
+	tests("#database-create", "create") do
+		instance = Fog::OracleCloud[:java].instances.create(
+			:service_name => 'TestWLS',
+			:description => 'A new weblogic instance',
+			:cloud_storage_container => 'todo',
+			:cloud_storage_user => 'admin',
+			:cloud_storage_password => 'password',
+			:dbaName => 'SYS',
+			:dbaPassword => 'password',
+			:dbServiceName => 'TestDB',
+			:shape => 'oc3',
+			:version => '12.2.1',
+			:vmPublicKey => 'ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAkNNQ4ri2oUW46mBO/4CHMGCOALciumwGvFEMDLGNnlinstanceUSqU4IRrqgj+znLClfb29Oer0devdarM6DilsZVgZ2YbI5ZD5vICR/O9J0c28dArwbtFeIjcV2TCWyj5xKEXF1r+OrJMexHQa0fW1URGrU8QODpJNC/9eCVGcEXddL31xTZYpjoVOCVx66kNa6lSHEVV3T4zaCby9Oe5QI4gZe1+xyxHPNEW5wogwS3dlKSyL2CfBP0aUKOmJ5Nrl8+y0GqJQXdGjZ9FIknmwWueRW/6qPQvZocjOZ8YiPZgAP0RNy6lL+u8mnAazj/mrEdmB5QUzpDAllIr5Tn/xaddZQ==',
+		)
+		test "can create a java instance" do
+			instance.is_a? Fog::OracleCloud::Java::Instance
+		end	
+
+		test "is being built" do
+			!instance.ready?
+		end
+		instance.wait_for { ready? }
+
+		test "is built" do
+			instance.ready?
+		end
+	end
 
 	tests('#java-read') do
 		instances = Fog::OracleCloud[:java].instances
@@ -49,4 +49,15 @@ Shindo.tests('Fog::Java[oraclecloud] | java requests', 'java') do
 			instance.service_name.is_a? String
 		end
 	end
+
+	tests("#java-delete", "create") do
+		instance = Fog::OracleCloud[:java].instances.get('TestWLS')
+		instance.dba_name = 'Admin',
+		instance.dba_password = 'password'
+		instance.destroy()
+		instance.wait_for { stopping? }
+		tests("should actually delete instance").raises(Fog::OracleCloud::Java::NotFound) do
+			instance.wait_for { stopped? } 
+		end
+	end
 end

data/tests/requests/orchestrations_tests.rb

@@ -18,6 +18,7 @@ Shindo.tests('Fog::Compute[oraclecloud] | orchestration requests', 'orchestratio
 				}]
 			}]
 		)
+		
 		test "can create an orchestration" do
 			orchestration.is_a? Fog::Compute::OracleCloud::Orchestration
 		end

data/tests/requests/ssh_keys_tests.rb

@@ -23,10 +23,7 @@ Shindo.tests('Fog::Compute[oraclecloud] | ssh_keys requests', 'ssh_keys') do
 			check = Fog::Compute[:oraclecloud].ssh_keys.get(sshkey.name)
 			check.enabled == true
 		end
-		sshkey.destroy()
-		tests("can delete ssh key").raises(Excon::Error::NotFound) do
-			check = Fog::Compute[:oraclecloud].ssh_keys.get(sshkey.name)
-		end
+		
 	end
 
 	tests("#sshkeys-read") do
@@ -46,4 +43,12 @@ Shindo.tests('Fog::Compute[oraclecloud] | ssh_keys requests', 'ssh_keys') do
 			sshkey.name.is_a? String
 		end
 	end
+
+	tests("#sshkeys-delete", "create") do
+		sshkey = Fog::Compute[:oraclecloud].ssh_keys.get('TestSSHKey2')
+		sshkey.destroy()
+		tests("should delete key").raises(Fog::Compute::OracleCloud::NotFound) do
+			sshkey = Fog::Compute[:oraclecloud].ssh_keys.get('TestSSHKey2')
+		end
+	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-oraclecloud
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Joel Nation
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-24 00:00:00.000000000 Z
+date: 2016-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -219,6 +219,7 @@ files:
 - lib/fog/oraclecloud/storage.rb
 - lib/fog/oraclecloud/version.rb
 - tests/helper.rb
+- tests/helpers/mock_helper.rb
 - tests/requests/database_tests.rb
 - tests/requests/instance_tests.rb
 - tests/requests/java_tests.rb