fog-oraclecloud 0.1.15 → 0.1.16

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

@@ -7,7 +7,6 @@ module Fog
 	      identity  :name
 
 	      attribute :dst_list
-	      attribute :name
 	      attribute :src_list
 	      attribute :uri
 	      attribute :disabled
@@ -24,11 +23,12 @@ module Fog
         end
 
 				def create
-        	requires :name, :src_list, :dst_list, :application, :action
+        	requires :name, :src_list, :dst_list, :application
           
-          data = service.create_security_rule(name, src_list, dst_list, application, action,
+          data = service.create_security_rule(name, src_list, dst_list, application, 'PERMIT',
                                             :description => description,
                                             :disabled => disabled)
+          merge_attributes(data.body)
         end
 
         def destroy

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

@@ -0,0 +1,52 @@
+require 'fog/core/model'
+
+module Fog
+  module OracleCloud
+    class Database
+      class AccessRule < Fog::Model
+        identity  :ruleName
+
+        attribute :destination
+        attribute :description
+        attribute :ports
+        attribute :source
+        attribute :status
+
+        attribute :database_id
+       
+        def save
+          create
+        end
+
+        def destroy
+          requires :name, :database_id
+          service.delete_snapshot(database_id, name).body
+        end
+
+        # Had to override reload as we need to pass the database_id
+        def reload
+          requires :identity, :database_id
+
+          data = begin
+            collection.get(database_id, identity)
+          rescue Excon::Errors::SocketError
+            nil
+          end
+
+          return unless data
+
+          new_attributes = data.attributes
+          merge_attributes(new_attributes)
+          self
+        end
+
+        private
+
+        def create
+          requires :ruleName, :database_id, :source 
+          service.create_access_rule(database_id, ruleName, description, ports, source, destination || 'DB', status || 'enabled')
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,28 @@
+require 'fog/core/collection'
+
+module Fog
+  module OracleCloud
+    class Database
+      class AccessRules < Fog::Collection
+
+        model Fog::OracleCloud::Database::AccessRule
+
+        def all(db_name)
+          data = service.list_access_rules(db_name).body
+          load(data)
+        end
+        
+        def get(db_name, access_rule_name)
+          new(service.get_access_rule(db_name, access_rule_name).body)
+        end
+
+        def create(db_name, attributes = {})
+          attributes[:database_id] = db_name
+          object = new(attributes)
+          object.save
+          object
+        end
+      end
+    end
+  end
+end

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

@@ -209,6 +209,16 @@ module Fog
           service.scale_instance(service_name, :additional_storage=>size, :usage=>type).body
         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)
+          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)
+          end
+        end
+
         def snapshots
           requires :service_name
           service.snapshots.all(service_name)
@@ -258,8 +268,11 @@ module Fog
         private
 
         def create
-          requires :service_name, :edition, :ssh_key, :shape, :version, :admin_password, :backup_destination
+          requires :service_name, :ssh_key, :admin_password
 
+          if backup_destination.nil? then
+            backup_destination = 'NONE'
+          end
           if backup_destination != 'NONE' then
             if cloud_storage_container.nil? then
               cloud_storage_if_missing = true
@@ -277,10 +290,10 @@ module Fog
 
           params = {
             :service_name => service_name,
-            :edition => edition,
+            :edition => edition || 'SE',
             :ssh_key => ssh_key,
-            :shape => shape,
-            :version => version,
+            :shape => shape || 'oc3',
+            :version => version || '12.2.0.1',
             :level => level || 'PAAS',
             :subscription_type => subscription_type || 'HOURLY',
             :description => description

data/lib/fog/oraclecloud/monitoring.rb

@@ -39,8 +39,8 @@ module Fog
       	end
 
         def request(params, parse_json = true, &block)
-          pp @connection
 					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/requests/compute/create_instance.rb

@@ -39,7 +39,40 @@ module Fog
             'imagelist' => imagelist,
             'label' => label,
             'sshkeys' => sshkeys,
-            'state' => 'running'
+            'state' => 'running',
+            'account' => "/Compute-#{@identity_domain}/default",
+            'boot_order' => [],
+            'disk_attach' => '',
+            'domain' => "compute-#{@identity_domain}.oraclecloud.internal",
+            'entry' => 1,
+            'error_reason' => '',
+            'hostname' => "mock.compute-#{@identity_domain}.oraclecloud.internal",
+            'hypervisor' => {"mode"=>"hvm"},
+            'image_format' => 'raw',
+            'ip' => '127.0.0.1',
+            'networking'=> {
+              "eth0"=>{
+                "model"=>"", 
+                "seclists"=>["/Compute-#{@identity_domain}/default/default"], 
+                "dns"=>["mock.compute-#{@identity_domain}.oraclecloud.internal."], 
+                "vethernet"=>"/oracle/public/default",
+                "nat"=>nil
+              }
+            },
+            'placement_requirement' => ["/system/compute/placement/default", "/system/compute/allow_instances"],
+            'platform' => 'linux', # Probably? Don't rely on this in mock
+            'priority' => '/oracle/public/default',
+            'quota' => "/Compute-#{@identity_domain}",
+            'quota_reservation' => nil,
+            'resolvers' => nil,
+            'reverse_dns' => true,
+            'site' => '',
+            'storage_attachments' => [],
+            'tags' => [],
+            'uri'=>"#{@api_endpoint}/instance/Compute-#{@identity_domain}/#{@username}/#{name}",
+            'vcable_id'=>"/Compute-#{@identity_domain}/#{@username}/", # TODO: add random id
+            'virtio'=>nil,
+            'vnc'=>'127.0.0.1:5900'
           }
           response.status = 201
           response.body = {

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

@@ -0,0 +1,39 @@
+module Fog
+  module Compute
+    class OracleCloud
+      class Real
+      	def create_ip_association (params)
+          params = params.reject {|key, value| value.nil?}
+          puts Fog::JSON.encode(params)
+          request(
+            :method   => 'POST',
+            :expects  => 201,
+            :path     => "/ip/association/",
+            :body     => Fog::JSON.encode(params),
+            :headers  => {
+              'Content-Type' => 'application/oracle-compute-v3+json'
+            }
+          )
+      	end
+      end
+
+      class Mock
+        def create_ip_association (params)
+          response = Excon::Response.new
+          name = SecureRandom.uuid
+
+          self.data[:ip_associations][name] = {
+            'name' => "/Compute-#{@identity_domain}/#{@username}/#{name}",
+            'account' => "/Compute-#{@identity_domain}/#{@username}",
+            'uri' => "#{@api_endpoint}ip/reservation/Compute-#{@identity_domain}/#{@username}/#{name}",
+            'parentpool' => params[:parentpool],
+            'vcable' => params[:vcable]
+          }
+          response.status = 201
+          response.body = self.data[:ip_associations][name]
+          response
+        end
+      end
+    end
+  end
+end

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

@@ -23,6 +23,24 @@ module Fog
           )
       	end
       end
+
+      class Mock
+        def create_security_application(name, protocol, options={})
+          response = Excon::Response.new
+          name.sub! "/Compute-#{@identity_domain}/#{@username}/", ''
+
+          data = {
+            'name'                => "/Compute-#{@identity_domain}/#{@username}/#{name}",
+            'protcol'             => protocol,
+            'uri'                 => "#{@api_endpoint}seclist/#{name}"
+          }
+          self.data[:security_applications][name] = data
+
+          response.status = 201
+          response.body = self.data[:security_applications][name]
+          response
+        end
+      end
     end
   end
 end

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

@@ -0,0 +1,47 @@
+module Fog
+  module Compute
+    class OracleCloud
+      class Real
+      	def create_security_association(name, seclist, vcable)
+          name.sub! "/Compute-#{@identity_domain}/#{@username}/", ''
+          seclist.sub! "/Compute-#{@identity_domain}/#{@username}/", ''
+
+          body_data     = {
+            'name'              => "/Compute-#{@identity_domain}/#{@username}/#{name}",
+            'seclist'           => "/Compute-#{@identity_domain}/#{@username}/#{seclist}",
+            'vcable'					  => vcable
+          }
+          body_data = body_data.reject {|key, value| value.nil?}
+          request(
+            :method   => 'POST',
+            :expects  => 201,
+            :path     => "/secassociation/",
+            :body     => Fog::JSON.encode(body_data),
+            :headers  => {
+              'Content-Type' => 'application/oracle-compute-v3+json'
+            }
+          )
+      	end
+      end
+      class Mock
+        def create_security_association(name, seclist, vcable)
+          response = Excon::Response.new
+          name.sub! "/Compute-#{@identity_domain}/#{@username}/", ''
+          seclist.sub! "/Compute-#{@identity_domain}/#{@username}/", ''
+
+          data = {
+            'name'                => "/Compute-#{@identity_domain}/#{@username}/#{name}",
+            'seclist'             => "/Compute-#{@identity_domain}/#{@username}/#{seclist}",
+            'vcable'              => vcable,
+            'uri'                 => "#{@api_endpoint}secassociation/#{name}"
+          }
+          self.data[:security_associations][name] = data
+
+          response.status = 201
+          response.body = self.data[:security_associations][name]
+          response
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,47 @@
+module Fog
+  module Compute
+    class OracleCloud
+      class Real
+      	def create_security_ip_list(name, description, secipentries)
+          name.sub! "/Compute-#{@identity_domain}/#{@username}/", ''
+
+          body_data     = {
+            'name'                => "/Compute-#{@identity_domain}/#{@username}/#{name}",
+            'description'         => description,
+            'secipentries'        => secipentries,
+          }
+          body_data = body_data.reject {|key, value| value.nil?}
+          request(
+            :method   => 'POST',
+            :expects  => 201,
+            :path     => "/seciplist/",
+            :body     => Fog::JSON.encode(body_data),
+            :headers  => {
+              'Content-Type' => 'application/oracle-compute-v3+json'
+            }
+          )
+
+      	end
+      end
+
+      class Mock
+        def create_security_ip_list(name, description, secipentries)
+          response = Excon::Response.new
+          name.sub! "/Compute-#{@identity_domain}/#{@username}/", ''
+
+          data = {
+            'name'                => "/Compute-#{@identity_domain}/#{@username}/#{name}",
+            'description'         => description,
+            'secipentries'        => secipentries,
+            'uri'                 => "#{@api_endpoint}seclist/#{name}"
+          }
+          self.data[:security_ip_lists][name] = data
+
+          response.status = 201
+          response.body = self.data[:security_ip_lists][name]
+          response
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,49 @@
+module Fog
+  module Compute
+    class OracleCloud
+      class Real
+      	def create_security_list(name, description, policy, outbound_policy)
+          name.sub! "/Compute-#{@identity_domain}/#{@username}/", ''
+
+          body_data     = {
+            'name'                => "/Compute-#{@identity_domain}/#{@username}/#{name}",
+            'description'         => description,
+            'policy'              => policy,
+            'outbound_cidr_policy'=> outbound_policy
+          }
+          body_data = body_data.reject {|key, value| value.nil?}
+          request(
+            :method   => 'POST',
+            :expects  => 201,
+            :path     => "/seclist/",
+            :body     => Fog::JSON.encode(body_data),
+            :headers  => {
+              'Content-Type' => 'application/oracle-compute-v3+json'
+            }
+          )
+
+      	end
+      end
+
+      class Mock
+        def create_security_list(name, description, policy, outbound_policy)
+          response = Excon::Response.new
+          name.sub! "/Compute-#{@identity_domain}/#{@username}/", ''
+
+          data = {
+            'name'                => "/Compute-#{@identity_domain}/#{@username}/#{name}",
+            'description'         => description,
+            'policy'              => policy,
+            'outbound_cidr_policy'=> outbound_policy,
+            'uri'                 => "#{@api_endpoint}seclist/#{name}"
+          }
+          self.data[:security_lists][name] = data
+
+          response.status = 201
+          response.body = self.data[:security_lists][name]
+          response
+        end
+      end
+    end
+  end
+end

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

@@ -24,6 +24,28 @@ module Fog
           )
       	end
       end
+      class Mock
+        def create_security_rule(name, src_list, dst_list, application, action, options={})
+          response = Excon::Response.new
+          name.sub! "/Compute-#{@identity_domain}/#{@username}/", ''
+
+          data = {
+            'name'                => "/Compute-#{@identity_domain}/#{@username}/#{name}",
+            'src_list'            => src_list,
+            'dst_list'            => dst_list,
+            'application'         => application,
+            'action'              => action,
+            'description'         => options[:description],
+            'disabled'            => options[:disabled],
+            'uri'                 => "#{@api_endpoint}secrule/#{name}"
+          }
+          self.data[:security_rules][name] = data
+
+          response.status = 201
+          response.body = self.data[:security_rules][name]
+          response
+        end
+      end
     end
   end
 end