fog-oraclecloud 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32b8b8181ca0bed560e5723757d0bac2673b6081
-  data.tar.gz: 1aaf410ec678fd0253c6a9c09601013b5616a854
+  metadata.gz: a11352b412e505c91f3fd1de158ef9db2f313fcd
+  data.tar.gz: 35d9ba4102908317860f30241269c2540693ab0c
 SHA512:
-  metadata.gz: 778a5e2973618d32ea082d203634e641710a574f42149d0878d5285cd736fbcb81dd32183f3f0818b1f69d42d10851b624bbf3444b1abc1ca4a25c1ba8685895
-  data.tar.gz: 511c3f3598a09467945dd601956bed1f13abe68116bfcf5b8bb8fc10da9a084b8e543889ad03f4e678b6d3806cedfe4f398e4f6148e5806a733733100b6da3b0
+  metadata.gz: 0b66f3bcaede8591dc93002757dae47ceea27a138639a63588790065e7979c5b589ccc92ca4614eece50f8ac1a8ddfba0efae5ed35a26d37d38a207a2b4491f4
+  data.tar.gz: b586a4be3346e7829c2835e4f26754ac6c4e6eed3924481c2a0ede36943241c26ca001c3a5d3390e56bddf87044eaef2e17cdf961de1aae18960074926949b09

data/lib/fog/oraclecloud/compute.rb

@@ -125,8 +125,8 @@ module Fog
 						}), &block)
 					rescue Excon::Errors::HTTPStatusError => error
 						raise case error
-						#when Excon::Errors::NotFound
-							#Fog::Oracle::Java::NotFound.slurp(error)
+						when Excon::Errors::NotFound
+							Fog::Compute::OracleCloud::NotFound.slurp(error)
 						when Excon::Errors::Conflict
 							data = Fog::JSON.decode(error.response.body)
 							raise Error.new(data['message'])

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

@@ -179,7 +179,7 @@ module Fog
         private
 
         def create
-        	requires :service_name, :dba_name, :dba_password, :db_service_name, :shape, :version, :ssh_key, :admin_password
+        	requires :service_name, :dba_name, :dba_password, :db_service_name, :shape, :version, :ssh_key, :admin_password, :admin_username
           
           #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,

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

@@ -4,9 +4,8 @@ module Fog
   module OracleCloud
     class SOA
       class Instance < Fog::Model
-        identity  :service_name
+        identity  :service_name,              :aliases=>'serviceName'
 
-        attribute :service_name       
         attribute :service_type
         attribute :resource_count
         attribute :status
@@ -18,22 +17,55 @@ module Fog
         attribute :created_by
         attribute :service_uri
         attribute :provisioning_progress
+        attribute :db_service_name,           :aliases=>'dbServiceName'
+        attribute :num_nodes,                 :aliases=>'managedServerCount'
+        attribute :shape
+        attribute :version
+        attribute :ssh_key,                   :aliases=>'vmPublicKey'
 
         # The following are only used to create an instance and are not returned in the list action
-        attribute :cloudStorageContainer
-        attribute :cloudStorageUser
-        attribute :cloudStoragePassword
+        attribute :cloud_storage_container,   :aliases=>'cloudStorageContainer'
+        attribute :cloud_storage_user,        :aliases=>'cloudStorageUser'
+        attribute :cloud_storage_pwd,         :aliases=>'cloudStoragePassword'
         attribute :level
-        attribute :subscriptionType
+        attribute :subscription_type,         :aliases=>'subscriptionType'
         attribute :topology
-        attribute :parameters
+        attribute :admin_username,            :aliases=>'adminUserName'
+        attribute :admin_password,            :aliases=>'adminPassword'
+        attribute :dba_name,                  :aliases=>'dbaName'
+        attribute :dba_password,              :aliases=>'dbaPassword'
+        attribute :provision_otd,             :aliases=>'provisionOtd'
 
         # 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
         attribute :skip_backup
 
+        def topology=(value)
+          if %w(osb soa soaosb b2b mft apim insight).include? value then
+            attributes[:topology]=value
+          else
+            raise ArgumentError, "Invalid topology. Valid values - osb, soa, soaosb, b2b, mft, apim, insight"
+          end
+        end
+
+        def num_nodes=(value)
+          if value.nil? then value = 1 end
+          if [1, 2, 4].include? value.to_i then
+            attributes[:num_nodes] = value.to_i
+          else
+            raise ArgumentError, "Invalid server count (#{value}). Valid values - 1, 2 or 4"
+          end
+        end
+
+        def shape=(value)
+          if %w( oc1m oc2m oc3m oc4m oc5m).include? value then
+            attributes[:shape]=value
+          else
+            raise ArgumentError, "Invalid Shape. Valid values - oc1m, oc2m, oc3m, oc4m or oc5m"
+          end
+        end
+
         def save
           #identity ? update : create
           create
@@ -43,6 +75,14 @@ module Fog
           status == "Running"
         end
 
+        def stopping?
+          status == 'Maintenance' || status == 'Terminating'
+        end
+
+        def stopped?
+          status == 'Stopped'
+        end
+
         def destroy
           requires :service_name, :dba_name, :dba_password
           service.delete_instance(service_name, dba_name, dba_password, 
@@ -53,11 +93,35 @@ module Fog
         private
 
         def create
-          requires :service_name, :topology, :cloudStorageContainer, :cloudStorageUser, :cloudStoragePassword, :parameters 
-          data = service.create_instance(service_name, topology, cloudStorageContainer, cloudStorageUser, cloudStoragePassword, parameters,
-                                            :level => level,
-                                            :subscriptionType => subscriptionType,
-                                            :description => description)
+          requires :service_name, :dba_name, :dba_password, :db_service_name, :shape, :version, :ssh_key, :admin_password, :admin_username, :cloud_storage_container, :topology
+
+          stor_user = cloud_storage_user || service.username
+          stor_pwd = cloud_storage_pwd || service.password
+
+          params = {            
+            :serviceName => service_name,
+            :cloudStorageContainer => cloud_storage_container,
+            :cloudStoragePassword => cloud_storage_pwd,
+            :cloudStorageUser => cloud_storage_user,
+            :description => description,
+            :provisionOTD => provision_otd.nil? ? true : provision_otd,
+            :subscriptionType => 'MONTHLY',
+            :level => 'PAAS',
+            :topology => topology
+          }
+          options = {
+            :adminPassword => admin_password,
+            :adminUserName => admin_username,
+            :dbaName => dba_name,
+            :dbaPassword => dba_password,
+            :dbServiceName => db_service_name,
+            :managedServerCount => num_nodes || 1,
+            :shape => shape,
+            :VMsPublicKey => ssh_key,
+            :version => version
+          }
+
+          data = service.create_instance(params, options)
         end
       end
     end

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

@@ -13,11 +13,7 @@ module Fog
         end
 
         def get(id)
-          begin
-            new(service.get_instance(id).body)
-          rescue Fog::OracleCloud::SOA::NotFound
-            nil
-          end
+          new(service.get_instance(id).body) 
         end
       end
     end

data/lib/fog/oraclecloud/models/storage/container.rb

@@ -19,7 +19,6 @@ module Fog
         def save
           requires :name
           data = service.create_container(name)
-          pp data
           merge_attributes(data.headers)
         end 
         

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

@@ -17,6 +17,20 @@ module Fog
           )
       	end
       end
+
+      class Mock
+        def delete_orchestration (name)
+          response = Excon::Response.new
+          clean_name = name.sub "/Compute-#{@identity_domain}/#{@username}/", ''
+          if self.data[:orchestrations][clean_name] 
+            self.data[:orchestrations].delete(clean_name)
+            response.status = 204
+            response
+          else
+            raise Fog::Compute::OracleCloud::NotFound.new("Orchestration #{name} does not exist");
+          end
+        end
+      end
     end
   end
 end

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

@@ -29,7 +29,7 @@ module Fog
             response.status = 200
             response.body = instance
             response
-          else;
+          else
             raise Fog::Compute::OracleCloud::NotFound.new("Orchestration #{name} does not exist");
           end
         end

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

@@ -11,6 +11,18 @@ module Fog
           response
         end
       end
+
+      class Mock
+        def list_orchestrations
+          response = Excon::Response.new
+
+          orchs = self.data[:orchestrations].values
+          response.body = {
+            'result' => orchs
+          }
+          response
+        end
+      end
     end
   end
 end

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

@@ -17,6 +17,23 @@ module Fog
           )
       	end
       end
+
+      class Mock
+        def start_orchestration (name)
+          response = Excon::Response.new
+          clean_name = name.sub "/Compute-#{@identity_domain}/#{@username}/", ''
+
+          if self.data[:orchestrations][clean_name] 
+            self.data[:orchestrations][clean_name]['status'] = 'running'
+            instance = self.data[:orchestrations][clean_name]
+            response.status = 200
+            response.body = instance
+            response
+          else
+            raise Fog::Compute::OracleCloud::NotFound.new("Orchestration #{name} does not exist");
+          end
+        end
+      end
     end
   end
 end

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

@@ -17,6 +17,23 @@ module Fog
           )
       	end
       end
+
+      class Mock
+        def stop_orchestration (name)
+          response = Excon::Response.new
+          clean_name = name.sub "/Compute-#{@identity_domain}/#{@username}/", ''
+
+          if self.data[:orchestrations][clean_name] 
+            self.data[:orchestrations][clean_name]['status'] = 'stopped'
+            instance = self.data[:orchestrations][clean_name]
+            response.status = 200
+            response.body = instance
+            response
+          else
+            raise Fog::Compute::OracleCloud::NotFound.new("Orchestration #{name} does not exist");
+          end
+        end
+      end
     end
   end
 end

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

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

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

@@ -2,45 +2,69 @@ module Fog
   module OracleCloud
     class SOA
       class Real
+        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
 
-        def create_instance(service_name, topology, cloudStorageContainer, cloudStorageUser, cloudStoragePassword, parameters, options={})
-          body_data     = {
-            'serviceName'             => service_name,
-            'topology'                => topology,
-            'cloudStorageContainer'   => cloudStorageContainer,
-            'cloudStorageUser'        => cloudStorageUser,
-            'cloudStoragePassword'    => cloudStoragePassword,
-            'parameters'              => parameters,
-            'level'                   => options[:level],
-            'subscriptionType'        => options[:subscriptionType],
-            'description'             => options[:description],
-            'sampleAppDeploymentRequests' => options[:sampleAppDeploymentRequests]
-          }
-          body_data = body_data.reject {|key, value| value.nil?}
           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'
+            # 'Content-Type'=>'application/vnd.com.oracle.oracloud.provisioning.Service+json'
             #}
           )
         end
-
       end
 
       class Mock
-        def create_instance(service_name, topology, cloudStorageContainer, cloudStorageUser, cloudStoragePassword, parameters, options={})
-      		response = Excon::Response.new
+        def create_instance(config, options)
+          response = Excon::Response.new
 
-      		instance = Fog::OracleCloud::Mock.create_instance(service_name)
-          self.data[:instances][service_name] = instance
+          ip = '192.168.1.1'
+          data = {
+            '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'),
+            'last_modified_time'=> Time.now.strftime('%Y-%b-%dT%H:%M:%S'),
+            'service_id' => Random.rand(100000),
+            'service_type' => config[:topology],
+            'service_uri'=>"#{@region_url}/paas/service/dbcs/api/v1.1/instances/#{@identity_domain}/#{config[:serviceName]}",
+           }
+            .merge(config.select {|key, value| [:serviceName, :description, :level, :subscriptionType].include?(key) })
+            .merge(options.select {|key, value| [:shape, :version].include?(key) }).collect{|k,v| [k.to_s, v]}.to_h
 
-      		response.status = 202
-          response.headers['Location'] =  "https://jaas.oraclecloud.com/paas/service/dbcs/api/v1.1/instances/agriculture/status/create/job/2781084"
+          self.data[:instances][config[:serviceName]] = data
+          self.data[:created_at][config[:serviceName]] = Time.now
+
+          server = {
+            "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
+        end
       end
     end
   end

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

@@ -22,16 +22,11 @@ module Fog
       end
 
       class Mock
-        def delete_instance(service_name, dba_name, dba_password, options={})
+        def delete_instance(name, dba_name, dba_password, options={})
           response = Excon::Response.new
-            # remove from memoreeeez.
-          self.data[:instances].delete service_name
-          response.body = { 
-            'service_name' => service_name,
-            'status' => 'Terminating' 
-          }
-          response.status = 202
-      
+          self.data[:instances][name]['status'] = 'Terminating'
+          self.data[:deleted_at][name] = Time.now
+          response.status = 204
           response
         end
       end

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

@@ -14,22 +14,29 @@ module Fog
       end
 
       class Mock
-        def get_instance(instance_id)
+        def get_instance(name)
           response = Excon::Response.new
-          if instance_exists? instance_id
+          if instance = self.data[:instances][name]
+            case instance['status']
+            when 'Terminating'
+              if Time.now - self.data[:deleted_at][name] >= Fog::Mock.delay
+                self.data[:deleted_at].delete(name)
+                self.data[:instances].delete(name)
+              end
+            when 'In Progress'
+              if Time.now - self.data[:created_at][name] >= Fog::Mock.delay
+                self.data[:instances][name]['status'] = 'Running'
+                instance = self.data[:instances][name]
+                self.data[:created_at].delete(name)
+              end
+            end
             response.status = 200
-            response.body   = self.data[:instances][instance_id]
+            response.body = instance
+            response
           else
-            raise Fog::OracleCloud::SOA::NotFound
+            raise Fog::OracleCloud::SOA::NotFound.new("SOA #{name} does not exist");
           end
-          response
-        end
-
-        # Checks if an instance exists
-        def instance_exists?(instance_id)
-          self.data[:instances].key? instance_id
         end
-        
       end
     end
   end

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

@@ -11,6 +11,19 @@ module Fog
           response
         end
       end
+
+      class Mock
+        def list_instances
+          response = Excon::Response.new
+
+          instances = self.data[:instances].values
+
+          response.body = {
+            'services' => instances
+          }
+          response
+        end
+      end
     end
   end
 end

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

@@ -1,3 +1,5 @@
+require 'securerandom'
+
 module Fog
   module Storage
     class OracleCloud
@@ -14,7 +16,25 @@ module Fog
       end
 
       class Mock
-      	
+      	def create_container (name)
+          response = Excon::Response.new
+
+          self.data[:containers][name] = {
+            'name' => name,
+            'count' => 0,
+            'bytes' => 0
+          }
+          response.status = 201
+          response.headers = {
+            'Content-Length' => 0,
+            'X-Container-Bytes-Used' => 0,
+            'X-Container-Object-Count' => 0,
+            'Date'=>Time.now.strftime('%Y-%m-%dT%H:%M:%S'),
+            'X-Timestamp'=>Time.now.to_i,
+            'X-Trans-id'=>SecureRandom.uuid
+          }
+          response
+        end
       end
     end
   end

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

@@ -19,6 +19,45 @@ module Fog
           response
         end
       end
+
+      class Mock
+        def get_container(name)
+          response = Excon::Response.new
+
+          if container = self.data[:containers][name] 
+            response.status = 200
+            response.body = container
+            response
+          else;
+            raise Fog::Compute::OracleCloud::NotFound.new("Storage Container #{name} does not exist");
+          end
+        end
+
+        def get_container_with_objects(name)
+          response = Excon::Response.new
+
+          if container = self.data[:containers][name] 
+            response.status = 200
+            response.body = [{
+              "hash": "aea0077f346227c91cd68e955721e262",
+              "last_modified": "2016-07-30T03:39:24.477480",
+              "bytes": 513,
+              "name": "Ausemon/1df0886e-3133-498f-9472-79632485b311/logs/web.1/36322757-7666-429a-87cc-3c320caf8afa/server.out.zip",
+              "content_type": "application/zip"
+            },
+            {
+              "hash": "2c35a8adaf8e7a3375e1354264135f94",
+              "last_modified": "2016-07-30T12:51:26.124600",
+              "bytes": 6524,
+              "name": "Ausemon/1df0886e-3133-498f-9472-79632485b311/logs/web.1/6ad56533-791f-4a79-8e5d-bbef854a2b50/server.out.zip",
+              "content_type": "application/zip"
+            }]
+            response
+          else;
+            raise Fog::Compute::OracleCloud::NotFound.new("Storage Container #{name} does not exist");
+          end 
+        end
+      end
     end
   end
 end

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

@@ -11,6 +11,17 @@ module Fog
           response
         end
       end
+
+      class Mock
+        def list_containers
+          response = Excon::Response.new
+
+          containers = self.data[:containers].values
+
+          response.body = containers
+          response
+        end
+      end
     end
   end
 end

data/lib/fog/oraclecloud/soa.rb

@@ -60,19 +60,36 @@ module Fog
       class Mock
 
         def initialize(options={})
+          @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 self.data
-          @data ||= Hash.new do |hash, key|
-            hash[key] = {
-              :instances    => {}
-            }
-          end
+        def password
+          @password
+        end
+
+
+       def self.data 
+          @data ||= {
+            :instances => {},
+            :servers => {},
+            :deleted_at => {},
+            :created_at => {}
+          }
+        end
+
+        def self.reset
+          @data = nil
         end
 
-        def data
-          self.class.data[@oracle_username]
+        def data 
+          self.class.data
         end
       end
     end

data/lib/fog/oraclecloud/storage.rb

@@ -73,7 +73,26 @@ module Fog
       end
 
       class Mock
+        def initialize(options={})
+          @username = options[:oracle_username]
+          @password = options[:oracle_password]
+          @identity_domain   = options[:oracle_domain]
+          @api_endpoint   = options[:oracle_compute_api]
+        end
+
+        def self.data 
+          @data ||= {
+            :containers => {}
+          }
+        end
 
+        def self.reset
+          @data = nil
+        end
+
+        def data 
+          self.class.data
+        end
       end
     end
   end

data/lib/fog/oraclecloud/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module OracleCloud
-    VERSION = "0.1.7"
+    VERSION = "0.1.8"
   end
 end

data/tests/requests/instance_tests.rb

@@ -36,9 +36,7 @@ Shindo.tests('Fog::Compute[oraclecloud] | instance requests', 'instances') do
 		test "returns an Array" do
 			instances.is_a? Array
 		end
-		instances.each do |ins|
-			puts "#{ins.clean_name} - #{ins.state}"
-		end
+		
 		test "should return records" do
 			instances.size >= 1
 		end

data/tests/requests/java_tests.rb

@@ -9,6 +9,8 @@ Shindo.tests('Fog::Java[oraclecloud] | java requests', 'java') do
 			: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 AAAAB3NzaC1yc2EAAAABJQAAAQEAkNNQ4ri2oUW46mBO/4CHMGCOALciumwGvFEMDLGNnlinstanceUSqU4IRrqgj+znLClfb29Oer0devdarM6DilsZVgZ2YbI5ZD5vICR/O9J0c28dArwbtFeIjcV2TCWyj5xKEXF1r+OrJMexHQa0fW1URGrU8QODpJNC/9eCVGcEXddL31xTZYpjoVOCVx66kNa6lSHEVV3T4zaCby9Oe5QI4gZe1+xyxHPNEW5wogwS3dlKSyL2CfBP0aUKOmJ5Nrl8+y0GqJQXdGjZ9FIknmwWueRW/6qPQvZocjOZ8YiPZgAP0RNy6lL+u8mnAazj/mrEdmB5QUzpDAllIr5Tn/xaddZQ==',

data/tests/requests/orchestrations_tests.rb

@@ -1,10 +1,11 @@
 require 'pp'
 
 Shindo.tests('Fog::Compute[oraclecloud] | orchestration requests', 'orchestrations') do
-	
+	orch_name = "OrchestrationTest-#{rand(100)}"
+
 	tests("#orchestrations-create", "create") do
 		orchestration = Fog::Compute[:oraclecloud].orchestrations.create(
-			:name => "OrchestrationTest-#{rand(100)}",
+			:name => orch_name,
 			:oplans => [{
 				'label' =>"WebServer",
 				'obj_type' => "launchplan",
@@ -41,7 +42,7 @@ Shindo.tests('Fog::Compute[oraclecloud] | orchestration requests', 'orchestratio
 			}]
 		}
 		orchestration.save()
-		orchestration.wait_for { ready? }
+		#orchestration.wait_for { ready? }
 		test "can update orchestration" do
 			check = Fog::Compute[:oraclecloud].orchestrations.get(orchestration.name)
 			check.oplans.size == 2
@@ -58,10 +59,7 @@ Shindo.tests('Fog::Compute[oraclecloud] | orchestration requests', 'orchestratio
 			orchestration.status == 'stopped'
 		end
 
-		orchestration.destroy()
-		tests("can delete orchestration").raises(Excon::Error::NotFound) do
-			check = Fog::Compute[:oraclecloud].orchestrations.get(orchestration.name)
-		end
+		
 	end
 
 	tests("#orchestrations-read") do
@@ -69,9 +67,7 @@ Shindo.tests('Fog::Compute[oraclecloud] | orchestration requests', 'orchestratio
 		test "returns an Array" do
 			orchestrations.is_a? Array
 		end
-		orchestrations.each do |orch|
-			puts orch.name
-		end
+		
 		test "should return keys" do
 			orchestrations.size >= 1
 		end
@@ -84,4 +80,12 @@ Shindo.tests('Fog::Compute[oraclecloud] | orchestration requests', 'orchestratio
 			orchestrations.name.is_a? String
 		end
 	end
+
+	tests("#orchestrations-delete", "create") do
+		orchestration = Fog::Compute[:oraclecloud].orchestrations.get(orch_name)
+		orchestration.destroy()
+		tests("can delete orchestration").raises(Fog::Compute::OracleCloud::NotFound) do
+			check = Fog::Compute[:oraclecloud].orchestrations.get(orchestration.name)
+		end
+	end
 end

data/tests/requests/soa_tests.rb

@@ -2,33 +2,35 @@ require 'pp'
 
 Shindo.tests('Fog::Soa[oraclecloud] | SOA requests', 'soa') do
 	
-	#tests("#java-create", "create") do
-	#	sshkey = Fog::Compute[:oracle].ssh_keys.first.name
-	#	new_instance = Fog::Compute[:oracle].instances.create(
-	#		:name=>'Test123', 
-	#		:shape=>'oc3', 
-	#		:imagelist=>'/oracle/public/oel_6.4_2GB_v1',
-	#		:label=>'dev-vm',
-	#		:sshkeys=>[sshkey]
-	#	)
-	#	test "can create an instance" do
-	#		new_instance.is_a? Fog::Compute::Oracle::Instance
-	#	end
-	#	test "is being built" do
-	#		new_instance.state != "running"
-	#	end
-	#	new_instance.wait_for { ready? }
-#
-	#	test "is built" do
-	#		new_instance.state == 'running'
-	#	end
-#
-	#	new_instance.destroy()
-	#	test "can delete instance" do
-	#		check = Fog::Compute[:oracle].instances.get(new_instance.name)
-	#		check.state == 'stopping'
-	#	end
-	#end
+	tests("#soa-create", "create") do
+		instance = Fog::OracleCloud[:soa].instances.create(
+			:service_name => 'TestSOA',
+			:description => 'A new weblogic instance',
+			:dba_name => 'SYS',
+			:dba_password => 'password',
+			:db_service_name => 'TestDB',
+			: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==',
+			:cloud_storage_container => 'Test123',
+			: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
+	end
+
 
 	tests('#soa-read') do
 		instances = Fog::OracleCloud[:soa].instances
@@ -49,4 +51,15 @@ Shindo.tests('Fog::Soa[oraclecloud] | SOA requests', 'soa') do
 			instance.service_name.is_a? String
 		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.wait_for { stopping? }
+		tests("should actually delete instance").raises(Fog::OracleCloud::SOA::NotFound) do
+			instance.wait_for { stopped? } 
+		end
+	end
 end

data/tests/requests/storage_tests.rb

@@ -8,7 +8,7 @@ Shindo.tests('Fog::Storage[oraclecloud] | storage requests', 'storage') do
 			container.is_a? Fog::Storage::OracleCloud::Container
 			container.name.is_a? String
 		end
-
+pp container
 		check = Fog::Storage[:oraclecloud].containers.get(container.name)
 		test "can get container" do
 			check.name == container.name
@@ -24,6 +24,7 @@ Shindo.tests('Fog::Storage[oraclecloud] | storage requests', 'storage') do
 
 	tests("#storage-read") do
 		containers = Fog::Storage[:oraclecloud].containers
+
 		test "returns an Array" do
 			containers.is_a? Array
 		end
@@ -40,7 +41,7 @@ Shindo.tests('Fog::Storage[oraclecloud] | storage requests', 'storage') do
 	end
 
 	tests("#object-read") do
-		objects = Fog::Storage[:oraclecloud].containers[5].objects
+		objects = Fog::Storage[:oraclecloud].containers.first.objects
 		test "returns an Array" do
 			objects.is_a? Array
 		end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-oraclecloud
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Joel Nation
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-18 00:00:00.000000000 Z
+date: 2016-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler