fog-oraclecloud 0.1.12 → 0.1.13

data/tests/requests/instance_tests.rb

@@ -1,62 +1,69 @@
-require 'pp'
-
-Shindo.tests('Fog::Compute[oraclecloud] | instance requests', 'instances') do
-	
-	tests("#instance-create", "create") do
-		#sshkey = Fog::Compute[:oraclecloud].ssh_keys.first.name
-		begin
-			sshkey = Fog::Compute[:oraclecloud].ssh_keys.get('Test123Key')
-		rescue Fog::Compute::OracleCloud::NotFound
-			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=='
-			)
-		end
-
-		new_instance = Fog::Compute[:oraclecloud].instances.create(
-			:name=>'Test123', 
-			:shape=>'oc3', 
-			:imagelist=>'/oracle/public/oel_6.4_2GB_v1',
-			:label=>'dev-vm',
-			:sshkeys=>[sshkey.name]
-		)
-		test "can create an instance" do
-			new_instance.is_a? Fog::Compute::OracleCloud::Instance
-		end
-		new_instance.wait_for { ready? }
-
-		test "is built" do
-			new_instance.state == 'running'
-		end
-	end
-
-	tests('#instances-read') do
-		instances = Fog::Compute[:oraclecloud].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.name.is_a? String
-		end
-
-		instance = Fog::Compute[:oraclecloud].instances.get(instances.first.name)
-		test "should return an instance" do
-			instance.name.is_a? String
-		end
-	end
-
-	tests("#instance-delete", "create") do
-		instance = Fog::Compute[:oraclecloud].instances.get('Test123')
-		instance.destroy()
-		instance.wait_for { state == 'stopping' }
-		tests("should actually delete instance").raises(Fog::Compute::OracleCloud::NotFound) do
-			instance.wait_for { state == 'stopped' } 
-		end
-	end
+require 'pp'
+
+Shindo.tests('Fog::Compute[oraclecloud] | instance requests', 'instances') do
+	
+	tests("#instance-create", "create") do
+		#sshkey = Fog::Compute[:oraclecloud].ssh_keys.first.name
+		begin
+			sshkey = Fog::Compute[:oraclecloud].ssh_keys.get('Test123Key')
+		rescue Fog::Compute::OracleCloud::NotFound
+			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=='
+			)
+		end
+
+		new_instance = Fog::Compute[:oraclecloud].instances.create(
+			:name=>'Test123', 
+			:shape=>'oc3', 
+			:imagelist=>'/oracle/public/oel_6.4_2GB_v1',
+			:label=>'dev-vm',
+			:sshkeys=>[sshkey.name]
+		)
+		test "can create an instance" do
+			new_instance.is_a? Fog::Compute::OracleCloud::Instance
+		end
+		new_instance.wait_for { ready? }
+
+		test "is built" do
+			new_instance.state == 'running'
+		end
+
+		test "can create with minimum attributes" do
+			min_instance = Fog::Compute[:oraclecloud].instances.create
+			min_instance.is_a? Fog::Compute::OracleCloud::Instance
+			min_instance.wait_for { ready? }
+			min_instance.state == 'running'
+		end
+	end
+
+	tests('#instances-read') do
+		instances = Fog::Compute[:oraclecloud].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.name.is_a? String
+		end
+
+		instance = Fog::Compute[:oraclecloud].instances.get(instances.first.name)
+		test "should return an instance" do
+			instance.name.is_a? String
+		end
+	end
+
+	tests("#instance-delete", "create") do
+		instance = Fog::Compute[:oraclecloud].instances.get('Test123')
+		instance.destroy()
+		instance.wait_for { state == 'stopping' }
+		tests("should actually delete instance").raises(Fog::Compute::OracleCloud::NotFound) do
+			instance.wait_for { state == 'stopped' } 
+		end
+	end
 end

data/tests/requests/java_tests.rb

@@ -1,110 +1,150 @@
-require 'pp'
-
-Shindo.tests('Fog::Java[oraclecloud] | java requests', 'java') do
-	
-	tests("#java-create", "create") do
-		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 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
-		end	
-
-		test "is being built" do
-			!instance.ready?
-		end
-		instance.wait_for { ready? }
-
-		test "is built" do
-			instance.ready?
-		end
-	end
-
-	tests('#java-read') do
-		instances = Fog::OracleCloud[:java].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[:java].instances.get(instances.first.service_name)
-		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('test jcs scaling ') do
-	  scale_out_server_name = 'TestWLS_server_1'
-    test_service_name = 'TestWLS'
- 
-		test "scale out a cluster" do
-		  instance = Fog::OracleCloud[:java].instances.get(test_service_name)
-			instance.scale_out_a_cluster('testcluster',false)
-			Fog::OracleCloud[:java].instances.get(test_service_name).wait_for(1800) { ready? }
-			Fog::OracleCloud[:java].instances.get(test_service_name).ready?			
-		end
-
-    test('get server') do
-      instance = Fog::OracleCloud[:java].instances.get(test_service_name)
-      instance.ready? 
-      server = instance.servers.get(test_service_name,scale_out_server_name)
-      server.ready?   
-    end
-    
-  	test "scale a node" do
-  	  instance = Fog::OracleCloud[:java].instances.get(test_service_name)
-  		instance.ready? 
-  		server = instance.servers.get(test_service_name,scale_out_server_name)
-  		server.scale('oc4')
-  		Fog::OracleCloud[:java].instances.get(test_service_name).wait_for(1800) { ready? }
-  		server = instance.servers.get(test_service_name,scale_out_server_name)
-  		server.ready?
-  		server.shape == 'oc4'
-  	end
-  
-  	test "scale in a cluster" do
-  	  instance = Fog::OracleCloud[:java].instances.get(test_service_name)
-  		instance.ready? 
-  		instance.servers.get(test_service_name,scale_out_server_name).scale_in_a_cluster
-  		Fog::OracleCloud[:java].instances.get(test_service_name).wait_for(1800) { ready? }
-  		Fog::OracleCloud[:java].instances.get(test_service_name).ready?
-  	end
-  
-  end
-	
-	tests("#java-delete", "create") do
-		instance = Fog::OracleCloud[:java].instances.get('TestWLS')
-		instance.dba_name = 'Admin',
-		instance.dba_password = 'password'
-		instance.destroy()
-		instance.wait_for { stopping? }
-		tests("should actually delete instance").raises(Fog::OracleCloud::Java::NotFound) do
-			instance.wait_for { stopped? } 
-		end
-	end
-
-
+require 'pp'
+
+Shindo.tests('Fog::Java[oraclecloud] | java requests', 'java') do
+	
+	tests("#java-create", "create") do
+		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 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
+		end	
+
+		test "is being built" do
+			!instance.ready?
+		end
+		instance.wait_for { ready? }
+
+		test "is built" do
+			instance.ready?
+		end
+	end
+
+	tests('#java-read') do
+		instances = Fog::OracleCloud[:java].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[:java].instances.get(instances.first.service_name)
+		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('test jcs scaling', 'create') do
+	  scale_out_server_name = 'TestWLS_server_1'
+    test_service_name = 'TestWLS'
+ 
+		test "scale out a cluster" do
+		  instance = Fog::OracleCloud[:java].instances.get(test_service_name)
+			instance.scale_out_a_cluster('testcluster',false)
+			Fog::OracleCloud[:java].instances.get(test_service_name).wait_for(1800) { ready? }
+			Fog::OracleCloud[:java].instances.get(test_service_name).ready?			
+		end
+
+    test('get server') do
+      instance = Fog::OracleCloud[:java].instances.get(test_service_name)
+      instance.ready? 
+      server = instance.servers.get(test_service_name,scale_out_server_name)
+      server.ready?   
+    end
+    
+  	test "scale a node" do
+  	  instance = Fog::OracleCloud[:java].instances.get(test_service_name)
+  		instance.ready? 
+  		server = instance.servers.get(test_service_name,scale_out_server_name)
+  		server.scale('oc4')
+  		Fog::OracleCloud[:java].instances.get(test_service_name).wait_for(1800) { ready? }
+  		server = instance.servers.get(test_service_name,scale_out_server_name)
+  		server.ready?
+  		server.shape == 'oc4'
+  	end
+  
+  	test "scale in a cluster" do
+  	  instance = Fog::OracleCloud[:java].instances.get(test_service_name)
+  		instance.ready? 
+  		instance.servers.get(test_service_name,scale_out_server_name).scale_in_a_cluster
+  		Fog::OracleCloud[:java].instances.get(test_service_name).wait_for(1800) { ready? }
+  		Fog::OracleCloud[:java].instances.get(test_service_name).ready?
+  	end
+  
+  end
+
+  tests("#java-access-rules") do
+  	instance = Fog::OracleCloud[:java].instances.first
+
+  	test "list access rules" do
+  		rules = instance.access_rules
+  		rules.is_a? Array
+  		!rules.first.rule_name.nil?
+  	end
+
+  	rule_name = "my_corp_vnc_#{rand(100)}"
+  	test "create access rule" do
+  		rule = instance.access_rules.create({
+  			:rule_name => rule_name,
+  			:description => 'Corporate VNC to Admin Server',
+  			:ports => '5900',
+  			:protocol => 'tcp',
+  			:status => 'disabled',
+  			:source => '192.123.45.6/32',
+  			:destination => 'WLS_ADMIN_SERVER'
+  		})
+  		rule.is_a? Fog::OracleCloud::Java::AccessRule
+  		rule.status == 'disabled'
+  	end
+
+  	test "enable access rule" do
+  		rule = instance.access_rules.get(rule_name)
+  		rule.enable()
+  		rule.status == 'enabled'
+  	end
+
+  	test "delete access rule" do
+  		rule = instance.access_rules.get(rule_name)
+  		rule.destroy()
+			tests("should delete key").raises(Fog::OracleCloud::Java::NotFound) do
+				rule = instance.access_rules.get(rule_name)
+			end
+  	end
+
+  end
+	
+	tests("#java-delete", "create") do
+		instance = Fog::OracleCloud[:java].instances.get('TestWLS')
+		instance.dba_name = 'Admin',
+		instance.dba_password = 'password'
+		instance.destroy()
+		instance.wait_for { stopping? }
+		tests("should actually delete instance").raises(Fog::OracleCloud::Java::NotFound) do
+			instance.wait_for { stopped? } 
+		end
+	end
+
+
 end

data/tests/requests/orchestrations_tests.rb

@@ -1,91 +1,91 @@
-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 => orch_name,
-			:oplans => [{
-				'label' =>"WebServer",
-				'obj_type' => "launchplan",
-				'objects' => [{
-					'instances' =>[{
-						'shape' => 'oc3',
-						'label' => "vm-1",
-						'imagelist' =>'/oracle/public/oel_6.4_2GB_v1',
-						'name' => "WebServer"
-					}]
-				}]
-			}]
-		)
-		
-		test "can create an orchestration" do
-			orchestration.is_a? Fog::Compute::OracleCloud::Orchestration
-		end
-
-		check = Fog::Compute[:oraclecloud].orchestrations.get(orchestration.name)
-		test "can get created orchestration" do
-			check.uri == orchestration.uri
-		end
-
-		orchestration.oplans << {
-			'label' => "Database Server",
-			'obj_type' => "launchplan",
-			'objects' => [{
-				'instances' => [{
-					'shape' => 'oc3',
-					'label' => 'vm-2',
-					'imagelist' => '/oracle/public/oel_6.4_2GB_v1',
-					'name' => 'DatabaseServer'
-				}]
-			}]
-		}
-		orchestration.save()
-		#orchestration.wait_for { ready? }
-		test "can update orchestration" do
-			check = Fog::Compute[:oraclecloud].orchestrations.get(orchestration.name)
-			check.oplans.size == 2
-		end
-
-		orchestration.start()
-		orchestration.wait_for { running? }
-		test "can start" do
-			orchestration.status == 'running'
-		end
-		orchestration.stop()
-		orchestration.wait_for { stopped? }
-		test "can stop" do
-			orchestration.status == 'stopped'
-		end
-
-		
-	end
-
-	tests("#orchestrations-read") do
-		orchestrations = Fog::Compute[:oraclecloud].orchestrations
-		test "returns an Array" do
-			orchestrations.is_a? Array
-		end
-		
-		test "should return keys" do
-			orchestrations.size >= 1
-		end
-		test "should return a valid name" do
-			orchestrations.first.name.is_a? String
-		end
-
-		orchestrations = Fog::Compute[:oraclecloud].orchestrations.get(orchestrations.first.name)
-		test "should return a key" do
-			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
+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 => orch_name,
+			:oplans => [{
+				'label' =>"WebServer",
+				'obj_type' => "launchplan",
+				'objects' => [{
+					'instances' =>[{
+						'shape' => 'oc3',
+						'label' => "vm-1",
+						'imagelist' =>'/oracle/public/oel_6.4_2GB_v1',
+						'name' => "WebServer"
+					}]
+				}]
+			}]
+		)
+		
+		test "can create an orchestration" do
+			orchestration.is_a? Fog::Compute::OracleCloud::Orchestration
+		end
+
+		check = Fog::Compute[:oraclecloud].orchestrations.get(orchestration.name)
+		test "can get created orchestration" do
+			check.uri == orchestration.uri
+		end
+
+		orchestration.oplans << {
+			'label' => "Database Server",
+			'obj_type' => "launchplan",
+			'objects' => [{
+				'instances' => [{
+					'shape' => 'oc3',
+					'label' => 'vm-2',
+					'imagelist' => '/oracle/public/oel_6.4_2GB_v1',
+					'name' => 'DatabaseServer'
+				}]
+			}]
+		}
+		orchestration.save()
+		#orchestration.wait_for { ready? }
+		test "can update orchestration" do
+			check = Fog::Compute[:oraclecloud].orchestrations.get(orchestration.name)
+			check.oplans.size == 2
+		end
+
+		orchestration.start()
+		orchestration.wait_for { running? }
+		test "can start" do
+			orchestration.status == 'running'
+		end
+		orchestration.stop()
+		orchestration.wait_for { stopped? }
+		test "can stop" do
+			orchestration.status == 'stopped'
+		end
+
+		
+	end
+
+	tests("#orchestrations-read") do
+		orchestrations = Fog::Compute[:oraclecloud].orchestrations
+		test "returns an Array" do
+			orchestrations.is_a? Array
+		end
+		
+		test "should return keys" do
+			orchestrations.size >= 1
+		end
+		test "should return a valid name" do
+			orchestrations.first.name.is_a? String
+		end
+
+		orchestrations = Fog::Compute[:oraclecloud].orchestrations.get(orchestrations.first.name)
+		test "should return a key" do
+			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