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