fog-oraclecloud 0.1.15 → 0.1.16

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

@@ -0,0 +1,29 @@
+module Fog
+  module Compute
+    class OracleCloud
+      class Real
+      	def delete_security_list(name)
+      		# Just in case it's already set
+      		name.sub! "/Compute-#{@identity_domain}/#{@username}/", ''
+	      	request(
+            :method   => 'DELETE',
+            :expects  => 204,
+            :path     => "/seclist/Compute-#{@identity_domain}/#{@username}/#{name}",
+            :headers  => {
+              'Content-Type' => 'application/oracle-compute-v3+json'
+            }
+          )
+      	end
+      end
+      class Mock
+        def delete_security_list(name)
+          response = Excon::Response.new
+          clean_name = name.sub "/Compute-#{@identity_domain}/#{@username}/", ''
+          self.data[:security_lists].delete(clean_name)
+          response.status = 204
+          response
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,36 @@
+module Fog
+  module Compute
+    class OracleCloud
+      class Real
+        def get_ip_association(name)
+          name.sub! "/Compute-#{@identity_domain}/#{@username}/", ''
+          response = request(
+            :expects  => 200,
+            :method   => 'GET',
+            :path     => "/ip/association/Compute-#{@identity_domain}/#{@username}/#{name}",
+            :headers  => {
+              'Content-Type' => 'application/oracle-compute-v3+json',
+              'Accept' => 'application/oracle-compute-v3+json'
+            }
+          )
+          response
+        end
+      end
+
+      class Mock
+        def get_ip_association(name)
+          response = Excon::Response.new
+          clean_name = name.sub "/Compute-#{@identity_domain}/#{@username}/", ''
+
+          if ip = self.data[:ip_associations][clean_name] 
+            response.status = 200
+            response.body = ip
+            response
+          else;
+            raise Fog::Compute::OracleCloud::NotFound.new("IP Association #{name} does not exist");
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -2,7 +2,7 @@ module Fog
   module Compute
     class OracleCloud
       class Real
-				def get_ip_reservation(name)
+				def get_ip_network(name)
           name.sub! "/Compute-#{@identity_domain}/#{@username}/", ''
  					response = request(
             :expects  => 200,

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

@@ -3,10 +3,17 @@ module Fog
     class OracleCloud
       class Real
 				def get_security_application(name)
+          path = "/secapplication"
+          name.sub! "/Compute-#{@identity_domain}/#{@username}/", ''
+          if name.include? '/oracle/public' then
+            path += "/#{name}/"
+          else 
+            path += "/Compute-#{@identity_domain}/#{@username}/#{name}/"
+          end
  					response = request(
             :expects  => 200,
             :method   => 'GET',
-            :path     => "/secapplication/Compute-#{@identity_domain}/#{@username}/#{name}",
+            :path     => path,
             :headers  => {
               'Content-Type' => 'application/oracle-compute-v3+json',
               'Accept' => 'application/oracle-compute-v3+json'
@@ -15,6 +22,19 @@ module Fog
           response
         end
       end
+      class Mock
+        def get_security_application(name)
+          response = Excon::Response.new
+          clean_name = name.sub "/Compute-#{@identity_domain}/#{@username}/", ''
+          if app = self.data[:security_applications][clean_name] 
+            response.status = 200
+            response.body = app
+            response
+          else
+            raise Fog::Compute::OracleCloud::NotFound.new("Security application #{name} does not exist");
+          end
+        end
+      end
     end
   end
 end

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

@@ -0,0 +1,37 @@
+module Fog
+  module Compute
+    class OracleCloud
+      class Real
+				def get_security_ip_list(name)
+          name.sub! "/Compute-#{@identity_domain}/#{@username}/", ''
+
+ 					response = request(
+            :expects  => 200,
+            :method   => 'GET',
+            :path     => "/seciplist/Compute-#{@identity_domain}/#{@username}/#{name}",
+            :headers  => {
+              'Content-Type' => 'application/oracle-compute-v3+json',
+              'Accept' => 'application/oracle-compute-v3+json'
+            }
+          )
+          response
+        end
+      end
+
+      class Mock
+        def get_security_ip_list(name)
+          response = Excon::Response.new
+          clean_name = name.sub "/Compute-#{@identity_domain}/#{@username}/", ''
+
+          if instance = self.data[:security_ip_lists][clean_name] 
+            response.status = 200
+            response.body = instance
+            response
+          else
+            raise Fog::Compute::OracleCloud::NotFound.new("Security IP List #{name} does not exist");
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,37 @@
+module Fog
+  module Compute
+    class OracleCloud
+      class Real
+				def get_security_list(name)
+          name.sub! "/Compute-#{@identity_domain}/#{@username}/", ''
+
+ 					response = request(
+            :expects  => 200,
+            :method   => 'GET',
+            :path     => "/seclist/Compute-#{@identity_domain}/#{@username}/#{name}",
+            :headers  => {
+              'Content-Type' => 'application/oracle-compute-v3+json',
+              'Accept' => 'application/oracle-compute-v3+json'
+            }
+          )
+          response
+        end
+      end
+
+      class Mock
+        def get_security_list(name)
+          response = Excon::Response.new
+          clean_name = name.sub "/Compute-#{@identity_domain}/#{@username}/", ''
+
+          if instance = self.data[:security_lists][clean_name] 
+            response.status = 200
+            response.body = instance
+            response
+          else
+            raise Fog::Compute::OracleCloud::NotFound.new("Security List #{name} does not exist");
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -3,6 +3,8 @@ module Fog
     class OracleCloud
       class Real
 				def get_security_rule(name)
+          name.sub! "/Compute-#{@identity_domain}/#{@username}/", ''
+
  					response = request(
             :expects  => 200,
             :method   => 'GET',
@@ -15,6 +17,21 @@ module Fog
           response
         end
       end
+
+      class Mock
+        def get_security_rule(name)
+          response = Excon::Response.new
+          clean_name = name.sub "/Compute-#{@identity_domain}/#{@username}/", ''
+
+          if instance = self.data[:security_rules][clean_name] 
+            response.status = 200
+            response.body = instance
+            response
+          else
+            raise Fog::Compute::OracleCloud::NotFound.new("Security Rule #{name} does not exist");
+          end
+        end
+      end
     end
   end
 end

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

@@ -0,0 +1,28 @@
+module Fog
+  module Compute
+    class OracleCloud
+      class Real
+      	def list_ip_associations
+          response = request(
+            :expects  => 200,
+            :method   => 'GET',
+            :path     => "/ip/association/Compute-#{@identity_domain}/"
+          )
+          response
+        end
+      end
+
+      class Mock
+        def list_ip_associations
+          response = Excon::Response.new
+
+          ips = self.data[:ip_associations].values
+          response.body = {
+            'result' => ips
+          }
+          response
+        end
+      end
+    end
+  end
+end

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

@@ -2,18 +2,31 @@ module Fog
   module Compute
     class OracleCloud
       class Real
-      	def list_security_applications
+      	def list_security_applications(public_list=false)
+          path = "/secapplication"
+          if public_list then
+            path += "/oracle/public/"
+          else 
+            path += "/Compute-#{@identity_domain}/#{@username}/"
+          end
           response = request(
             :expects  => 200,
             :method   => 'GET',
-            :path     => "/secapplication/Compute-#{@identity_domain}/#{@username}/"
+            :path     => path
           )
           response
         end
       end
-
       class Mock
-        def list_security_applications
+        def list_security_applications(public_list=false)
+          response = Excon::Response.new
+          if public_list then check = "/oracle/public" 
+          else check = "/Compute-" end
+          instances = self.data[:security_applications].values.select { |app| app['name'].include? check}
+          response.body = {
+            'result' => instances
+          }
+          response
         end
       end
     end

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

@@ -13,7 +13,7 @@ module Fog
       end
 
       class Mock
-        def list_security_applications
+        def list_security_rules
         end
       end
     end

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

@@ -5,6 +5,8 @@ module Fog
     class OracleCloud
       class Real
       	def update_ip_reservation (params) 
+          params[:name].sub! "/Compute-#{@identity_domain}/#{@username}/", ''
+          params[:name] = "/Compute-#{@identity_domain}/#{@username}/#{params[:name]}"
           params = params.reject {|key, value| value.nil?}
           request(
             :method   => 'PUT',

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

@@ -0,0 +1,47 @@
+module Fog
+  module OracleCloud
+    class Database
+      class Real
+
+      	def create_access_rule(service_name, name, description, ports, source, destination, status)
+          body_data     = {
+            'ruleName' => name,
+            'description' => description,
+            'destination' => destination,
+            'ports' => ports,
+            'source' => source,
+            'status' => status
+          }
+          response = request(
+            :method   => 'POST',
+            :expects  => 202,
+            :path     => "/paas/api/v1.1/instancemgmt/#{@identity_domain}/services/dbaas/instances/#{service_name}/accessrules",
+            :body     => Fog::JSON.encode(body_data),
+          )
+          response
+        end
+      end
+
+      class Mock
+        def create_access_rule(service_name, name, description, ports, source, destination, status)
+          response = Excon::Response.new
+
+          data = {
+            'ruleName' => name,
+            'description' => description,
+            'status' => status,
+            'source' => source,
+            'destination'=>destination,
+            'ports'=>ports,
+            'ruleType'=>'USER',
+            'database_id'=>service_name
+          }
+          if !self.data[:access_rules].key?(service_name) then self.data[:access_rules][service_name] = {} end
+          self.data[:access_rules][service_name][name] = data
+          response.status = 202
+          response
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,50 @@
+module Fog
+  module OracleCloud
+    class Database
+      class Real
+
+      	def get_access_rule(db_name, rule_name)
+          # There isn't actually an API for this. So just get all of them and find the one they wanted
+ 					response = request(
+            :expects  => 200,
+            :method   => 'GET',
+            :path     => "/paas/api/v1.1/instancemgmt/#{@identity_domain}/services/dbaas/instances/#{db_name}/accessrules"
+          )
+          rule = response.body["accessRules"].detect { |r| r['ruleName'] == rule_name}
+          if rule.nil? then
+            raise Fog::OracleCloud::Database::NotFound.new("Could not find rule (#{rule_name}) attached to #{service_name}")
+          end
+          response.body = rule
+          response
+        end
+      end
+
+      class Mock
+        def get_snapshot(db_name, snapshot_name)
+          response = Excon::Response.new
+
+          if snapshot = self.data[:snapshots][db_name][snapshot_name]
+            case snapshot['status']
+            when 'Terminating'
+              if Time.now - self.data[:deleted_at][snapshot_name] >= Fog::Mock.delay
+                self.data[:deleted_at].delete(snapshot_name)
+                self.data[:snapshots][db_name].delete(snapshot_name)
+              end
+            when 'In Progress'
+              if Time.now - self.data[:created_at][snapshot_name] >= Fog::Mock.delay
+                self.data[:snapshots][db_name][snapshot_name]['status'] = 'Succeeded'
+                snapshot = self.data[:snapshots][db_name][snapshot_name]
+                self.data[:created_at].delete(snapshot_name)
+              end
+            end
+            response.status = 200
+            response.body = snapshot
+            response
+          else
+            raise Fog::OracleCloud::Database::NotFound.new("Snapshot #{snapshot_name} for #{db_name} does not exist");
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/oraclecloud/soa.rb

@@ -40,8 +40,8 @@ module Fog
       	end
 
         def request(params, parse_json = true, &block)
-
 					begin
+            Fog::Logger.debug("Sending #{params[:body].to_s} to #{params[:path]}")
 						response = @connection.request(params.merge!({
 							:headers  => {
 								'Authorization' => auth_header,

data/lib/fog/oraclecloud/storage.rb

@@ -29,8 +29,8 @@ module Fog
       	end
 
       	def authenticate()
-
       		begin
+            Fog::Logger.debug("Sending #{params[:body].to_s} to #{params[:path]}")
             response = @connection.request({
             	:expects  => 200,
           	  :method   => 'GET',

data/lib/fog/oraclecloud/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module OracleCloud
-    VERSION = "0.1.15"
+    VERSION = "0.1.16"
   end
 end

data/tests/requests/database_tests.rb

@@ -3,18 +3,25 @@ require 'pp'
 Shindo.tests('Fog::Database[oraclecloud] | database requests', 'database') do
 	
 	tests("#database-create", "create") do
+		#db = Fog::OracleCloud[:database].instances.create(
+		#	:service_name => 'TestDB',
+		#	:description => 'A new database',
+		#	:edition => 'SE',
+		#	:ssh_key => 'ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAkNNQ4ri2oUW46mBO/4CHMGCOALciumwGvFEMDLGNnlDbUSqU4IRrqgj+znLClfb29Oer0devdarM6DilsZVgZ2YbI5ZD5vICR/O9J0c28dArwbtFeIjcV2TCWyj5xKEXF1r+OrJMexHQa0fW1URGrU8QODpJNC/9eCVGcEXddL31xTZYpjoVOCVx66kNa6lSHEVV3T4zaCby9Oe5QI4gZe1+xyxHPNEW5wogwS3dlKSyL2CfBP0aUKOmJ5Nrl8+y0GqJQXdGjZ9FIknmwWueRW/6qPQvZocjOZ8YiPZgAP0RNy6lL+u8mnAazj/mrEdmB5QUzpDAllIr5Tn/xaddZQ==',
+		#	:shape => 'oc3',
+		#	:version => '12.1.0.2',
+		#	:backup_destination => 'NONE',
+		#	:admin_password => 'Welcome1#',
+		#	:usable_storage => '15'
+		#)
+		# Minimum options
 		db = Fog::OracleCloud[:database].instances.create(
 			:service_name => 'TestDB',
-			:description => 'A new database',
-			:edition => 'SE',
 			:ssh_key => 'ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAkNNQ4ri2oUW46mBO/4CHMGCOALciumwGvFEMDLGNnlDbUSqU4IRrqgj+znLClfb29Oer0devdarM6DilsZVgZ2YbI5ZD5vICR/O9J0c28dArwbtFeIjcV2TCWyj5xKEXF1r+OrJMexHQa0fW1URGrU8QODpJNC/9eCVGcEXddL31xTZYpjoVOCVx66kNa6lSHEVV3T4zaCby9Oe5QI4gZe1+xyxHPNEW5wogwS3dlKSyL2CfBP0aUKOmJ5Nrl8+y0GqJQXdGjZ9FIknmwWueRW/6qPQvZocjOZ8YiPZgAP0RNy6lL+u8mnAazj/mrEdmB5QUzpDAllIr5Tn/xaddZQ==',
-			:shape => 'oc3',
-			:version => '12.1.0.2',
-			:backup_destination => 'NONE',
 			:admin_password => 'Welcome1#',
-			:usable_storage => '15'
 		)
 
+
 		test "can create a database" do
 			db.is_a? Fog::OracleCloud::Database::Instance
 		end	
@@ -49,7 +56,6 @@ Shindo.tests('Fog::Database[oraclecloud] | database requests', 'database') do
 			db.wait_for { ready? }
 			db.ready?
 		end
-
 	end
 
 	tests("#database-attributes", "attributes") do
@@ -66,7 +72,8 @@ Shindo.tests('Fog::Database[oraclecloud] | database requests', 'database') do
 	end
 
 	tests('#database-read') do
-		instances = Fog::OracleCloud[:database].instances
+		instances = Fog::OracleCloud[:database].instances.all
+
 		test "returns an Array" do
 			instances.is_a? Array
 		end