fog-oraclecloud 0.1.16 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f9ad74ac0b9188a2b139801bfcae16b9899b9fd
-  data.tar.gz: b45fb66290683793a7fa5b7ab1a4e4a3769cb960
+  metadata.gz: 957f4b17a9cd35a509e3e36a143601554f65af0e
+  data.tar.gz: 90772e01330a112d5d1e59f1155a6c97d4337fd3
 SHA512:
-  metadata.gz: b66da260963aef98195ad8313c159f437bce2d8afe5f36daafa0b85e93142412e0a1782524a09e07af98a253566370b5334a715c97e04ec4eebea072863d6d68
-  data.tar.gz: c509903acc75d3ba4a8366c0cdbb2c901e1f49f2017169fd04ca03598ac81cb3750a55be58102c7d9ec5ea6adb266efaf8f7bfdfbdd45327595a9e9e9275a819
+  metadata.gz: 1fa4a5478e1b4df84d3e4708b4f00f976294aef8e2ec1466ddcd5e37e6c0e10c0fae2a691355b64b2d9d4d57c682e5fd5fa9c96e1c367347a829d5e4be7f7065
+  data.tar.gz: 82399fc788831cbc2568eef8421c3f84344a3f35559de16b08fb4e1237a242ea8478ee82b24cb5edbe99d9b6e3e5efb2a2b2f2a1b58b743eee48cf846a570e74

data/README.md

@@ -20,7 +20,7 @@ Or install it yourself as:
 
 ## Usage
 
-Before you can use fog-aws, you must require it in your application:
+Before you can use fog-oraclecloud, you must require it in your application:
 
 ```ruby
 require 'fog/oraclecloud'

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require "bundler/setup"
-require "fog/oracle"
+require "fog/oraclecloud"
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.

data/lib/fog/oraclecloud/compute.rb

@@ -161,7 +161,7 @@ module Fog
 
       	def request(params, parse_json = true, &block)
 					begin
-            Fog::Logger.debug("Sending #{params[:body].to_s} to #{params[:path]}")
+            Fog::Logger.debug("Sending #{params[:body].to_s} to (#{params[:method]}):#{params[:path]}")
 						response = @connection.request(params.merge!({
 							:headers  => {
 								'Cookie' => @auth_cookie

data/lib/fog/oraclecloud/database.rb

@@ -37,8 +37,11 @@ module Fog
       request :backup_instance
       request :recover_instance
       request :list_patches
+
       request :create_access_rule
       request :get_access_rule
+      request :list_access_rules
+
 
       class Real
 
@@ -48,7 +51,7 @@ module Fog
       		@identity_domain   = options[:oracle_domain]
           region_url = options[:oracle_region] == 'emea' ? 'https://dbcs.emea.oraclecloud.com' : 'https://dbaas.oraclecloud.com'
           Excon.ssl_verify_peer = false
-
+          Fog::Logger.debug("Using region_url #{region_url}")
           @connection = Fog::XML::Connection.new(region_url)
       	end
 
@@ -66,7 +69,7 @@ module Fog
 
         def request(params, parse_json = true, &block)
           begin
-            Fog::Logger.debug("Sending #{params[:body].to_s} to #{params[:path]}")
+            Fog::Logger.debug("Sending #{params[:body].to_s} to (#{params[:method]}):#{params[:path]}")
             response = @connection.request(params.merge!({
               :headers  => {
                 'Authorization' => auth_header,

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

@@ -8,7 +8,7 @@ module Fog
         model Fog::OracleCloud::Database::AccessRule
 
         def all(db_name)
-          data = service.list_access_rules(db_name).body
+          data = service.list_access_rules(db_name).body['accessRules']
           load(data)
         end
         

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

@@ -209,10 +209,20 @@ module Fog
           service.scale_instance(service_name, :additional_storage=>size, :usage=>type).body
         end
 
+        def access_rules
+          requires :service_name
+          service.access_rules.all(service_name)
+        end
+
+        def get_access_rule(rule_name)
+          requires :service_name
+          service.access_rules.get(service_name, rule_name)
+        end
+
         def add_rule(port, ip, rule_name=nil)
           if !rule_name then rule_name = "#{service_name}_#{port}_#{ip}" end
           begin
-            rule = service.access_rules.get(service_name, rule_name)
+            rule = get_access_rule(rule_name)
           rescue Fog::OracleCloud::Database::NotFound    
             Fog::Logger.debug "Add access rule (#{rule_name}) to (#{service_name}) on port #{port}"
             rule = service.access_rules.create(service_name, :ports=>port, :source=>ip, :destination=>'DB', :ruleName=>rule_name)

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

@@ -8,7 +8,7 @@ module Fog
         model Fog::OracleCloud::Database::Patch
 
         def all(db_name)
-          data = service.list_patches(db_name).body['availablePatches']
+          data = service.list_patches(db_name).body
           load(data)
         end
 

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

@@ -70,7 +70,7 @@ module Fog
             'storage_attachments' => [],
             'tags' => [],
             'uri'=>"#{@api_endpoint}/instance/Compute-#{@identity_domain}/#{@username}/#{name}",
-            'vcable_id'=>"/Compute-#{@identity_domain}/#{@username}/", # TODO: add random id
+            'vcable_id'=>"/Compute-#{@identity_domain}/#{@username}/#{SecureRandom.uuid}", # TODO: add random id
             'virtio'=>nil,
             'vnc'=>'127.0.0.1:5900'
           }

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

@@ -29,6 +29,13 @@ module Fog
             'parentpool' => params[:parentpool],
             'vcable' => params[:vcable]
           }
+          instance = self.data[:instances].detect { |i|i[1]['vcable_id'] = params[:vcable]}
+          if instance.nil? then
+            # TODO: Add error handling. And don't create ip association
+          else
+            # Update it's networking
+            instance[1]['networking']['eth0']['nat']="#{params[:parentpool]}"
+          end
           response.status = 201
           response.body = self.data[:ip_associations][name]
           response

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

@@ -26,7 +26,6 @@ module Fog
           response = Excon::Response.new
           name = params[:name]
           name.sub! "/Compute-#{@identity_domain}/#{@username}/", ''
-
           self.data[:ip_reservations][name] = {
             'name' => "/Compute-#{@identity_domain}/#{@username}/#{name}",
             'account' => "/Compute-#{@identity_domain}/#{@username}",

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

@@ -21,7 +21,6 @@ module Fog
         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

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

@@ -21,7 +21,6 @@ module Fog
         def get_ip_reservation(name)
           response = Excon::Response.new
           clean_name = name.sub "/Compute-#{@identity_domain}/#{@username}/", ''
-
           if ip = self.data[:ip_reservations][clean_name] 
             response.status = 200
             response.body = ip

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

@@ -36,8 +36,8 @@ module Fog
             '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
+          if !self.data[:access_rules].key?(service_name) then self.data[:access_rules][service_name] = [] end
+          self.data[:access_rules][service_name] << data
           response.status = 202
           response
         end

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

@@ -91,6 +91,18 @@ module Fog
             "hostname"=>"db12c-xp-rac1"
           }
           self.data[:servers][config[:service_name]] = [node]
+          
+          # And some access rules
+          if self.data[:access_rules][config[:service_name]].nil? then self.data[:access_rules][config[:service_name]] = [] end
+          self.data[:access_rules][config[:service_name]] << {
+            "ruleName"=>"ora_p2_ssh",
+            "destination"=>"DB",
+            "ports"=>22,
+            "source"=>"PUBLIC-INTERNET",
+            "status"=>"enabled",
+            "database_id"=>config[:service_name]
+          }
+
           response.headers['Location'] = "https://dbaas.oraclecloud.com:443/paas/service/dbcs/api/v1.1/instances/#{@identity_domain}/status/create/job/#{job_id}"
           response.status = 202
           response

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

@@ -12,7 +12,7 @@ module Fog
           )
           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}")
+            raise Fog::OracleCloud::Database::NotFound.new("Could not find rule (#{rule_name}) attached to #{db_name}")
           end
           response.body = rule
           response
@@ -20,28 +20,17 @@ module Fog
       end
 
       class Mock
-        def get_snapshot(db_name, snapshot_name)
+        def get_access_rule(db_name, rule_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
+          rule = self.data[:access_rules][db_name].detect { |r| r['ruleName'] == rule_name}
+
+          if !rule.nil? then
             response.status = 200
-            response.body = snapshot
+            response.body = rule
             response
           else
-            raise Fog::OracleCloud::Database::NotFound.new("Snapshot #{snapshot_name} for #{db_name} does not exist");
+            raise Fog::OracleCloud::Database::NotFound.new("Rule #{rule_name} for #{db_name} does not exist");
           end
         end
       end

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

@@ -0,0 +1,30 @@
+module Fog
+  module OracleCloud
+    class Database
+      class Real
+      	def list_access_rules(db_name)
+          response = request(
+            :expects  => 200,
+            :method   => 'GET',
+            :path     => "/paas/api/v1.1/instancemgmt/#{@identity_domain}/services/dbaas/instances/#{db_name}/accessrules"
+          )
+          response
+        end
+      end
+
+      class Mock
+        def list_access_rules(db_name)
+          response = Excon::Response.new
+
+          if !self.data[:access_rules][db_name] then self.data[:access_rules][db_name] = [] end
+          access_rules = self.data[:access_rules][db_name]
+
+          response.body = {
+            'accessRules' => access_rules
+          }
+          response
+        end
+      end
+    end
+  end
+end

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

@@ -6,7 +6,7 @@ module Fog
           response = request(
             :expects  => 200,
             :method   => 'GET',
-            :path     => "/paas/service/dbcs/api/v1.1/instances/#{@identity_domain}/#{db_name}/patches"
+            :path     => "/paas/api/v1.1/instancemgmt/#{@identity_domain}/services/dbaas/instances/#{db_name}/patches/available"
           )
           response
         end

data/lib/fog/oraclecloud/version.rb

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

data/tests/requests/compute/ip_tests.rb

@@ -55,4 +55,13 @@ Shindo.tests('Fog::Compute[oraclecloud] | compute requests', 'compute') do
 			rule = Fog::Compute[:oraclecloud].ip_reservations.get(ip_name)
 		end
 	end
+
+	tests("#ip-association", "create") do
+		test "it can add a public ip" do
+			compute = Fog::Compute[:oraclecloud].instances.create(:name=>'Test', :sshkeys=>['TestSSHKey'])
+			compute.wait_for { ready? }
+			compute.add_public_ip_address
+			compute.get_public_ip_address.is_a? String
+		end
+	end
 end

data/tests/requests/database_tests.rb

@@ -127,6 +127,18 @@ Shindo.tests('Fog::Database[oraclecloud] | database requests', 'database') do
 		end
 	end
 
+	tests("#database-access_rules") do
+		instance = Fog::OracleCloud[:database].instances.first
+		access_rules = instance.access_rules
+		test "should get access_rules" do
+			access_rules.is_a? Array
+		end
+		test "should get rule" do
+			rule = instance.get_access_rule('ora_p2_ssh')
+			rule.ruleName == 'ora_p2_ssh'
+		end
+	end
+
 	tests("#database-recoveries-create", "create") do
 		instance = Fog::OracleCloud[:database].instances.first
 		tag = instance.backups.first.db_tag

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-oraclecloud
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.17
 platform: ruby
 authors:
 - Joel Nation
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-12 00:00:00.000000000 Z
+date: 2017-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -301,6 +301,7 @@ files:
 - lib/fog/oraclecloud/requests/database/get_instance.rb
 - lib/fog/oraclecloud/requests/database/get_instance_from_job.rb
 - lib/fog/oraclecloud/requests/database/get_snapshot.rb
+- lib/fog/oraclecloud/requests/database/list_access_rules.rb
 - lib/fog/oraclecloud/requests/database/list_backups.rb
 - lib/fog/oraclecloud/requests/database/list_instances.rb
 - lib/fog/oraclecloud/requests/database/list_patches.rb