fog-oraclecloud 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 017c38b53be7d47493cce5f250eb0e3fddfade35
-  data.tar.gz: 5cc5d6596ed71fc42d40eb6b757962cbab4c114b
+  metadata.gz: 42f3ec759406aebf8f527b45f0938a629ae4834b
+  data.tar.gz: 7a6926e91e7aaf4e14741f442c04f570a727b1e5
 SHA512:
-  metadata.gz: c538b96940ba665dc84ff3ea263cd603a4a07a86ccdac52d0ac097f8c1de1563dc1711528258c460d711c6b98983a96e110bf9116bcfa03ad4d616ea12266322
-  data.tar.gz: cb8b4a9f7ee3c6b1b81667975f6f62c46481cdd1a62749df6cddeda3b964ed45c177b23361f813601cb1300b18a0437948644078de692bc6607c5acc1a9963b1
+  metadata.gz: bfed58be742d9556b18c073599a64d0ff2a8271630aca564c23bfbb2a4450a44a11f10ff6d3e6fe045ecdbc1eab1e83375674dd7e10955631d19dd45596792ed
+  data.tar.gz: cf09714cc354e8193c1e01db4f4b5ff4d54fd15ca1602aeee96a2b4d722566f9e08d2a8f5cc85d83f249af1c8cc5ef78abbf9ba804dd43c6b359a2bc75748865

data/README.md

@@ -20,15 +20,134 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+Before you can use fog-aws, you must require it in your application:
 
-## Development
+```ruby
+require 'fog/oraclecloud'
+```
+
+Since it's a bad practice to have your credentials in source code, you should load them from default fog configuration file: ```~/.fog```. This file could look like this:
+
+```
+default:
+  oracle_username: <USERNAME>
+  oracle_password: <PASSWORD>
+  oracle_domain: <IDENTITY DOMAIN>
+  oracle_region: <emea or remove if using US data centre>
+  oracle_compute_api: <COMPUTE API>
+  oracle_storage_api: <STORAGE_API>
+```
 
-After checking out the repo, run `bin/setup` to install dependencies. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+### Example: Java Cloud Service
+Get all Java Instances
+```ruby
+instances = Fog::OracleCloud[:java].instances
+```
+Create a Java Instance
+```ruby
+instance = Fog::OracleCloud[:java].instances.create(
+    :service_name => 'TestWLS',
+    :description => 'A new weblogic instance',
+    :dba_name => 'SYS',
+    :dba_password => 'password',
+    :db_service_name => 'TestDB',
+    :admin_password => 'Welcome1$',
+    :admin_username => 'weblogic',
+    :shape => 'oc3',
+    :version => '12.2.1',
+    :ssh_key => 'ssh-rsa AAAAB3NzaC1yc2...',
+)
+```
+Delete an instance
+```ruby
+instance = Fog::OracleCloud[:java].instances.get('TestWLS')
+# Have to add the database details in so that the tables in the database can be removed
+instance.dba_name = 'Admin'
+instance.dba_password = 'password'
+instance.destroy()
+```
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+## Supported Services
+The following services are supported:
+* Java Cloud Service
+  * create_instance
+  * delete_instance
+  * get_instance
+  * get_server
+  * list_instances
+  * list_servers
+* SOA Cloud Service
+  * create_instance
+  * delete_instance
+  * get_instance
+  * list_instances
+* Database Cloud Service
+  * backup_instance
+  * create_instance
+  * create_snapshot
+  * delete_instance
+  * delete_snapshot
+  * get_instance
+  * get_snapshot
+  * list_backups
+  * list_instances
+  * list_patches
+  * list_recoveries
+  * list_servers
+  * list_snapshots
+  * recover_instance
+  * scale_instance
+* Compute Cloud Servcice
+  * create_image
+  * create_image_list
+  * create_instance
+  * create_orchestration
+  * create_security_application
+  * create_security_rule
+  * create_ssh_key
+  * create_volume
+  * delete_image_list
+  * delete_instance
+  * delete_orchestration
+  * delete_security_application
+  * delete_ssh_key
+  * get_image
+  * get_image_list
+  * get_instance
+  * get_orchestration
+  * get_security_application
+  * get_security_rule
+  * get_ssh_key
+  * list_image_lists
+  * list_images
+  * list_instances
+  * list_orchestrations
+  * list_security_applications
+  * list_security_lists
+  * list_security_rules
+  * list_ssh_keys
+  * list_volumes
+  * start_orchestration
+  * stop_orchestration
+  * update_image
+  * update_image_list
+  * update_orchestration
+  * update_ssh_key
+* Storage Cloud Service
+  * create_container
+  * delete_container
+  * get_container
+  * list_containers
+  
+These basically align with the REST API documentation on docs.oracle.com. Check there for particulars around parameters, types etc. 
+
+**Note**: The APIs above are slightly modified from the Oracle cloud to provide consistency across requests. Keep in mind the following:
+* All parameters are given in lower camel case (ie: service_name, not ServiceName)
+* For IaaS services you don't need to provide the fully qualified names (ie: Compute/<identity_domain>/<name>). The system will prepend the configured user when necessary
+* The Java and Database configuration has all the parameters as top level attributes (ie: don't configure parameters/content_port, use content_port)
+* Smart defaults are included where possible. Check the code to see.
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/fog-oracle.
+Bug reports and pull requests are welcome on GitHub at https://github.com/fog/fog-oraclecloud.
 

data/fog-oracle.gemspec

@@ -27,4 +27,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'fog-json',   '~>1.0'
   spec.add_dependency 'fog-xml',    '~>0.1'
   spec.add_dependency 'ipaddress',  '~>0.8'
+  spec.add_dependency 'mime-types'
 end

data/lib/fog/oraclecloud/database.rb

@@ -21,6 +21,7 @@ module Fog
 			request_path 'fog/oraclecloud/requests/database'
       request :list_instances
       request :get_instance
+      request :get_instance_from_job
       request :create_instance
       request :delete_instance
       request :list_backups

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

@@ -52,6 +52,14 @@ module Fog
         attribute :golden_gate,       :aliases=>'goldenGate'
         attribute :usable_storage,  :aliases=>'usableStorage'
 
+        def service_name=(value)
+          if value.include? '_'
+            raise ArgumentError, "Invalid service name. Names must be less than 50 characters; must start with a letter and can only contain letters, numbers and hyphens (-); can not end with a hyphen"
+          else
+            attributes[:service_name] = value
+          end
+        end
+
         def edition=(value)
           if %w(SE EE EE_HP EE_EP).include? value then
             attributes[:edition]=value
@@ -144,6 +152,14 @@ module Fog
           end
         end
 
+        def admin_password=(value)
+          if !value.nil? and (!(value[0] =~ /[[:alpha:]]/) or value.size < 8 or value.size > 30 or !(value =~ /[_#$]/) or !(value =~ /[0-9]/))
+            raise ArgumentError, "Invalid admin password. Password must be between 8 and 30 characters in length; must start with a letter and can only contain letters, numbers and $, \#, _"
+          else
+            attributes[:admin_password] = value
+          end
+        end
+
 
         def clean_name 
           name.sub %r{\/.*\/}, ''
@@ -274,9 +290,9 @@ module Fog
             :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,
+            :cloud_storage_pwd => stor_pwd,
+            :cloud_storage_user => stor_user,
+            :create_storage_container_if_missing => cloud_storage_if_missing,
             :disaster_recovery => disaster_recovery,
             :failover_database => failover_database,
             :golden_gate => golden_gate,
@@ -288,6 +304,26 @@ module Fog
             :usable_storage => usable_storage || 25
           }
           data = service.create_instance(params, options)
+          # Get the Job Id out of the header
+          self.creation_job_id = /status\/create\/job\/([0-9]*)/.match(data.headers['Location'])[1]
+        end
+
+        def reload
+          requires :identity
+          data = begin
+            collection.get(identity)
+          rescue Excon::Errors::SocketError
+            nil
+          rescue Excon::Errors::NotFound
+            # Try using the creation job id (maybe it was just created)
+            collection.get_from_job(creation_job_id)
+          end
+
+          return unless data
+
+          new_attributes = data.attributes
+          merge_attributes(new_attributes)
+          self
         end
       end
     end

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

@@ -16,6 +16,9 @@ module Fog
           new(service.get_instance(id).body)
         end
 
+        def get_from_job(job_id)
+          new(service.get_instance_from_job(job_id).body)
+        end
       end
     end
   end

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

@@ -41,6 +41,14 @@ module Fog
         attribute :force_delete
         attribute :skip_backup
 
+        def service_name=(value)
+          if value.include? '_' or !(value[0] =~ /[[:alpha:]]/) or value.size > 50 or !(value[/[a-zA-Z0-9-]+/]  == value)
+            raise ArgumentError, "Invalid service name. Names must be less than 50 characters; must start with a letter and can only contain letters, numbers and hyphens (-); can not end with a hyphen"
+          else
+            attributes[:service_name] = value
+          end
+        end
+
         def topology=(value)
           if %w(osb soa soaosb b2b mft apim insight).include? value then
             attributes[:topology]=value
@@ -66,6 +74,14 @@ module Fog
           end
         end
 
+        def admin_password=(value)
+          if !(value[0] =~ /[[:alpha:]]/) or value.size < 8 or value.size > 30 or !(value =~ /[_#$]/) or !(value =~ /[0-9]/)
+            raise ArgumentError, "Invalid admin password. Password must be between 8 and 30 characters in length; must start with a letter and can only contain letters, numbers and $, \#, _"
+          else
+            attributes[:admin_password] = value
+          end
+        end
+
         def save
           #identity ? update : create
           create
@@ -83,28 +99,46 @@ module Fog
           status == 'Stopped'
         end
 
-        def destroy
-          requires :service_name, :dba_name, :dba_password
+        def destroy(dba_name, dba_password)
+          requires :service_name
           service.delete_instance(service_name, dba_name, dba_password, 
                                             :force_delete => force_delete,
                                             :skip_backup => skip_backup).body
         end
 
+        def job_status
+          requires :creation_job_id
+          service.get_job_status('create', creation_job_id)
+        end
+
         private
 
         def create
-          requires :service_name, :dba_name, :dba_password, :db_service_name, :shape, :version, :ssh_key, :admin_password, :admin_username, :cloud_storage_container, :topology
+          requires :service_name, :dba_name, :dba_password, :db_service_name, :shape, :version, :ssh_key, :admin_password, :admin_username, :topology
 
           stor_user = cloud_storage_user || service.username
           stor_pwd = cloud_storage_pwd || service.password
 
+          if cloud_storage_container.nil? then
+            cloud_storage_container = "#{service_name}_Backup"
+            begin
+              container = Fog::Storage[:oraclecloud].containers.get(cloud_storage_container)
+            rescue Excon::Error::NotFound => error
+              # Doesn't exist, create it first
+              # The Oracle Cloud currently doesn't create a storage container for us, if it doesn't exist. Do it manually now
+              container = Fog::Storage[:oraclecloud].containers.create(
+                :name     => cloud_storage_container,
+              )
+            end
+          end
+
           params = {            
             :serviceName => service_name,
             :cloudStorageContainer => cloud_storage_container,
-            :cloudStoragePassword => cloud_storage_pwd,
-            :cloudStorageUser => cloud_storage_user,
+            :cloudStoragePassword => stor_pwd,
+            :cloudStorageUser => stor_user,
             :description => description,
-            :provisionOTD => provision_otd.nil? ? true : provision_otd,
+            :provisionOTD => provision_otd.nil? ? false : provision_otd,
             :subscriptionType => 'MONTHLY',
             :level => 'PAAS',
             :topology => topology

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

@@ -15,6 +15,39 @@ module Fog
         def get(id)
           new(service.get_instance(id).body) 
         end
+
+        def create(attributes = {}, db_attributes = {})
+          if attributes[:db_service_name].nil?
+            # Attempt to create a database instance for them
+            db_name = db_attributes[:service_name] || "#{attributes[:service_name]}-DB"
+            db_attributes.merge!({
+              :service_name => "#{attributes[:service_name]}-DB",
+              :edition => 'EE',
+              :ssh_key => attributes[:ssh_key],
+              :shape => 'oc3',
+              :version => '12.1.0.2',
+              :admin_password => attributes[:admin_password],
+              :backup_destination => 'BOTH'
+            }) { |key, v1, v2| v1 }
+            # Check it doesn't exist already
+            begin
+              db = Fog::OracleCloud[:database].instances.get(db_name)
+            rescue Fog::OracleCloud::Database::NotFound => error
+              # Doesn't exist, create it first
+              db = Fog::OracleCloud[:database].instances.create(db_attributes)
+              db.wait_for { ready? }
+            end
+            attributes.merge!({
+              :dba_name => 'SYS',
+              :dba_password => db_attributes[:admin_password],
+              :db_service_name => db_name
+            })
+          end
+          # Now provision SOA
+          object = new(attributes)
+          object.save
+          object
+        end
       end
     end
   end

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

@@ -4,15 +4,15 @@ module Fog
       class Real
 
         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)}
+          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, :create_storage_container_if_missing].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}"
+                if !value.start_with?("Storage-") then
+                  value = "Storage-#{@identity_domain}/#{value}"
                 end
               end
               new_key = key.to_s.split('_').collect(&:capitalize).join
@@ -49,17 +49,18 @@ module Fog
       class Mock
         def create_instance(config, options)
           response = Excon::Response.new
-
+          job_id = rand(10000).to_s
           data = {
             'serviceName' => config[:service_name],
             'shape' => config[:shape],
             'edition' => config[:edition],
             'version' => config[:version],
-            'status' => 'In Progress',
+            'status' => 'Starting Provisioning', # Not a valid status, but we use it to simulate the time that the Oracle Cloud takes to add this to the list of instances
             'charset' => 'AL32UTF8',
             'ncharset' => 'AL16UTF16',
             'pdbName' => 'pdb1', # Note this is only valid for 12c instances. Too hard to fix for mocking
             'timezone' => 'UTC',
+            'creation_job_id' => job_id,
             'totalSharedStorage' => options[:usable_storage],
             'domainName' => @identity_domain,
             'creation_date'=>Time.now.strftime('%Y-%b-%dT%H:%M:%S'),
@@ -90,7 +91,7 @@ module Fog
             "hostname"=>"db12c-xp-rac1"
           }
           self.data[:servers][config[:service_name]] = [node]
-          
+          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
         end

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

@@ -19,6 +19,18 @@ module Fog
 
           if instance = self.data[:instances][name]
             case instance['status']
+            when 'Starting Provisioning'
+              self.data[:instances][name]['status'] = 'In Progress'
+              # This simulates the few seconds the Oracle Cloud takes to add this instance to the GET request after creating
+              raise(
+                Excon::Errors.status_error(
+                  { :expects => 200 },
+                  Excon::Response.new({
+                    :status => 404,
+                    :body => 'No such service exists, check domain and service name'
+                  })
+                )
+              )
             when 'Terminating'
               if Time.now - self.data[:deleted_at][name] >= Fog::Mock.delay
                 self.data[:deleted_at].delete(name)

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

@@ -0,0 +1,32 @@
+module Fog
+  module OracleCloud
+    class Database
+      class Real
+
+      	def get_instance_from_job(job_id)
+ 					response = request(
+            :expects  => 200,
+            :method   => 'GET',
+            :path     => "/paas/service/dbcs/api/v1.1/instances/#{@identity_domain}/status/create/#{job_id}"
+          )
+          response
+        end
+      end
+
+      class Mock
+        def get_instance_from_job(job_id)
+          response = Excon::Response.new
+
+          instance = self.data[:instances].select { |k, v| v['creation_job_id'] == job_id }
+          if instance
+            response.status = 200
+            response.body = instance
+            response
+          else
+            raise Fog::OracleCloud::Database::NotFound.new("Database #{job_id} does not exist");
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -7,23 +7,23 @@ module Fog
             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?}
+          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, :version].include?(key)}
+          parameters.reject! { |key,value| value.nil?}
           config.reject! { |key,value| value.nil?}
           # Currently only support weblogic
-          config[:parameters][:type] = "weblogic"
-
+          parameters[:type] = "weblogic"
+          config[:parameters] = [parameters]
           body_data = config
 
-          request(
+          request({
             :method   => 'POST',
             :expects  => 202,
             :path     => "/paas/service/soa/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/json'
+            }
+          }, false)
         end
       end
 

data/lib/fog/oraclecloud/requests/soa/get_job_status.rb

@@ -0,0 +1,23 @@
+module Fog
+  module OracleCloud
+    class SOA
+      class Real
+
+      	def get_job_status(type, job_id)
+ 					response = request(
+            :expects  => 200,
+            :method   => 'GET',
+            :path     => "/paas/service/soa/api/v1.1/instances/#{@identity_domain}/status/#{type}/job/#{job_id}"
+          )
+          response.body['message']
+        end
+      end
+
+      class Mock
+        def get_job_status(type, job_id)
+          ['Creation job succeded']
+        end
+      end
+    end
+  end
+end

data/lib/fog/oraclecloud/requests/storage/delete_container.rb

@@ -6,7 +6,7 @@ module Fog
           request(
             :method   => 'DELETE',
             :expects  => 204,
-            :path     => "/v1/Storage-#{@identity_domain}/#{@username}/#{name}"
+            :path     => "/v1/Storage-#{@identity_domain}/#{name}"
           )
       	end
       end

data/lib/fog/oraclecloud/soa.rb

@@ -1,7 +1,8 @@
 module Fog
   module OracleCloud
     class SOA < Fog::Service
-      requires :oracle_username, :oracle_password, :oracle_domain, :oracle_region
+      requires :oracle_username, :oracle_password, :oracle_domain
+      recognizes :oracle_region
 
       model_path	'fog/oraclecloud/models/soa'
       model				:instance
@@ -12,6 +13,7 @@ module Fog
       request :create_instance
       request :get_instance
       request :delete_instance
+      request :get_job_status
 
       class Real
 
@@ -25,6 +27,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
@@ -66,7 +76,7 @@ module Fog
           @region_url = options[:oracle_region] == 'emea' ? 'https://jcs.emea.oraclecloud.com' : 'https://jaas.oraclecloud.com'
         end
 
-         def username
+        def username
           @username
         end
 
@@ -74,8 +84,7 @@ module Fog
           @password
         end
 
-
-       def self.data 
+        def self.data 
           @data ||= {
             :instances => {},
             :servers => {},

data/lib/fog/oraclecloud/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module OracleCloud
-    VERSION = "0.1.9"
+    VERSION = "0.1.10"
   end
 end

data/tests/requests/database_tests.rb

@@ -11,7 +11,7 @@ Shindo.tests('Fog::Database[oraclecloud] | database requests', 'database') do
 			:shape => 'oc3',
 			:version => '12.1.0.2',
 			:backup_destination => 'NONE',
-			:admin_password => 'password123',
+			:admin_password => 'Welcome1#',
 			:usable_storage => '15'
 		)
 
@@ -52,6 +52,19 @@ Shindo.tests('Fog::Database[oraclecloud] | database requests', 'database') do
 
 	end
 
+	tests("#database-attributes", "attributes") do
+		tests("should check shape").raises(ArgumentError) do
+			instance = Fog::OracleCloud[:database].instances.new({
+				:shape => 'fsdfsdf'
+			})
+		end
+		tests("should check service_name").raises(ArgumentError) do
+			instance = Fog::OracleCloud[:database].instances.new({
+				:service_name => 'Has_Underscore'
+				})
+		end
+	end
+
 	tests('#database-read') do
 		instances = Fog::OracleCloud[:database].instances
 		test "returns an Array" do

data/tests/requests/soa_tests.rb

@@ -31,6 +31,87 @@ Shindo.tests('Fog::Soa[oraclecloud] | SOA requests', 'soa') do
 		end
 	end
 
+	tests("#soa-and-db-create", "create") do
+		instance = Fog::OracleCloud[:soa].instances.create({
+			:service_name => 'TestSOA2',
+			:description => 'A new weblogic instance',
+			:admin_password => 'Welcome1$',
+			:admin_username => 'weblogic',
+			:shape => 'oc3m',
+			:version => '12.2.1',
+			:ssh_key => 'ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAkNNQ4ri2oUW46mBO/4CHMGCOALciumwGvFEMDLGNnlinstanceUSqU4IRrqgj+znLClfb29Oer0devdarM6DilsZVgZ2YbI5ZD5vICR/O9J0c28dArwbtFeIjcV2TCWyj5xKEXF1r+OrJMexHQa0fW1URGrU8QODpJNC/9eCVGcEXddL31xTZYpjoVOCVx66kNa6lSHEVV3T4zaCby9Oe5QI4gZe1+xyxHPNEW5wogwS3dlKSyL2CfBP0aUKOmJ5Nrl8+y0GqJQXdGjZ9FIknmwWueRW/6qPQvZocjOZ8YiPZgAP0RNy6lL+u8mnAazj/mrEdmB5QUzpDAllIr5Tn/xaddZQ==',
+			:topology => 'osb'			
+		})
+		test "can create a soa instance" do
+			instance.is_a? Fog::OracleCloud::SOA::Instance
+		end	
+
+		test "is being built" do
+			!instance.ready?
+		end
+		instance.wait_for { ready? }
+
+		test "is built" do
+			instance.ready?
+		end
+
+		test "shoud have created a database instance" do
+			db = Fog::OracleCloud[:database].instances.get('TestSOA2-DB')
+			db.is_a? Fog::OracleCloud::Database::Instance
+		end
+
+		test "should have created a storage container" do
+			container = Fog::Storage[:oraclecloud].containers.get('TestSOA2_Backup')
+			container.is_a? Fog::Storage::OracleCloud::Container
+		end
+	end
+
+	tests('#soa-validation') do
+		tests("should ensure service name doesn't have underscore").raises(ArgumentError) do
+			instance = Fog::OracleCloud[:soa].instances.new({
+				:service_name => 'Has_Underscore'
+				})
+		end
+		tests("should ensure service name doesn't have number as first letter").raises(ArgumentError) do
+			instance = Fog::OracleCloud[:soa].instances.new({
+				:service_name => '1NotFirstLetter'
+				})
+		end
+		tests("should ensure service name isn't too long").raises(ArgumentError) do
+			instance = Fog::OracleCloud[:soa].instances.new({
+				:service_name => 'ReallyReallyReallyReallyReallyReallyReallyReallyReallyReallyReallyReallyReallyReallyLongName'
+				})
+		end
+		tests("should ensure service name doesn't contain special characters").raises(ArgumentError) do
+			instance = Fog::OracleCloud[:soa].instances.new({
+				:service_name => 'Special$characters'
+				})
+		end
+		tests("should ensure admin password starts with a letter").raises(ArgumentError) do
+			instance = Fog::OracleCloud[:soa].instances.new({
+				:service_name => 'Test',
+				:admin_password => '1NotFirstLetter'
+				})
+		end
+		tests("should ensure admin password is not too long").raises(ArgumentError) do
+			instance = Fog::OracleCloud[:soa].instances.new({
+				:service_name => 'Test',
+				:admin_password => 'ReallyReallyReallyReallyReallyReallyReallyReallyPassword1$'
+				})
+		end
+		tests("should ensure admin password has special chars").raises(ArgumentError) do
+			instance = Fog::OracleCloud[:soa].instances.new({
+				:service_name => 'Test',
+				:admin_password => 'WelcomePassword1'
+				})
+		end
+		tests("should ensure admin password has numbers").raises(ArgumentError) do
+			instance = Fog::OracleCloud[:soa].instances.new({
+				:service_name => 'Test',
+				:admin_password => 'WelcomePassword$'
+				})
+		end
+	end
 
 	tests('#soa-read') do
 		instances = Fog::OracleCloud[:soa].instances
@@ -50,16 +131,22 @@ Shindo.tests('Fog::Soa[oraclecloud] | SOA requests', 'soa') do
 		test "should return an instance" do
 			instance.service_name.is_a? String
 		end
+
+		test "get job status" do
+			status = instance.job_status
+			status.is_a? Array
+		end
 	end
 
 	tests("#soa-delete", "create") do
 		instance = Fog::OracleCloud[:soa].instances.get('TestSOA')
-		instance.dba_name = 'Admin',
-		instance.dba_password = 'password'
-		instance.destroy()
+		instance.destroy('SYS', 'password')
 		instance.wait_for { stopping? }
 		tests("should actually delete instance").raises(Fog::OracleCloud::SOA::NotFound) do
 			instance.wait_for { stopped? } 
 		end
+		# Clean up
+		instance = Fog::OracleCloud[:soa].instances.get('TestSOA2')
+		instance.destroy('SYS', 'Welcome1$')
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-oraclecloud
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - Joel Nation
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-23 00:00:00.000000000 Z
+date: 2016-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: This library can be used as a module for `fog` or as standalone provider
   to use the Oracle Cloud Service in applications.
 email:
@@ -215,6 +229,7 @@ files:
 - lib/fog/oraclecloud/requests/database/delete_instance.rb
 - lib/fog/oraclecloud/requests/database/delete_snapshot.rb
 - 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_backups.rb
 - lib/fog/oraclecloud/requests/database/list_instances.rb
@@ -233,6 +248,7 @@ files:
 - lib/fog/oraclecloud/requests/soa/create_instance.rb
 - lib/fog/oraclecloud/requests/soa/delete_instance.rb
 - lib/fog/oraclecloud/requests/soa/get_instance.rb
+- lib/fog/oraclecloud/requests/soa/get_job_status.rb
 - lib/fog/oraclecloud/requests/soa/list_instances.rb
 - lib/fog/oraclecloud/requests/storage/create_container.rb
 - lib/fog/oraclecloud/requests/storage/delete_container.rb