cp_oraclecloud 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c78ca804b054bdfb3c01b17f2e4e9794ac264e28
-  data.tar.gz: c5fba7ace68a7ab0e0f5dde90147051f28b9633c
+  metadata.gz: b310e6d45a592f97e412c303511bae7b178facd1
+  data.tar.gz: ccb36c2a552cfa869324eb4a56b7921102a1f454
 SHA512:
-  metadata.gz: 4fee671dccd5040daff93ceff1bb006691fd9d1c049c94c0d7ffcde74107a8e6aa3178db7f781d36e5213f79421735b12d9435b81856a176c6bb836134b26e75
-  data.tar.gz: 0ff67df98036aa9a8b8d389b7d7a2005174bcc71ce9282590db60596b0df5f931c8991da182014a6224a5442f6a67ce6ba87fa18c290e7def922f339538b6f57
+  metadata.gz: 2066969495e34e905c324bbbab1f95d83476a0fc5a7df6938f85b32eb67fd0151ba6bcf473a91da982ccb5713637d272bf971252ba3a5f447f5486633c94b077
+  data.tar.gz: 58ea82f86220bcce15a0a9b586fe3868495eed5bb87a8bb3c87a3a014899d4a9b89518bd240bf1b0c7d78c27b347557c027acfc8edb4f9bb3882ab3f3f7f0c3d

data/README.md

@@ -1,46 +1,118 @@
-# CP_OracleCloud
-Cloud Portal plugin to support the Oracle Cloud Platform.
-
-## Usage
-This is included by default in the Cloud Portal project. It relies on that project and will not work stand-alone. 
-
-## Installation
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'cp_oraclecloud'
-```
-
-And then execute:
-```bash
-$ bundle
-```
-
-Or install it yourself as:
-```bash
-$ gem install cp_oraclecloud
-```
-Configuration options need to be added to an initliazer in your app. Eg: in config/initializers/cp_oraclecloud.rb
-
-```ruby
-CpOraclecloud.setup do |config|
-  config.username = <username>
-  config.password = <password>
-  config.domain = <domain>
-  config.region = <region, remove if using US data centres>
-  config.compute_api = <compute url>
-  config.storage_api = <storage url>
-  config.active_components = ['Database', 'Java', 'SOA']
-end
-```
-The *active_components* option configures which components can be created in the cloud. Supported options are 'Database', 'Java' and 'SOA'. Remove any services you aren't subscribed to. 
-
-## Contributing
-1. Fork it ( https://github.com/Joelith/cp_oraclecloud )
-2. Create your feature branch (git checkout -b my-new-feature)
-3. Commit your changes (git commit -am 'Add some feature')
-4. Push to the branch (git push origin my-new-feature)
-5. Create a new Pull Request
-
-## License
-The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
+# CP_OracleCloud
+Cloud Portal plugin to support the Oracle Cloud Platform.
+
+## Usage
+This is included by default in the Cloud Portal project. It relies on that project and will not work stand-alone. 
+
+## Installation
+Add this line to your application's Gemfile:
+
+```ruby
+gem 'cp_oraclecloud'
+```
+
+And then execute:
+```bash
+$ bundle
+```
+
+Or install it yourself as:
+```bash
+$ gem install cp_oraclecloud
+```
+Configuration options need to be added to an initliazer in your app. Eg: in config/initializers/cp_oraclecloud.rb
+
+```ruby
+CpOraclecloud.setup do |config|
+  config.username = <username>
+  config.password = <password>
+  config.domain = <domain>
+  config.region = <region, remove if using US data centres>
+  config.compute_api = <compute url>
+  config.storage_api = <storage url>
+  config.active_components = ['Database', 'Java', 'SOA']
+  config.rate_card = YAML.load_file(File.expand_path "<path to rate card yml file", __FILE__)[Rails.env].symbolize_keys!
+
+end
+```
+The *active_components* option configures which components can be created in the cloud. Supported options are 'Database', 'Java' and 'SOA'. Remove any services you aren't subscribed to. 
+
+The *rate_card* option points to where the rate card YML file is located. Add the following to /config/oraclecloud_rate_card.yml to use the default US pricing for the Oracle Cloud (modify to suit your rate card)
+
+```yml
+---
+defaults: &defaults
+  compute:
+    hourly: 0.1
+  java:
+    general:
+      standard: 
+        monthly: 450
+        hourly: 0.75
+      enterprise: 
+        monthly: 1200
+        hourly: 2.02
+      suite: 
+        monthly: 2800
+        hourly: 4.7
+    high:
+      standard: 
+        monthly: 550
+        hourly: 0.924
+      enterprise: 
+        monthly: 1300
+        hourly: 2.184
+      suite: 
+        monthly: 2900
+        hourly: 4.872
+  soa:
+    full: 5500
+    api: 3500
+    mft: 4500
+  database:
+    general:
+      standard: 
+        monthly: 600
+        hourly: 1.08
+      enterprise: 
+        monthly: 3000
+        hourly: 5.04
+      hp: 
+        monthly: 4000
+        hourly: 6.72
+      xp:
+        monthly: 5000
+        hourly: 8.401
+    high:
+      standard: 
+        monthly: 700
+        hourly: 1.176
+      enterprise: 
+        monthly: 3100
+        hourly: 5.208
+      hp: 
+        monthly: 4100
+        hourly: 6.888
+      xp:
+        monthly: 5100
+        hourly: 8.569
+
+development:
+  <<: *defaults
+
+test:
+  <<: *defaults
+
+production:
+  <<: *defaults
+```
+
+## Contributing
+1. Fork it ( https://github.com/Joelith/cp_oraclecloud )
+2. Create your feature branch (git checkout -b my-new-feature)
+3. Commit your changes (git commit -am 'Add some feature')
+4. Push to the branch (git push origin my-new-feature)
+5. Create a new Pull Request
+
+## License
+The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).

data/app/controllers/cp_oraclecloud/compute_components_controller.rb

@@ -1,9 +1,9 @@
-module CpOraclecloud
-	class ComputeComponentsController < CloudComponentsController
-
-		private
-		def component_params
-		  params.require(:cp_oraclecloud_compute_component).permit(:name, :shape, :imagelist, :label, :sshkeys)
-		end
-	end
+module CpOraclecloud
+	class ComputeComponentsController < CloudComponentsController
+
+		private
+		def component_params
+		  params.require(:cp_oraclecloud_compute_component).permit(:name, :shape, :imagelist, :label, :sshkeys)
+		end
+	end
 end

data/app/controllers/cp_oraclecloud/compute_instances_controller.rb

@@ -1,5 +1,5 @@
-module CpOraclecloud
-	class ComputeInstancesController < CloudInstancesController
-
-	end
-end
+module CpOraclecloud
+	class ComputeInstancesController < CloudInstancesController
+
+	end
+end

data/app/controllers/cp_oraclecloud/database_components_controller.rb

@@ -1,9 +1,9 @@
-module CpOraclecloud
-	class DatabaseComponentsController < CloudComponentsController
-
-		private
-		def component_params
-		  params.require(:cp_oraclecloud_database_component).permit(:service_name, :version, :description, :ssh_key, :shape, :level, :subscription_type, :edition, :backup_destination, :admin_password)
-		end
-	end
+module CpOraclecloud
+	class DatabaseComponentsController < CloudComponentsController
+
+		private
+		def component_params
+		  params.require(:cp_oraclecloud_database_component).permit(:service_name, :version, :description, :ssh_key, :shape, :level, :subscription_type, :edition, :backup_destination, :admin_password)
+		end
+	end
 end

data/app/controllers/cp_oraclecloud/database_instances_controller.rb

@@ -1,11 +1,11 @@
-module CpOraclecloud
-	class DatabaseInstancesController < CloudInstancesController
-
-		def backup
-	  	instance = CloudInstance.find(params[:database_instance_id])
-			instance.fog.backup()
-			flash[:notice] = "Backup has been requested"
-			redirect_to request.referrer
-		end
-	end
-end
+module CpOraclecloud
+	class DatabaseInstancesController < CloudInstancesController
+
+		def backup
+	  	instance = CloudInstance.find(params[:database_instance_id])
+			instance.fog.backup()
+			flash[:notice] = "Backup has been requested"
+			redirect_to request.referrer
+		end
+	end
+end

data/app/controllers/cp_oraclecloud/java_components_controller.rb

@@ -1,9 +1,9 @@
-module CpOraclecloud
-	class JavaComponentsController < CloudComponentsController
-
-		private
-		def component_params
-		  params.require(:cp_oraclecloud_java_component).permit(:service_name, :cloud_storage_container, :cloud_storage_pwd, :cloud_storage_user, :cloud_storage_if_missing, :description, :enable_admin_console, :provision_otd, :sample_app_deployment_requested, :subscription_type, :level, :admin_password, :admin_port, :admin_username, :backup_volume_size, :cluster_name, :content_port, :dba_name, :dba_password, :db_service_name, :wls_deployment_channel_port, :domain_mode, :domain_name, :domain_partition_count, :domain_volume_size, :edition, :num_nodes, :ms_initial_heap_mb, :ms_jvm_args, :ms_max_heap_mb, :ms_max_perm_mb, :node_manager_password, :node_manager_port, :node_manager_username, :overwrite_ms_jvm_args, :pdb_name, :secured_admin_port, :secured_content_port, :shape, :ssh_key, :version)
-		end
-	end
+module CpOraclecloud
+	class JavaComponentsController < CloudComponentsController
+
+		private
+		def component_params
+		  params.require(:cp_oraclecloud_java_component).permit(:service_name, :cloud_storage_container, :cloud_storage_pwd, :cloud_storage_user, :cloud_storage_if_missing, :description, :enable_admin_console, :provision_otd, :sample_app_deployment_requested, :subscription_type, :level, :admin_password, :admin_port, :admin_username, :backup_volume_size, :cluster_name, :content_port, :dba_name, :dba_password, :db_service_name, :wls_deployment_channel_port, :domain_mode, :domain_name, :domain_partition_count, :domain_volume_size, :edition, :num_nodes, :ms_initial_heap_mb, :ms_jvm_args, :ms_max_heap_mb, :ms_max_perm_mb, :node_manager_password, :node_manager_port, :node_manager_username, :overwrite_ms_jvm_args, :pdb_name, :secured_admin_port, :secured_content_port, :shape, :ssh_key, :version)
+		end
+	end
 end

data/app/controllers/cp_oraclecloud/java_instances_controller.rb

@@ -1,5 +1,5 @@
-module CpOraclecloud
-	class JavaInstancesController < CloudInstancesController
-
-	end
-end
+module CpOraclecloud
+	class JavaInstancesController < CloudInstancesController
+
+	end
+end

data/app/controllers/cp_oraclecloud/soa_components_controller.rb

@@ -1,9 +1,9 @@
-module CpOraclecloud
-	class SoaComponentsController < CloudComponentsController
-
-		private
-		def component_params
-		  params.require(:cp_oraclecloud_soa_component).permit(:service_name, :cloud_storage_container, :cloud_storage_pwd, :cloud_storage_user, :description, :provision_otd, :subscription_type, :level, :topology, :admin_password, :admin_username, :dba_name, :dba_password, :db_service_name, :num_nodes, :shape, :ssh_key, :version)
-		end
-	end
+module CpOraclecloud
+	class SoaComponentsController < CloudComponentsController
+
+		private
+		def component_params
+		  params.require(:cp_oraclecloud_soa_component).permit(:service_name, :cloud_storage_container, :cloud_storage_pwd, :cloud_storage_user, :description, :provision_otd, :subscription_type, :level, :topology, :admin_password, :admin_username, :dba_name, :dba_password, :db_service_name, :num_nodes, :shape, :ssh_key, :version)
+		end
+	end
 end

data/app/controllers/cp_oraclecloud/soa_instances_controller.rb

@@ -1,5 +1,5 @@
-module CpOraclecloud
-	class SoaInstancesController < CloudInstancesController
-
-	end
-end
+module CpOraclecloud
+	class SoaInstancesController < CloudInstancesController
+
+	end
+end

data/app/controllers/cp_oraclecloud/ssh_keys_controller.rb

@@ -1,68 +1,68 @@
-module CpOraclecloud
-	class SshKeysController < ApplicationController
-		before_action :set_ssh_key, only: [:show, :edit, :update, :destroy]
-
-		def index
-			authorize SshKey
-			@ssh_keys = policy_scope(SshKey)
-		end
-
-		def new
-			authorize SshKey
-			@ssh_key = CpOraclecloud::SshKey.new
-		end
-
-		def show
-			authorize @ssh_key
-		end
-
-		def create
-			authorize SshKey
-		  @ssh_key = SshKey.new(ssh_key_params)
-
-		  if @ssh_key.save
-		    flash[:notice] = "SSH Key has been created."
-		    redirect_to cp_oraclecloud_ssh_keys_path
-		  else
-	  	  flash.now[:alert] = "SSH Key has not been created."
-		    render "new"
-		  end
-		end
-
-		def edit
-			authorize @ssh_key
-		end
-
-		def destroy
-			authorize @ssh_key
-			@ssh_key.destroy
-	  	flash[:notice] = "SSH Key has been deleted."
-
-	  	redirect_to cp_oraclecloud_ssh_keys_path
-		end
-
-		def update
-			authorize @ssh_key
-			if @ssh_key.update_attributes(ssh_key_params)
-				flash[:notice] = "SSH Key has been updated."
-				redirect_to cp_oraclecloud_ssh_keys_path
-			else
-				flash.now[:alert] = "SSH Key has not been updated."
-				render "edit"
-			end
-		end
-
-		private
-
-		def set_ssh_key
-		  @project = CpOraclecloud::SshKey.find(params[:name])
-		rescue ActiveRecord::RecordNotFound
-		  flash[:alert] = "The SSH Key you were looking for could not be found."
-		  redirect_to cp_oraclecloud_ssh_keys_path
-		end
-
-		def ssh_key_params
-	  	params.require(:cp_oraclecloud_ssh_key).permit(:name, :enabled, :key)
-		end
-	end
-end
+module CpOraclecloud
+	class SshKeysController < ApplicationController
+		before_action :set_ssh_key, only: [:show, :edit, :update, :destroy]
+
+		def index
+			authorize SshKey
+			@ssh_keys = policy_scope(SshKey)
+		end
+
+		def new
+			authorize SshKey
+			@ssh_key = CpOraclecloud::SshKey.new
+		end
+
+		def show
+			authorize @ssh_key
+		end
+
+		def create
+			authorize SshKey
+		  @ssh_key = SshKey.new(ssh_key_params)
+
+		  if @ssh_key.save
+		    flash[:notice] = "SSH Key has been created."
+		    redirect_to cp_oraclecloud_ssh_keys_path
+		  else
+	  	  flash.now[:alert] = "SSH Key has not been created."
+		    render "new"
+		  end
+		end
+
+		def edit
+			authorize @ssh_key
+		end
+
+		def destroy
+			authorize @ssh_key
+			@ssh_key.destroy
+	  	flash[:notice] = "SSH Key has been deleted."
+
+	  	redirect_to cp_oraclecloud_ssh_keys_path
+		end
+
+		def update
+			authorize @ssh_key
+			if @ssh_key.update_attributes(ssh_key_params)
+				flash[:notice] = "SSH Key has been updated."
+				redirect_to cp_oraclecloud_ssh_keys_path
+			else
+				flash.now[:alert] = "SSH Key has not been updated."
+				render "edit"
+			end
+		end
+
+		private
+
+		def set_ssh_key
+		  @project = CpOraclecloud::SshKey.find(params[:name])
+		rescue ActiveRecord::RecordNotFound
+		  flash[:alert] = "The SSH Key you were looking for could not be found."
+		  redirect_to cp_oraclecloud_ssh_keys_path
+		end
+
+		def ssh_key_params
+	  	params.require(:cp_oraclecloud_ssh_key).permit(:name, :enabled, :key)
+		end
+	end
+end