cp_oraclecloud 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b309be01ededecda8f4a122b74ebe1321881ecf
-  data.tar.gz: 4df976087afbfe24dadedfa3d01dea592a39f0dd
+  metadata.gz: c71c79e6d8c964b6f6a179b98816de8e28756570
+  data.tar.gz: 8b674c39cd22ec9240956a448830f5c951c9e297
 SHA512:
-  metadata.gz: 128ac380fb8511765adb409840014026eefa25d07df8f63fbbfefaad796bb69507fda78146d64f2f72747dd847ae68dc669ca5caa02344d30022c4480dbe6c4f
-  data.tar.gz: ba0185bd806417b7dcac1127b6afbf7aba76368697167e986fdc2776b12e0068ce5c9f3735d2c3071dbda911685f1fc2d453fc34e2671cb8b2f9868cd1c06747
+  metadata.gz: 3abdfeff13bc49af0283474badbbe965246793752dd0d05fd5793cefd1ab3484a2d08d24db3ea1a6badc239236f5acba8623a46cebc7a64d73097193792c9194
+  data.tar.gz: c9e30a08902a498e7d79a5a32dc507e18c7186626144719e2b37d058e1af3cd6bb18cf03de3a047da87ccbe7752ab5c869928e0ce31440c128026210006f4d05

data/README.md

@@ -30,8 +30,11 @@ CpOraclecloud.setup do |config|
   config.region = <region, remove if using US data centres>
   config.compute_api = <compute url>
   config.storage_api = <storage url>
+  config.active_components = ['Database', 'Java']
 end
 ```
+The *active_components* option configures which components can be created in the cloud. Supported options are 'Database' and 'Java'. 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)

data/app/controllers/cp_oraclecloud/soa_components_controller.rb

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

data/app/controllers/cp_oraclecloud/soa_instances_controller.rb

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

data/app/models/cp_oraclecloud/database_component.rb

@@ -28,20 +28,6 @@ module CpOraclecloud
       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
-      "Database"
-    end
-
     def instance_type
       "CpOraclecloud::DatabaseInstance"
     end

data/app/models/cp_oraclecloud/database_instance.rb

@@ -2,7 +2,7 @@ module CpOraclecloud
   class DatabaseInstance < CloudInstance
 
 		def provision
-			connection.instances.create(init_config)
+			@instance = connection.instances.create(init_config)
 		end
 
 		def wait

data/app/models/cp_oraclecloud/java_component.rb

@@ -65,20 +65,6 @@ module CpOraclecloud
       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

data/app/models/cp_oraclecloud/soa_component.rb

@@ -0,0 +1,57 @@
+module CpOraclecloud
+  class SoaComponent < CloudComponent
+    after_initialize :init
+    store :config, accessors: [: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], coder: JSON
+
+    enum shape: [:oc1m, :oc2m, :oc3m, :oc4m, :oc5m]
+    enum topology: [:soa, :osb, :soaosb, :b2b, :mft, :apim, :insight]
+  
+    validates :service_name, :presence => true
+    validates :shape, :presence => true
+    validates :version, :presence => true
+    validates :ssh_key, :presence => true
+    validates :admin_password, :presence => true
+    validates :admin_username, :presence => true
+    validates :topology, :presence => true
+
+    validate :admin_password_complexity
+    validate :server_count_correct
+
+    def init
+      self.provision_otd ||= false
+      self.level ||= 'PAAS'
+      self.subscription_type ||= 'MONTHLY'
+      self.num_nodes ||= 1
+    end
+
+    def server_count_correct
+      if ![1,2,4].include?(num_nodes.to_i) then errors.add :num_nodes, "Invalid server 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 SOA Cloud Service'
+    end
+
+    def instance_name
+      "service_name"
+    end
+
+    def instance_type
+      "CpOraclecloud::SoaInstance"
+    end
+  end
+end

data/app/models/cp_oraclecloud/soa_instance.rb

@@ -0,0 +1,55 @@
+module CpOraclecloud
+  class SoaInstance < CloudInstance
+
+		def provision
+			connection.instances.create(init_config)
+		end
+
+		def wait
+			fog.wait_for { ready? }
+		end
+
+		def provider
+			"OracleCloud"
+		end
+
+		def cloud_type
+			"SOA"
+		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::SOA.new(
+	      :oracle_username => CpOraclecloud.username,
+	      :oracle_password => CpOraclecloud.password,
+	      :oracle_domain => CpOraclecloud.domain,
+	      :oracle_region => CpOraclecloud.region
+	      )
+		end
+
+	end
+end

data/app/policies/cp_oraclecloud/soa_component_policy.rb

@@ -0,0 +1,5 @@
+module CpOraclecloud
+
+class SoaComponentPolicy < CloudComponentPolicy
+end
+end

data/app/policies/cp_oraclecloud/soa_instance_policy.rb

@@ -0,0 +1,5 @@
+module CpOraclecloud
+
+class SoaInstancePolicy < CloudInstancePolicy
+end
+end

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

@@ -0,0 +1,37 @@
+<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>
+</ul>
+
+
+<div class="tab-content ">
+  <div class="tab-pane active" id="general">
+		<%= f.input :service_name %>
+		<%= f.input :description %>
+		<%= f.input :topology %>
+		<%= 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 :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 }%>
+	</div>
+	<div class="tab-pane" id="database">
+		<em>If you leave these blank, the system will create a Enterprise Edition (12.1.0.2) Database of size 'oc3' with the name '%service_name%-DB'</em>
+		<%= f.input :db_service_name %>
+		<%= f.input :dba_name %>
+		<%= f.input :dba_password, input_html: { value: @component.dba_password }%>		
+	</div>
+	<div class="tab-pane" id="networking">
+		<%= f.input :provision_otd, as: :boolean %>
+	</div>
+</div>

data/app/views/cp_oraclecloud/soa_instances/_show.html.erb

@@ -0,0 +1,8 @@
+<dl class="dl-horizontal">
+	<% ['description', 'status', 'shape', 'level', 'edition', 'version', 'service_uri'].each { |a| %>
+		<% if instance.attr_get(a).present? then %>
+			<dt><%= a.titleize() %></dt>
+			<dd><%= instance.attr_get(a) %></dd>
+		<% end %>
+ 	<% } %>
+</dl>

data/app/views/products/_cp_oraclecloud_component_menu.html.erb

@@ -7,6 +7,8 @@
 			<%= link_to "Create Database", [@product, CpOraclecloud::DatabaseComponent, action: :new]%>
 		<% elsif comp == 'Java' %>
 			<%= link_to "Create WebLogic", [@product, CpOraclecloud::JavaComponent, action: :new]%>
+		<% elsif comp == 'SOA' %>
+			<%= link_to "Create SOA Instance", [@product, CpOraclecloud::SoaComponent, action: :new]%>
 		<% end %>
 		</li>
 	<% end %>

data/config/routes.rb

@@ -1,17 +1,19 @@
-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
-
-	namespace :cp_oraclecloud do
-		resources :database_instances, type: 'CpOraclecloud::DatabaseInstance' do
-			put :backup
-		end
-		resources :java_instances, type: 'CpOraclecloud::JavaInstance' do
-			put :backup
-		end
-	end
-end
+Rails.application.routes.draw do
+	resources :products do
+		namespace :cp_oraclecloud do
+			resources :database_components, type: 'CpOraclecloud::DatabaseComponent'
+			resources :java_components, type: 'CpOraclecloud::JavaComponent'
+			resources :soa_components, type: 'CpOraclecloud::SoaComponent'
+		end
+	end
+
+	namespace :cp_oraclecloud do
+		resources :database_instances, type: 'CpOraclecloud::DatabaseInstance' do
+			put :backup
+		end
+		resources :java_instances, type: 'CpOraclecloud::JavaInstance' do
+			put :backup
+		end
+		resources :soa_instances, type: 'CpOraclecloud::SoaInstance'
+	end
+end

data/lib/cp_oraclecloud/version.rb

@@ -1,3 +1,3 @@
-module CpOraclecloud
-  VERSION = '0.1.7'
-end
+module CpOraclecloud
+  VERSION = '0.1.8'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cp_oraclecloud
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Joel Nation
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-24 00:00:00.000000000 Z
+date: 2016-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -59,18 +59,26 @@ files:
 - app/controllers/cp_oraclecloud/database_instances_controller.rb
 - app/controllers/cp_oraclecloud/java_components_controller.rb
 - app/controllers/cp_oraclecloud/java_instances_controller.rb
+- app/controllers/cp_oraclecloud/soa_components_controller.rb
+- app/controllers/cp_oraclecloud/soa_instances_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/models/cp_oraclecloud/soa_component.rb
+- app/models/cp_oraclecloud/soa_instance.rb
 - app/policies/cp_oraclecloud/database_component_policy.rb
 - app/policies/cp_oraclecloud/database_instance_policy.rb
 - app/policies/cp_oraclecloud/java_component_policy.rb
 - app/policies/cp_oraclecloud/java_instance_policy.rb
+- app/policies/cp_oraclecloud/soa_component_policy.rb
+- app/policies/cp_oraclecloud/soa_instance_policy.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
 - app/views/cp_oraclecloud/java_instances/_show.html.erb
+- app/views/cp_oraclecloud/soa_components/_fields.html.erb
+- app/views/cp_oraclecloud/soa_instances/_show.html.erb
 - app/views/products/_cp_oraclecloud_component_menu.html.erb
 - config/routes.rb
 - lib/cp_oraclecloud.rb