cp_oraclecloud 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4197fac53f0abf22ab0e8304998e2b97acd05983
-  data.tar.gz: 4c167e946da04179e2cc783d05c91bc60304795a
+  metadata.gz: a839cf27bf08b34c85237dd832567b51f4b24971
+  data.tar.gz: 7246253711b7a7e5ab12b5243c33a26e621bc224
 SHA512:
-  metadata.gz: 56f0ae81ad6c7fa2e0d18c30b89bb8297dca17fcce79464de50ed19136ac6b2d8793bcda9b901fc0606d6a7706a5707808d2be055d7862c77335be39e16413e3
-  data.tar.gz: 2a88c7202edfb8d829c81f891f64b0d8d835df5a2385673bf7a834396be0ca0ffc8d7e717b958b90f2e2067e9eef5625a91ed0b8a7da7b00f8a73a100099dd42
+  metadata.gz: 201e38663ac20bc1e4a92169b0d82c1bbf3e24ffae0fb5d1c1ecc1bd130125ba144ee4ce07581bb8761e20f045e086563b0f4a506023e773a1d366d2f657b082
+  data.tar.gz: 933a1ae6ef61e064cb7ad96e469a51c8c05e29f18a6e7fa81859c8175869722f42e6da9a3289c8568ef60d73caf1fa1051c70b7616c1c83b26c859c5d3e92d9d

data/app/controllers/cp_oraclecloud/java_components_controller.rb

@@ -0,0 +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
+end

data/app/models/cp_oraclecloud/database_instance.rb

@@ -5,6 +5,10 @@ module CpOraclecloud
 			connection.instances.create(init_config)
 		end
 
+		def wait
+			fog.wait_for { ready? }
+		end
+
 		def provider
 			"OracleCloud"
 		end

data/app/models/cp_oraclecloud/java_component.rb

@@ -0,0 +1,91 @@
+module CpOraclecloud
+  class JavaComponent < CloudComponent
+    after_initialize :init
+    store :config, accessors: [: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], coder: JSON
+
+    enum edition: [:SE, :EE, :SUITE]
+    enum shape: [:oc3, :oc4, :oc5, :oc6, :oc1m, :oc2m, :oc3m, :oc4m]
+    enum level: [:PAAS, :BASIC]
+    enum subscription_type: [:HOURLY, :MONTHLY]
+    enum domain_mode: [:DEVELOPMENT, :PRODUCTION]
+  
+    validates :service_name, :presence => true
+    validates :dba_name, :presence => true
+    validates :dba_password, :presence => true
+    validates :db_service_name, :presence => true
+    validates :shape, :presence => true
+    validates :version, :presence => true
+    validates :ssh_key, :presence => true
+    validates :admin_password, :presence => true
+    #validates_inclusion_of :num_nodes, :in => [1,2,4,8]
+    #validates :domain_partition_count, :inclusion => {:in => [0,1,2,4]}
+
+    validate :admin_password_complexity
+    validate :server_count_correct
+    validate :domain_partition_correct
+
+    def init
+      self.enable_admin_console ||= true
+      self.provision_otd ||= true
+      self.level ||= 'PAAS'
+      self.subscription_type ||= 'HOURLY'
+      self.edition ||= 'EE'
+      self.num_nodes ||= 1
+    end
+
+    def server_count_correct
+      if ![1,2,4,8].include?(num_nodes.to_i) then errors.add :num_nodes, "Invalid server count" end
+    end
+
+    def domain_partition_correct
+      if ![0,1,2,4].include?(domain_partition_count.to_i) then errors.add :domain_partition_count, "Invalid Domain Partition Count" end
+    end
+
+    def admin_password_complexity
+      if admin_password.size < 8 or admin_password.size > 30
+        errors.add :admin_password, "Must be at betweeen 8 and 30 characters long."
+      end
+      if !(admin_password[0] =~ /[[:alpha:]]/)
+        errors.add :admin_password, "First character must be a letter"
+      end
+      if (admin_password =~ /[a-z]/).blank? then errors.add :admin_password, 'Must contain a lower case letter' end
+      if (admin_password =~ /[A-Z]/).blank? then errors.add :admin_password, 'Must contain an upper case letter' end
+      if (admin_password =~ /[0-9]/).blank? then errors.add :admin_password, 'Must contain atleast one number' end
+      if (admin_password =~ /[-_#$]/).blank? then errors.add :admin_password, 'Must contain a special character (-, _, #, $)' end
+
+    end
+
+    def pretty_type
+      'Oracle Java Cloud Service'
+    end
+
+    def pretty_size
+      if config && config.is_a?(Hash) && config.key?('shape')
+        config['shape']
+      end
+    end
+
+    # These should be constants, can't work out
+    # how to access them that way though
+    def self.provider
+      "OracleCloud"
+    end
+
+    def provider
+      "OracleCloud"
+    end
+
+    def fog_type
+      "Java"
+    end
+
+    def instance_type
+      "CpOraclecloud::JavaInstance"
+    end
+
+    def instance_name
+      "service_name"
+    end
+
+  end
+end

data/app/models/cp_oraclecloud/java_instance.rb

@@ -0,0 +1,54 @@
+module CpOraclecloud
+  class JavaInstance < CloudInstance
+
+		def provision
+			connection.instances.create(init_config)
+		end
+
+		def wait
+			fog.wait_for { ready? }
+		end
+
+		def provider
+			"OracleCloud"
+		end
+
+		def cloud_type
+			"Java"
+		end
+
+		def fog
+			@instance ||= connection.instances.get(name)
+			@instance
+		end
+
+		def attr_get(attribute)
+			begin
+				@instance ||= connection.instances.get(name)
+				@instance.attributes[attribute.to_sym]
+			rescue Fog::OracleCloud::Database::NotFound
+				"Error"
+			end
+		end
+
+		def month_cost
+			cost = 0
+			cost
+		end
+
+		def calc_cost(start_date, end_date)
+			cost = 0
+			cost = (end_date - start_date) * (month_cost / 30)
+			cost
+		end
+
+		def connection 
+	 		@connection ||= Fog::OracleCloud::Java.new(
+	      :oracle_username => APP_CONFIG[:oracle_username],
+	      :oracle_password => APP_CONFIG[:oracle_password],
+	      :oracle_domain => APP_CONFIG[:oracle_domain],
+	      )
+		end
+
+	end
+end

data/app/views/cp_oraclecloud/java_components/_fields.html.erb

@@ -0,0 +1,68 @@
+<em>Required fields are on the General and Database tabs. You can ignore the rest if needed</em>
+<ul class="nav nav-tabs">
+  <li role="presentation" class="active"><a href="#general" data-toggle="tab">* General</a></li>
+  <li role="presentation"><a href="#database" data-toggle="tab"> * Database</a></li>
+  <li role="presentation"><a href="#storage" data-toggle="tab"> Storage</a></li>
+  <li role="presentation"><a href="#networking" data-toggle="tab"> Networking</a></li>
+  <li role="presentation"><a href="#config" data-toggle="tab">Server Config</a></li>
+</ul>
+
+
+<div class="tab-content ">
+  <div class="tab-pane active" id="general">
+		<%= f.input :service_name %>
+		<%= f.input :description %>
+		<%= f.input :edition, :label_method=> lambda { |item| "#{item.first.upcase}" } %>
+		<%= f.input :shape %>
+		<%= f.input :num_nodes, label: 'Managed Server Count', as: :integer, hint: 'Valid values: 1, 2, 4, 8' %>
+		<%= f.input :version %>
+		<%= f.input :level, :label_method=> lambda { |item| "#{item.first.upcase}" }  %>
+		<%= f.input :subscription_type, :label_method=> lambda { |item| "#{item.first.upcase}" }  %>
+		<%= f.input :ssh_key %>
+		<%= f.input :admin_username %>
+		<%= f.input :admin_password, input_html: { value: @component.admin_password } %>
+	</div>
+	<div class="tab-pane" id="storage">
+		<em>If you leave these blank, the system will create a storage container with the name '%service_name%_backup'</em>
+		<%= f.input :cloud_storage_container %>
+		<%= f.input :cloud_storage_user %>
+		<%= f.input :cloud_storage_pwd, input_html: { value: @component.cloud_storage_pwd }%>
+		<%= f.input :cloud_storage_if_missing, as: :boolean, label: 'Create storage container if missing?' %>
+		<%= f.input :backup_volume_size, hint: 'In bytes or GBs (with a G). Ie: 100000000000 or 10G' %>
+		<%= f.input :domain_volume_size, hint: 'In bytes or GBs (with a G). Ie: 100000000000 or 10G' %>
+
+	</div>
+	<div class="tab-pane" id="database">
+		<%= f.input :db_service_name %>
+		<%= f.input :dba_name %>
+		<%= f.input :dba_password, input_html: { value: @component.dba_password }%>
+		<%= f.input :pdb_name, hint: 'Will use default PDB is not provided. Only valid for 12c databases' %>
+		
+	</div>
+	<div class="tab-pane" id="networking">
+		<%= f.input :enable_admin_console, as: :boolean, hint: 'Configures networking to the admin console' %>
+		<%= f.input :provision_otd, as: :boolean %>
+		<%= f.input :admin_port, input_html: { placeholder: 7001 } %>
+		<%= f.input :content_port, input_html: { placeholder: 8001 } %>
+		<%= f.input :wls_deployment_channel_port, input_html: { placeholder: 9001 }, label: 'Deployment Channel Port', hint: 'Port used for accessing admin server using WLST' %>
+		<%= f.input :node_manager_port, input_html: { placeholder: 5556 } %>
+		<%= f.input :secured_admin_port, input_html: { placeholder: 7002 } %>
+		<%= f.input :secured_content_port, input_html: { placeholder: 8002 } %>
+
+	</div>
+	<div class="tab-pane" id="config">
+		<%= f.input :cluster_name, hint: 'Leave blank to have %service_name%_cluster' %>	
+		<%= f.input :domain_name, hint: 'Leave blank to have %service_name%_domain' %>	
+		<%= f.input :domain_mode %>
+		<%= f.input :domain_partition_count, as: :integer, hint: 'Valid values: 0, 1, 2, 4' %>
+		<%= f.input :node_manager_username %>
+		<%= f.input :node_manager_password, input_html: { value: @component.node_manager_password } %>
+
+		<%= f.input :ms_initial_heap_mb %>
+		<%= f.input :ms_jvm_args %>
+		<%= f.input :ms_max_heap_mb %>
+		<%= f.input :ms_max_perm_mb %>
+		<%= f.input :overwrite_ms_jvm_args %>
+		<%= f.input :sample_app_deployment_requested, as: :boolean %>
+	</div>
+</div>

data/config/routes.rb

@@ -2,6 +2,7 @@ Rails.application.routes.draw do
 	resources :products do
 		namespace :cp_oraclecloud do
 			resources :database_components, type: 'CpOraclecloud::DatabaseComponent'
+			resources :java_components, type: 'CpOraclecloud::JavaComponent'
 		end
 	end
 
@@ -9,5 +10,8 @@ Rails.application.routes.draw do
 		resources :database_instances, type: 'CpOraclecloud::DatabaseInstance' do
 			put :backup
 		end
+		resources :java_instances, type: 'CpOraclecloud::JavaInstance' do
+			put :backup
+		end
 	end
 end

data/lib/cp_oraclecloud/version.rb

@@ -1,3 +1,3 @@
 module CpOraclecloud
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cp_oraclecloud
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Joel Nation
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-17 00:00:00.000000000 Z
+date: 2016-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -57,10 +57,14 @@ files:
 - app/assets/config/cp_oraclecloud_manifest.js
 - app/controllers/cp_oraclecloud/database_components_controller.rb
 - app/controllers/cp_oraclecloud/database_instances_controller.rb
+- app/controllers/cp_oraclecloud/java_components_controller.rb
 - app/models/cp_oraclecloud/database_component.rb
 - app/models/cp_oraclecloud/database_instance.rb
+- app/models/cp_oraclecloud/java_component.rb
+- app/models/cp_oraclecloud/java_instance.rb
 - app/views/cp_oraclecloud/database_components/_fields.html.erb
 - app/views/cp_oraclecloud/database_instances/_show.html.erb
+- app/views/cp_oraclecloud/java_components/_fields.html.erb
 - config/routes.rb
 - lib/cp_oraclecloud.rb
 - lib/cp_oraclecloud/engine.rb