fog-oraclecloud 0.1.12 → 0.1.13

data/tests/requests/soa_tests.rb

@@ -1,152 +1,152 @@
-require 'pp'
-
-Shindo.tests('Fog::Soa[oraclecloud] | SOA requests', 'soa') do
-	
-	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-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
-		test "returns an Array" do
-			instances.is_a? Array
-		end
-	
-		test "should return records" do
-			instances.size >= 1
-		end
-
-		test "should return a valid name" do
-			instances.first.service_name.is_a? String
-		end
-
-		instance = Fog::OracleCloud[:soa].instances.get(instances.first.service_name)
-		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.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
+require 'pp'
+
+Shindo.tests('Fog::Soa[oraclecloud] | SOA requests', 'soa') do
+	
+	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-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
+		test "returns an Array" do
+			instances.is_a? Array
+		end
+	
+		test "should return records" do
+			instances.size >= 1
+		end
+
+		test "should return a valid name" do
+			instances.first.service_name.is_a? String
+		end
+
+		instance = Fog::OracleCloud[:soa].instances.get(instances.first.service_name)
+		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.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

data/tests/requests/ssh_keys_tests.rb

@@ -1,54 +1,54 @@
-Shindo.tests('Fog::Compute[oraclecloud] | ssh_keys requests', 'ssh_keys') do
-
-	tests("#sshkeys-create", "create") do
-		sshkey = Fog::Compute[:oraclecloud].ssh_keys.create(
-			:name 		=> 'TestSSHKey2',
-			:enabled 	=> false,
-			:key			=> 'ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAkNNQ4ri2oUW46mBO/4CHMGCOALciumwGvFEMDLGNnlDbUSqU4IRrqgj+znLClfb29Oer0devdarM6DilsZVgZ2YbI5ZD5vICR/O9J0c28dArwbtFeIjcV2TCWyj5xKEXF1r+OrJMexHQa0fW1URGrU8QODpJNC/9eCVGcEXddL31xTZYpjoVOCVx66kNa6lSHEVV3T4zaCby9Oe5QI4gZe1+xyxHPNEW5wogwS3dlKSyL2CfBP0aUKOmJ5Nrl8+y0GqJQXdGjZ9FIknmwWueRW/6qPQvZocjOZ8YiPZgAP0RNy6lL+u8mnAazj/mrEdmB5QUzpDAllIr5Tn/xaddZQ=='
-		)
-
-		test "can create an sshkey" do
-			sshkey.is_a? Fog::Compute::OracleCloud::SshKey
-			sshkey.uri.is_a? String
-		end
-
-		check = Fog::Compute[:oraclecloud].ssh_keys.get(sshkey.name)
-		test "can get ssh key" do
-			check.uri == sshkey.uri
-		end
-
-		sshkey.enabled = true
-		sshkey.save()
-		test "can update ssh key" do
-			check = Fog::Compute[:oraclecloud].ssh_keys.get(sshkey.name)
-			check.enabled == true
-		end
-		
-	end
-
-	tests("#sshkeys-read") do
-		sshkeys = Fog::Compute[:oraclecloud].ssh_keys
-		test "returns an Array" do
-			sshkeys.is_a? Array
-		end
-		test "should return keys" do
-			sshkeys.size >= 1
-		end
-		test "should return a valid name" do
-			sshkeys.first.name.is_a? String
-		end
-
-		sshkey = Fog::Compute[:oraclecloud].ssh_keys.get(sshkeys.first.name)
-		test "should return a key" do
-			sshkey.name.is_a? String
-		end
-	end
-
-	tests("#sshkeys-delete", "create") do
-		sshkey = Fog::Compute[:oraclecloud].ssh_keys.get('TestSSHKey2')
-		sshkey.destroy()
-		tests("should delete key").raises(Fog::Compute::OracleCloud::NotFound) do
-			sshkey = Fog::Compute[:oraclecloud].ssh_keys.get('TestSSHKey2')
-		end
-	end
+Shindo.tests('Fog::Compute[oraclecloud] | ssh_keys requests', 'ssh_keys') do
+
+	tests("#sshkeys-create", "create") do
+		sshkey = Fog::Compute[:oraclecloud].ssh_keys.create(
+			:name 		=> 'TestSSHKey2',
+			:enabled 	=> false,
+			:key			=> 'ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAkNNQ4ri2oUW46mBO/4CHMGCOALciumwGvFEMDLGNnlDbUSqU4IRrqgj+znLClfb29Oer0devdarM6DilsZVgZ2YbI5ZD5vICR/O9J0c28dArwbtFeIjcV2TCWyj5xKEXF1r+OrJMexHQa0fW1URGrU8QODpJNC/9eCVGcEXddL31xTZYpjoVOCVx66kNa6lSHEVV3T4zaCby9Oe5QI4gZe1+xyxHPNEW5wogwS3dlKSyL2CfBP0aUKOmJ5Nrl8+y0GqJQXdGjZ9FIknmwWueRW/6qPQvZocjOZ8YiPZgAP0RNy6lL+u8mnAazj/mrEdmB5QUzpDAllIr5Tn/xaddZQ=='
+		)
+
+		test "can create an sshkey" do
+			sshkey.is_a? Fog::Compute::OracleCloud::SshKey
+			sshkey.uri.is_a? String
+		end
+
+		check = Fog::Compute[:oraclecloud].ssh_keys.get(sshkey.name)
+		test "can get ssh key" do
+			check.uri == sshkey.uri
+		end
+
+		sshkey.enabled = true
+		sshkey.save()
+		test "can update ssh key" do
+			check = Fog::Compute[:oraclecloud].ssh_keys.get(sshkey.name)
+			check.enabled == true
+		end
+		
+	end
+
+	tests("#sshkeys-read") do
+		sshkeys = Fog::Compute[:oraclecloud].ssh_keys
+		test "returns an Array" do
+			sshkeys.is_a? Array
+		end
+		test "should return keys" do
+			sshkeys.size >= 1
+		end
+		test "should return a valid name" do
+			sshkeys.first.name.is_a? String
+		end
+
+		sshkey = Fog::Compute[:oraclecloud].ssh_keys.get(sshkeys.first.name)
+		test "should return a key" do
+			sshkey.name.is_a? String
+		end
+	end
+
+	tests("#sshkeys-delete", "create") do
+		sshkey = Fog::Compute[:oraclecloud].ssh_keys.get('TestSSHKey2')
+		sshkey.destroy()
+		tests("should delete key").raises(Fog::Compute::OracleCloud::NotFound) do
+			sshkey = Fog::Compute[:oraclecloud].ssh_keys.get('TestSSHKey2')
+		end
+	end
 end

data/tests/requests/storage_tests.rb

@@ -1,55 +1,55 @@
-Shindo.tests('Fog::Storage[oraclecloud] | storage requests', 'storage') do
-
-	tests("#storage-create", "create") do
-		container = Fog::Storage[:oraclecloud].containers.create(
-			:name 		=> 'TestContainer1',
-		)
-		test "can create a storage container" 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
-		end
-
-		# Can't destroy immediately, as the cloud won't have replicated in time and will give us an error
-		# when we try to delete. No way to find out if the cloud has finished this replication though
-	#	container.destroy()
-	#	tests("can delete container").raises(Excon::Error::NotFound) do
-	#		check = Fog::Storage[:oracle].containers.get(container.name)
-	#	end
-	end
-
-	tests("#storage-read") do
-		containers = Fog::Storage[:oraclecloud].containers
-
-		test "returns an Array" do
-			containers.is_a? Array
-		end
-		test "should return keys" do
-			containers.size >= 1
-		end
-		test "should return a valid name" do
-			containers.first.name.is_a? String
-		end
-		container = Fog::Storage[:oraclecloud].containers.get(containers.first.name)
-		test "should return a key" do
-			container.name.is_a? String
-		end
-	end
-
-	tests("#object-read") do
-		objects = Fog::Storage[:oraclecloud].containers.first.objects
-		test "returns an Array" do
-			objects.is_a? Array
-		end
-		test "should return multiple" do
-			objects.size >= 1
-		end
-		test "should return an object" do
-			objects.first.name.is_a? String
-		end
-	end
+Shindo.tests('Fog::Storage[oraclecloud] | storage requests', 'storage') do
+
+	tests("#storage-create", "create") do
+		container = Fog::Storage[:oraclecloud].containers.create(
+			:name 		=> 'TestContainer1',
+		)
+		test "can create a storage container" 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
+		end
+
+		# Can't destroy immediately, as the cloud won't have replicated in time and will give us an error
+		# when we try to delete. No way to find out if the cloud has finished this replication though
+	#	container.destroy()
+	#	tests("can delete container").raises(Excon::Error::NotFound) do
+	#		check = Fog::Storage[:oracle].containers.get(container.name)
+	#	end
+	end
+
+	tests("#storage-read") do
+		containers = Fog::Storage[:oraclecloud].containers
+
+		test "returns an Array" do
+			containers.is_a? Array
+		end
+		test "should return keys" do
+			containers.size >= 1
+		end
+		test "should return a valid name" do
+			containers.first.name.is_a? String
+		end
+		container = Fog::Storage[:oraclecloud].containers.get(containers.first.name)
+		test "should return a key" do
+			container.name.is_a? String
+		end
+	end
+
+	tests("#object-read") do
+		objects = Fog::Storage[:oraclecloud].containers.first.objects
+		test "returns an Array" do
+			objects.is_a? Array
+		end
+		test "should return multiple" do
+			objects.size >= 1
+		end
+		test "should return an object" do
+			objects.first.name.is_a? String
+		end
+	end
 end