fog-oraclecloud 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4517e556687acd69faa9807cc250d1830eb0624
-  data.tar.gz: 86091d93411468a2face694fffbf86f883919910
+  metadata.gz: 6e4b239a1b6936caca8c4f0a8f3c89ff7d697254
+  data.tar.gz: 6c3243744a58ce2da4b0b70e60b477faf8316a65
 SHA512:
-  metadata.gz: e9741aad0ade9bb060e7011f675c51bb9d12a1c56067abc405600b4d1057bc4d32c87e85a0fad0bee43300cfe3700a78fbacc03dcb4089156b814b098e6d0e03
-  data.tar.gz: 8f3c6713655cb0f9f4594a752c396350bb9807b99ddd2174b1252d2673b7fed020e087dfa2ba2672a327185e4248ec92d9a9635f3e7a77257eb5b86bd9493108
+  metadata.gz: d3e67446447c21e58e428792e5ca5779f1474d21e9c97d6ddcb9209f3ac6aab85d5d81d96913a84a94d7e14657ea29d16c546a264ed6b42c77390a8ff66803d6
+  data.tar.gz: 99802541bd95b63e88779b049872c4f87c6cdd01ac4aca5625f87b9c2c1042a1e64f4c064d9144cb0f65a72b4095fc5720c0fddee2c44396fa10cce7ad289a23

data/lib/fog/oraclecloud/database.rb

@@ -46,6 +46,14 @@ module Fog
           @connection = Fog::XML::Connection.new(region_url)
       	end
 
+        def username
+          @username
+        end
+
+        def password
+          @password
+        end
+
       	def auth_header
         	auth_header ||= 'Basic ' + Base64.encode64("#{@username}:#{@password}").gsub("\n",'')
       	end

data/lib/fog/oraclecloud/java.rb

@@ -27,6 +27,15 @@ module Fog
           @connection = Fog::XML::Connection.new(region_url)
       	end
 
+        def username
+          @username
+        end
+
+        def password
+          @password
+        end
+
+
       	def auth_header
         	auth_header ||= 'Basic ' + Base64.encode64("#{@username}:#{@password}").gsub("\n",'')
       	end
@@ -63,11 +72,25 @@ module Fog
           @username = options[:oracle_username]
           @password = options[:oracle_password]
           @identity_domain   = options[:oracle_domain]
+          @region_url = options[:oracle_region] == 'emea' ? 'https://jcs.emea.oraclecloud.com' : 'https://jaas.oraclecloud.com'
+        end
+
+        def username
+          @username
+        end
+
+        def password
+          @password
+        end
+
+        def region_url
+          @region_url
         end
 
         def self.data 
           @data ||= {
             :instances => {},
+            :servers => {},
             :deleted_at => {},
             :created_at => {}
           }

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

@@ -4,30 +4,29 @@ module Fog
   module OracleCloud
     class Database
       class Instance < Fog::Model
-        identity  :service_name
+        identity  :service_name,        :aliases=>'serviceName'
 
         attribute :version
         attribute :status
-        attribute :description
-        attribute :identity_domain
-        attribute :creation_time
+        attribute :description,     :aliases=>'serviceDescription'
+        attribute :domain_name,     :aliases=>'domainName'
+        attribute :creation_date
         attribute :last_modified_time
-        attribute :created_by
+        attribute :created_by,      :aliases=>'creator'
         attribute :sm_plugin_version
         attribute :service_uri
         attribute :num_nodes
-        attribute :level
+        attribute :level,       :aliases=>'serviceLevel'
         attribute :edition
         attribute :shape
-        attribute :subscriptionType
+        attribute :subscription_type,   :aliases=>['subscriptionType', 'subscription']
         attribute :creation_job_id
         attribute :num_ip_reservations
         attribute :backup_destination
-        attribute :cloud_storage_container
+        attribute :cloud_storage_container,   :aliases=>'cloudStorageContainer'
         attribute :failover_database
-        attribute :rac_database
         attribute :sid
-        attribute :pdbName
+        attribute :pdb_name,        :aliases=>'pdbName'
         attribute :listenerPort
         attribute :timezone
         attribute :em_url
@@ -37,10 +36,110 @@ module Fog
         attribute :glassfish_url
         attribute :dbaasmonitor_url
         attribute :compute_site_name
+        attribute :charset  
+        attribute :ncharset 
+        attribute :is_rac,      :aliases=>['isRac', 'rac_database']   
+        attribute :total_shared_storage,    :aliases=>'totalSharedStorage'      
+        attribute :service_type, :aliases=>'serviceType'
+
+        # The following are only used to create an instance and are not returned in the list or get actions
+        attribute :ssh_key,             :aliases=>'vmPublicKeyText'
+        attribute :admin_password
+        attribute :cloud_storage_pwd,    :aliases=>'cloudStoragePwd'
+        attribute :cloud_storage_user,    :aliases=>'cloudStorageUser'
+        attribute :cloud_storage_container_if_missing,  :aliases=>'cloudStorageContainerIfMissing'
+        attribute :disaster_recovery,   :aliases=>'disasterRecovery'
+        attribute :golden_gate,       :aliases=>'goldenGate'
+        attribute :usable_storage,  :aliases=>'usableStorage'
+
+        def edition=(value)
+          if %w(SE EE EE_HP EE_EP).include? value then
+            attributes[:edition]=value
+          else
+            raise ArgumentError, "Invalid Edition. Valid values - SE, EE, EE_HP, EE_EP"
+          end
+        end
+
+        def level=(value)
+          if %w(PAAS BASIC).include? value then
+            attributes[:level]=value
+          else
+            raise ArgumentError, "Invalid level. Valid values - PAAS or BASIC"
+          end
+        end
+
+        def shape=(value)
+          if %w(oc3 oc4 oc5 oc6 oc1m oc2m oc3m oc4m).include? value then
+            attributes[:shape]=value
+          else
+            raise ArgumentError, "Invalid Shape. Valid values - oc3, oc4, oc5, oc6, oc1m, oc2m, oc3m or oc4m"
+          end
+        end
+
+        def subscription_type=(value)
+          if %w(HOURLY MONTHLY).include? value then
+            attributes[:subscription_type]=value
+          else
+            raise ArgumentError, "Invalid subscription type. Valid values - HOURLY or MONTHLY"
+          end
+        end
+
+        def backup_destination=(value)
+          if %w(BOTH OSS NONE).include? value then
+            attributes[:backup_destination]=value
+          else
+            raise ArgumentError, "Invalid backup destination. Valid values - BOTH, OSS or NONE"
+          end
+        end
+
+        def disaster_recovery=(value)
+          if %w(yes no).include? value then
+            attributes[:disaster_recovery]=value
+          else
+            raise ArgumentError, "Invalid disaster recovery value"
+          end
+        end
+
+        def failover_database=(value)
+          if value == true
+            value = 'yes'
+          elsif value == false || value.nil?
+            value = 'no'
+          else
+            raise ArgumentError, "Invalid failover database value (#{value})"
+          end
+          attributes[:failover_database] = value
+        end
+
+        def is_rac=(value)
+          if value == true
+            value = 'yes'
+          elsif value == false || value.nil?
+            value = 'no'
+          else
+            raise ArgumentError, "Invalid is_rac value (#{value})"
+          end
+          attributes[:is_rac]=value
+        end
+
+        def ncharset=(value)
+          if value.nil? then
+            attributes[:ncharset] = 'AL16UTF16'
+          elsif %w(AL16UTF16 UTF8).include? value then
+            attributes[:ncharset]=value
+          else
+            raise ArgumentError, "Invalid ncharset"
+          end
+        end
+
+        def usable_storage=(value)
+          if value.to_f >= 15 && value.to_f <= 1000 then
+            attributes[:usable_storage]=value
+          else
+            raise ArgumentError, "Usable storage value is invalid: #{value.to_f}"
+          end
+        end
 
-        # The following are only used to create an instance and are not returned in the list action
-        attribute :vmPublicKey
-        attribute :parameters
 
         def clean_name 
           name.sub %r{\/.*\/}, ''
@@ -139,13 +238,52 @@ module Fog
         private
 
         def create
-          requires :service_name, :edition, :vmPublicKey, :shape, :version 
-          data = service.create_instance(service_name, edition, vmPublicKey, shape, version,
-                                            :level => level,
-                                            :subscriptionType => subscriptionType,
-                                            :description => description,
-                                            :edition => edition)
+          requires :service_name, :edition, :ssh_key, :shape, :version, :admin_password, :backup_destination
+
+          if backup_destination != 'NONE' then
+            if cloud_storage_container.nil? then
+              cloud_storage_if_missing = true
+              stor_name = "#{service_name}_Backup"
+            else
+              stor_name = cloud_storage_container
+            end
+            stor_user = cloud_storage_user || service.username
+            stor_pwd = cloud_storage_pwd || service.password
+          end
+
+          if !disaster_recovery.nil? && (failover_database.nil? || failover_database == 'no') then raise ArgumentError, 'Can\'t set disaster recovery option without failover_database set to \'yes\'' end
+          if failover_database == 'yes' && golden_gate == 'yes' then raise ArgumentError, 'Can\'t set failover_database and golden_gate both to \'yes\'' end
+          if is_rac == 'yes' && (failover_database == 'yes' || golden_gate == 'yes') then raise ArgumentError, 'Can\'t set is_rac and failover_database or golden_gate both to \'yes\'' end
 
+          params = {
+            :service_name => service_name,
+            :edition => edition,
+            :ssh_key => ssh_key,
+            :shape => shape,
+            :version => version,
+            :level => level || 'PAAS',
+            :subscription_type => subscription_type || 'HOURLY',
+            :description => description
+          }
+          options = {
+            :admin_password => admin_password,
+            :charset => charset,
+            :backup_destination => backup_destination,
+            :cloud_storage_container => stor_name,
+            :cloud_storage_pwd => stor_user,
+            :cloud_storage_user => stor_pwd,
+            :cloud_storage_if_missing => cloud_storage_if_missing,
+            :disaster_recovery => disaster_recovery,
+            :failover_database => failover_database,
+            :golden_gate => golden_gate,
+            :is_rac => is_rac,
+            :ncharset => ncharset,
+            :pdb_name => pdb_name,
+            :sid => sid || 'ORCL',
+            :timezone => timezone,
+            :usable_storage => usable_storage || 25
+          }
+          data = service.create_instance(params, options)
         end
       end
     end

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

@@ -0,0 +1,17 @@
+require 'fog/compute/models/server'
+
+module Fog
+  module OracleCloud
+    class Java
+      class Database < Fog::Model
+      	identity :service_name
+
+      	attribute :infra
+      	attribute :connect_string
+      	attribute :version
+      	attribute :pdb
+      
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+require 'fog/core/collection'
+
+module Fog
+  module OracleCloud
+    class Java
+      class Databases < Fog::Collection
+
+        model Fog::OracleCloud::Java::Database
+
+        def all(service_name)
+        #  data = service.list_databases(service_name).body['servers']
+        #  load(data)
+        end
+      end
+    end
+  end
+end

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

@@ -4,13 +4,13 @@ module Fog
   module OracleCloud
     class Java
       class Instance < Fog::Model
-        identity  :service_name, :aliases=>'name'
+        identity  :service_name, :aliases=>['name', 'serviceName']
 
 
         attribute :created_by
 
         attribute :auto_update
-        attribute :cluster_name
+        attribute :cluster_name,      :aliases=>'clusterName'
         attribute :compliance_status
         attribute :compliance_status_desc
         attribute :compute_site_name
@@ -19,10 +19,10 @@ module Fog
         attribute :creation_time
         attribute :db_associations
         attribute :db_info
-        attribute :db_servicename
+        attribute :db_service_name
         attribute :deletion_job_id
         attribute :description
-        attribute :domain_mode
+        attribute :domain_mode,               :aliases=>'domainMode'
         attribute :edition
         attribute :error_status_desc
         attribute :fmw_control_url
@@ -30,7 +30,7 @@ module Fog
         attribute :level
         attribute :lifecycle_control_job_id
         attribute :num_ip_reservations
-        attribute :num_nodes
+        attribute :num_nodes,                  :aliases=>'managedServerCount'
         attribute :options
         attribute :otd_admin_url
         attribute :otd_provisioned
@@ -44,26 +44,101 @@ module Fog
         attribute :service_uri
         attribute :shape
         attribute :status
-        attribute :subscription_type
+        attribute :subscription_type,           :aliases=>['subscriptionType']
         attribute :uri
         attribute :version
         attribute :wls_admin_url
         attribute :wls_deployment_channel_port
         attribute :wls_version,               :aliases=>'wlsVersion'
+        attribute :domain_name,               :aliases=>'domainName'
+        attribute :pdb_name,                  :aliases=>['pdbName', 'pdb_service_name']
 
 
         # The following are only used to create an instance and are not returned in the list action
         attribute :cloud_storage_container,   :aliases=>'cloudStorageContainer'
         attribute :cloud_storage_user,        :aliases=>'cloudStorageUser'
-        attribute :cloud_storage_password,    :aliases=>'cloudStoragePassword'
-        attribute :admin_user_name,           :aliases=>'adminUserName'
-        attribute :vm_public_key,             :aliases=>'vmPublicKey'
+        attribute :cloud_storage_pwd,         :aliases=>'cloudStoragePassword'
+        attribute :admin_username,            :aliases=>'adminUserName'
+        attribute :admin_password,            :aliases=>'adminPassword'
+        attribute :ssh_key,                   :aliases=>'vmPublicKey'
+        attribute :cloud_storage_container_if_missing,  :aliases=>'cloudStorageContainerIfMissing'
+        attribute :enable_admin_console,      :aliases=>'enableAdminConsole'
+        attribute :provision_otd,             :aliases=>'provisionOTD'
+        attribute :sample_app_deployment_requested, :aliases=>'sampleAppDeploymentRequested'
+        attribute :admin_port,                :aliases=>'adminPort'
+        attribute :app_dbs,                   :aliases=>'appDBs'
+        attribute :backup_volume_size,        :aliases=>'backupVolumeSize'
+        attribute :content_port,              :aliases=>'contentPort'
+        attribute :dba_name,                  :aliases=>'dbaName'
+        attribute :dba_password,              :aliases=>'dbaPassword'
+        attribute :domain_partition_count,    :aliases=>'domainPartitionCount'
+        attribute :domain_volume_size,        :aliases=>'domainVolumeSize'
+        attribute :ip_reservations,           :aliases=>'ipReservations'
+        attribute :ms_initial_heap_mb,        :aliases=>'msInitialHeapMB'
+        attribute :ms_jvm_args,               :aliases=>'msJvmArgs'
+        attribute :ms_max_heap_mb,            :aliases=>'msMaxHeapMB'
+        attribute :ms_max_perm_mb,            :aliases=>'msMaxPermMB'
+        attribute :ms_perm_mb,                :aliases=>'msPermMb'
+        attribute :node_manager_password,     :aliases=>'nodeManagerPassword'
+        attribute :node_manager_port,         :aliases=>'nodeManagerPort'
+        attribute :node_manager_user_name,    :aliases=>'nodeManagerUserName'
+        attribute :overwrite_ms_jvm_args,     :aliases=>'overwriteMsJvmArgs'
+        attribute :secured_admin_port,        :aliases=>'securedAdminPort'
+        attribute :secured_content_port,      :aliases=>'securedContentPort'
 
         # The following are used to delete an instance and are not returned in the list action
-        attribute :dba_name
-        attribute :dba_password
         attribute :force_delete
 
+        def level=(value)
+          if %w(PAAS BASIC).include? value then
+            attributes[:level]=value
+          else
+            raise ArgumentError, "Invalid level. Valid values - PAAS or BASIC"
+          end
+        end
+
+        def subscription_type=(value)
+          if %w(HOURLY MONTHLY).include? value then
+            attributes[:subscription_type]=value
+          else
+            raise ArgumentError, "Invalid subscription type. Valid values - HOURLY or MONTHLY"
+          end
+        end
+
+        def domain_mode=(value)
+          if %w(DEVELOPMENT PRODUCTION).include? value then
+            attributes[:domain_mode]=value
+          else
+            raise ArgumentError, "Invalid domain mode. Valid values - DEVELOPMENT or PRODUCTION"
+          end
+        end
+
+        def edition=(value)
+          if %w(SE EE SUITE).include? value then
+            attributes[:edition]=value
+          else
+            raise ArgumentError, "Invalid edition. Valid values - SE, EE or SUITE"
+          end
+        end
+
+        def num_nodes=(value)
+          if [1, 2, 4, 8].include? value then
+            attributes[:num_nodes]=value
+          else
+            raise ArgumentError, "Invalid server count (#{value}). Valid values - 1, 2, 4 or 8"
+          end
+        end
+
+        def shape=(value)
+          if %w(oc3 oc4 oc5 oc6 oc1m oc2m oc3m oc4m).include? value then
+            attributes[:shape]=value
+          else
+            raise ArgumentError, "Invalid Shape. Valid values - oc3, oc4, oc5, oc6, oc1m, oc2m, oc3m or oc4m"
+          end
+        end
+
+
+
         def initialize(attributes={})
           level ||= 'PAAS'
           subscription_type ||= 'HOURLY'
@@ -93,7 +168,7 @@ module Fog
           service.servers.all(service_name)
         end
 				
-				def destroy
+		    def destroy
           requires :service_name, :dba_name, :dba_password
           service.delete_instance(service_name, dba_name, dba_password, :force_delete => force_delete).body
         end
@@ -101,12 +176,79 @@ module Fog
         private
 
         def create
-        	requires :service_name, :cloud_storage_container, :cloud_storage_user, :cloud_storage_password 
+        	requires :service_name, :dba_name, :dba_password, :db_service_name, :shape, :version, :ssh_key
           
-          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 => subscription_type,
-                                            :description => description)
+          #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 => subscription_type,
+          #                                  :description => description)
+
+          if cloud_storage_container.nil? then
+            cloud_storage_if_missing = true
+            stor_name = "#{service_name}_Backup"
+          else
+            stor_name = cloud_storage_container
+          end
+          stor_user = cloud_storage_user || service.username
+          stor_pwd = cloud_storage_pwd || service.password
+
+          params = {            
+            :serviceName => service_name,
+            :cloudStorageContainer => stor_name,
+            :cloudStoragePassword => stor_user,
+            :cloudStorageUser => stor_pwd,
+            :cloudStorageContainerIfMissing => cloud_storage_if_missing,
+            :description => description,
+            :enableAdminConsole => enable_admin_console.nil? ? true : enable_admin_console,
+            :provisionOTD => provision_otd.nil? ? true : provision_otd,
+            :sampleAppDeploymentRequested => sample_app_deployment_requested.nil? ? true : sample_app_deployment_requested,
+            :subscriptionType => subscription_type || 'HOURLY',
+            :level => level || 'PAAS',
+          }
+          options = {
+            :adminPassword => admin_password,
+            :adminPort => admin_port,
+            :adminUserName => admin_username,
+            :backupVolumeSize => backup_volume_size,
+            :clusterName => cluster_name,
+            :contentPort => content_port,
+            :dbaName => dba_name,
+            :dbaPassword => dba_password,
+            :dbServiceName => db_service_name,
+            :deploymentChannelPort => wls_deployment_channel_port,
+            :domainMode => domain_mode,
+            :domainName => domain_name,
+            :domainPartitionCount => domain_partition_count,
+            :domainVolumeSize => domain_volume_size,
+            :edition => edition || 'EE',
+            :ipReservations => ip_reservations,
+            :managedServerCount => num_nodes || 1,
+            :msInitialHeapMB => ms_initial_heap_mb,
+            :msJvmArgs => ms_jvm_args,
+            :msMaxHeapMB => ms_max_heap_mb,
+            :msMaxPermMB => ms_max_perm_mb,
+            :msPermMb => ms_perm_mb,
+            :nodeManagerPassword => node_manager_password,
+            :nodeManagerPort => node_manager_port,
+            :nodeManagerUserName => node_manager_user_name,
+            :overwriteMsJvmArgs => overwrite_ms_jvm_args,
+            :pdbName => pdb_name,
+            :securedAdminPort => secured_admin_port,
+            :securedContentPort => secured_content_port,
+            :shape => shape,
+            :VMsPublicKey => ssh_key,
+            :version => version
+          }
+
+          if app_dbs and app_dbs.is_a? Array and app_dbs.size >= 1
+            options[:appDBs] = []
+            app_dbs.each { |db| options[:appDBs].push({
+              :dbaName => db.username,
+              :dbaPassword => db.password,
+              :dbServiceName => db.service_name,
+              }) } 
+          end
+          data = service.create_instance(params, options)
 
         end
 

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

@@ -6,19 +6,19 @@ module Fog
       class Server < Fog::Model
       	identity :name
 
-      	attribute :clusterName
+      	attribute :cluster_name,     :aliases=>'clusterName'
       	attribute :name
       	attribute :shape
-      	attribute :nodeType
-      	attribute :isAdmin
+      	attribute :node_type,        :aliases=>'nodeType'
+      	attribute :is_admin,         :aliases=>'is_admin'
       	attribute :hostname
       	attribute :status
-      	attribute :reservedIp
-      	attribute :storageAllocated
-      	attribute :creationDate
+      	attribute :reserved_ip,      :aliases=>'reserved_ip'
+      	attribute :storage_allocated, :aliases=>'storageAllocated'
+      	attribute :creation_date,     :aliases=>'creationDate'
 
       	def ip_addr
-          reservedIp.blank? ? hostname : reservedIp
+          reserved_ip.blank? ? hostname : reserved_ip
         end
       end
     end

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

@@ -22,9 +22,8 @@ module Fog
         def backup_instance(service_name)
       		response = Excon::Response.new
 
-          if !self.data[:backups][service_name].is_a? Array then 
+          if !self.data[:backups][service_name].is_a? Array 
             self.data[:backups][service_name] = []
-            self.data[:created_at][service_name] = []
           end
           self.data[:backups][service_name].push({
             'backupCompleteDate'=>Time.now.strftime('%d-%b-%Y %H:%M:%S UTC'),
@@ -32,7 +31,11 @@ module Fog
             'status'=>'IN PROGRESS',
             'database_id'=>service_name
           })
-          self.data[:created_at][service_name].push(Time.now)
+          if !self.data[:created_at][:backups] 
+            self.data[:created_at][:backups] = {}
+            self.data[:created_at][:backups][service_name] = []
+          end
+          self.data[:created_at][:backups][service_name].push(Time.now)
           response.status = 202
           response
       	end

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

@@ -3,30 +3,43 @@ module Fog
     class Database
       class Real
 
-      	def create_instance(service_name, edition, vmPublicKey, shape, version, options={})
-          body_data     = {
-            'serviceName'             => service_name,
-            'version'                 => options[:version],
-            'level'										=> options[:level],
-            'edition'                 => edition,
-            'subscriptionType'				=> options[:subscriptionType],
-            'description'							=> options[:description],
-            'shape'                   => options[:shape],
-            'vmPublicKeyText'         => vmPublicKey,
-            'parameters'              => {
-              'shape'                   => shape,
-              'version'                 => version
-            }
+        def create_instance(config, options)
+          parameters = options.select{|key, value| [:admin_password, :backup_destination, :charset, :cloud_storage_container, :cloud_storage_pwd, :cloud_storage_user, :cloud_storage_if_missing, :disaster_recovery, :failover_database, :golden_gate, :is_rac, :ncharset, :pdb_name, :sid, :timezone, :usable_storage].include?(key)}
+          params = {
+            'type' => 'db'
+          }
+          parameters.each { |key, value| 
+            if !value.nil? then 
+              if key == :cloud_storage_container then 
+                if !value.start_with?("/Storage-") then
+                  value = "/Storage-#{@identity_domain}/#{value}"
+                end
+              end
+              new_key = key.to_s.split('_').collect(&:capitalize).join
+              new_key = new_key[0,1].downcase + new_key[1..-1]
+              params[new_key] = value
+            end
+          }
+          body_data  = {
+            'serviceName'         => config[:service_name],
+            'version'             => config[:version],
+            'level'               => config[:level],
+            'edition'             => config[:edition],
+            'subscriptionType'    => config[:subscription_type],
+            'description'         => config[:description],
+            'shape'               => config[:shape],
+            'vmPublicKeyText'     => config[:ssh_key],
+            'parameters'          => [params]
           }
           body_data = body_data.reject {|key, value| value.nil?}
-        
+
           request(
             :method   => 'POST',
             :expects  => 202,
             :path     => "/paas/service/dbcs/api/v1.1/instances/#{@identity_domain}",
             :body     => Fog::JSON.encode(body_data),
             #:headers  => {
-            #	'Content-Type'=>'application/vnd.com.oracle.oracloud.provisioning.Service+json'
+            # 'Content-Type'=>'application/vnd.com.oracle.oracloud.provisioning.Service+json'
             #}
           )
         end
@@ -34,19 +47,30 @@ module Fog
       end
 
       class Mock
-        def create_instance(service_name, edition, vmPublicKey, shape, version, options={})
-      		response = Excon::Response.new
+        def create_instance(config, options)
+          response = Excon::Response.new
 
           data = {
-            'service_name' => service_name,
-            'shape' => shape,
-            'edition' => edition,
-            'version' => version,
-            'status' => 'In Progress'
-          }.merge(options.select {|key, value| ["description"].include?(key) })
+            'serviceName' => config[:service_name],
+            'shape' => config[:shape],
+            'edition' => config[:edition],
+            'version' => config[:version],
+            'status' => 'In Progress',
+            'charset' => 'AL32UTF8',
+            'ncharset' => 'AL16UTF16',
+            'pdbName' => 'pdb1', # Note this is only valid for 12c instances. Too hard to fix for mocking
+            'timezone' => 'UTC',
+            'totalSharedStorage' => options[:usable_storage],
+            'domainName' => @identity_domain,
+            'creation_date'=>Time.now.strftime('%Y-%b-%dT%H:%M:%S'),
+            'serviceType'=>'DBaaS',
+            'creator'=>@username
+          }
+            .merge(config.select {|key, value| [:description, :level, :subscription_type].include?(key) })
+            .merge(options.select {|key, value| [:backup_destination, :failover_database, :cloud_storage_container, :is_rac, :ncharset, :pdb_name, :sid, :timezone].include?(key) })
 
-          self.data[:instances][service_name] = data
-          self.data[:created_at][service_name] = Time.now
+          self.data[:instances][config[:service_name]] = data
+          self.data[:created_at][config[:service_name]] = Time.now
 
           # Also create some compute nodes 
           node = {
@@ -65,11 +89,11 @@ module Fog
             "reservedIP"=>"129.144.23.112",
             "hostname"=>"db12c-xp-rac1"
           }
-          self.data[:servers][service_name] = [node]
+          self.data[:servers][config[:service_name]] = [node]
           
           response.status = 202
           response
-      	end
+        end
       end
     end
   end

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

@@ -16,11 +16,13 @@ module Fog
         def list_backups(db_name)
           response = Excon::Response.new
 
+          if !self.data[:backups][db_name] then self.data[:backups][db_name] = [] end
           backups = self.data[:backups][db_name]
+
           backups.each_with_index { |b, i| 
             if b['status'] = 'IN PROGRESS' then
-              if Time.now - self.data[:created_at][db_name][i] >= Fog::Mock.delay
-                self.data[:created_at][db_name].delete(i)
+              if Time.now - self.data[:created_at][:backups][db_name][i] >= Fog::Mock.delay
+                self.data[:created_at][:backups][db_name].delete(i)
                 self.data[:backups][db_name][i]['status'] = 'COMPLETED'
                 b = self.data[:backups][db_name][i]
               end

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

@@ -16,7 +16,9 @@ module Fog
         def list_recoveries(db_name)
           response = Excon::Response.new
 
+          if !self.data[:recoveries][db_name] then self.data[:recoveries][db_name] = [] end
           recoveries = self.data[:recoveries][db_name]
+
           recoveries.each_with_index { |r, i| 
             if r['status'] = 'IN PROGRESS' then
               if Time.now - self.data[:created_at][:recoveries][db_name][i] >= Fog::Mock.delay

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

@@ -18,7 +18,9 @@ module Fog
 
           servers = self.data[:servers][db_name]
 
-          response.body = servers
+          response.body = {
+            "servers" : [servers]
+          }
           response
         end
       end

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

@@ -26,6 +26,9 @@ module Fog
 
           if !self.data[:recoveries][service_name].is_a? Array then 
             self.data[:recoveries][service_name] = []
+          end
+
+          if !self.data[:created_at][:recoveries] 
             self.data[:created_at][:recoveries] = {}
             self.data[:created_at][:recoveries][service_name] = []
           end

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

@@ -3,50 +3,80 @@ module Fog
     class Java
       class Real
 
-        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}"
-          end   
-          body_data     = {
-            'serviceName'             => service_name,
-            'cloudStorageContainer'		=> cloudStorageContainer,
-            'cloudStorageUser'				=> cloudStorageUser,
-            'cloudStoragePassword'		=> cloudStoragePassword,
-            'parameters'							=> parameters,
-            'level'										=> options[:level],
-            'subscriptionType'				=> options[:subscriptionType],
-            'description'							=> options[:description],
-            'provisionOTD'						=> options[:provisionOTD],
-            'sampleAppDeploymentRequests' => options[:sampleAppDeploymentRequests]
-          }
-          body_data = body_data.reject {|key, value| value.nil?}
+        def create_instance(config, options)
+          
+          if !config[:cloudStorageContainer].start_with?("/Storage-")
+            config[:cloudStorageContainer] = "/Storage-#{@identity_domain}/#{config[:cloudStorageContainer]}"
+          end
+
+          config[:parameters] = options.select{|key, value| [:adminPassword, :adminPort, :adminUserName, :backupVolumeSize, :clusterName, :contentPort, :dbaName, :dbaPassword, :dbServiceName, :deploymentChannelPort, :domainMode, :domainName, :domainPartitionCount, :domainVolumeSize, :edition, :ipReservations, :managedServerCount, :msInitialHeapMB, :msJvmArgs, :msMaxHeapMB, :msMaxPermMB, :msPermMb, :nodeManagerPassword, :nodeManagerPort, :nodeManagerUserName, :overwriteMsJvmArgs, :pdbName, :securedAdminPort, :securedContentPort, :shape, :VMsPublicKey].include?(key)}
+          config[:parameters].reject! { |key,value| value.nil?}
+          config.reject! { |key,value| value.nil?}
+          # Currently only support weblogic
+          config[:parameters][:type] = "weblogic"
+
+          body_data = config
+
           request(
             :method   => 'POST',
             :expects  => 202,
-            :path     => "/paas/service/jcs/api/v1.1/instances/#{@identity_domain}",
+            :path     => "/paas/service/dbcs/api/v1.1/instances/#{@identity_domain}",
             :body     => Fog::JSON.encode(body_data),
-            :headers  => {
-            	'Content-Type'=>'application/vnd.com.oracle.oracloud.provisioning.Service+json'
-            }
+            #:headers  => {
+            # 'Content-Type'=>'application/vnd.com.oracle.oracloud.provisioning.Service+json'
+            #}
           )
         end
-
       end
       class Mock
-        def create_instance(service_name, cloudStorageContainer, cloudStorageUser, cloudStoragePassword, dbaName, dbaPassword, dbServiceName, shape, version, vmPublicKey, options={})
+        def create_instance(config, options)
           response = Excon::Response.new
 
+          ip = '192.168.1.1'
           data = {
-            'service_name' => service_name,
-            'db_service_name' => dbServiceName,
-            'shape' => shape,
-            'version' => version,
-            'status' => 'In Progress'
-          }.merge(options.select {|key, value| ["description"].include?(key) })
-
-          self.data[:instances][service_name] = data
-          self.data[:created_at][service_name] = Time.now
+            'status' => 'In Progress',
+            'compute_site_name' => 'EM002_Z11',
+            'content_url' => "http://#{ip}",
+            'created_by' => @username,
+            'creation_job_id' => Random.rand(100000),
+            'creation_time'=> Time.now.strftime('%Y-%b-%dT%H:%M:%S'),
+            'db_info' => "#{options[:dbServiceName]}:1521/#{options[:pdbName] || 'PDB1'}.#{@identity_domain}.oraclecloud.internal",
+            'deletion_job_id' => 0,
+            'domainMode'=>'DEVELOPMENT',
+            'fmw_control_url'=> "https://#{ip}:#{options[:adminPort] || 7002}/em",
+            'last_modified_time'=> Time.now.strftime('%Y-%b-%dT%H:%M:%S'),
+            'num_ip_reservations'=> 2, # Can't rely on this number in mocking mode
+            'num_nodes'=>options[:managedServerCount],
+            'otd_provisioned'=>options[:provisionOTD] || 'no',
+            'psm_plugin_version'=>"16.3.5-532",
+            'secure_content_url' => "https://#{ip}",
+            'service_type'=>'jaas',
+            'service_uri'=>"#{@region_url}/paas/service/dbcs/api/v1.1/instances/#{@identity_domain}/#{config[:serviceName]}",
+            'wls_admin_url'=> "https://#{ip}:#{options[:adminPort] || 7002}/console",
+            'wls_deployment_channel_port' => options[:deploymentChannelPort] || 9001,
+            'wlsVersion'=>'12.2.1.0.160419'
+          }
+            .merge(config.select {|key, value| [:serviceName, :description, :level, :subscriptionType].include?(key) })
+            .merge(options.select {|key, value| [:clusterName, :dbServiceName, :edition, :shape, :version].include?(key) }).collect{|k,v| [k.to_s, v]}.to_h
+
+          if data['clusterName'].nil? then data['clusterName'] = data['serviceName'][0,8] + "_cluster" end
+          if data['domainName'].nil? then data['domainName'] = data['serviceName'][0,8] + "_domain" end
+          self.data[:instances][config[:serviceName]] = data
+          self.data[:created_at][config[:serviceName]] = Time.now
+
+          server = {
+            "clusterName": data['clusterName'] || data['serviceName'][0,8] + "_cluster",
+            "name": "#{data['serviceName'][0,8]}_server_1",
+            "shape": data['shape'],
+            "nodeType": "WLS",
+            "isAdmin": true,
+            "hostname": ip,
+            "status": "Ready",
+            "storageAllocated": 74752,
+            "creationDate": Time.now.strftime('%Y-%b-%dT%H:%M:%S')
+          }
+          self.data[:servers][data['serviceName']] = [server]
+
           response.status = 202
           response
         end

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

@@ -12,7 +12,19 @@ module Fog
         end
       end
 
-     
+      class Mock
+        def list_servers(db_name)
+          response = Excon::Response.new
+
+          servers = self.data[:servers][db_name]
+
+          response.body =  {
+            'servers' => servers
+          }
+
+          response
+        end
+      end
     end
   end
 end

data/lib/fog/oraclecloud/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module OracleCloud
-    VERSION = "0.1.3"
+    VERSION = "0.1.4"
   end
 end

data/tests/requests/database_tests.rb

@@ -7,10 +7,14 @@ Shindo.tests('Fog::Database[oraclecloud] | database requests', 'database') do
 			:service_name => 'TestDB',
 			:description => 'A new database',
 			:edition => 'SE',
-			:vmPublicKey => 'ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAkNNQ4ri2oUW46mBO/4CHMGCOALciumwGvFEMDLGNnlDbUSqU4IRrqgj+znLClfb29Oer0devdarM6DilsZVgZ2YbI5ZD5vICR/O9J0c28dArwbtFeIjcV2TCWyj5xKEXF1r+OrJMexHQa0fW1URGrU8QODpJNC/9eCVGcEXddL31xTZYpjoVOCVx66kNa6lSHEVV3T4zaCby9Oe5QI4gZe1+xyxHPNEW5wogwS3dlKSyL2CfBP0aUKOmJ5Nrl8+y0GqJQXdGjZ9FIknmwWueRW/6qPQvZocjOZ8YiPZgAP0RNy6lL+u8mnAazj/mrEdmB5QUzpDAllIr5Tn/xaddZQ==',
+			:ssh_key => 'ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAkNNQ4ri2oUW46mBO/4CHMGCOALciumwGvFEMDLGNnlDbUSqU4IRrqgj+znLClfb29Oer0devdarM6DilsZVgZ2YbI5ZD5vICR/O9J0c28dArwbtFeIjcV2TCWyj5xKEXF1r+OrJMexHQa0fW1URGrU8QODpJNC/9eCVGcEXddL31xTZYpjoVOCVx66kNa6lSHEVV3T4zaCby9Oe5QI4gZe1+xyxHPNEW5wogwS3dlKSyL2CfBP0aUKOmJ5Nrl8+y0GqJQXdGjZ9FIknmwWueRW/6qPQvZocjOZ8YiPZgAP0RNy6lL+u8mnAazj/mrEdmB5QUzpDAllIr5Tn/xaddZQ==',
 			:shape => 'oc3',
-			:version => '12.1.0.2'
+			:version => '12.1.0.2',
+			:backup_destination => 'NONE',
+			:admin_password => 'password123',
+			:usable_storage => '15'
 		)
+
 		test "can create a database" do
 			db.is_a? Fog::OracleCloud::Database::Instance
 		end	
@@ -72,6 +76,10 @@ Shindo.tests('Fog::Database[oraclecloud] | database requests', 'database') do
 			servers.size >= 1
 			servers.first.status.is_a? String
 		end
+
+		test "has special attributes" do
+			instance.failover_database == 'no'
+		end
 	end
 
 	tests("#database-backups-create", "create") do

data/tests/requests/java_tests.rb

@@ -2,19 +2,16 @@ require 'pp'
 
 Shindo.tests('Fog::Java[oraclecloud] | java requests', 'java') do
 	
-	tests("#database-create", "create") do
+	tests("#java-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',
+			:dba_name => 'SYS',
+			:dba_password => 'password',
+			:db_service_name => 'TestDB',
 			:shape => 'oc3',
 			:version => '12.2.1',
-			:vmPublicKey => 'ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAkNNQ4ri2oUW46mBO/4CHMGCOALciumwGvFEMDLGNnlinstanceUSqU4IRrqgj+znLClfb29Oer0devdarM6DilsZVgZ2YbI5ZD5vICR/O9J0c28dArwbtFeIjcV2TCWyj5xKEXF1r+OrJMexHQa0fW1URGrU8QODpJNC/9eCVGcEXddL31xTZYpjoVOCVx66kNa6lSHEVV3T4zaCby9Oe5QI4gZe1+xyxHPNEW5wogwS3dlKSyL2CfBP0aUKOmJ5Nrl8+y0GqJQXdGjZ9FIknmwWueRW/6qPQvZocjOZ8YiPZgAP0RNy6lL+u8mnAazj/mrEdmB5QUzpDAllIr5Tn/xaddZQ==',
+			:ssh_key => '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
@@ -48,6 +45,13 @@ Shindo.tests('Fog::Java[oraclecloud] | java requests', 'java') do
 		test "should return an instance" do
 			instance.service_name.is_a? String
 		end
+
+		servers = instance.servers
+		test "should have compute nodes" do
+			servers.is_a? Array
+			servers.size >= 1
+			servers.first.status.is_a? String
+		end
 	end
 
 	tests("#java-delete", "create") do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-oraclecloud
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Joel Nation
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-11 00:00:00.000000000 Z
+date: 2016-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -160,6 +160,8 @@ files:
 - lib/fog/oraclecloud/models/database/servers.rb
 - lib/fog/oraclecloud/models/database/snapshot.rb
 - lib/fog/oraclecloud/models/database/snapshots.rb
+- lib/fog/oraclecloud/models/java/database.rb
+- lib/fog/oraclecloud/models/java/databases.rb
 - lib/fog/oraclecloud/models/java/instance.rb
 - lib/fog/oraclecloud/models/java/instances.rb
 - lib/fog/oraclecloud/models/java/server.rb